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

feat(otel): support mapping otel environment variables to ddtrace environment variables [backport 2.9] #9360

Merged
merged 1 commit into from
May 23, 2024

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented May 23, 2024

Backport f471e6b from #9298 to 2.9.

Description

This provides mapping support between values set for OTEL environment variables to Datadog equivalent tracing environment variables.

Checklist

  • Change(s) are motivated and described in the PR description
  • Testing strategy is described if automated tests are not included in the PR
  • Risks are described (performance impact, potential for breakage, maintainability)
  • Change is maintainable (easy to change, telemetry, documentation)
  • Library release note guidelines are followed or label changelog/no-changelog is set
  • Documentation is included (in-code, generated user docs, public corp docs)
  • Backport labels are set (if applicable)
  • If this PR changes the public interface, I've notified @DataDog/apm-tees.

Reviewer Checklist

  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Description motivates each change
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Change is maintainable (easy to change, telemetry, documentation)
  • Release note makes sense to a user of the library
  • Author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

…ironment variables (#9298)

## Description
This provides mapping support between values set for OTEL environment
variables to Datadog equivalent tracing environment variables.

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

---------

Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
(cherry picked from commit f471e6b)
@github-actions github-actions bot requested review from a team as code owners May 23, 2024 03:32
@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented May 23, 2024

Datadog Report

Branch report: backport-9298-to-2.9
Commit report: e18e9a6
Test service: dd-trace-py

✅ 0 Failed, 138669 Passed, 36055 Skipped, 9h 19m 53.41s Total duration (1h 53m 41.11s time saved)
❄️ 1 New Flaky

New Flaky Tests (1)

  • test_send_timed_events - test_llmobs_span_writer.py - Last Failure

    Expand for error
     Calls not found.
     Expected: [call('sent %d LLMObs %s events to %s', 1, 'span', 'https://llmobs-intake.datad0g.com/api/v2/llmobs')]
    

@brettlangdon brettlangdon reopened this May 23, 2024
@brettlangdon brettlangdon enabled auto-merge (squash) May 23, 2024 10:48
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 0% with 216 lines in your changes are missing coverage. Please review.

Project coverage is 10.31%. Comparing base (af1c3e2) to head (e18e9a6).
Report is 1 commits behind head on 2.9.

Files Patch % Lines
tests/opentelemetry/test_config.py 0.00% 121 Missing ⚠️
ddtrace/settings/_otel_remapper.py 0.00% 93 Missing ⚠️
ddtrace/settings/config.py 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              2.9    #9360      +/-   ##
==========================================
- Coverage   11.78%   10.31%   -1.47%     
==========================================
  Files        1253     1255       +2     
  Lines      119277   119813     +536     
==========================================
- Hits        14052    12361    -1691     
- Misses     105225   107452    +2227     

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

@brettlangdon brettlangdon merged commit cda412a into 2.9 May 23, 2024
160 of 162 checks passed
@brettlangdon brettlangdon deleted the backport-9298-to-2.9 branch May 23, 2024 11:49
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.

None yet

3 participants