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

Fix OpenTelemetry internal loading #3400

Merged
merged 6 commits into from
Jan 26, 2024
Merged

Fix OpenTelemetry internal loading #3400

merged 6 commits into from
Jan 26, 2024

Conversation

marcotc
Copy link
Member

@marcotc marcotc commented Jan 24, 2024

This PR fixes two issues:

  • When loading datadog/opentelemetry before ddtrace, tracing/contrib files are not loaded.
  • There are two default OpenTelemetry propagation getters, text_map_getter and rack_env_getter, but we only supported text_map_getter before. All our propagation code works correctly with rack_env_getter, so we allow it during configuration.

Motivation:

These two issues were found during the setup of https://github.com/DataDog/opentelemetry-demo/pull/42/files#diff-6f62dcc2d3fa2ec6fa2c3529d3d9357ae69c771fca911e87e2e982a45b50fa71

Additional Notes:

How to test the change?

For Datadog employees:

  • If this PR touches code that signs or publishes builds or packages, or handles
    credentials of any kind, 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!

@codecov-commenter
Copy link

codecov-commenter commented Jan 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8fd4b30) 98.24% compared to head (c533905) 98.24%.
Report is 5 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3400   +/-   ##
=======================================
  Coverage   98.24%   98.24%           
=======================================
  Files        1254     1254           
  Lines       73345    73346    +1     
  Branches     3435     3435           
=======================================
+ Hits        72057    72059    +2     
+ Misses       1288     1287    -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@github-actions github-actions bot added integrations Involves tracing integrations tracing labels Jan 25, 2024
@marcotc marcotc marked this pull request as ready for review January 25, 2024 20:55
@marcotc marcotc requested a review from a team as a code owner January 25, 2024 20:55
@marcotc marcotc merged commit c1ebdd6 into master Jan 26, 2024
218 checks passed
@marcotc marcotc deleted the otel-load branch January 26, 2024 18:23
@github-actions github-actions bot added this to the 1.20.0 milestone Jan 26, 2024
@TonyCTHsu TonyCTHsu mentioned this pull request Feb 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrations Involves tracing integrations tracing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants