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-DDAlexeyKuznetsov-DD self-assigned this Jun 18, 2026
@AlexeyKuznetsov-DDAlexeyKuznetsov-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 DatadogGitLab

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 ownerJune 18, 2026 16:40
@dd-octo-sts

Copy link
Copy Markdown
Contributor

🟢 Java Benchmark SLOs — All performance SLOs passed

SuiteStatus
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
ScenarioCandidatemasterΔ (95% CI of mean)
startup:insecure-bank:iast:Agent13.95 s13.87 s[-0.3%; +1.4%] (no difference)
startup:insecure-bank:tracing:Agent12.93 s13.00 s[-1.6%; +0.5%] (no difference)
startup:petclinic:appsec:Agent16.33 s16.65 s[-6.4%; +2.6%] (no difference)
startup:petclinic:iast:Agent16.86 s16.90 s[-1.0%; +0.6%] (no difference)
startup:petclinic:profiling:Agent16.82 s16.44 s[-2.3%; +6.8%] (no difference)
startup:petclinic:sca:Agent16.91 s16.71 s[+0.3%; +2.0%] (maybe worse)
startup:petclinic:tracing:Agent16.05 s16.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
Collaborator

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
ContributorAuthor

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

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351Bot 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-cf854dBot merged commit 139a1ba into masterJun 19, 2026
583 of 592 checks passed
@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854dBot deleted the alexeyk/fix-update-latest-deps-split-logic branch June 19, 2026 14:56
@github-actionsgithub-actionsBot added this to the 1.64.0 milestone Jun 19, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: toolingBuild & Toolingtag: no release notesChanges to exclude from release notestype: bug fixBug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@AlexeyKuznetsov-DD@bric3@PerfectSlayer