Merge branch 'main' into opamp-websocket-service

LikeTheSalad · LikeTheSalad · commit defd60bc8fd7 · 2025-07-01T09:48:33.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,29 +36,46 @@ jobs:
         run: ./gradlew build -x test
 
   test:
-    name: test (${{ matrix.test-java-version }})
-    runs-on: ubuntu-latest
+    name: Test
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
+        os:
+          - macos-latest
+          - macos-13
+          - ubuntu-latest
+          - windows-latest
         test-java-version:
           - 8
           - 11
           - 17
           - 21
           - 23
-      fail-fast: false
+        # 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: 23
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - id: setup-test-java
-        name: Set up JDK ${{ matrix.test-java-version }} for running tests
+      - id: setup-java-test
+        name: Set up Java ${{ matrix.test-java-version }} for tests
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
-          # using zulu because new releases get published quickly
-          distribution: zulu
+          distribution: temurin
           java-version: ${{ matrix.test-java-version }}
 
-      - name: Set up JDK for running Gradle
+      - id: setup-java
+        name: Set up Java for build
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: temurin
@@ -71,9 +88,9 @@ jobs:
       - name: Gradle test
         run: >
           ./gradlew test
-          -PtestJavaVersion=${{ matrix.test-java-version }}
-          -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
-          -Porg.gradle.java.installations.auto-download=false
+          "-PtestJavaVersion=${{ matrix.test-java-version }}"
+          "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}"
+          "-Porg.gradle.java.installations.auto-download=false"
 
   integration-test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -50,7 +50,7 @@ jobs:
         uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/init@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
         with:
           languages: ${{ matrix.language }}
           # using "latest" 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@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/analyze@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -42,6 +42,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@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
         with:
           sarif_file: results.sarif
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -13,7 +13,7 @@ repositories {
 dependencies {
   // When updating, update above in plugins too
   implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
-  implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
+  implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("org.owasp:dependency-check-gradle:12.1.3")
 }
diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -136,7 +136,7 @@ testing {
       implementation(project(project.path))
 
       implementation(enforcedPlatform("org.junit:junit-bom:5.13.2"))
-      implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.21.2"))
+      implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.21.3"))
       implementation(enforcedPlatform("com.google.guava:guava-bom:33.4.8-jre"))
       implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.32.5"))
 
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -26,8 +26,8 @@ dependencies {
     api("com.google.auto.service:auto-service-annotations:1.1.1")
     api("com.google.auto.value:auto-value:1.11.0")
     api("com.google.auto.value:auto-value-annotations:1.11.0")
-    api("com.google.errorprone:error_prone_annotations:2.38.0")
-    api("com.google.errorprone:error_prone_core:2.38.0")
+    api("com.google.errorprone:error_prone_annotations:2.39.0")
+    api("com.google.errorprone:error_prone_core:2.39.0")
     api("io.github.netmikey.logunit:logunit-jul:2.0.0")
     api("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
     api("io.prometheus:simpleclient:0.16.0")
@@ -52,7 +52,7 @@ dependencies {
     api("org.junit-pioneer:junit-pioneer:1.9.1")
     api("org.skyscreamer:jsonassert:1.5.3")
     api("org.apache.kafka:kafka-clients:4.0.0")
-    api("org.testcontainers:kafka:1.21.2")
+    api("org.testcontainers:kafka:1.21.3")
     api("com.lmax:disruptor:3.4.4")
     api("org.jctools:jctools-core:4.0.5")
     api("tools.profiler:async-profiler:4.0")
diff --git a/disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/storage/FolderManager.java b/disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/storage/FolderManager.java
@@ -11,13 +11,14 @@
 import io.opentelemetry.contrib.disk.buffering.internal.storage.files.ReadableFile;
 import io.opentelemetry.contrib.disk.buffering.internal.storage.files.WritableFile;
 import io.opentelemetry.sdk.common.Clock;
+import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.util.Objects;
 import javax.annotation.Nullable;
 import org.jetbrains.annotations.NotNull;
 
-public final class FolderManager {
+public final class FolderManager implements Closeable {
   private final File folder;
   private final Clock clock;
   private final StorageConfiguration configuration;
@@ -30,6 +31,16 @@ public FolderManager(File folder, StorageConfiguration configuration, Clock cloc
     this.clock = clock;
   }
 
+  @Override
+  public void close() throws IOException {
+    if (currentReadableFile != null) {
+      currentReadableFile.close();
+    }
+    if (currentWritableFile != null) {
+      currentWritableFile.close();
+    }
+  }
+
   @Nullable
   public synchronized ReadableFile getReadableFile() throws IOException {
     currentReadableFile = null;
diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java
@@ -48,6 +48,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -103,6 +104,11 @@ void setUp() throws IOException {
     logger = createLoggerProvider(logToDiskExporter).get("LogInstrumentationScope");
   }
 
+  @AfterEach
+  void tearDown() throws IOException {
+    spanStorage.close();
+  }
+
   @NotNull
   private <T> ToDiskExporter<T> buildToDiskExporter(
       SignalSerializer<T> serializer, Function<Collection<T>, CompletableResultCode> exporter) {
diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/FolderManagerTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/FolderManagerTest.java
@@ -24,6 +24,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -40,6 +41,11 @@ void setUp() {
     folderManager = new FolderManager(rootDir, TestData.getConfiguration(rootDir), clock);
   }
 
+  @AfterEach
+  void tearDown() throws Exception {
+    folderManager.close();
+  }
+
   @Test
   void createWritableFile_withTimeMillisAsName() throws IOException {
     when(clock.now()).thenReturn(MILLISECONDS.toNanos(1000L));
diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/StorageTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/StorageTest.java
@@ -26,6 +26,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.function.Function;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -47,6 +48,11 @@ void setUp() throws IOException {
     storage = new Storage(folderManager, true);
   }
 
+  @AfterEach
+  void tearDown() throws IOException {
+    storage.close();
+  }
+
   @Test
   void whenReadingAndProcessingSuccessfully_returnSuccess() throws IOException {
     when(folderManager.getReadableFile()).thenReturn(readableFile);
diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFileTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFileTest.java
@@ -32,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -98,6 +99,11 @@ void setUp() throws IOException {
     readableFile = new ReadableFile(source, CREATED_TIME_MILLIS, clock, getConfiguration(dir));
   }
 
+  @AfterEach
+  void tearDown() throws IOException {
+    readableFile.close();
+  }
+
   private static void addFileContents(File source) throws IOException {
     List<byte[]> items = new ArrayList<>();
     items.add(SERIALIZER.serialize(Collections.singleton(FIRST_LOG_RECORD)));
diff --git a/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/WritableFileTest.java b/disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/WritableFileTest.java
@@ -22,6 +22,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.List;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -47,6 +48,11 @@ void setUp() throws IOException {
             clock);
   }
 
+  @AfterEach
+  void tearDown() throws IOException {
+    writableFile.close();
+  }
+
   @Test
   void hasNotExpired_whenWriteAgeHasNotExpired() {
     when(clock.now()).thenReturn(MILLISECONDS.toNanos(1500L));
diff --git a/gcp-resources/build.gradle.kts b/gcp-resources/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
   api("io.opentelemetry:opentelemetry-sdk")
 
   // Provides GCP resource detection support
-  implementation("com.google.cloud.opentelemetry:detector-resources-support:0.35.0")
+  implementation("com.google.cloud.opentelemetry:detector-resources-support:0.36.0")
 
   testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
 
diff --git a/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfigTest.java b/inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfigTest.java
@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.condition.OS.WINDOWS;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
@@ -31,9 +32,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
 
+@DisabledOnOs(WINDOWS) // Uses async-profiler, which is not supported on Windows
 public class InferredSpansAutoConfigTest {
 
   @BeforeEach
@@ -107,7 +108,6 @@ public void checkDisabledbyDefault() {
   }
 
   @DisabledOnOpenJ9
-  @DisabledOnOs(OS.WINDOWS)
   @Test
   public void checkProfilerWorking() {
     try (AutoConfigTestProperties props =
diff --git a/jmx-scraper/README.md b/jmx-scraper/README.md
@@ -85,12 +85,14 @@ Setting the value of `otel.jmx.target.source` allows to fit the following use-ca
 - `legacy` allows to keep using definitions that are very close to JMX Gatherer, this is the recommended option if preserving compatibility is required. Those definitions are in maintenance and are unlikely to evolve over time.
 - `instrumentation` forces using metrics definitions from instrumentation, hence only the reference. Metrics definitions and supported values of `otel.jmx.target.system` will be updated whenever the dependency on instrumentation is updated.
 
-The following SDK configuration options are also relevant
+The following [SDK configuration options](https://opentelemetry.io/docs/languages/java/configuration/#environment-variables-and-system-properties) are also relevant
 
 | config option                 | default value   | description                                                                                                                                                       |
 |-------------------------------|-----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `otel.metric.export.interval` | `1m` (1 minute) | metric export interval, also controls the JMX sampling interval                                                                                                   |
 | `otel.metrics.exporter`       | `otlp`          | comma-separated list of metrics exporters supported values are `otlp` and `logging`, additional values might be provided through extra libraries in the classpath |
+| `otel.service.name`           |                 | service name                                                                                                                                                      |
+| `otel.resource.attributes`    |                 | used to specify otel resource attributes, including service attributes. See [the sdk configuration](https://opentelemetry.io/docs/languages/java/configuration/#properties-resource) and [service attributes](https://opentelemetry.io/docs/specs/semconv/registry/attributes/service/)                           |
 
 In addition to OpenTelemetry configuration, the following Java system properties can be provided
 through the command-line arguments, properties file or stdin and will be propagated to the JVM system properties:
diff --git a/jmx-scraper/src/test/java/io/opentelemetry/contrib/jmxscraper/JmxScraperTest.java b/jmx-scraper/src/test/java/io/opentelemetry/contrib/jmxscraper/JmxScraperTest.java
@@ -17,6 +17,8 @@
 import java.util.List;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junitpioneer.jupiter.ClearSystemProperty;
 
 class JmxScraperTest {
@@ -46,8 +48,10 @@ private static void testInvalidArguments(String... args) {
   }
 
   @Test
+  @DisabledOnOs(OS.WINDOWS)
   void shouldCreateConfig_propertiesLoadedFromFile() throws InvalidArgumentException {
     // Given
+    // Windows returns /C:/path/to/file, which is not a valid path for Path.get() in Java.
     String filePath =
         ClassLoader.getSystemClassLoader().getResource("validConfig.properties").getPath();
     List<String> args = Arrays.asList("-config", filePath);
diff --git a/opamp-client/build.gradle.kts b/opamp-client/build.gradle.kts
@@ -1,6 +1,6 @@
-import de.undercouch.gradle.tasks.download.Download
 import de.undercouch.gradle.tasks.download.DownloadExtension
-import groovy.json.JsonSlurper
+import java.net.HttpURLConnection
+import java.net.URL
 
 plugins {
   id("otel.java-conventions")
@@ -19,19 +19,9 @@ dependencies {
   testImplementation("com.google.protobuf:protobuf-java-util")
 }
 
-val opampReleaseInfo = tasks.register<Download>("opampLastReleaseInfo") {
-  group = "opamp"
-  src("https://api.github.com/repos/open-telemetry/opamp-spec/releases/latest")
-  dest(project.layout.buildDirectory.file("opamp/release.json"))
-}
-
 val opampProtos = tasks.register<DownloadOpampProtos>("opampProtoDownload", download)
 opampProtos.configure {
   group = "opamp"
-  dependsOn(opampReleaseInfo)
-  lastReleaseInfoJson.set {
-    opampReleaseInfo.get().dest
-  }
   outputProtosDir.set(project.layout.buildDirectory.dir("opamp/protos"))
   downloadedZipFile.set(project.layout.buildDirectory.file("intermediate/$name/release.zip"))
 }
@@ -49,20 +39,28 @@ abstract class DownloadOpampProtos @Inject constructor(
   private val fileOps: FileSystemOperations,
 ) : DefaultTask() {
 
-  @get:InputFile
-  abstract val lastReleaseInfoJson: RegularFileProperty
-
   @get:OutputDirectory
   abstract val outputProtosDir: DirectoryProperty
 
   @get:Internal
   abstract val downloadedZipFile: RegularFileProperty
 
-  @Suppress("UNCHECKED_CAST")
   @TaskAction
   fun execute() {
-    val releaseInfo = JsonSlurper().parse(lastReleaseInfoJson.get().asFile) as Map<String, String>
-    val zipUrl = releaseInfo["zipball_url"]
+    // 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"
+
     download.run {
       src(zipUrl)
       dest(downloadedZipFile)

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ repositories {`
`13`	`13`	`dependencies {`
`14`	`14`	`// When updating, update above in plugins too`
`15`	`15`	`implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")`
`16`		`- implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")`
	`16`	`+ implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")`
`17`	`17`	`implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")`
`18`	`18`	`implementation("org.owasp:dependency-check-gradle:12.1.3")`
`19`	`19`	`}`