Merge remote-tracking branch 'upstream/main' into copilot-code-review-test

trask · trask · commit 6815a6ad9506 · 2025-08-29T17:46:56.000-07:00
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -202,5 +202,15 @@
       depNameTemplate: 'java',
       extractVersionTemplate: '^(?<version>\\d+)',
     },
+    {
+      customType: 'regex',
+      datasourceTemplate: 'github-releases',
+      managerFilePatterns: [
+        '**/build.gradle.kts',
+      ],
+      matchStrings: [
+        '"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
+      ],
+    },
   ],
 }
diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
@@ -18,6 +18,25 @@ permissions:
   contents: read
 
 jobs:
+  spotless:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+      - name: Set up JDK for running Gradle
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        with:
+          cache-read-only: ${{ inputs.cache-read-only }}
+
+      - name: Spotless
+        run: ./gradlew spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
+
   build:
     runs-on: ubuntu-latest
     steps:
@@ -29,13 +48,13 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - name: Set up gradle
+      - name: Set up Gradle
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           cache-read-only: ${{ inputs.cache-read-only }}
 
-      - name: Gradle build and test
-        run: ./gradlew build -x test ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
+      - name: Build
+        run: ./gradlew build -x spotlessCheck -x test ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
   test:
     name: Test
@@ -44,8 +63,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-latest
-          - macos-13
           - ubuntu-latest
           - windows-latest
         test-java-version:
@@ -54,18 +71,6 @@ jobs:
           - 17
           - 21
           - 24 # renovate: datasource=java-version
-        # macos-latest drops support for java 8 temurin. Run java 8 on macos-13. Run java 11, 17, 21 on macos-latest.
-        exclude:
-          - os: macos-latest
-            test-java-version: 8
-          - os: macos-13
-            test-java-version: 11
-          - os: macos-13
-            test-java-version: 17
-          - os: macos-13
-            test-java-version: 21
-          - os: macos-13
-            test-java-version: 24 # renovate: datasource=java-version
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -83,12 +88,12 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - name: Set up gradle
+      - name: Set up Gradle
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           cache-read-only: ${{ inputs.cache-read-only }}
 
-      - name: Gradle test
+      - name: Test
         run: >
           ./gradlew test
           "-PtestJavaVersion=${{ matrix.test-java-version }}"
@@ -97,6 +102,10 @@ jobs:
           "-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
+
   integration-test:
     runs-on: ubuntu-latest
     steps:
@@ -108,14 +117,18 @@ jobs:
           distribution: temurin
           java-version: 17
 
-      - name: Set up gradle
+      - name: Set up Gradle
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         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()
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,6 +21,8 @@ jobs:
     needs:
       - common
     runs-on: ubuntu-latest
+    # skipping release branches because the versions in those branches are not snapshots
+    if: github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-contrib'
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -1,10 +1,6 @@
 name: CodeQL
 
 on:
-  push:
-    branches:
-      - main
-      - release/*
   pull_request:
     branches:
       - main
@@ -15,6 +11,10 @@ on:
   # - https://github.com/github/codeql-action/issues/1537
   # - https://github.com/github/codeql-action/issues/2691
   # merge_group:
+  push:
+    branches:
+      - main
+      - release/*
   schedule:
     - cron: "29 13 * * 2"  # weekly at 13:29 UTC on Tuesday
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,59 +11,15 @@ permissions:
   contents: read
 
 jobs:
-  build:
-    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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
-      - name: Gradle build
-        run: ./gradlew build
-
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        name: Save unit test results
-        if: always()
-        with:
-          name: test-results
-          path: jmx-metrics/build/reports/tests/test
-
-  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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
-      - name: Integration test
-        run: ./gradlew integrationTest
-
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        name: Save integration test results
-        if: always()
-        with:
-          name: integration-test-results
-          path: jmx-metrics/build/reports/tests/integrationTest
+  common:
+    uses: ./.github/workflows/build-common.yml
 
   release:
     permissions:
       contents: write # for creating the release
     runs-on: ubuntu-latest
     needs:
-      - build
-      - integration-test
+      - common
     outputs:
       version: ${{ steps.create-github-release.outputs.version }}
     steps:
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 val otelInstrumentationVersion = "2.19.0-alpha"
-val semconvVersion = "1.34.0"
+val semconvVersion = "1.37.0"
 
 javaPlatform {
   allowDependencies()
diff --git a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/KafkaIntegrationTest.java b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/KafkaIntegrationTest.java
@@ -44,7 +44,7 @@ protected KafkaIntegrationTest(String configName) {
 
   @Container
   GenericContainer<?> kafka =
-      new GenericContainer<>("bitnami/kafka:2.8.1")
+      new GenericContainer<>("bitnamilegacy/kafka:2.8.1")
           .withNetwork(Network.SHARED)
           .withEnv("KAFKA_CFG_ZOOKEEPER_CONNECT", "zookeeper:2181")
           .withEnv("ALLOW_PLAINTEXT_LISTENER", "yes")
@@ -80,7 +80,7 @@ public Set<Startable> getDependencies() {
       };
 
   protected GenericContainer<?> kafkaProducerContainer() {
-    return new GenericContainer<>("bitnami/kafka:2.8.1")
+    return new GenericContainer<>("bitnamilegacy/kafka:2.8.1")
         .withNetwork(Network.SHARED)
         .withEnv("KAFKA_CFG_ZOOKEEPER_CONNECT", "zookeeper:2181")
         .withEnv("ALLOW_PLAINTEXT_LISTENER", "yes")
@@ -207,7 +207,7 @@ static class KafkaConsumerIntegrationTest extends KafkaIntegrationTest {
 
     @Container
     GenericContainer<?> consumer =
-        new GenericContainer<>("bitnami/kafka:2.8.1")
+        new GenericContainer<>("bitnamilegacy/kafka:2.8.1")
             .withNetwork(Network.SHARED)
             .withEnv("KAFKA_CFG_ZOOKEEPER_CONNECT", "zookeeper:2181")
             .withEnv("ALLOW_PLAINTEXT_LISTENER", "yes")
diff --git a/jmx-scraper/README.md b/jmx-scraper/README.md
@@ -9,13 +9,18 @@ This is an alternative to the [JMX Gatherer](../jmx-metrics/README.md) utility.
 ## Release
 
 This project is released as part of the [OpenTelemetry Java Contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) project.
-The latest release is available from [Maven Central](https://central.sonatype.com/artifact/io.opentelemetry.contrib/opentelemetry-jmx-scraper)
-or can be browsed via [MVN Repository](https://mvnrepository.com/artifact/io.opentelemetry.contrib/opentelemetry-jmx-scraper).
+The latest release is available from:
+
+- [GitHub Release assets](https://github.com/open-telemetry/opentelemetry-java-contrib/releases/latest/download/opentelemetry-jmx-scraper.jar)
+- [Maven Central](https://central.sonatype.com/artifact/io.opentelemetry.contrib/opentelemetry-jmx-scraper) or can be browsed via [MVN Repository](https://mvnrepository.com/artifact/io.opentelemetry.contrib/opentelemetry-jmx-scraper).
 
 ## Usage
 
 The general command to invoke JMX scraper is `java -jar scraper.jar <config>`, where `scraper.jar`
-is the `build/libs/opentelemetry-jmx-scraper-<version>.jar` packaged binary when building this module.
+is the packaged binary:
+
+- `build/libs/opentelemetry-jmx-scraper-<version>.jar` when building from sources
+- `.jar` file downloaded from Maven central or Release assets
 
 Minimal configuration required
 
diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaContainerFactory.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/kafka/KafkaContainerFactory.java
@@ -12,7 +12,7 @@
 public class KafkaContainerFactory {
   private static final int KAFKA_PORT = 9092;
   private static final String KAFKA_BROKER = "kafka:" + KAFKA_PORT;
-  private static final String KAFKA_DOCKER_IMAGE = "bitnami/kafka:2.8.1";
+  private static final String KAFKA_DOCKER_IMAGE = "bitnamilegacy/kafka:2.8.1";
 
   private KafkaContainerFactory() {}
 
diff --git a/opamp-client/build.gradle.kts b/opamp-client/build.gradle.kts
@@ -1,6 +1,4 @@
 import de.undercouch.gradle.tasks.download.DownloadExtension
-import java.net.HttpURLConnection
-import java.net.URL
 
 plugins {
   id("otel.java-conventions")
@@ -53,19 +51,7 @@ abstract class DownloadOpampProtos @Inject constructor(
 
   @TaskAction
   fun execute() {
-    // Get the latest release tag by following the redirect from GitHub's latest release URL
-    val latestReleaseUrl = "https://github.com/open-telemetry/opamp-spec/releases/latest"
-    val connection = URL(latestReleaseUrl).openConnection() as HttpURLConnection
-    connection.instanceFollowRedirects = false
-    connection.requestMethod = "HEAD"
-
-    val redirectLocation = connection.getHeaderField("Location")
-    connection.disconnect()
-
-    // Extract tag from URL like: https://github.com/open-telemetry/opamp-spec/releases/tag/v0.12.0
-    val latestTag = redirectLocation.substringAfterLast("/")
-    // Download the source code for the latest release
-    val zipUrl = "https://github.com/open-telemetry/opamp-spec/zipball/$latestTag"
+    val zipUrl = "https://github.com/open-telemetry/opamp-spec/zipball/v0.14.0"
 
     download.run {
       src(zipUrl)
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -29,6 +29,12 @@ develocity {
     publishing.onlyIf { System.getenv("CI") != null }
     termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
     termsOfUseAgree.set("yes")
+
+    buildScanPublished {
+      File("build-scan.txt").printWriter().use { writer ->
+        writer.println(buildScanUri)
+      }
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`val otelInstrumentationVersion = "2.19.0-alpha"`
`6`		`-val semconvVersion = "1.34.0"`
	`6`	`+val semconvVersion = "1.37.0"`
`7`	`7`
`8`	`8`	`javaPlatform {`
`9`	`9`	`allowDependencies()`