Merge branch 'main' into opamp-remote-cfg-profiler-interval

robsunday · robsunday · commit 23628add462d · 2026-06-29T13:00:55.000+02:00
# Conflicts:
#	opamp/src/main/java/com/splunk/opentelemetry/opamp/RemoteConfigProcessor.java
#	opamp/src/test/java/com/splunk/opentelemetry/opamp/RemoteConfigProcessorTest.java
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -68,7 +68,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -90,7 +90,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -136,7 +136,7 @@ jobs:
           }
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -84,7 +84,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -130,7 +130,7 @@ jobs:
           }
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -75,7 +75,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -99,7 +99,7 @@ jobs:
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -148,7 +148,7 @@ jobs:
           }
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -196,7 +196,7 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
@@ -232,7 +232,7 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: temurin
           java-version: 17
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -44,5 +44,5 @@ dependencies {
   implementation("io.opentelemetry.instrumentation:gradle-plugins:2.29.0-alpha")
 
   // keep these versions in sync with settings.gradle.kts
-  implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.2")
+  implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.3")
 }
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
   api(enforcedPlatform("io.grpc:grpc-bom:1.82.1"))
   api(enforcedPlatform("io.opentelemetry:opentelemetry-bom-alpha:$otelAlphaVersion"))
   api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelInstrumentationAlphaVersion"))
-  api(enforcedPlatform("org.junit:junit-bom:6.1.0"))
+  api(enforcedPlatform("org.junit:junit-bom:6.1.1"))
   api(enforcedPlatform("org.testcontainers:testcontainers-bom:2.0.5"))
 
   constraints {
@@ -58,7 +58,7 @@ dependencies {
     api("io.opentelemetry.contrib:opentelemetry-opamp-client:${otelContribAlphaVersion}")
     api("io.opentelemetry.proto:opentelemetry-proto:1.10.0-alpha")
 
-    api("org.apache.commons:commons-jexl3:3.6.3")
+    api("org.apache.commons:commons-jexl3:3.6.4")
     api("org.snakeyaml:snakeyaml-engine:2.10")
     api("io.github.netmikey.logunit:logunit-jul:2.0.0")
   }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
+distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/licenses/commons-jexl3-3.6.4.jar/META-INF/LICENSE.txt b/licenses/commons-jexl3-3.6.4.jar/META-INF/LICENSE.txt
diff --git a/licenses/commons-jexl3-3.6.4.jar/META-INF/NOTICE.txt b/licenses/commons-jexl3-3.6.4.jar/META-INF/NOTICE.txt
diff --git a/licenses/licenses.md b/licenses/licenses.md
@@ -1,7 +1,7 @@
 
 # splunk-otel-javaagent
 ## Dependency License Report
-_2026-06-24 14:18:04 CEST_
+_2026-06-29 09:11:38 EEST_
 ## Apache License, Version 2.0
 
 **1** **Group:** `com.squareup.okhttp3` **Name:** `okhttp` **Version:** `5.4.0` 
@@ -92,12 +92,12 @@ _2026-06-24 14:18:04 CEST_
 > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
 
-**23** **Group:** `org.apache.commons` **Name:** `commons-jexl3` **Version:** `3.6.3` 
+**23** **Group:** `org.apache.commons` **Name:** `commons-jexl3` **Version:** `3.6.4` 
 > - **Project URL**: [https://commons.apache.org/proper/commons-jexl/](https://commons.apache.org/proper/commons-jexl/)
 > - **Manifest License**: [https://www.apache.org/licenses/LICENSE-2.0](Apache License, Version 2.0)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
-> - **Embedded license files**: [commons-jexl3-3.6.3.jar/META-INF/LICENSE.txt](commons-jexl3-3.6.3.jar/META-INF/LICENSE.txt) 
-    - [commons-jexl3-3.6.3.jar/META-INF/NOTICE.txt](commons-jexl3-3.6.3.jar/META-INF/NOTICE.txt)
+> - **Embedded license files**: [commons-jexl3-3.6.4.jar/META-INF/LICENSE.txt](commons-jexl3-3.6.4.jar/META-INF/LICENSE.txt) 
+    - [commons-jexl3-3.6.4.jar/META-INF/NOTICE.txt](commons-jexl3-3.6.4.jar/META-INF/NOTICE.txt)
 
 **24** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` 
 > - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org)
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,7 +3,7 @@ pluginManagement {
     id("com.bmuschko.docker-remote-api") version "10.0.0"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
     id("com.github.jk1.dependency-license-report") version "3.1.4"
-    id("com.gradleup.shadow") version "9.4.2"
+    id("com.gradleup.shadow") version "9.4.3"
   }
 }
 
diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
   testImplementation("io.opentelemetry.proto:opentelemetry-proto")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
-  testImplementation("ch.qos.logback:logback-classic:1.5.35")
+  testImplementation("ch.qos.logback:logback-classic:1.5.37")
   testImplementation("com.github.docker-java:docker-java-core")
   testImplementation("com.github.docker-java:docker-java-transport-httpclient5")
   testImplementation("org.mock-server:mockserver-client-java:7.2.0")

Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,5 @@ dependencies {`
`44`	`44`	`implementation("io.opentelemetry.instrumentation:gradle-plugins:2.29.0-alpha")`
`45`	`45`
`46`	`46`	`// keep these versions in sync with settings.gradle.kts`
`47`		`- implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.2")`
	`47`	`+ implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.3")`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ pluginManagement {`
`3`	`3`	`id("com.bmuschko.docker-remote-api") version "10.0.0"`
`4`	`4`	`id("io.github.gradle-nexus.publish-plugin") version "2.0.0"`
`5`	`5`	`id("com.github.jk1.dependency-license-report") version "3.1.4"`
`6`		`- id("com.gradleup.shadow") version "9.4.2"`
	`6`	`+ id("com.gradleup.shadow") version "9.4.3"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`