Skip to content

chore(telemetry): exclude OTLP headers from configuration telemetry#18497

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits into
mainfrom
brian.marks/omit-sensitive-config-telemetry
Jun 11, 2026
Merged

chore(telemetry): exclude OTLP headers from configuration telemetry#18497
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits into
mainfrom
brian.marks/omit-sensitive-config-telemetry

Conversation

@bm1549

@bm1549 bm1549 commented Jun 6, 2026

Copy link
Copy Markdown
Contributor

Description

Marks the OpenTelemetry OTLP exporter header configurations as sensitive: true in supported-configurations.json and excludes sensitive configurations from configuration telemetry: OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_TRACES_HEADERS, OTEL_EXPORTER_OTLP_METRICS_HEADERS, and OTEL_EXPORTER_OTLP_LOGS_HEADERS. Other exporter configurations (endpoint, protocol, timeout) are unaffected.

Testing

Unit tests in tests/telemetry/test_writer.py.

Risks

None.

Additional Notes

Release note included.

@bm1549 bm1549 added the AI Generated Largely based on code generated by an AI or LLM. This label is the same across all dd-trace-* repos label Jun 6, 2026
@datadog-official

datadog-official Bot commented Jun 6, 2026

Copy link
Copy Markdown
Contributor

Pipelines  Tests

Fix all issues with BitsAI

⚠️ Warnings

🚦 9 Pipeline jobs failed

DataDog/apm-reliability/dd-trace-py | build linux serverless: [amd64, cp315-cp315, v113741238-d2b8243-manylinux2014_x86_64, 1]   View in Datadog   GitLab

DataDog/apm-reliability/dd-trace-py | build linux serverless: [amd64, cp315-cp315, v113741491-d2b8243-musllinux_1_2_x86_64, 1]   View in Datadog   GitLab

DataDog/apm-reliability/dd-trace-py | build linux serverless: [arm64, cp315-cp315, v113741357-d2b8243-manylinux2014_aarch64, 1]   View in Datadog   GitLab

View all 9 failed jobs.

ℹ️ Info

No other issues found (see more)

🧪 All tests passed
❄️ No new flaky tests detected

🔄 Datadog auto-retried 2 jobs - 2 passed on retry View in Datadog

Useful? React with 👍 / 👎

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 865d0b5 | Docs | Datadog PR Page | Give us feedback!

@bm1549 bm1549 force-pushed the brian.marks/omit-sensitive-config-telemetry branch from ce2db44 to c665d22 Compare June 8, 2026 21:39
@cit-pr-commenter-54b7da

cit-pr-commenter-54b7da Bot commented Jun 8, 2026

Copy link
Copy Markdown

Codeowners resolved as

ddtrace/internal/settings/_supported_configurations.py                  @DataDog/apm-sdk-capabilities-python @DataDog/apm-python
ddtrace/internal/telemetry/__init__.py                                  @DataDog/apm-python
scripts/supported_configurations.py                                     @DataDog/apm-sdk-capabilities-python @DataDog/apm-python
supported-configurations.json                                           @DataDog/apm-sdk-capabilities-python @DataDog/apm-python
tests/telemetry/test_writer.py                                          @DataDog/apm-python

@pr-commenter

pr-commenter Bot commented Jun 8, 2026

Copy link
Copy Markdown

Benchmarks

Benchmark execution time: 2026-06-09 22:49:49

Comparing candidate commit 9293b0c in PR branch brian.marks/omit-sensitive-config-telemetry with baseline commit 3fbaabe in branch main.

Found 0 performance improvements and 3 performance regressions! Performance is the same for 618 metrics, 10 unstable metrics.

scenario:iastaspects-strip_noaspect

  • 🟥 execution_time [+23.645µs; +28.657µs] or [+10.737%; +13.013%]

scenario:iastaspectsospath-ospathbasename_aspect

  • 🟥 execution_time [+97.858µs; +107.374µs] or [+23.142%; +25.392%]

scenario:span-start

  • 🟥 execution_time [+1.317ms; +1.496ms] or [+8.562%; +9.722%]

@bm1549 bm1549 force-pushed the brian.marks/omit-sensitive-config-telemetry branch from c665d22 to 9293b0c Compare June 9, 2026 22:21
Comment thread releasenotes/notes/omit-sensitive-config-telemetry-9a7a0d56e600b742.yaml Outdated
@bm1549 bm1549 marked this pull request as ready for review June 10, 2026 21:39
@bm1549 bm1549 requested review from a team as code owners June 10, 2026 21:39
@bm1549 bm1549 requested review from juanjux and rachelyangdog June 10, 2026 21:39
bm1549 and others added 2 commits June 10, 2026 17:39
…iguration telemetry

Add a `sensitive: true` marker to the configuration registry and exclude any
configuration carrying that marker from instrumentation configuration telemetry
(the `configuration` array in app-started and app-client-configuration-change
events).

- supported-configurations.json: mark OTEL_EXPORTER_OTLP_HEADERS,
  OTEL_EXPORTER_OTLP_TRACES_HEADERS, OTEL_EXPORTER_OTLP_METRICS_HEADERS,
  OTEL_EXPORTER_OTLP_LOGS_HEADERS, DD_API_KEY, and DD_APP_KEY as `sensitive: true`,
  and regenerate _supported_configurations.py (adds SENSITIVE_CONFIGURATIONS).
- scripts/supported_configurations.py: emit SENSITIVE_CONFIGURATIONS from the
  registry's `sensitive` attribute.
- ddtrace/internal/telemetry/__init__.py: honor SENSITIVE_CONFIGURATIONS in both
  get_config() and report_configuration() so a sensitive config's value is not
  reported. Non-sensitive OTLP exporter configurations are still reported.

DD_API_KEY/DD_APP_KEY were already read with report_telemetry=False; the marker
documents that intent and their runtime behavior is unchanged.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@bm1549 bm1549 force-pushed the brian.marks/omit-sensitive-config-telemetry branch from 54fd6e0 to 865d0b5 Compare June 10, 2026 21:40
@bm1549 bm1549 added the changelog/no-changelog A changelog entry is not required for this PR. label Jun 10, 2026
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit 314cdf9 into main Jun 11, 2026
535 of 538 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the brian.marks/omit-sensitive-config-telemetry branch June 11, 2026 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI Generated Largely based on code generated by an AI or LLM. This label is the same across all dd-trace-* repos 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.

2 participants