Merge remote-tracking branch 'upstream/main' into test-suites-runtime-attach

trask · trask · commit 69431bcec2ad · 2025-10-14T11:42:48.000-07:00
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -4,6 +4,8 @@
     'config:best-practices',
     'helpers:pinGitHubActionDigestsToSemver',
   ],
+  ignorePaths: [], // overwrite default ignore which includes **/test/**
+                   // used to update docker image versions used in Java test files
   ignorePresets: [
     ':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date
     'workarounds:javaLTSVersions', // Allow all Java major versions, not just LTS
@@ -243,5 +245,17 @@
         '"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
       ],
     },
+    {
+      customType: 'regex',
+      datasourceTemplate: 'docker',
+      managerFilePatterns: [
+        '**/*.java',
+      ],
+      matchStrings: [
+        '"(?<depName>otel/opentelemetry-collector-contrib):(?<currentValue>[^@"]+)(?:@(?<currentDigest>sha256:[a-f0-9]+))?"',
+      ],
+      autoReplaceStringTemplate: '"{{depName}}:{{newValue}}{{#if newDigest}}@{{newDigest}}{{/if}}"',
+      versioningTemplate: 'docker',
+    },
   ],
 }
diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
@@ -111,7 +111,7 @@ jobs:
 
       - name: Test
         run: >
-          ./gradlew test
+          ./gradlew check -x spotlessCheck
           "-PtestJavaVersion=${{ matrix.test-java-version }}"
           "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}"
           "-Porg.gradle.java.installations.auto-download=false"
@@ -122,36 +122,6 @@ jobs:
         if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
         run: cat build-scan.txt
 
-  integration-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          cache-read-only: ${{ inputs.cache-read-only }}
-
-      - name: Integration test
-        run: ./gradlew integrationTest "-PmaxTestRetries=${{ inputs.max-test-retries }}" ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
-
-      - name: Build scan
-        if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
-        run: cat build-scan.txt
-
-      - name: Save integration test results
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        if: always()
-        with:
-          name: integration-test-results
-          path: jmx-metrics/build/reports/tests/integrationTest
-
   markdown-lint-check:
     uses: ./.github/workflows/reusable-markdown-lint.yml
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -50,7 +50,7 @@ jobs:
         uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@a8d1ac45b9a34d11fe398d5503176af0d06b303e # v3.30.7
+        uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         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@a8d1ac45b9a34d11fe398d5503176af0d06b303e # v3.30.7
+        uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/ossf-scorecard.yml b/.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@a8d1ac45b9a34d11fe398d5503176af0d06b303e # v3.30.7
+        uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/reusable-link-check.yml b/.github/workflows/reusable-link-check.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
-          fetch-depth: 0 # needed for merge-base below
+          fetch-depth: 0 # needed for merge-base used in lint:links-in-modified-files
 
       - uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
 
diff --git a/.mise/tasks/lint/links-in-modified-files.sh b/.mise/tasks/lint/links-in-modified-files.sh
@@ -17,12 +17,12 @@ fi
 config_modified=$(git diff --name-only --merge-base "$usage_base" $usage_head \
                   | grep -E '^(\.github/config/lychee\.toml|\.mise/tasks/lint/.*|mise\.toml)$' || true)
 
-if [ -n "$config_modified" ] ; then
+if [ "$usage_event" != "pull_request" ] ; then
+  echo "Not a PR - checking all files."
+  mise run lint:links
+elif [ -n "$config_modified" ] ; then
   echo "config changes, checking all files."
   mise run lint:links
-elif [ "$usage_event" != "pull_request" ] ; then
-  echo "Not a PR - skipping link linting."
-  exit 0
 else
   # Using lychee's default extension filter here to match when it runs against all files
   # Note: --diff-filter=d filters out deleted files
diff --git a/.mise/tasks/lint/links.sh b/.mise/tasks/lint/links.sh
@@ -5,4 +5,9 @@ set -e
 
 #USAGE arg "<file>" var=#true help="files to check" default="."
 
-lychee --verbose --config .github/config/lychee.toml "$usage_file"
+for f in $usage_file; do
+    echo "Checking links in file: $f"
+done
+
+# shellcheck disable=SC2086
+lychee --verbose --config .github/config/lychee.toml $usage_file
diff --git a/.mise/tasks/lint/local-links.sh b/.mise/tasks/lint/local-links.sh
@@ -5,4 +5,9 @@ set -e
 
 #USAGE arg "<file>" var=#true help="files to check" default="."
 
-lychee --verbose --scheme file --include-fragments "$usage_file"
+for f in $usage_file; do
+    echo "Checking links in file: $f"
+done
+
+# shellcheck disable=SC2086
+lychee --verbose --scheme file --include-fragments $usage_file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -31,12 +31,6 @@ To run the tests:
 ./gradlew test
 ```
 
-Some modules include integration tests that can be run with:
-
-```bash
-./gradlew integrationTest
-```
-
 ## Snapshot Builds
 
 Snapshot builds of the `main` branch are available from the Sonatype snapshot repository at:
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ### Maintainers
 
-- [Jack Berg](https://github.com/jack-berg), New Relic
+- [Jack Berg](https://github.com/jack-berg), Grafana Labs
 - [Jason Plumb](https://github.com/breedx-splk), Splunk
 - [Lauri Tulmin](https://github.com/laurit), Splunk
 - [Trask Stalnaker](https://github.com/trask), Microsoft
@@ -63,7 +63,7 @@ For more information about the maintainer role, see the [community repository](h
 
 ### Approvers
 
-- [Jay DeLuca](https://github.com/jaydeluca), Grafana
+- [Jay DeLuca](https://github.com/jaydeluca), Grafana Labs
 - [John Watson](https://github.com/jkwatson), Cloudera
 
 For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
diff --git a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java
@@ -16,13 +16,13 @@
 import java.time.Duration;
 import java.util.Collections;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
@@ -31,15 +31,21 @@
 // to update sampling rules and assert rough ratios of sampling decisions. In the meantime, it
 // expects you to update the rules through the dashboard to see the effect on the sampling decisions
 // that are printed.
-@Testcontainers(disabledWithoutDocker = true)
+@EnabledIf("hasAwsCredentials")
 class AwsXrayRemoteSamplerIntegrationTest {
 
+  static boolean hasAwsCredentials() {
+    return System.getenv("AWS_ACCESS_KEY_ID") != null;
+  }
+
   private static final Logger logger =
       LoggerFactory.getLogger(AwsXrayRemoteSamplerIntegrationTest.class);
 
   @Container
   private static final GenericContainer<?> otelCollector =
-      new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest"))
+      new GenericContainer<>(
+              DockerImageName.parse(
+                  "otel/opentelemetry-collector-contrib:0.137.0@sha256:886722fe0f37af9d1fe24d29529253ec59fbf263b3b1df4facaf221373e19d23"))
           .withExposedPorts(13133, 2000)
           .waitingFor(Wait.forHttp("/").forPort(13133))
           .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("otel-collector")))
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,9 +15,9 @@ dependencies {
   implementation("com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:8.0.0")
   implementation("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
   implementation("net.ltgt.nullaway:net.ltgt.nullaway.gradle.plugin:2.3.0")
-  implementation("org.owasp.dependencycheck:org.owasp.dependencycheck.gradle.plugin:12.1.6")
+  implementation("org.owasp.dependencycheck:org.owasp.dependencycheck.gradle.plugin:12.1.8")
   implementation("ru.vyarus.animalsniffer:ru.vyarus.animalsniffer.gradle.plugin:2.0.1")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2.1")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2.2")
   implementation("me.champeau.gradle.japicmp:me.champeau.gradle.japicmp.gradle.plugin:0.4.6")
   implementation("com.google.auto.value:auto-value-annotations:1.11.0")
 }
diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -148,7 +148,7 @@ dependencies {
 testing {
   suites.withType(JvmTestSuite::class).configureEach {
     dependencies {
-      implementation(project(project.path))
+      implementation(project())
 
       implementation(enforcedPlatform("org.junit:junit-bom:5.14.0"))
       implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.21.3"))
@@ -173,6 +173,12 @@ testing {
   }
 }
 
+tasks {
+  check {
+    dependsOn(testing.suites)
+  }
+}
+
 fun isJavaVersionAllowed(version: JavaVersion): Boolean {
   if (otelJava.minJavaVersionSupported.get() > version) {
     return false
diff --git a/consistent-sampling/README.md b/consistent-sampling/README.md
@@ -5,7 +5,7 @@ There are two major components included here.
 ## Original proposal implementation
 
 The original specification for consistent probability sampling is defined by
-<https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/tracestate-probability-sampling-experimental.md>
+<https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/trace/4673-experimental-probability-sampling.md>
 and <https://github.com/open-telemetry/opentelemetry-specification/pull/2047>.
 It supports sampling probabilities that are power of 2 (1, 1/2, 1/4, ...), and uses 8-bit `r-value` and 8-bit `p-value` in tracestate.
 
@@ -14,18 +14,18 @@ The implementation of this proposal is contained by the package `io/opentelemetr
 * **ConsistentSampler**:
   abstract base class of all consistent sampler implementations below
 * **ConsistentAlwaysOffSampler**:
-  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/tracestate-probability-sampling-experimental.md#always-off-sampler>
+  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/trace/4673-experimental-probability-sampling.md#always-off-sampler>
 * **ConsistentAlwaysOnSampler**:
-  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/tracestate-probability-sampling-experimental.md#always-on-consistent-probability-sampler>
+  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/trace/4673-experimental-probability-sampling.md#always-on-consistent-probability-sampler>
 * **ConsistentComposedAndSampler**:
   allows combining two consistent samplers and samples when both samplers would sample
 * **ConsistentComposedOrSampler**:
   allows combining two consistent sampler and samples when at least one of both samplers would sample,
-  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/tracestate-probability-sampling-experimental.md#requirement-combine-multiple-consistent-probability-samplers-using-the-minimum-p-value>
+  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/trace/4673-experimental-probability-sampling.md#requirement-combine-multiple-consistent-probability-samplers-using-the-minimum-p-value>
 * **ConsistentParentBasedSampler**:
-  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/tracestate-probability-sampling-experimental.md#parentconsistentprobabilitybased-sampler>
+  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/trace/4673-experimental-probability-sampling.md#parentconsistentprobabilitybased-sampler>
 * **ConsistentProbabilityBasedSampler**:
-  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/tracestate-probability-sampling-experimental.md#consistentprobabilitybased-sampler>
+  see <https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/trace/4673-experimental-probability-sampling.md#consistentprobabilitybased-sampler>
 * **ConsistentRateLimitingSampler**:
   a rate limiting sampler based on exponential smoothing that dynamically adjusts the sampling
   probability based on the estimated rate of spans occurring to satisfy a given rate of sampled spans
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
   api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
   api(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
   api(platform("com.google.protobuf:protobuf-bom:4.32.1"))
-  api(platform("com.squareup.okhttp3:okhttp-bom:5.1.0"))
+  api(platform("com.squareup.okhttp3:okhttp-bom:5.2.1"))
 
   constraints {
     api("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")
diff --git a/ibm-mq-metrics/build.gradle.kts b/ibm-mq-metrics/build.gradle.kts
@@ -50,7 +50,11 @@ testing {
       targets {
         all {
           testTask.configure {
-            shouldRunAfter(tasks.test)
+            // Jakarta JMS requires Java 11+
+            val testJavaVersion: String? by project
+            if (testJavaVersion == "8") {
+              enabled = false
+            }
           }
         }
       }
diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpans.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpans.java
@@ -42,10 +42,12 @@ public static boolean isEnabled() {
    *
    * @param interval the new profiler interval
    */
-  public static void setProfilerInterval(Duration interval) {
+  @Nullable
+  public static Duration setProfilerInterval(Duration interval) {
     InferredSpansProcessor p = instance;
     if (p != null) {
-      p.setProfilerInterval(interval);
+      return p.setProfilerInterval(interval);
     }
+    return null;
   }
 }
diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansProcessor.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansProcessor.java
@@ -57,9 +57,10 @@ public class InferredSpansProcessor implements SpanProcessor {
     }
   }
 
-  public void setProfilerInterval(Duration interval) {
-    config.setProfilerInterval(interval);
+  public Duration setProfilerInterval(Duration interval) {
+    Duration oldInterval = config.setProfilerInterval(interval);
     profiler.reschedule();
+    return oldInterval;
   }
 
   public static InferredSpansProcessorBuilder builder() {
diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/InferredSpansConfiguration.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/InferredSpansConfiguration.java
@@ -84,8 +84,10 @@ public Duration getProfilingInterval() {
     return profilerInterval;
   }
 
-  public void setProfilerInterval(Duration profilerInterval) {
+  public Duration setProfilerInterval(Duration profilerInterval) {
+    Duration oldInterval = this.profilerInterval;
     this.profilerInterval = profilerInterval;
+    return oldInterval;
   }
 
   public Duration getProfilingDuration() {
diff --git a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java
@@ -11,11 +11,16 @@
 import io.opentelemetry.proto.metrics.v1.Metric;
 import java.time.Duration;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
 
+// possible workaround on Java 8:
+// https://stackoverflow.com/questions/35466461/how-to-connect-with-jmx-from-host-to-docker-container-in-docker-machine
+@DisabledOnJre(JRE.JAVA_8)
 class SolrIntegrationTest extends AbstractIntegrationTest {
 
   SolrIntegrationTest() {
diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java
@@ -23,12 +23,14 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 /**
  * Tests all supported ways to connect to remote JMX interface. This indirectly tests
  * JmxConnectionBuilder and relies on containers to minimize the JMX/RMI network complications which
  * are not NAT-friendly.
  */
+@Testcontainers(disabledWithoutDocker = true)
 class JmxConnectionTest {
 
   // OTLP endpoint is not used in test mode, but still has to be provided
diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java
@@ -14,10 +14,15 @@
 import io.opentelemetry.contrib.jmxscraper.assertions.AttributeMatcherGroup;
 import java.nio.file.Path;
 import java.time.Duration;
+import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
 
+// possible workaround on Java 8:
+// https://stackoverflow.com/questions/35466461/how-to-connect-with-jmx-from-host-to-docker-container-in-docker-machine
+@DisabledOnJre(JRE.JAVA_8)
 class SolrIntegrationTest extends TargetSystemIntegrationTest {
 
   @Override
diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java
diff --git a/micrometer-meter-provider/build.gradle.kts b/micrometer-meter-provider/build.gradle.kts
diff --git a/opamp-client/README.md b/opamp-client/README.md
diff --git a/opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClient.java b/opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClient.java
diff --git a/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImpl.java b/opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImpl.java
diff --git a/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java b/opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
