From b1b7258844771bdb8e3274b595caea2b3d61a5a8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 31 Jul 2026 08:10:28 +0000 Subject: [PATCH 1/4] Initial plan From a393f8723cd20e6c7338c9ab7b77e0805c168e8d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 31 Jul 2026 08:13:53 +0000 Subject: [PATCH 2/4] Batch Dependabot updates to reduce lockfile conflict churn Co-authored-by: xiang17 <9310587+xiang17@users.noreply.github.com> --- .github/dependabot.yml | 53 +++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 867b901887..6934e310fb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,7 +9,12 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "daily" + interval: "weekly" + day: "monday" + groups: + all-dependencies: + patterns: + - "*" - package-ecosystem: "gradle" directory: "/" @@ -36,13 +41,10 @@ updates: # junit 6 requires Java 17 versions: [ "[6,)" ] schedule: - interval: "daily" - open-pull-requests-limit: 10 + interval: "weekly" + day: "monday" + open-pull-requests-limit: 5 groups: - testcontainers: - patterns: - - "org.testcontainers:*" - opentelemetry: patterns: - "otelSdkVersion" @@ -59,30 +61,43 @@ updates: - "io.opentelemetry.instrumentation:gradle-plugins" - "io.opentelemetry.contrib:opentelemetry-jfr-connection" - "io.opentelemetry.contrib:opentelemetry-runtime-attach-core" - - opentelemetry-semconv: - patterns: - "io.opentelemetry.semconv:opentelemetry-semconv" - "io.opentelemetry.semconv:opentelemetry-semconv-incubating" - - # Spotless repeatedly appears as two separate dependency names for the same version bump - spotless: + all-dependencies: patterns: - - "com.diffplug.spotless" - - "com.diffplug.spotless:*" + - "*" + update-types: + - "minor" + - "patch" - package-ecosystem: "gradle" directory: "/perf-tests" registries: - gradle-plugin-portal schedule: - interval: "daily" - open-pull-requests-limit: 10 + interval: "weekly" + day: "monday" + open-pull-requests-limit: 5 + groups: + all-dependencies: + patterns: + - "*" + update-types: + - "minor" + - "patch" - package-ecosystem: "gradle" directory: "/etw/etw-testapp" registries: - gradle-plugin-portal schedule: - interval: "daily" - open-pull-requests-limit: 10 + interval: "weekly" + day: "monday" + open-pull-requests-limit: 5 + groups: + all-dependencies: + patterns: + - "*" + update-types: + - "minor" + - "patch" From e16650e74a5f21b9e107bbefcda2d2968018fcab Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 31 Jul 2026 20:18:26 +0000 Subject: [PATCH 3/4] Split opentelemetry semconv into separate dependabot group Co-authored-by: xiang17 <9310587+xiang17@users.noreply.github.com> --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6934e310fb..9c5484af59 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -61,6 +61,8 @@ updates: - "io.opentelemetry.instrumentation:gradle-plugins" - "io.opentelemetry.contrib:opentelemetry-jfr-connection" - "io.opentelemetry.contrib:opentelemetry-runtime-attach-core" + opentelemetry-semconv: + patterns: - "io.opentelemetry.semconv:opentelemetry-semconv" - "io.opentelemetry.semconv:opentelemetry-semconv-incubating" all-dependencies: From 9d9721af40376413265d299721e5de60b95f15d4 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Sat, 1 Aug 2026 16:55:18 -0700 Subject: [PATCH 4/4] Group all other dependencies into a single group --- .github/dependabot.yml | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9c5484af59..8cd106cb78 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -43,31 +43,33 @@ updates: schedule: interval: "weekly" day: "monday" - open-pull-requests-limit: 5 + open-pull-requests-limit: 10 + # a dependency lands in the first group it matches, and whatever is left over gets its own PR, + # so major updates are intentionally left ungrouped groups: - opentelemetry: - patterns: - - "otelSdkVersion" - - "otelSdkAlphaVersion" - - "otelInstrumentationVersion" - - "otelInstrumentationAlphaVersion" - - "otelContribVersion" - - "otelContribAlphaVersion" - - "io.opentelemetry:opentelemetry-bom" - - "io.opentelemetry:opentelemetry-bom-alpha" - - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom" - - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha" - - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator" - - "io.opentelemetry.instrumentation:gradle-plugins" - - "io.opentelemetry.contrib:opentelemetry-jfr-connection" - - "io.opentelemetry.contrib:opentelemetry-runtime-attach-core" + # semconv bumps rename attributes and require test changes, so they are kept out of the + # opentelemetry group to avoid mixing a version bump with semantic code churn opentelemetry-semconv: patterns: - - "io.opentelemetry.semconv:opentelemetry-semconv" - - "io.opentelemetry.semconv:opentelemetry-semconv-incubating" + - "io.opentelemetry.semconv:*" + + # the otel sdk/instrumentation/contrib/javaagent artifacts are interdependent and need to be + # reviewed, tested and merged together + opentelemetry: + patterns: + - "otel*Version" # version properties in dependencyManagement/build.gradle.kts + - "io.opentelemetry*" + exclude-patterns: + - "io.opentelemetry.semconv:*" + # released independently of the otel sdk, and only used by the smoke test framework + - "io.opentelemetry.proto:*" + all-dependencies: patterns: - "*" + exclude-patterns: + # every release adds checks that fire on existing code + - "errorProneVersion" update-types: - "minor" - "patch"