Merge branch 'main' into disk-buffering-api-implementation

Author: LikeTheSalad

.github/scripts/draft-change-log-entries.sh

@@ -35,6 +35,7 @@ component_names["consistent-sampling/"]="Consistent sampling"
 component_names["disk-buffering/"]="Disk buffering"
 component_names["gcp-resources/"]="GCP resources"
 component_names["gcp-auth-extension/"]="GCP authentication extension"
+component_names["ibm-mq-metrics/"]="IBM MQ metrics"
 component_names["inferred-spans/"]="Inferred spans"
 component_names["jfr-connection/"]="JFR connection"
 component_names["jfr-events/"]="JFR events"
@@ -44,6 +45,7 @@ component_names["kafka-exporter/"]="Kafka exporter"
 component_names["maven-extension/"]="Maven extension"
 component_names["micrometer-meter-provider/"]="Micrometer MeterProvider"
 component_names["noop-api/"]="No-op API"
+component_names["opamp-client/"]="OpAMP client"
 component_names["processors/"]="Telemetry processors"
 component_names["prometheus-client-bridge/"]="Prometheus client bridge"
 component_names["runtime-attach/"]="Runtime attach"

.github/workflows/build-common.yml

@@ -9,6 +9,10 @@ on:
       no-build-cache:
         type: boolean
         required: false
+      max-test-retries:
+        type: number
+        required: false
+        default: 0
 
 permissions:
   contents: read
@@ -90,6 +94,7 @@ jobs:
           "-PtestJavaVersion=${{ matrix.test-java-version }}"
           "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}"
           "-Porg.gradle.java.installations.auto-download=false"
+          "-PmaxTestRetries=${{ inputs.max-test-retries }}"
           ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
   integration-test:
@@ -109,7 +114,7 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Integration test
-        run: ./gradlew integrationTest ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
+        run: ./gradlew integrationTest "-PmaxTestRetries=${{ inputs.max-test-retries }}" ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
       - name: Save integration test results
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/workflows/build-pull-request.yml

@@ -16,6 +16,8 @@ jobs:
     uses: ./.github/workflows/build-common.yml
     with:
       cache-read-only: true
+      # retry in merge queue to avoid unnecessary failures
+      max-test-retries: ${{ github.event_name == 'merge_group' && 5 || 0 }}
 
   link-check:
     uses: ./.github/workflows/reusable-link-check.yml

.github/workflows/codeql.yml

@@ -50,7 +50,7 @@ jobs:
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
+        uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
         with:
           languages: ${{ matrix.language }}
           # using "linked" helps to keep up with the latest Kotlin support
@@ -65,6 +65,6 @@ jobs:
         run: ./gradlew assemble --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
+        uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

@@ -52,6 +52,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
+        uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
         with:
           sarif_file: results.sarif

.github/workflows/release.yml

@@ -1,6 +1,11 @@
 name: Release
 on:
   workflow_dispatch:
+    inputs:
+      already-published:
+        description: 'Skip publishing, download artifacts from Maven Central instead'
+        default: false
+        type: boolean
 
 permissions:
   contents: read
@@ -125,14 +130,31 @@ jobs:
 
       - name: Set up gradle
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+
       - name: Build and publish artifacts
+        if: ${{ !inputs.already-published }}
         run: ./gradlew assemble publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
 
+      - name: Download artifacts from Maven Central (when already published)
+        if: ${{ inputs.already-published }}
+        run: |
+          mkdir -p jmx-metrics/build/libs
+          mkdir -p jmx-scraper/build/libs
+          
+          curl -L -o jmx-metrics/build/libs/opentelemetry-jmx-metrics-$VERSION-alpha.jar \
+            "https://repo1.maven.org/maven2/io/opentelemetry/contrib/opentelemetry-jmx-metrics/$VERSION-alpha/opentelemetry-jmx-metrics-$VERSION-alpha.jar"
+          curl -L -o jmx-metrics/build/libs/opentelemetry-jmx-metrics-$VERSION-alpha.jar.asc \
+            "https://repo1.maven.org/maven2/io/opentelemetry/contrib/opentelemetry-jmx-metrics/$VERSION-alpha/opentelemetry-jmx-metrics-$VERSION-alpha.jar.asc"
+          curl -L -o jmx-scraper/build/libs/opentelemetry-jmx-scraper-$VERSION-alpha.jar \
+            "https://repo1.maven.org/maven2/io/opentelemetry/contrib/opentelemetry-jmx-scraper/$VERSION-alpha/opentelemetry-jmx-scraper-$VERSION-alpha.jar"
+          curl -L -o jmx-scraper/build/libs/opentelemetry-jmx-scraper-$VERSION-alpha.jar.asc \
+            "https://repo1.maven.org/maven2/io/opentelemetry/contrib/opentelemetry-jmx-scraper/$VERSION-alpha/opentelemetry-jmx-scraper-$VERSION-alpha.jar.asc"
+
       - name: Generate release notes
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -182,17 +204,16 @@ jobs:
           cp jmx-metrics/build/libs/opentelemetry-jmx-metrics-$VERSION-alpha.jar opentelemetry-jmx-metrics.jar
           cp jmx-metrics/build/libs/opentelemetry-jmx-metrics-$VERSION-alpha.jar.asc opentelemetry-jmx-metrics.jar.asc
           cp jmx-scraper/build/libs/opentelemetry-jmx-scraper-$VERSION-alpha.jar opentelemetry-jmx-scraper.jar
-          cp jmx-scraper/build/libs/opentelemetry-jmx-scraper-$VERSION-alpha.jar opentelemetry-jmx-scraper.jar.asc
+          cp jmx-scraper/build/libs/opentelemetry-jmx-scraper-$VERSION-alpha.jar.asc opentelemetry-jmx-scraper.jar.asc
           
           gh release create --target $GITHUB_REF_NAME \
                             --title "Version $VERSION" \
                             --notes-file /tmp/release-notes.txt \
                             v$VERSION \
                             opentelemetry-jmx-metrics.jar \
-                            opentelemetry-jmx-metrics.jar.asc \ 
+                            opentelemetry-jmx-metrics.jar.asc \
                             opentelemetry-jmx-scraper.jar \
-                            opentelemetry-jmx-scraper.jar.asc 
-                            
+                            opentelemetry-jmx-scraper.jar.asc
 
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 

CHANGELOG.md

@@ -2,6 +2,33 @@
 
 ## Unreleased
 
+## Version 1.49.0 (2025-08-22)
+
+### Consistent sampling
+
+- Add updateable threshold sampler for dynamic sampling configuration
+  ([#2137](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/2137))
+
+### Disk buffering
+
+- Introduce API changes for improved disk buffering functionality
+  ([#2084](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/2084))
+- Implement more efficient serializer with direct disk write capabilities
+  ([#2138](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/2138))
+
+### IBM MQ metrics - New 🌟
+
+IBM MQ metrics collection utility.
+
+### Inferred spans
+
+- Update async profiler to version 4.1 for improved performance
+  ([#2096](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/2096))
+
+### OpAMP client - New 🌟
+
+OpenTelemetry Agent Management Protocol (OpAMP) client implementation.
+
 ## Version 1.48.0 (2025-07-23)
 
 ### AWS resources

buildSrc/build.gradle.kts

@@ -17,6 +17,7 @@ dependencies {
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("org.owasp:dependency-check-gradle:12.1.3")
   implementation("ru.vyarus.animalsniffer:ru.vyarus.animalsniffer.gradle.plugin:2.0.1")
+  implementation("com.gradle:develocity-gradle-plugin:4.1.1")
 }
 
 spotless {

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -66,10 +66,23 @@ tasks {
   withType<Test>().configureEach {
     useJUnitPlatform()
 
+    val maxTestRetries = gradle.startParameter.projectProperties["maxTestRetries"]?.toInt() ?: 0
+    develocity.testRetry {
+      // You can see tests that were retried by this mechanism in the collected test reports and build scans.
+      maxRetries.set(maxTestRetries)
+    }
+
     testLogging {
       exceptionFormat = TestExceptionFormat.FULL
       showStandardStreams = true
     }
+    
+    configure<JacocoTaskExtension> {
+      // only care about code coverage for code in this repository
+      // (in particular avoiding netty classes which sometimes end up
+      // causing sporadic CI failures)
+      includes = listOf("io/opentelemetry/contrib/**")
+    }
   }
 
   withType<Javadoc>().configureEach {

consistent-sampling/build.gradle.kts

@@ -12,3 +12,14 @@ dependencies {
   testImplementation("org.hipparchus:hipparchus-core:4.0.1")
   testImplementation("org.hipparchus:hipparchus-stat:4.0.1")
 }
+
+tasks {
+  withType<Test>().configureEach {
+    develocity.testRetry {
+      // TODO (trask) fix flaky tests and remove this workaround
+      if (System.getenv().containsKey("CI")) {
+        maxRetries.set(5)
+      }
+    }
+  }
+}