Merge branch 'main' into copilot/fix-79effdad-6d82-4980-ad08-443e4438f725

Author: jaydeluca

.github/workflows/build-common.yml

@@ -279,7 +279,7 @@ jobs:
 
       # vaadin 14 tests fail with node 18
       - name: Set up Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 16
 

.github/workflows/codeql.yml

@@ -32,7 +32,7 @@ jobs:
         include:
           - language: actions
           - language: java
-    runs-on: oracle-8cpu-32gb-x86-64
+    runs-on: oracle-vm-8cpu-32gb-x86-64
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -63,7 +63,7 @@ jobs:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@42213152a85ae7569bdb6bec7bcd74cd691bfe41 # v3.30.9
+        uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
         with:
           languages: ${{ matrix.language }}
           # using "linked" helps to keep up with the linked Kotlin support
@@ -84,6 +84,6 @@ jobs:
           --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@42213152a85ae7569bdb6bec7bcd74cd691bfe41 # v3.30.9
+        uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
         with:
           category: "/language:${{matrix.language}}"

.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@42213152a85ae7569bdb6bec7bcd74cd691bfe41 # v3.30.9
+        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
         with:
           sarif_file: results.sarif

.github/workflows/pr-automation-comments.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Comment on PR
-        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const { data: comments } = await github.rest.issues.listComments({
@@ -64,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Comment on PR
-        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const { data: comments } = await github.rest.issues.listComments({

build.gradle.kts

@@ -155,7 +155,7 @@ tasks {
   }
 
   val generateReleaseBundle by registering(Zip::class) {
-    dependsOn(getTasksByName("publishAllPublicationToReleaseRepoRepository", true))
+    dependsOn(project.tasks.withType<PublishToMavenRepository>())
     from("releaseRepo")
 
     exclude("**/maven-metadata.*")

instrumentation/executors/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/executors/ThreadPoolExecutorTest.java

@@ -10,7 +10,7 @@
 
 import io.opentelemetry.api.baggage.Baggage;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.bootstrap.VirtualFieldInstalledMarker;
+import io.opentelemetry.javaagent.bootstrap.field.VirtualFieldInstalledMarker;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.LinkedBlockingQueue;

instrumentation/internal/internal-class-loader/compile-stub/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("otel.java-conventions")
+}

instrumentation/internal/internal-class-loader/compile-stub/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/stub/ClassLoader.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.internal.classloader.stub;
+
+import java.security.ProtectionDomain;
+
+/**
+ * A placeholder for java.lang.ClassLoader to allow compilation of advice classes that invoke
+ * protected methods of ClassLoader (like defineClass and findLoadedClass). During the build we'll
+ * use shadow plugin to replace reference to this class with the real java.lang.ClassLoader.
+ */
+@SuppressWarnings("JavaLangClash")
+public abstract class ClassLoader {
+  public abstract Class<?> findLoadedClass(String name);
+
+  public abstract Class<?> defineClass(
+      String name, byte[] b, int off, int len, ProtectionDomain protectionDomain);
+}

instrumentation/internal/internal-class-loader/javaagent-integration-tests/build.gradle.kts

@@ -6,5 +6,5 @@ dependencies {
   compileOnly("org.apache.commons:commons-lang3:3.12.0")
   testImplementation("org.apache.commons:commons-lang3:3.12.0")
 
-  testInstrumentation(project(":instrumentation:internal:internal-class-loader:javaagent"))
+  testInstrumentation(project(":instrumentation:internal:internal-class-loader:javaagent", configuration = "shaded"))
 }

instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts

@@ -1,10 +1,13 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id("otel.javaagent-instrumentation")
 }
 
 dependencies {
   compileOnly(project(":javaagent-bootstrap"))
   compileOnly(project(":javaagent-tooling"))
+  compileOnly(project(":instrumentation:internal:internal-class-loader:compile-stub"))
 
   testImplementation(project(":javaagent-bootstrap"))
 
@@ -21,3 +24,32 @@ dependencies {
   testImplementation("org.eclipse.platform:org.eclipse.osgi:3.13.200")
   testImplementation("org.apache.felix:org.apache.felix.framework:6.0.2")
 }
+
+val shadedJar by tasks.registering(ShadowJar::class) {
+  from(zipTree(tasks.jar.get().archiveFile))
+  archiveClassifier.set("shaded")
+}
+
+tasks {
+  withType(ShadowJar::class) {
+    relocate("io.opentelemetry.javaagent.instrumentation.internal.classloader.stub", "java.lang")
+  }
+
+  assemble {
+    dependsOn(shadedJar)
+  }
+}
+
+// Create a consumable configuration for the shaded jar. We can't use the "shadow" configuration
+// because that is taken by the agent-testing.jar
+configurations {
+  consumable("shaded") {
+    attributes {
+      attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named("shaded"))
+    }
+  }
+}
+
+artifacts {
+  add("shaded", shadedJar)
+}