Merge branch 'open-telemetry:main' into fix-noclassdeffound-in-predestroy

cyrille-leclerc · web-flow · commit a33e2c31a4f0 · 2024-08-26T15:55:12.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -132,10 +132,12 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          instrumentation_version=$(grep -Po "val otelInstrumentationVersion = \"\K[0-9]+.[0-9]+.[0-9]+" dependencyManagement/build.gradle.kts)
+
           # conditional blocks not indented because of the heredoc
           if [[ $VERSION == *.0 ]]; then
           cat > /tmp/release-notes.txt << EOF
-          This release targets the OpenTelemetry SDK $VERSION.
+          This release targets the OpenTelemetry Java Instrumentation [$instrumentation_version](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v$instrumentation_version).
 
           EOF
           else
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## Version 1.38.0 (2024-08-19)
+
+### JFR connection
+
+- Recording close should not throw exception
+  ([#1412](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1412))
+
 ## Version 1.37.0 (2024-07-18)
 
 ### AWS resources
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.0.1")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.0.0")
-  implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.6")
+  implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18")
 }
 
 spotless {
diff --git a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentProbabilityBasedSampler.java b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentProbabilityBasedSampler.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.contrib.sampler.consistent;
 
+import java.util.Locale;
 import javax.annotation.concurrent.Immutable;
 
 /** A consistent sampler that samples with a fixed probability. */
@@ -32,7 +33,7 @@ final class ConsistentProbabilityBasedSampler extends ConsistentSampler {
       throw new IllegalArgumentException("Sampling probability must be in range [0.0, 1.0]!");
     }
     this.description =
-        String.format("ConsistentProbabilityBasedSampler{%.6f}", samplingProbability);
+        String.format(Locale.ROOT, "ConsistentProbabilityBasedSampler{%.6f}", samplingProbability);
     this.randomGenerator = randomGenerator;
 
     lowerPValue = getLowerBoundP(samplingProbability);
diff --git a/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSampler.java b/consistent-sampling/src/main/java/io/opentelemetry/contrib/sampler/consistent/ConsistentRateLimitingSampler.java
@@ -8,6 +8,7 @@
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.sdk.trace.samplers.Sampler;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.LongSupplier;
 import javax.annotation.concurrent.Immutable;
@@ -113,8 +114,10 @@ public State(double effectiveWindowCount, double effectiveWindowNanos, long last
     }
     this.description =
         String.format(
+            Locale.ROOT,
             "ConsistentRateLimitingSampler{%.6f, %.6f}",
-            targetSpansPerSecondLimit, adaptationTimeSeconds);
+            targetSpansPerSecondLimit,
+            adaptationTimeSeconds);
     this.nanoTimeSupplier = requireNonNull(nanoTimeSupplier);
 
     this.inverseAdaptationTimeNanos = 1e-9 / adaptationTimeSeconds;
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -7,23 +7,25 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
+val otelInstrumentationVersion = "2.7.0-alpha"
+
 val DEPENDENCY_BOMS = listOf(
   "com.fasterxml.jackson:jackson-bom:2.17.2",
-  "com.google.guava:guava-bom:33.2.1-jre",
+  "com.google.guava:guava-bom:33.3.0-jre",
   "com.linecorp.armeria:armeria-bom:1.30.0",
-  "org.junit:junit-bom:5.10.3",
+  "org.junit:junit-bom:5.11.0",
   "io.grpc:grpc-bom:1.66.0",
-  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.6.0-alpha",
+  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}",
   "org.testcontainers:testcontainers-bom:1.20.1"
 )
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.29.2"
+val errorProneVersion = "2.30.0"
 val prometheusVersion = "0.16.0"
 val mockitoVersion = "4.11.0"
 val slf4jVersion = "2.0.16"
-val semConvVersion = "1.26.0-alpha"
+val semConvVersion = "1.27.0-alpha"
 
 val CORE_DEPENDENCIES = listOf(
   "com.google.auto.service:auto-service:${autoServiceVersion}",
@@ -53,7 +55,7 @@ val DEPENDENCIES = listOf(
   "com.google.code.findbugs:annotations:3.0.1u2",
   "com.google.code.findbugs:jsr305:3.0.2",
   "com.squareup.okhttp3:okhttp:4.12.0",
-  "com.uber.nullaway:nullaway:0.11.1",
+  "com.uber.nullaway:nullaway:0.11.2",
   "org.assertj:assertj-core:3.26.3",
   "org.awaitility:awaitility:4.2.2",
   "org.bouncycastle:bcpkix-jdk15on:1.70",
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
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=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfiler.java
@@ -36,6 +36,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -563,7 +564,7 @@ public void processTraces() throws IOException {
 
   @SuppressWarnings("JavaUtilDate")
   private void backupDiagnosticFiles(long eof) throws IOException {
-    String now = String.format("%tFT%<tT.%<tL", new Date());
+    String now = String.format(Locale.ROOT, "%tFT%<tT.%<tL", new Date());
     Path profilerDir = Paths.get(System.getProperty("java.io.tmpdir"), "profiler");
     profilerDir.toFile().mkdir();
 
diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/BufferedFile.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/BufferedFile.java
@@ -14,6 +14,7 @@
 import java.nio.channels.FileChannel;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.StandardOpenOption;
+import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
@@ -243,7 +244,10 @@ public void ensureRemaining(int minRemaining, int maxRead) throws IOException {
     if (minRemaining > buffer.capacity()) {
       throw new IllegalStateException(
           String.format(
-              "Length (%d) greater than buffer capacity (%d)", minRemaining, buffer.capacity()));
+              Locale.ROOT,
+              "Length (%d) greater than buffer capacity (%d)",
+              minRemaining,
+              buffer.capacity()));
     }
     if (buffer.remaining() < minRemaining) {
       read(position(), maxRead);
diff --git a/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParser.java b/inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/asyncprofiler/JfrParser.java
@@ -14,6 +14,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Level;
@@ -114,7 +115,7 @@ private int readChunk(int position) throws IOException {
     short minor = bufferedFile.getShort();
     if (major != 2 || minor != 0) {
       throw new IllegalArgumentException(
-          String.format("Can only parse version 2.0. Was %d.%d", major, minor));
+          String.format(Locale.ROOT, "Can only parse version 2.0. Was %d.%d", major, minor));
     }
     long chunkSize = bufferedFile.getLong();
     long constantPoolOffset = bufferedFile.getLong();
diff --git a/jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderDiagnosticCommandConnection.java b/jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderDiagnosticCommandConnection.java
@@ -156,14 +156,6 @@ private static Object[] formOptions(
     return mkParamsArray(params);
   }
 
-  /**
-   * Stop a recording. This method is called from the {@link Recording#stop()} method.
-   *
-   * @param id The id of the recording.
-   * @throws JfrConnectionException Wraps an {@code javax.management.InstanceNotFoundException}, a
-   *     {@code javax.management.MBeanException} or a {@code javax.management.ReflectionException}
-   *     and indicates an issue with the FlightRecorderMXBean in the JVM.
-   */
   @Override
   public void stopRecording(long id) throws JfrConnectionException {
     try {
@@ -174,14 +166,6 @@ public void stopRecording(long id) throws JfrConnectionException {
     }
   }
 
-  /**
-   * Writes recording data to the specified file. The recording must be started, but not necessarily
-   * stopped. The {@code outputFile} argument is relevant to the machine where the JVM is running.
-   *
-   * @param id The id of the recording.
-   * @param outputFile the system-dependent file name where data is written, not {@code null}
-   * @throws JfrConnectionException Wraps a {@code javax.management.JMException}.
-   */
   @Override
   public void dumpRecording(long id, String outputFile) throws IOException, JfrConnectionException {
     try {
@@ -192,28 +176,25 @@ public void dumpRecording(long id, String outputFile) throws IOException, JfrCon
     }
   }
 
-  /**
-   * Not supported on Java 8
-   *
-   * @param id The id of the recording being cloned.
-   * @param stop Whether to stop the cloned recording.
-   * @return id of the recording
-   */
+  /** Not available through the DiagnosticCommand MBean. {@inheritDoc} */
   @Override
   public long cloneRecording(long id, boolean stop) {
-    throw new UnsupportedOperationException("Clone not supported on Java 8");
+    throw new UnsupportedOperationException(
+        "cloneRecording not available through the DiagnosticCommand connection");
   }
 
-  /** Not supported on Java 8 */
+  /** Not available through the DiagnosticCommand MBean. {@inheritDoc} */
   @Override
   public InputStream getStream(long id, Instant startTime, Instant endTime, long blockSize) {
-    throw new UnsupportedOperationException("getStream not supported on Java 8");
+    throw new UnsupportedOperationException(
+        "getStream not available through the DiagnosticCommand connection");
   }
 
-  /** Not supported on Java 8 */
+  /** Not available through the DiagnosticCommand MBean. {@inheritDoc} */
   @Override
   public void closeRecording(long id) {
-    throw new UnsupportedOperationException("closeRecording not supported on Java 8");
+    throw new UnsupportedOperationException(
+        "closeRecording not available through the DiagnosticCommand connection");
   }
 
   // Do this check separate from assertCommercialFeatures because reliance
diff --git a/jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/Recording.java b/jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/Recording.java
@@ -9,6 +9,7 @@
 import java.io.InputStream;
 import java.text.MessageFormat;
 import java.time.Instant;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.annotation.Nullable;
@@ -54,7 +55,7 @@ public enum State {
   // {0} is the state the code is trying to transition to.
   // {1} are the states that the instance could be in for a valid transition.
   private static final MessageFormat illegalStateFormat =
-      new MessageFormat("Recording state {0} not in [{1}]");
+      new MessageFormat("Recording state {0} not in [{1}]", Locale.ROOT);
 
   /**
    * Helper for formatting the message for an IllegalStateException that may be thrown by methods of
@@ -270,8 +271,14 @@ public void close() throws IOException, JfrConnectionException {
         connection.stopRecording(id);
       } catch (IOException | JfrConnectionException ignored) {
         // Stopping the recording is best-effort
-      } finally {
+      }
+    }
+    if (oldState == State.STOPPED || oldState == State.RECORDING) {
+      try {
         connection.closeRecording(id);
+      } catch (IOException | JfrConnectionException | UnsupportedOperationException ignored) {
+        // Closing the recording is best-effort
+        // FlightRecorderDiagnosticCommandConnection close throws UnsupportedOperationException
       }
     }
   }
diff --git a/runtime-attach/runtime-attach-core/build.gradle.kts b/runtime-attach/runtime-attach-core/build.gradle.kts
@@ -7,7 +7,7 @@ description = "To help in create an OpenTelemetry distro able to runtime attach
 otelJava.moduleName.set("io.opentelemetry.contrib.attach.core")
 
 dependencies {
-  implementation("net.bytebuddy:byte-buddy-agent:1.14.18")
+  implementation("net.bytebuddy:byte-buddy-agent:1.14.19")
 
   // Used by byte-buddy but not brought in as a transitive dependency.
   compileOnly("com.google.code.findbugs:annotations")
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement {
   plugins {
     id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("com.gradle.develocity") version "3.17.6"
+    id("com.gradle.develocity") version "3.18"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
   }
 }
diff --git a/static-instrumenter/maven-plugin/build.gradle.kts b/static-instrumenter/maven-plugin/build.gradle.kts
@@ -17,11 +17,11 @@ otelJava {
 dependencies {
   implementation("org.apache.maven:maven-plugin-api:3.5.0") // do not auto-update this version
   implementation("org.apache.maven:maven-project:2.2.1")
-  compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations:3.13.1")
+  compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations:3.14.0")
   compileOnly("org.apache.maven:maven-core:3.5.0") // do not auto-update this version
   compileOnly("org.slf4j:slf4j-api")
 
-  testImplementation("org.apache.maven.plugin-tools:maven-plugin-annotations:3.13.1")
+  testImplementation("org.apache.maven.plugin-tools:maven-plugin-annotations:3.14.0")
   testImplementation("org.apache.maven:maven-core:3.5.0")
   testImplementation("org.slf4j:slf4j-simple")
 }
diff --git a/version.gradle.kts b/version.gradle.kts
@@ -1,5 +1,5 @@
-val stableVersion = "1.38.0-SNAPSHOT"
-val alphaVersion = "1.38.0-alpha-SNAPSHOT"
+val stableVersion = "1.39.0-SNAPSHOT"
+val alphaVersion = "1.39.0-alpha-SNAPSHOT"
 
 allprojects {
   if (findProperty("otel.stable") != "true") {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ dependencies {`
`15`	`15`	`implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")`
`16`	`16`	`implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.0.1")`
`17`	`17`	`implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.0.0")`
`18`		`- implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.17.6")`
	`18`	`+ implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.18")`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`spotless {`