Merge main 2 #2199
Merged
Merge main 2 #2199
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add regexes to check keys and values Fixes open-telemetry#2010 * Fix tests * Add changelog * Fix test * Add checks to set_baggage * Fix lint * Add changelog entry * Fix mypy * Fix mypy * Cast to string * WIP * Key value format * Mostly done * Remove old changelog entry * fomat * Correct typing * Fix lint * Fix issues * Add CHANGELOG entry * Make changes as discussed in SIG meeting * Update opentelemetry-api/src/opentelemetry/baggage/__init__.py Co-authored-by: Leighton Chen <[email protected]> Co-authored-by: Diego Hurtado <[email protected]> Co-authored-by: Leighton Chen <[email protected]>
* Adding thread name * Updating CHANGELOG
* Move _SUPPRESS_INTRUMENTATION key from instrumentation to api This will continue to be part of the internal API but live in the API context package. * Move BaseConfigurator from isntrumentation to SDK This allows SDK to not depend on instrumentation package anymore.
…elemetry#2187) This will continue to be part of the internal API but live in the API context package.
ocelotl
added
Approve Public API check
|
@ocelotl this is merging metrics_new into main. To get rid of the merge conflict markers, I think you just need a PR to metrics_new fixing the unresolved files |
Conflicts are in changelog as well, so I fixed them in the same PR |
aabmass
added
the
Approve Public API check
lzchen
approved these changes
Oct 14, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge
mainintometrics_new. Fixes #2194