backport recent commits from master
#2096
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch backports the following commits from
master
:#[instrument(follows_from = …)]
(attributes, mock: permit#[instrument(follows_from = …)]
#2093)#[instrument(parent = …)]
(attributes: permit setting parent span via#[instrument(parent = …)]
#2091)async
blocks (attributes: remove extra braces aroundasync
blocks #2090)callsite
module (core: document thecallsite
module #2088)After this, we'll prep a new
tracing-attributes
release, andadd additional docs to the changes in #2083 based on those
added in #2093