upgrade-semantic-1.26

.github/workflows/build-common.yml

@@ -235,7 +235,7 @@ jobs:
 
       # vaadin 14 tests fail with node 18
       - name: Set up Node
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 16
 

.github/workflows/codeql-daily.yml

@@ -30,7 +30,7 @@ jobs:
           java-version-file: .java-version
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
         with:
           languages: java
           # using "latest" helps to keep up with the latest Kotlin support
@@ -45,7 +45,7 @@ jobs:
         run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
 
   workflow-notification:
     needs:

.github/workflows/pr-smoke-test-early-jdk8-images.yml

@@ -25,7 +25,7 @@ jobs:
           java-version-file: .java-version
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@d9336dac04dea2507a617466bc058a3def92b18b # v3.4.0
+        uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
         with:
           cache-read-only: true
           # gradle enterprise is used for the build cache

.github/workflows/publish-smoke-test-early-jdk8-images.yml

@@ -35,7 +35,7 @@ jobs:
         run: echo "TAG=$(date '+%Y%m%d').$GITHUB_RUN_ID" >> $GITHUB_ENV
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@d9336dac04dea2507a617466bc058a3def92b18b # v3.4.0
+        uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
 
       - name: Build Docker image
         run: ./gradlew :smoke-tests:images:early-jdk8:dockerPush -PextraTag=${{ env.TAG }}
@@ -46,8 +46,4 @@ jobs:
     if: always()
     uses: ./.github/workflows/reusable-workflow-notification.yml
     with:
-      success: >-
-        ${{
-          needs.publishLinux.result == 'success' &&
-          needs.publishWindows.result == 'success'
-        }}
+      success: ${{ needs.publish.result == 'success' }}

.github/workflows/reusable-test-indy.yml

@@ -46,7 +46,7 @@ jobs:
 
       # vaadin 14 tests fail with node 18
       - name: Set up Node
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 16
 

.github/workflows/scorecard.yml

@@ -64,6 +64,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
         with:
           sarif_file: results.sarif

benchmark-overhead/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

benchmark-overhead/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

benchmark-overhead/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

benchmark-overhead/src/test/java/io/opentelemetry/OverheadTests.java

@@ -110,7 +110,7 @@ void runAppOnce(TestConfig config, Agent agent) throws Exception {
   }
 
   private void startRecording(Agent agent, GenericContainer<?> petclinic) throws Exception {
-    Path outFile = namingConventions.container.jfrFile(agent);
+    String outFile = namingConventions.container.jfrFile(agent);
     String[] command = {
       "jcmd",
       "1",
@@ -123,16 +123,27 @@ private void startRecording(Agent agent, GenericContainer<?> petclinic) throws E
     petclinic.execInContainer(command);
   }
 
-  private void doWarmupPhase(TestConfig testConfig, GenericContainer<?> petclinic) throws IOException, InterruptedException {
-    System.out.println("Performing startup warming phase for " + testConfig.getWarmupSeconds() + " seconds...");
+  private void doWarmupPhase(TestConfig testConfig, GenericContainer<?> petclinic)
+      throws IOException, InterruptedException {
+    System.out.println(
+        "Performing startup warming phase for " + testConfig.getWarmupSeconds() + " seconds...");
 
     // excluding the JFR recording from the warmup causes strange inconsistencies in the results
     System.out.println("Starting disposable JFR warmup recording...");
-    String[] startCommand = {"jcmd", "1", "JFR.start", "settings=/app/overhead.jfc", "dumponexit=true", "name=warmup", "filename=warmup.jfr"};
+    String[] startCommand = {
+      "jcmd",
+      "1",
+      "JFR.start",
+      "settings=/app/overhead.jfc",
+      "dumponexit=true",
+      "name=warmup",
+      "filename=warmup.jfr"
+    };
     petclinic.execInContainer(startCommand);
 
-    long deadline = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(testConfig.getWarmupSeconds());
-    while(System.currentTimeMillis() < deadline) {
+    long deadline =
+        System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(testConfig.getWarmupSeconds());
+    while (System.currentTimeMillis() < deadline) {
       GenericContainer<?> k6 =
           new GenericContainer<>(DockerImageName.parse("loadimpact/k6"))
               .withNetwork(NETWORK)
@@ -151,7 +162,7 @@ private void doWarmupPhase(TestConfig testConfig, GenericContainer<?> petclinic)
 
   private void writeStartupTimeFile(Agent agent, long start) throws IOException {
     long delta = System.currentTimeMillis() - start;
-    Path startupPath = namingConventions.local.startupDurationFile(agent);
+    Path startupPath = Path.of(namingConventions.local.startupDurationFile(agent));
     Files.writeString(startupPath, String.valueOf(delta));
   }
 }

benchmark-overhead/src/test/java/io/opentelemetry/containers/K6Container.java

@@ -8,7 +8,6 @@
 import io.opentelemetry.agents.Agent;
 import io.opentelemetry.config.TestConfig;
 import io.opentelemetry.util.NamingConventions;
-import java.nio.file.Path;
 import java.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +34,7 @@ public K6Container(
   }
 
   public GenericContainer<?> build() {
-    Path k6OutputFile = namingConventions.container.k6Results(agent);
+    String k6OutputFile = namingConventions.container.k6Results(agent);
     return new GenericContainer<>(DockerImageName.parse("loadimpact/k6"))
         .withNetwork(network)
         .withNetworkAliases("k6")
@@ -52,7 +51,7 @@ public GenericContainer<?> build() {
             "--rps",
             String.valueOf(config.getMaxRequestRate()),
             "--summary-export",
-            k6OutputFile.toString(),
+            k6OutputFile,
             "/app/basic.js")
         .withStartupCheckStrategy(
             new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(15)));

benchmark-overhead/src/test/java/io/opentelemetry/results/ResultsCollector.java

@@ -54,14 +54,14 @@ private AppPerfResults readAgentResults(Agent agent, TestConfig config) {
 
   private AppPerfResults.Builder addStartupTime(AppPerfResults.Builder builder, Agent agent)
       throws IOException {
-    Path file = namingConvention.startupDurationFile(agent);
+    Path file = Path.of(namingConvention.startupDurationFile(agent));
     long startupDuration = Long.parseLong(new String(Files.readAllBytes(file)).trim());
     return builder.startupDurationMs(startupDuration);
   }
 
   private AppPerfResults.Builder addK6Results(AppPerfResults.Builder builder, Agent agent)
       throws IOException {
-    Path k6File = namingConvention.k6Results(agent);
+    Path k6File = Path.of(namingConvention.k6Results(agent));
     String json = new String(Files.readAllBytes(k6File));
     double iterationAvg = read(json, "$.metrics.iteration_duration.avg");
     double iterationP95 = read(json, "$.metrics.iteration_duration['p(95)']");
@@ -82,7 +82,7 @@ private static double read(String json, String jsonPath) {
 
   private AppPerfResults.Builder addJfrResults(AppPerfResults.Builder builder, Agent agent)
       throws IOException {
-    Path jfrFile = namingConvention.jfrFile(agent);
+    Path jfrFile = Path.of(namingConvention.jfrFile(agent));
     return builder
         .totalGCTime(readTotalGCTime(jfrFile))
         .totalAllocated(readTotalAllocated(jfrFile))

benchmark-overhead/src/test/java/io/opentelemetry/util/ContainerNamingConvention.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.util;
+
+import io.opentelemetry.agents.Agent;
+
+public class ContainerNamingConvention implements NamingConvention {
+  private final String dir;
+
+  public ContainerNamingConvention(String dir) {
+    this.dir = dir;
+  }
+
+  public String k6Results(Agent agent) {
+
+    return String.join("/", dir, "k6_out_" + agent.getName() + ".json");
+  }
+
+  public String jfrFile(Agent agent) {
+    return String.join("/", dir, "petclinic-" + agent.getName() + ".jfr");
+  }
+
+  public String startupDurationFile(Agent agent) {
+    return String.join("/", dir, "startup-time-" + agent.getName() + ".txt");
+  }
+
+  public String root() {
+    return dir;
+  }
+}

benchmark-overhead/src/test/java/io/opentelemetry/util/LocalNamingConvention.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.util;
+
+import io.opentelemetry.agents.Agent;
+import java.nio.file.Paths;
+
+public class LocalNamingConvention implements NamingConvention {
+  private final String dir;
+
+  public LocalNamingConvention(String dir) {
+    this.dir = dir;
+  }
+
+  public String k6Results(Agent agent) {
+    return Paths.get(dir, "k6_out_" + agent.getName() + ".json").toString();
+  }
+
+  public String jfrFile(Agent agent) {
+    return Paths.get(dir, "petclinic-" + agent.getName() + ".jfr").toString();
+  }
+
+  public String startupDurationFile(Agent agent) {
+    return Paths.get(dir, "startup-time-" + agent.getName() + ".txt").toString();
+  }
+
+  public String root() {
+    return dir;
+  }
+}

benchmark-overhead/src/test/java/io/opentelemetry/util/NamingConvention.java

@@ -6,51 +6,34 @@
 package io.opentelemetry.util;
 
 import io.opentelemetry.agents.Agent;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 /**
  * This utility class provides the standard file naming conventions, primarily for files that are
  * shared between containers and the test runner. It consolidates the naming logic into one place to
  * ensure consistency, reduce duplication, and decrease errors.
  */
-public class NamingConvention {
-
-  private final String dir;
-
-  public NamingConvention(String dir) {
-    this.dir = dir;
-  }
-
+public interface NamingConvention {
   /**
-   * Returns a path to the location of the k6 results json file.
+   * Returns a path string to the location of the k6 results json file.
    *
    * @param agent The agent to get results file path for
    */
-  public Path k6Results(Agent agent) {
-    return Paths.get(dir, "k6_out_" + agent.getName() + ".json");
-  }
+  String k6Results(Agent agent);
 
   /**
-   * Returns a path to the location of the jfr output file for a given agent run.
+   * Returns a path string to the location of the jfr output file for a given agent run.
    *
    * @param agent The agent to get the jfr file path for.
    */
-  public Path jfrFile(Agent agent) {
-    return Paths.get(dir, "petclinic-" + agent.getName() + ".jfr");
-  }
+  String jfrFile(Agent agent);
 
   /**
-   * Returns the path to the file that contains the startup duration for a given agent run.
+   * Returns the path string to the file that contains the startup duration for a given agent run.
    *
    * @param agent The agent to get the startup duration for.
    */
-  public Path startupDurationFile(Agent agent) {
-    return Paths.get(dir, "startup-time-" + agent.getName() + ".txt");
-  }
+  String startupDurationFile(Agent agent);
 
   /** Returns the root path that this naming convention was configured with. */
-  public String root() {
-    return dir;
-  }
+  String root();
 }

benchmark-overhead/src/test/java/io/opentelemetry/util/NamingConventions.java

@@ -5,18 +5,22 @@
 
 package io.opentelemetry.util;
 
-/** An container to hold both the local and container naming conventions. */
+/** A container to hold both the local and container naming conventions. */
 public class NamingConventions {
 
-  public final NamingConvention container = new NamingConvention("/results");
-  public final NamingConvention local = new NamingConvention(".");
+  public final NamingConvention container = new ContainerNamingConvention("/results");
+  public final NamingConvention local = new LocalNamingConvention(".");
 
-  /** @return Root path for the local naming convention (where results are output) */
+  /**
+   * @return Root path for the local naming convention (where results are output)
+   */
   public String localResults() {
     return local.root();
   }
 
-  /** @return Root path for the container naming convention (where results are output) */
+  /**
+   * @return Root path for the container naming convention (where results are output)
+   */
   public String containerResults() {
     return container.root();
   }

conventions/build.gradle.kts

@@ -74,5 +74,5 @@ dependencies {
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.3"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-  testImplementation("org.assertj:assertj-core:3.26.0")
+  testImplementation("org.assertj:assertj-core:3.26.3")
 }

custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadoc.java

@@ -42,7 +42,7 @@ public class OtelInternalJavadoc extends BugChecker implements BugChecker.ClassT
 
   @Override
   public Description matchClass(ClassTree tree, VisitorState state) {
-    if (!isPublic(tree) || !isInternal(state)) {
+    if (!isPublic(tree) || !isInternal(state) || tree.getSimpleName().toString().endsWith("Test")) {
       return Description.NO_MATCH;
     }
     String javadoc = getJavadoc(state);