Skip to content

fix(contrib/net/http): workaround to fix symbol collision in Orchestrion#3865

Merged
dd-mergequeue[bot] merged 5 commits into
mainfrom
rarguelloF/AIDM-706/fix-net-http-aspect
Aug 13, 2025
Merged

fix(contrib/net/http): workaround to fix symbol collision in Orchestrion#3865
dd-mergequeue[bot] merged 5 commits into
mainfrom
rarguelloF/AIDM-706/fix-net-http-aspect

Conversation

@rarguelloF

@rarguelloF rarguelloF commented Aug 12, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

What does this PR do?

Fixes DataDog/orchestrion#670

The core issue is solved in DataDog/orchestrion#678, but this should make it work even if using older Orchestrion versions.

Motivation

Reviewer's Checklist

  • Changed code has unit tests for its functionality at or near 100% coverage.
  • System-Tests covering this feature have been added and enabled with the va.b.c-dev version tag.
  • 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.
  • New code is free of linting errors. You can check this by running ./scripts/lint.sh locally.
  • Add an appropriate team label so this PR gets put in the right place for the release notes.
  • Non-trivial go.mod changes, e.g. adding new modules, are reviewed by @DataDog/dd-trace-go-guild.

Unsure? Have a question? Request a review!

@github-actions github-actions Bot added the apm:ecosystem contrib/* related feature requests or bugs label Aug 12, 2025
@pr-commenter

pr-commenter Bot commented Aug 12, 2025 •
edited
Loading

Copy link
Copy Markdown

Benchmarks

Benchmark execution time: 2025-08-13 10:08:23

Comparing candidate commit ccafeb2 in PR branch rarguelloF/AIDM-706/fix-net-http-aspect with baseline commit 3aac4d6 in branch main.

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

RomainMuller
RomainMuller reviewed Aug 13, 2025
View reviewed changes
Comment thread contrib/net/http/orchestrion.client.yml
# Wire the context that is found to the handlers...
- wrap-expression:
imports:
client: github.com/DataDog/dd-trace-go/contrib/net/http/v2/client

@RomainMuller RomainMuller Aug 13, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe add a comment explaining the "weird" name?

@rarguelloF rarguelloF Aug 13, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done!

@rarguelloF
rarguelloF marked this pull request as ready for review August 13, 2025 09:51
@rarguelloF
rarguelloF requested review from a team as code owners August 13, 2025 09:51
@rarguelloF

rarguelloF commented Aug 13, 2025

Copy link
Copy Markdown
Contributor Author

/merge

@dd-devflow-routing-codex

dd-devflow-routing-codex Bot commented Aug 13, 2025 •
edited
Loading

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2025-08-13 10:04:36 UTC ℹ️ Start processing command /merge

2025-08-13 10:04:45 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

2025-08-13 10:11:09 UTC ℹ️ MergeQueue: merge request added to the queue

The expected merge time in main is approximately 14m (p90).

2025-08-13 10:21:32 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue
dd-mergequeue Bot merged commit c0cbb8f into main Aug 13, 2025
222 checks passed
@dd-mergequeue
dd-mergequeue Bot deleted the rarguelloF/AIDM-706/fix-net-http-aspect branch August 13, 2025 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RomainMuller RomainMuller RomainMuller approved these changes
@darccio darccio darccio approved these changes

Assignees

No one assigned

Labels

apm:ecosystem contrib/* related feature requests or bugs mergequeue-status: done

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BUG] Build problem with Ginkgo

3 participants

@rarguelloF @darccio @RomainMuller