Skip to content

Use highest version as baseline#11714

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits into
masterfrom
sarahchen6/tweak-instrumentation-automation
Jun 23, 2026
Merged

Use highest version as baseline#11714
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits into
masterfrom
sarahchen6/tweak-instrumentation-automation

Conversation

@sarahchen6

Copy link
Copy Markdown
Contributor

What Does This Do

When there are multiple versions for a dependency set across multiple lockfiles, use the highest of these versions as the baseline.

Motivation

In #11712, there was an issue that a too-new version of logback-core was not reverted properly. This is because there are multiple versions of logback-core set across lockfiles, and the baseline was not defined as the newest of these set versions. Thus, 1.5.34 (the version to revert to) was calculated as a new_gav here, but since it was in the baseline_coords set, the revert was skipped here. The change in this PR addresses the issue such that we should no longer be able to calculate a new_gav that's already in the baseline_coords set.

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]

@sarahchen6 sarahchen6 added the type: bug Bug report and fix label Jun 23, 2026
@sarahchen6 sarahchen6 requested a review from a team as a code owner June 23, 2026 17:53
@sarahchen6 sarahchen6 added tag: no release notes Changes to exclude from release notes comp: tooling Build & Tooling labels Jun 23, 2026
@sarahchen6 sarahchen6 requested review from bric3 and removed request for a team June 23, 2026 17:53
@dd-octo-sts

dd-octo-sts Bot commented Jun 23, 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.97 s 13.97 s [-0.8%; +0.7%] (no difference)
startup:insecure-bank:tracing:Agent 12.99 s 13.03 s [-1.3%; +0.7%] (no difference)
startup:petclinic:appsec:Agent 16.94 s 16.68 s [+0.5%; +2.6%] (maybe worse)
startup:petclinic:iast:Agent 16.83 s 17.00 s [-1.8%; -0.3%] (maybe better)
startup:petclinic:profiling:Agent 16.68 s 16.89 s [-2.2%; -0.4%] (maybe better)
startup:petclinic:sca:Agent 16.23 s 16.76 s [-7.2%; +1.0%] (no difference)
startup:petclinic:tracing:Agent 16.03 s 16.04 s [-0.9%; +0.8%] (no difference)

Commit: ed944433 · 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.

@AlexeyKuznetsov-DD

Copy link
Copy Markdown
Contributor

/gitlab resync-job-status --bypass-required-checks-syncing-strategy

@gh-worker-devflow-routing-ef8351

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-06-23 19:50:00 UTC ℹ️ Start processing command /gitlab resync-job-status --bypass-required-checks-syncing-strategy
If you need support, contact us on Slack #ci-infra-support!


2026-06-23 19:54:42 UTC 🚨 Devflow

404 Not Found

Details
child workflow execution error (type: cirel.Cirel_SyncCommitJobsStatusWorkflow, workflowID: 26d71316-8da3-4c73-8024-cf204f835b82_44, runID: 019ef608-543d-71f7-ae64-f92158066cbb, initiatedEventID: 44, startedEventID: 45): activity error (type: gitlab.GitlabService_GetJobsByCommit, scheduledEventID: 14, startedEventID: 15, identity: 1@gitlab-worker-dc9c5b84-8glp7@): 404 Not Found

If you need support, contact us on Slack #ci-infra-support with those details!

@sarahchen6

Copy link
Copy Markdown
Contributor Author

/merge -f --reason "Only changing GHA workflows, so no need to run MQ tests"

@gh-worker-devflow-routing-ef8351

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

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-06-23 20:48:54 UTC ℹ️ Start processing command /merge -f --reason "Only changing GHA workflows, so no need to run MQ tests"


2026-06-23 20:48:59 UTC ℹ️ MergeQueue: pull request added to the queue

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


2026-06-23 20:49:08 UTC ℹ️ MergeQueue: This merge request was merged

Warning

This change was merged without running any pre merge CI checks

Reason: Only changing GHA workflows, so no need to run MQ tests

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit 00c0301 into master Jun 23, 2026
582 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the sarahchen6/tweak-instrumentation-automation branch June 23, 2026 20:49
@github-actions github-actions Bot added this to the 1.64.0 milestone Jun 23, 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 Bug report and fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants