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

ddtrace/tracer: Switch default context propagation order #2349

Merged
merged 3 commits into from Nov 17, 2023

Conversation

JianyiGao
Copy link
Contributor

@JianyiGao JianyiGao commented Nov 13, 2023

What does this PR do?

This PR switch default context propagation order from tracecontext,datadog to datadog,tracecontext
System test change: DataDog/system-tests#1853

Motivation

Reviewer's Checklist

  • Changed code has unit tests for its functionality at or near 100% coverage.
  • There is a benchmark for any new code, or changes to existing code.
  • If this interacts with the agent in a new way, a system test has been added.

For Datadog employees:

  • If this PR touches code that handles credentials of any kind, such as Datadog API keys, I've requested a review from @DataDog/security-design-and-guidance.
  • This PR doesn't touch any of that.

Unsure? Have a question? Request a review!

@JianyiGao JianyiGao force-pushed the jennie.gao/switch-context-propagation branch from fd0d4ce to 2cae4b9 Compare November 16, 2023 15:45
@JianyiGao JianyiGao marked this pull request as ready for review November 16, 2023 18:48
@JianyiGao JianyiGao requested a review from a team November 16, 2023 18:48
@JianyiGao JianyiGao requested a review from a team as a code owner November 16, 2023 18:48
Comment on lines 248 to 268

- name: Testing outlier gRPC v1.2
if: inputs.ref != 'refs/heads/v2-dev'
run: |
# This hacky approach is necessary because running the tests regularly
# do not allow using grpc-go@v1.2.0 alongside sketches-go@v1.0.0
go mod vendor

# Checkout grpc-go@v1.2.0
cd vendor/google.golang.org && rm -rf grpc
git clone https://github.com/grpc/grpc-go grpc && cd grpc
git fetch origin && git checkout v1.2.0 && cd ../..

# Checkout sketches-go@v1.0.0
cd vendor/github.com/DataDog && rm -rf sketches-go
git clone https://github.com/DataDog/sketches-go && cd sketches-go
git fetch origin && git checkout v1.0.0 && cd ../..

go test -mod=vendor -v ./contrib/google.golang.org/grpc.v12/...

Copy link
Contributor

Choose a reason for hiding this comment

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

Context: unrelated change due to the modifications for v2 CI nightly runs.

@darccio darccio self-requested a review November 17, 2023 08:51
Copy link
Contributor

@darccio darccio left a comment

Choose a reason for hiding this comment

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

LGTM

@dianashevchenko dianashevchenko merged commit 4b5eb5e into v2-dev Nov 17, 2023
1 of 10 checks passed
@dianashevchenko dianashevchenko deleted the jennie.gao/switch-context-propagation branch November 17, 2023 13:52
@dianashevchenko dianashevchenko restored the jennie.gao/switch-context-propagation branch November 17, 2023 14:01
dianashevchenko added a commit that referenced this pull request Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants