Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Nov 20, 2023

There are three commits needed to fix tracer and opentelemetry tests on 1.20. This PR cherry picks these changes and fixes many painful merge conflicts:

Commit 1: Tried to fix tracer+opentelemetry in one PR (this failed).
Commit 2: Reverted the broken otel cattrs fix (but not the tracer fix)
Commit 3: Finally fix the otel tests by pinning cattrs and otel-flask-instrumentation

  • box

@github-actions github-actions bot requested review from a team as code owners November 20, 2023 19:51
@github-actions github-actions bot added the changelog/no-changelog A changelog entry is not required for this PR. label Nov 20, 2023
@mabdinur mabdinur force-pushed the backport-7682-to-1.20 branch from c6b0282 to a275315 Compare November 20, 2023 20:52
@mabdinur mabdinur enabled auto-merge (squash) November 20, 2023 20:53
@mabdinur mabdinur merged commit 77c6566 into 1.20 Nov 20, 2023
@mabdinur mabdinur deleted the backport-7682-to-1.20 branch November 20, 2023 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog/no-changelog A changelog entry is not required for this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants