Skip to content

revert #3727#3807

Merged
eliottness merged 2 commits into
mainfrom
eliottness/test-revert-go-get-u
Jul 25, 2025
Merged

revert #3727#3807
eliottness merged 2 commits into
mainfrom
eliottness/test-revert-go-get-u

Conversation

@eliottness

@eliottness eliottness commented Jul 24, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

What does this PR do?

Revert #3727

Created via this:

git revert ac97b54c9ba
git checkout --theirs **/go.mod
find -name go.mod -execdir sed -Ei 's|(github.com/DataDog/dd-trace-go/.*v2) v2.2.0-dev|\1 v2.3.0-dev.1|' {} \; 
./scripts/fix_modules.sh && ./scripts/generate.sh

Motivation

Dogfooding is impossible as-is right now because way to much dependencies have been upgraded in this PR, dd-source ends up with 89 dependencies being upgraded with this PR vs. 18 without

what to do with the original content ?

#3727 Is very important for security and good practices so it will be reintroduced using the go get -tool feature from go 1.24 which will be usable in a few weeks in dd-trace-go once go 1.25 is released. If for some reason this is not enough, we will have to start planning how to migrate dd-source and dd-go on dd-trace-go@v2 instead of keeping the shim there.

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!

@eliottness
eliottness changed the base branch from main to release-v2.2.x July 24, 2025 11:25
@eliottness
eliottness force-pushed the eliottness/test-revert-go-get-u branch from 6730ad2 to 9f50384 Compare July 24, 2025 12:25
@eliottness eliottness changed the title revert dependencies updates from #3727 revert #3727 Jul 24, 2025
@eliottness
eliottness force-pushed the eliottness/test-revert-go-get-u branch from 9f50384 to 31002d7 Compare July 24, 2025 12:26
@eliottness
eliottness changed the base branch from release-v2.2.x to main July 24, 2025 12:26
@github-actions github-actions Bot added the apm:ecosystem contrib/* related feature requests or bugs label Jul 24, 2025
@eliottness
eliottness marked this pull request as ready for review July 24, 2025 12:27
@eliottness
eliottness requested review from a team as code owners July 24, 2025 12:27
@pr-commenter

pr-commenter Bot commented Jul 24, 2025 •
edited
Loading

Copy link
Copy Markdown

Benchmarks

Benchmark execution time: 2025-07-24 13:14:35

Comparing candidate commit ba2e1f9 in PR branch eliottness/test-revert-go-get-u with baseline commit afc85f1 in branch main.

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

@eliottness eliottness added modules and removed apm:ecosystem contrib/* related feature requests or bugs labels Jul 24, 2025
@github-actions github-actions Bot added the apm:ecosystem contrib/* related feature requests or bugs label Jul 24, 2025
@eliottness
run ./scripts/fix_modules.sh
ba2e1f9 
Signed-off-by: Eliott Bouhana <[email protected]>
felixge
felixge approved these changes Jul 24, 2025
View reviewed changes

@felixge felixge left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. But please update this PR with the plan for bringing this change back in Go 1.25 using go get -tool. Or put it in confluence and link it from here. Otherwise slack will eat the decision record.

@datadog-datadog-prod-us1

datadog-datadog-prod-us1 Bot commented Jul 24, 2025 •
edited
Loading

Copy link
Copy Markdown

✅ Tests

🎉 All green!

❄️ No new flaky tests detected
🧪 All tests passed

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: ba2e1f9 | Was this helpful? Give us feedback!

@eliottness

eliottness commented Jul 24, 2025

Copy link
Copy Markdown
Contributor Author

/merge

@dd-devflow-routing-codex

dd-devflow-routing-codex Bot commented Jul 24, 2025 •
edited
Loading

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2025-07-24 14:01:48 UTC ℹ️ Start processing command /merge

2025-07-24 14:02:03 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-07-24 14:32:19 UTC ⚠️ MergeQueue: This merge request was unqueued

[email protected] unqueued this merge request

@eliottness

eliottness commented Jul 24, 2025

Copy link
Copy Markdown
Contributor Author

/remove

@dd-devflow-routing-codex

dd-devflow-routing-codex Bot commented Jul 24, 2025 •
edited
Loading

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2025-07-24 14:32:07 UTC ℹ️ Start processing command /remove

2025-07-24 14:32:13 UTC ℹ️ Devflow: /remove

@eliottness

eliottness commented Jul 24, 2025

Copy link
Copy Markdown
Contributor Author

/remove

@dd-devflow-routing-codex

dd-devflow-routing-codex Bot commented Jul 24, 2025

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2025-07-24 14:32:20 UTC ℹ️ Start processing command /remove
If you need support, contact us on Slack #devflow!

2025-07-24 14:32:25 UTC ❌ Devflow: /remove

This merge request was already processed and can't be unqueued anymore.

To get help about command usage, write /remove --help

If you need support, contact us on Slack #devflow with those details!

@eliottness

eliottness commented Jul 24, 2025

Copy link
Copy Markdown
Contributor Author

/merge

@dd-devflow-routing-codex

dd-devflow-routing-codex Bot commented Jul 24, 2025 •
edited
Loading

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2025-07-24 14:32:35 UTC ℹ️ Start processing command /merge

2025-07-24 14:32:52 UTC ℹ️ MergeQueue: pull request added to the queue

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

2025-07-24 14:44:31 UTC ❌ MergeQueue: The checks failed on this merge request

Tests failed on this commit 87075bc:

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.

@eliottness
eliottness merged commit cc103fb into main Jul 25, 2025
257 of 260 checks passed
@eliottness
eliottness deleted the eliottness/test-revert-go-get-u branch July 25, 2025 13:40
This was referenced Jul 31, 2025
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@felixge felixge felixge approved these changes
@hannahkm hannahkm hannahkm approved these changes

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@eliottness @felixge @hannahkm