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.

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

updating changelogs and version to 1.6.1-0.25b1 #2223

Merged
merged 2 commits into from
Oct 18, 2021
Merged

Conversation

lzchen
Copy link
Contributor

@lzchen lzchen commented Oct 18, 2021

No description provided.

@lzchen lzchen requested a review from a team October 18, 2021 17:54
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

ERROR: Cannot install opentelemetry-instrumentation-requests==0.25b0, opentelemetry-sdk==1.6.1 and opentelemetry-semantic-conventions 0.25b1 (from /home/runner/work/opentelemetry-python/opentelemetry-python/opentelemetry-semantic-conventions) because these package versions have conflicting dependencies.

The conflict is caused by:
    The user requested opentelemetry-semantic-conventions 0.25b1 (from /home/runner/work/opentelemetry-python/opentelemetry-python/opentelemetry-semantic-conventions)
    opentelemetry-sdk 1.6.1 depends on opentelemetry-semantic-conventions==0.25b1
    opentelemetry-instrumentation-requests 0.25b0 depends on opentelemetry-semantic-conventions==0.25b0

@lzchen lzchen merged commit ea00608 into main Oct 18, 2021
aabmass added a commit that referenced this pull request Oct 29, 2021
* updating changelogs and version to 1.6.1-0.25b1 (#2223)

* default value is invalid, was renamed (#2226)

* Website: support GH page links to canonical src, and aliases (#2224)

* Fix opentracing shim references (#2180)

* Prepare release v1.6.2 and 0.25b2 (#2230)

* update changelog to note the rename of entrypoints in 1.6.0 (#2228)

* add note about proto version to README.rst (#2232)

* ReadableSpan events and links now return a tuple (#2215)

* ReadableSpan events and links now return a tuple

Removed MappingProxy since events and links are not mappings

Signed-off-by: Ted Kern <[email protected]>

* fix lint

Signed-off-by: Ted Kern <[email protected]>

* fix lint

* fix lint

Co-authored-by: Diego Hurtado <[email protected]>
Co-authored-by: Leighton Chen <[email protected]>

* adding CI testing for python 3.10 (#2207)

* remove `X-B3-ParentSpanId` for B3 propagator as per OpenTelemetry Specification (#2237)

* remove X-B3-ParentSpanId for B3 propagator as per OpenTelemetry specification

* revert changes - run tests

* re-commit changes

* add entry to CHANGELOG

* remove ParentSpanId in B3SingleFormat

* Remove lingering distro pkg files (#2241)

Co-authored-by: Leighton Chen <[email protected]>
Co-authored-by: alrex <[email protected]>
Co-authored-by: Patrice Chalin <[email protected]>
Co-authored-by: Ben Roberts <[email protected]>
Co-authored-by: Owais Lone <[email protected]>
Co-authored-by: Ted Kern <[email protected]>
Co-authored-by: Diego Hurtado <[email protected]>
Co-authored-by: James <[email protected]>
Co-authored-by: (Eliseo) Nathaniel Ruiz Nowell <[email protected]>
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