Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instrumentation into spring-actuator-update

Author: jaydeluca

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

@@ -1,20 +1,20 @@
 name: Auto license report
 on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
+  push:
+    branches:
+      - 'renovate/**/*'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 permissions:
   contents: read
 
 jobs:
-  check:
-    if: ${{ github.event.pull_request.draft == false }}
+  auto-license-report:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -33,26 +33,16 @@ jobs:
         with:
           cache-read-only: true
 
-      - name: Check out PR branch
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh pr checkout ${{ github.event.pull_request.number }}
+      - name: Use CLA approved bot
+        run: .github/scripts/use-cla-approved-bot.sh
 
       - name: Update license report
         run: ./gradlew generateLicenseReport --no-build-cache
 
-      - id: create-patch
-        name: Create patch file
+      - name: Commit and push if there are changes
         run: |
-          git add -N --ignore-removal licenses
-          git diff > patch
-          if [ -s patch ]; then
-            echo "exists=true" >> "$GITHUB_OUTPUT"
+          git add licenses
+          if ! git diff --cached --quiet; then
+            git commit -m "Update license report"
+            git push
           fi
-
-      - name: Upload patch file
-        if: steps.create-patch.outputs.exists == 'true'
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
-        with:
-          path: patch
-          name: patch

instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/build.gradle.kts

@@ -27,10 +27,6 @@ dependencies {
 
   testLibrary("org.springframework.boot:spring-boot-starter-test:3.0.0")
   testLibrary("org.springframework.boot:spring-boot-starter:3.0.0")
-
-  // tests don't work with spring boot 4 yet
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter:3.+") // documented limitation
 }
 
 // spring 6 requires java 17

instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/AbstractSpringJmsListenerTest.java

@@ -45,12 +45,12 @@ abstract class AbstractSpringJmsListenerTest {
   @BeforeAll
   static void setUp() {
     broker =
-        new GenericContainer<>("quay.io/artemiscloud/activemq-artemis-broker:artemis.2.27.0")
-            .withEnv("AMQ_USER", "test")
-            .withEnv("AMQ_PASSWORD", "test")
+        new GenericContainer<>("apache/activemq-artemis:2.44.0")
+            .withEnv("ARTEMIS_USER", "test")
+            .withEnv("ARTEMIS_PASSWORD", "test")
             .withEnv("JAVA_TOOL_OPTIONS", "-Dbrokerconfig.maxDiskUsage=-1")
             .withExposedPorts(61616, 8161)
-            .waitingFor(Wait.forLogMessage(".*Server is now live.*", 1))
+            .waitingFor(Wait.forLogMessage(".*Server is now active.*", 1))
             .withStartupTimeout(Duration.ofMinutes(2))
             .withLogConsumer(new Slf4jLogConsumer(logger));
     broker.start();

instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts

@@ -12,6 +12,8 @@ muzzle {
   }
 }
 
+val latestDepTest = findProperty("testLatestDeps") as Boolean
+
 dependencies {
   library("org.springframework.amqp:spring-rabbit:1.0.0.RELEASE")
 
@@ -24,9 +26,9 @@ dependencies {
   // spring-retry is required by org.springframework.amqp:spring-rabbit:4.0.0
   testLibrary("org.springframework.retry:spring-retry")
 
-  // tests don't work with spring boot 4 yet
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter:3.+") // documented limitation
-  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
+  if (latestDepTest) {
+    testLibrary("org.springframework.boot:spring-boot-starter-amqp:latest.release")
+  }
 }
 
 tasks {
@@ -36,8 +38,6 @@ tasks {
   }
 }
 
-val latestDepTest = findProperty("testLatestDeps") as Boolean
-
 // spring 6 requires java 17
 if (latestDepTest) {
   otelJava {

instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts

@@ -31,10 +31,6 @@ dependencies {
   // testLibrary("jakarta.servlet:jakarta.servlet-api:6.0.0")
   testImplementation("jakarta.servlet:jakarta.servlet-api:6.0.0")
   latestDepTestLibrary("jakarta.servlet:jakarta.servlet-api:6.1.0") // documented limitation
-  // remove after 7.0 is released for spring security
-  // spring-test 7 requires spring-context 7
-  latestDepTestLibrary("org.springframework:spring-context:latest.release")
-  latestDepTestLibrary("org.springframework:spring-web:latest.release")
 }
 
 otelJava {

instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts

@@ -20,9 +20,6 @@ dependencies {
   testImplementation(platform("org.junit:junit-bom:6.0.1"))
 
   testLibrary("org.springframework:spring-test:6.0.0")
-  // remove after 7.0 is released for spring security
-  // spring-test 7 requires spring-context 7
-  latestDepTestLibrary("org.springframework:spring-context:latest.release")
 }
 
 otelJava {