Merge branch 'main' into fix-check-gh-aw-lockfiles-over-trigger

Author: trask

.github/copilot-instructions.md

@@ -5,6 +5,13 @@ separately later in the PR lifecycle. **Prefer silence over uncertainty.** Only
 flag substantive issues on changed lines. Skip stylistic preferences not listed
 below. Do not nitpick.
 
+Do not flag anything CI will catch. This includes compilation errors (missing
+imports, unbalanced braces, type errors, unresolved symbols), Spotless-covered
+formatting (indentation, wrapping, alignment, brace placement, import
+ordering/grouping, whitespace), Checkstyle/ErrorProne/NullAway findings, and
+test failures. Do not ask authors to run the formatter. CI surfaces these
+directly, so review comments on them are noise.
+
 Use category tags like `[Style]`, `[Naming]`, `[Testing]`, `[General]`.
 
 ## [Style] Style Guide

.github/workflows/flaky-test-remediation.yml

@@ -183,6 +183,12 @@ jobs:
           ref: otelbot/flaky-test-remediation-progress
           path: progress
 
+      - name: Use CLA approved bot
+        if: steps.changes.outputs.committed == 'true'
+        working-directory: progress
+        # This is a separate checkout with its own local git config.
+        run: ../.github/scripts/use-cla-approved-bot.sh
+
       - name: Record attempt
         if: steps.changes.outputs.committed == 'true'
         working-directory: progress

.github/workflows/pr-review.lock.yml

@@ -62,8 +62,8 @@ dependencies {
     // We exclude plexus-xml and plexus-utils here because our current usages of the shadow plugin
     // don't require it, the  failure happens in spdx-gradle-plugin that can continue using and
     // older version of plexus-xml and plexus-utils
-    exclude(group = "org.codehaus.plexus", module = "plexus-utils")
-    exclude(group = "org.codehaus.plexus", module = "plexus-xml")
+    exclude("org.codehaus.plexus", "plexus-utils")
+    exclude("org.codehaus.plexus", "plexus-xml")
   }
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.4.1")

conventions/build.gradle.kts

@@ -36,11 +36,11 @@ dependencies {
   // Apply common dependencies for instrumentation.
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api") {
     // OpenTelemetry SDK is not needed for compilation
-    exclude(group = "io.opentelemetry", module = "opentelemetry-sdk")
+    exclude("io.opentelemetry", "opentelemetry-sdk")
   }
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") {
     // OpenTelemetry SDK is not needed for compilation
-    exclude(group = "io.opentelemetry", module = "opentelemetry-sdk")
+    exclude("io.opentelemetry", "opentelemetry-sdk")
   }
 
   // Used by byte-buddy but not brought in as a transitive dependency

conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
   testInstrumentation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-3.0:$opentelemetryJavaagentAlphaVersion")
 
   testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common") {
-    exclude(group = "org.eclipse.jetty", module = "jetty-server")
+    exclude("org.eclipse.jetty", "jetty-server")
   }
 
   testImplementation("com.squareup.okhttp3:okhttp:5.3.2")

examples/distro/instrumentation/servlet-3/build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
   implementation("com.google.guava:guava:33.6.0-jre")
   // we need to use byte buddy variant that does not shade asm
   implementation("net.bytebuddy:byte-buddy-gradle-plugin:${byteBuddyVersion}") {
-    exclude(group = "net.bytebuddy", module = "byte-buddy")
+    exclude("net.bytebuddy", "byte-buddy")
   }
   implementation("net.bytebuddy:byte-buddy-dep:${byteBuddyVersion}")
 
@@ -43,8 +43,8 @@ dependencies {
   implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.1") {
     // plexus-xml 4.1+ pulls in Maven 4 API which uses JPMS-only service registration,
     // causing "No XmlService implementation found" in Gradle's classloader
-    exclude(group = "org.codehaus.plexus", module = "plexus-utils")
-    exclude(group = "org.codehaus.plexus", module = "plexus-xml")
+    exclude("org.codehaus.plexus", "plexus-utils")
+    exclude("org.codehaus.plexus", "plexus-xml")
   }
 
   testImplementation("org.assertj:assertj-core:3.27.7")

gradle-plugins/build.gradle.kts

@@ -26,5 +26,5 @@ dependencies {
 
 // Needed by mockito
 configurations.testRuntimeClasspath {
-  exclude(group = "net.bytebuddy", module = "byte-buddy-dep")
+  exclude("net.bytebuddy", "byte-buddy-dep")
 }