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 into metrics_new #2250

Merged
merged 12 commits into from
Oct 29, 2021
Merged

Merge main into metrics_new #2250

merged 12 commits into from
Oct 29, 2021

Conversation

aabmass
Copy link
Member

@aabmass aabmass commented Oct 29, 2021 •
edited

Fixed some issues in CHANGELOG, otherwise there were no conflicts.

git switch metrics_new
git switch -c metrics_new-merge
git merge main

After this PR is merged, we should be able to merge metrics_new into main (metrics packages are private from #2249)

lzchen and others added 12 commits October 18, 2021 12:44
@lzchen
updating changelogs and version to 1.6.1-0.25b1 (open-telemetry#2223)
ea00608
default value is invalid, was renamed (open-telemetry#2226)
063681d
@chalin
Website: support GH page links to canonical src, and aliases (open-te…
6b38689 
…lemetry#2224)
@robertsben
Fix opentracing shim references (open-telemetry#2180)
9b25d74
@owais
Prepare release v1.6.2 and 0.25b2 (open-telemetry#2230)
6f8ccf3
update changelog to note the rename of entrypoints in 1.6.0 (open-tel…
f6e793a 
…emetry#2228)
add note about proto version to README.rst (open-telemetry#2232)
67d65ba
@Arnatious @ocelotl @lzchen
ReadableSpan events and links now return a tuple (open-telemetry#2215)
a002f7a 
* ReadableSpan events and links now return a tuple

Removed MappingProxy since events and links are not mappings

Signed-off-by: Ted Kern <tkern@arnatious.com>

* fix lint

Signed-off-by: Ted Kern <tkern@arnatious.com>

* fix lint

* fix lint

Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
Co-authored-by: Leighton Chen <lechen@microsoft.com>
adding CI testing for python 3.10 (open-telemetry#2207)
10231d1
@JamesJHPark
remove X-B3-ParentSpanId for B3 propagator as per OpenTelemetry Spe…
2109633 
…cification (open-telemetry#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
@NathanielRN
Remove lingering distro pkg files (open-telemetry#2241)
05e9fe1
@aabmass
Merge branch 'main' into metrics_new-merge
c7e575c
@aabmass aabmass changed the title metrics new merge Merge main into metrics_new Oct 29, 2021
@aabmass aabmass marked this pull request as ready for review October 29, 2021 15:35
@aabmass aabmass requested a review from a team as a code owner October 29, 2021 15:35
@aabmass aabmass enabled auto-merge (squash) October 29, 2021 15:36
@aabmass aabmass merged commit aff87a7 into open-telemetry:metrics_new Oct 29, 2021
@aabmass aabmass deleted the metrics_new-merge branch October 29, 2021 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ocelotl ocelotl ocelotl approved these changes

@lzchen lzchen lzchen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@aabmass @ocelotl @lzchen @chalin @robertsben @owais @Arnatious @JamesJHPark @NathanielRN