Merge branch 'main' into main

Author: aaaugustine29

.github/repository-settings.md

@@ -29,3 +29,4 @@ private admin repo.
 ### Organization variables
 
 - `OTELBOT_APP_ID`
+- `OTELBOT_JAVA_INSTRUMENTATION_APP_ID` (scoped only to this repo)

.github/workflows/auto-license-report.yml

@@ -71,7 +71,7 @@ jobs:
         if: steps.check-patch.outputs.exists == 'true'
         id: otelbot-token
         with:
-          app-id: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_APP_ID }}
+          app-id: ${{ vars.OTELBOT_JAVA_INSTRUMENTATION_APP_ID }}
           private-key: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY }}
 
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

.github/workflows/auto-update-otel-sdk.yml

@@ -75,7 +75,8 @@ jobs:
         uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
 
       - name: Update license report
-        run: ./gradlew generateLicenseReport
+        # with the build cache enabled occasionally produces outdated results
+        run: ./gradlew generateLicenseReport --no-build-cache
 
       - name: Undo license report clean
         if: failure()

.github/workflows/metadata-update.yml

@@ -21,7 +21,15 @@ jobs:
       pull-requests: write # for adding label and assignee to PR
 
     steps:
+      - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_JAVA_INSTRUMENTATION_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY }}
+
       - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        with:
+          token: ${{ steps.otelbot-token.outputs.token }}
 
       - name: Free disk space
         run: .github/scripts/gha-free-disk-space.sh
@@ -55,27 +63,16 @@ jobs:
         if: steps.diffcheck.outputs.has_diff == 'true'
         run: .github/scripts/use-cla-approved-bot.sh
 
-      - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
-        if: steps.diffcheck.outputs.has_diff == 'true'
-        id: otelbot-token
-        with:
-          app-id: ${{ vars.OTELBOT_APP_ID }}
-          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
-
       - name: Find or create metadata update branch
         if: steps.diffcheck.outputs.has_diff == 'true'
         id: findbranch
-        env:
-          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           BRANCH_NAME="otelbot/metadata-update-main"
           echo "branch=$BRANCH_NAME" >> $GITHUB_OUTPUT
           git checkout -B "$BRANCH_NAME"
 
       - name: Commit and push changes
         if: steps.diffcheck.outputs.has_diff == 'true'
-        env:
-          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           BRANCH_NAME="${{ steps.findbranch.outputs.branch }}"
           git commit -m "chore: update instrumentation list [automated]" || echo "No changes to commit."
@@ -104,7 +101,7 @@ jobs:
       - name: Add label to PR
         if: steps.createpr.outputs.new_pr == 'true'
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           BRANCH_NAME="${{ steps.findbranch.outputs.branch }}"
           PR_URL=$(gh pr list --state open --head "$BRANCH_NAME" --json url -q '.[0].url')

conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts

@@ -85,24 +85,19 @@ if (project == rootProject) {
         ".gitattributes",
         ".gitconfig",
         ".editorconfig",
-        "**/*.md",
-        "**/*.sh",
-        "**/*.dockerfile",
-        "**/gradle.properties"
+        "*.md",
+        "gradle.properties",
+        ".github/**/*.md",
+        ".github/**/*.sh",
+        "docs/**/*.md",
+        "examples/**/*.md",
+        "examples/**/gradle.properties",
+        "licenses/**/*.md"
       )
       leadingTabsToSpaces()
       trimTrailingWhitespace()
       endWithNewline()
     }
-    groovy {
-      target("**/*.groovy")
-      targetExclude("**/build/**")
-      licenseHeaderFile(
-        rootProject.file("buildscripts/spotless.license.java"),
-        "(package|import|(?:abstract )?class)"
-      )
-      endWithNewline()
-    }
     predeclareDeps()
   }
 

examples/distro/smoke-tests/build.gradle

@@ -5,7 +5,7 @@ plugins {
 dependencies {
   testImplementation("org.testcontainers:testcontainers:2.0.2")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.33.1")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.33.2")
   testImplementation("com.squareup.okhttp3:okhttp:5.3.2")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")

examples/extension/build.gradle

@@ -100,7 +100,7 @@ dependencies {
   //All dependencies below are only for tests
   testImplementation("org.testcontainers:testcontainers:2.0.2")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.1")
-  testImplementation("com.google.protobuf:protobuf-java-util:4.33.1")
+  testImplementation("com.google.protobuf:protobuf-java-util:4.33.2")
   testImplementation("com.squareup.okhttp3:okhttp:5.3.2")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha")

instrumentation/grails-3.0/javaagent/build.gradle.kts

@@ -61,6 +61,17 @@ configurations.testRuntimeClasspath {
   }
 }
 
+spotless {
+  groovy {
+    target("src/**/*.groovy")
+    licenseHeaderFile(
+      rootProject.file("buildscripts/spotless.license.java"),
+      "(package|import|(?:abstract )?class)"
+    )
+    endWithNewline()
+  }
+}
+
 tasks {
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", latestDepTest)

…faultClientResourcesInstrumentation.java …v5_1/ClientResourcesInstrumentation.javainstrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/DefaultClientResourcesInstrumentation.java renamed to instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/ClientResourcesInstrumentation.java instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/DefaultClientResourcesInstrumentation.java renamed to instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/ClientResourcesInstrumentation.java

@@ -5,22 +5,29 @@
 
 package io.opentelemetry.javaagent.instrumentation.lettuce.v5_1;
 
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.isStatic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-import io.lettuce.core.resource.DefaultClientResources;
+import io.lettuce.core.resource.ClientResources;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-public class DefaultClientResourcesInstrumentation implements TypeInstrumentation {
+public class ClientResourcesInstrumentation implements TypeInstrumentation {
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
-    return named("io.lettuce.core.resource.DefaultClientResources");
+    return implementsInterface(named("io.lettuce.core.resource.ClientResources"));
+  }
+
+  @Override
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
+    return hasClassesNamed("io.lettuce.core.resource.ClientResources");
   }
 
   @Override
@@ -34,7 +41,7 @@ public void transform(TypeTransformer transformer) {
   public static class BuilderAdvice {
 
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void methodEnter(@Advice.Return DefaultClientResources.Builder builder) {
+    public static void methodEnter(@Advice.Return ClientResources.Builder builder) {
       if (CompatibilityChecker.checkCompatible()) {
         builder.tracing(TracingHolder.TRACING);
       }

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceInstrumentationModule.java

@@ -35,8 +35,7 @@ public boolean isHelperClass(String className) {
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return asList(
-        new DefaultClientResourcesInstrumentation(), new LettuceAsyncCommandInstrumentation());
+    return asList(new ClientResourcesInstrumentation(), new LettuceAsyncCommandInstrumentation());
   }
 
   @Override