Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main 2 #2199

Merged
merged 7 commits into from
Oct 14, 2021
Merged

Merge main 2 #2199

merged 7 commits into from
Oct 14, 2021

Conversation

ocelotl
Copy link
Contributor

@ocelotl ocelotl commented Oct 14, 2021

Merge main into metrics_new. Fixes #2194

srikanthccv and others added 6 commits October 13, 2021 17:46
@srikanthccv @ocelotl @lzchen
Make baggage implementation w3c spec complaint (open-telemetry#2167)
ed3d657 
* 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 <lechen@microsoft.com>

Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
Co-authored-by: Leighton Chen <lechen@microsoft.com>
@benjaminsky
Adding BatchSpanProcessor thread name (open-telemetry#2186)
e74e1f6 
* Adding thread name

* Updating CHANGELOG
@lzchen
updating changelogs and version to 1.6.0-0.25b0 (open-telemetry#2193)
e1c4a5b
@owais
Move BaseConfigurator to SDK (open-telemetry#2188)
ade44b1 
* 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.
@owais
Only run Python3.6 contrib tests (open-telemetry#2192)
171569a
@owais
Move _SUPPRESS_INTRUMENTATION key from instrumentation to api (open-t…
a746d57 
…elemetry#2187)

This will continue to be part of the internal API but live in the API
context package.
@ocelotl ocelotl requested a review from a team October 14, 2021 10:44
@ocelotl ocelotl added Approve Public API check This label shows that the public symbols added or changed in a PR are strictly necessary and removed Approve Public API check This label shows that the public symbols added or changed in a PR are strictly necessary labels Oct 14, 2021
@aabmass
Copy link
Member

aabmass commented Oct 14, 2021

@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

@ocelotl ocelotl changed the base branch from main to metrics_new October 14, 2021 13:50
@ocelotl
Copy link
Contributor Author

ocelotl commented Oct 14, 2021

@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
aabmass approved these changes Oct 14, 2021
View reviewed changes
Copy link
Member

@aabmass aabmass left a comment

Choose a reason for hiding this comment

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

LGTM

@aabmass aabmass added the Approve Public API check This label shows that the public symbols added or changed in a PR are strictly necessary label Oct 14, 2021
@aabmass aabmass mentioned this pull request Oct 14, 2021
Merged
@lzchen lzchen merged commit dacaff2 into open-telemetry:metrics_new Oct 14, 2021
@ocelotl ocelotl deleted the merge_main_2 branch October 14, 2021 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aabmass aabmass aabmass approved these changes

@lzchen lzchen lzchen approved these changes

Assignees
No one assigned
Labels
Approve Public API check This label shows that the public symbols added or changed in a PR are strictly necessary
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merge conflict markers in metrics_new branch
6 participants
@ocelotl @aabmass @lzchen @srikanthccv @benjaminsky @owais