Skip to content

Support span_attributes testing in datadog and OTLP exporters (backport #7369)#7408

Merged
carodewig merged 6 commits into1.xfrom
mergify/bp/1.x/pr-7369
May 14, 2025
Merged

Support span_attributes testing in datadog and OTLP exporters (backport #7369)#7408
carodewig merged 6 commits into1.xfrom
mergify/bp/1.x/pr-7369

Conversation

@carodewig
Copy link
Contributor

@carodewig carodewig commented May 6, 2025

This backport enables testing of span attributes in the datadog and OTLP exporters. It does not backport any of the core functionality of #7369, which changed how some attributes were passed through the telemetry codebase.


Checklist

Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.

  • Changes are compatible1
  • Documentation2 completed
  • Performance impact assessed and acceptable
  • Tests added and passing3
    • Unit Tests
    • Integration Tests
    • Manual Tests

Exceptions

Note any exceptions here

Notes


This is an automatic backport of pull request #7369 done by [Mergify](https://mergify.com).

Footnotes

  1. It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this.

  2. Configuration is an important part of many changes. Where applicable please try to document configuration examples.

  3. Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions.

#7369)

(cherry picked from commit 47925d0)

# Conflicts:
#	apollo-router/src/plugins/telemetry/mod.rs
#	apollo-router/tests/integration/telemetry/datadog.rs
#	apollo-router/tests/integration/telemetry/mod.rs
#	apollo-router/tests/integration/telemetry/otlp.rs
@carodewig carodewig requested a review from a team May 6, 2025 14:56
@carodewig carodewig requested review from a team as code owners May 6, 2025 14:56
@mergify mergify bot added the conflicts label May 6, 2025
@mergify
Copy link
Contributor

mergify bot commented May 6, 2025

Cherry-pick of 47925d0 has failed:

On branch mergify/bp/1.x/pr-7369
Your branch is up to date with 'origin/1.x'.

You are currently cherry-picking commit 47925d01.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .changesets/fix_caroline_client_header.md
	new file:   apollo-router/tests/integration/telemetry/fixtures/otlp_override_client_name.router.yaml
	new file:   apollo-router/tests/integration/telemetry/fixtures/override_client_name.rhai

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   apollo-router/src/plugins/telemetry/mod.rs
	both modified:   apollo-router/tests/integration/telemetry/datadog.rs
	both modified:   apollo-router/tests/integration/telemetry/mod.rs
	both modified:   apollo-router/tests/integration/telemetry/otlp.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@svc-apollo-docs
Copy link
Collaborator

svc-apollo-docs commented May 6, 2025

✅ Docs preview has no changes

The preview was not built because there were no changes.

Build ID: 584a4abaf29447e4b0f509ec

@carodewig carodewig changed the title fix: propagate client name and version modifications through telemetry (backport #7369) Support span_attributes testing in datadog and OTLP exporters (backport #7369) May 6, 2025
@carodewig carodewig merged commit 528c7dd into 1.x May 14, 2025
14 of 15 checks passed
@carodewig carodewig deleted the mergify/bp/1.x/pr-7369 branch May 14, 2025 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants