Skip to content

admission,server: context improvements#72647

Merged
craig[bot] merged 6 commits intocockroachdb:masterfrom
knz:20211111-contexts
Nov 11, 2021
Merged

admission,server: context improvements#72647
craig[bot] merged 6 commits intocockroachdb:masterfrom
knz:20211111-contexts

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Nov 11, 2021

All commits but the last 2 from #72644
(Reviewers: only review last 2 commits)

Informs #58938

@knz knz requested review from a team and stevendanna November 11, 2021 14:49
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Member

@RaduBerinde RaduBerinde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @stevendanna)

knz added 6 commits November 11, 2021 18:43
- `(*AmbientContext).AnnotateCtx()` - takes care of connecting the
  context to the tracer
- `logtags.FromContext` / `logtags.WithTags` - reproduces the logging
  tags on the child context.

Release note: None
This ensures the activity is present in traces, logs, etc
and that the server IDs are properly reported.

Release note: None
@knz knz force-pushed the 20211111-contexts branch from 98c4f1e to 465c8ea Compare November 11, 2021 19:04
@knz
Copy link
Copy Markdown
Contributor Author

knz commented Nov 11, 2021

bors r=RaduBerinde

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 11, 2021

Build succeeded:

@craig craig bot merged commit 4300949 into cockroachdb:master Nov 11, 2021
@knz knz deleted the 20211111-contexts branch November 12, 2021 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants