Skip to content

Fix new instrumentation lock files leaking into core dependency update PR.#11676

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
masterfrom
alexeyk/fix-update-latest-deps-split-logic
Jun 19, 2026
Merged

Fix new instrumentation lock files leaking into core dependency update PR.#11676
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
masterfrom
alexeyk/fix-update-latest-deps-split-logic

Conversation

@AlexeyKuznetsov-DD

Copy link
Copy Markdown
Contributor

What Does This Do

Fixes the update-gradle-dependencies workflow so a newly generated instrumentation gradle.lockfile no longer leaks into the core PR.

Motivation

Correct PRs.

Additional Notes

Contributor Checklist

  • Format the title according to the contribution guidelines
  • Assign the type: and (comp: or inst:) labels in addition to any other useful labels
  • Avoid using close, fix, or any linking keywords when referencing an issue
    Use solves instead, and assign the PR milestone to the issue
  • Update the CODEOWNERS file on source file addition, migration, or deletion
  • Update public documentation with any new configuration flags or behaviors
  • Add your completed PR to the merge queue by commenting /merge. You can also:
    • Customize the commit message associated with the merge with /merge --commit-message "..."
    • Remove your PR from the merge queue with /merge -c
    • Skip all merge queue checks with /merge -f --reason "reason"; please use this judiciously, as some checks do not run at the PR-level (note: the PR still needs to be mergeable, this will only skip the pre-merge build)
    • Get more information in this doc

Jira ticket: [PROJ-IDENT]

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD self-assigned this Jun 18, 2026
@AlexeyKuznetsov-DD AlexeyKuznetsov-DD added type: bug fix Bug fix tag: no release notes Changes to exclude from release notes comp: tooling Build & Tooling labels Jun 18, 2026
@datadog-datadog-prod-us1-2

Copy link
Copy Markdown
Contributor

Pipelines

Fix all issues with BitsAI

⚠️ Warnings

🚦 1 Pipeline job failed

DataDog/apm-reliability/dd-trace-java | linux-java-spring-petclinic-sca-load-parallel   View in Datadog   GitLab

Useful? React with 👍 / 👎

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

@AlexeyKuznetsov-DD
AlexeyKuznetsov-DD marked this pull request as ready for review June 18, 2026 16:40
@AlexeyKuznetsov-DD
AlexeyKuznetsov-DD requested a review from a team as a code owner June 18, 2026 16:40
@dd-octo-sts

dd-octo-sts Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

🟢 Java Benchmark SLOs — All performance SLOs passed

Suite Status
Startup 🟢 pass

SLO thresholds are defined here based on automatically generated metrics. A warning is raised when results are within 5% of the threshold.

PR vs. master results
Scenario Candidate master Δ (95% CI of mean)
startup:insecure-bank:iast:Agent 13.95 s 13.87 s [-0.3%; +1.4%] (no difference)
startup:insecure-bank:tracing:Agent 12.93 s 13.00 s [-1.6%; +0.5%] (no difference)
startup:petclinic:appsec:Agent 16.33 s 16.65 s [-6.4%; +2.6%] (no difference)
startup:petclinic:iast:Agent 16.86 s 16.90 s [-1.0%; +0.6%] (no difference)
startup:petclinic:profiling:Agent 16.82 s 16.44 s [-2.3%; +6.8%] (no difference)
startup:petclinic:sca:Agent 16.91 s 16.71 s [+0.3%; +2.0%] (maybe worse)
startup:petclinic:tracing:Agent 16.05 s 16.08 s [-1.3%; +0.9%] (no difference)

Commit: cd8dab80 · CI Pipeline · Benchmarking Platform UI


Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion.

Comment on lines +81 to +83
git ls-files --others --exclude-standard -- \
'dd-smoke-tests/*gradle.lockfile' 'dd-java-agent/instrumentation/*gradle.lockfile' \
| xargs -r rm -f

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.

🎯 suggestion: ‏What about git clean -f?
It can take pathspec as argument (ref).

@AlexeyKuznetsov-DD

Copy link
Copy Markdown
Contributor Author

/merge -f --reason "This is GitHub Action, no need to run on MQ"

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Jun 19, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-06-19 14:55:58 UTC ℹ️ Start processing command /merge -f --reason "This is GitHub Action, no need to run on MQ"


2026-06-19 14:56:04 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 0s (p90).


2026-06-19 14:56:13 UTC ℹ️ MergeQueue: This merge request was merged

Warning

This change was merged without running any pre merge CI checks

Reason: This is GitHub Action, no need to run on MQ

@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot merged commit 139a1ba into master Jun 19, 2026
583 of 592 checks passed
@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot deleted the alexeyk/fix-update-latest-deps-split-logic branch June 19, 2026 14:56
@github-actions github-actions Bot added this to the 1.64.0 milestone Jun 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: tooling Build & Tooling tag: no release notes Changes to exclude from release notes type: bug fix Bug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants