Merge branch 'main' into sqlcommenter2

Author: laurit

.github/renovate.json5

@@ -93,13 +93,6 @@
         'com.fasterxml.jackson.core:**',
       ],
     },
-    {
-      // prevent update to 2.4-groovy-4.0-SNAPSHOT
-      allowedVersions: '!/\\-SNAPSHOT$/',
-      matchPackageNames: [
-        'org.spockframework:**',
-      ],
-    },
     {
       // prevent 3.0.1u2 -> 3.0.1
       matchPackageNames: [

.github/workflows/build-common.yml

@@ -247,6 +247,7 @@ jobs:
           - 17
           - 21
           - 25 # renovate: datasource=java-version
+          - 25-deny-unsafe
         vm:
           - hotspot
           - openj9
@@ -260,6 +261,8 @@ jobs:
           - true
         exclude:
           - vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
+          - test-java-version: 25-deny-unsafe
+            vm: openj9
       fail-fast: false
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -273,7 +276,7 @@ jobs:
         with:
           # using zulu because new releases get published quickly
           distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
-          java-version: ${{ matrix.test-java-version }}
+          java-version: ${{ matrix.test-java-version != '25-deny-unsafe' && matrix.test-java-version || '25' }}
 
       - name: Set up JDK for running Gradle
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -329,6 +332,7 @@ jobs:
           -PtestJavaVersion=${{ matrix.test-java-version }}
           -PtestJavaVM=${{ matrix.vm }}
           -PtestIndy=${{ matrix.test-indy }}
+          -PdenyUnsafe=${{ matrix.test-java-version == '25-deny-unsafe' && 'true' || 'false' }}
           -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
           -Porg.gradle.java.installations.auto-download=false
           ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}

benchmark-overhead/gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -6,6 +6,9 @@ plugins {
   id("io.opentelemetry.instrumentation.javaagent-shadowing")
 }
 
+val denyUnsafe = gradle.startParameter.projectProperties["denyUnsafe"] == "true"
+extra["denyUnsafe"] = denyUnsafe
+
 dependencies {
   /*
     Dependencies added to this configuration will be found by the muzzle gradle plugin during code
@@ -72,31 +75,41 @@ class JavaagentTestArgumentsProvider(
   @PathSensitive(PathSensitivity.RELATIVE)
   val shadowJar: File,
 ) : CommandLineArgumentProvider {
-  override fun asArguments(): Iterable<String> = listOf(
-    "-Dotel.javaagent.debug=true",
-    "-javaagent:${agentShadowJar.absolutePath}",
-    // make the path to the javaagent available to tests
-    "-Dotel.javaagent.testing.javaagent-jar-path=${agentShadowJar.absolutePath}",
-    "-Dotel.javaagent.experimental.initializer.jar=${shadowJar.absolutePath}",
-    "-Dotel.javaagent.testing.additional-library-ignores.enabled=false",
-    "-Dotel.javaagent.testing.fail-on-context-leak=${findProperty("failOnContextLeak") != false}",
-    // prevent sporadic gradle deadlocks, see SafeLogger for more details
-    "-Dotel.javaagent.testing.transform-safe-logging.enabled=true",
-    // Reduce noise in assertion messages since we don't need to verify this in most tests. We check
-    // in smoke tests instead.
-    "-Dotel.javaagent.add-thread-details=false",
-    "-Dotel.javaagent.experimental.indy=${findProperty("testIndy") == "true"}",
-    // suppress repeated logging of "No metric data to export - skipping export."
-    // since PeriodicMetricReader is configured with a short interval
-    "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.opentelemetry.sdk.metrics.export.PeriodicMetricReader=INFO",
-    // suppress a couple of verbose ClassNotFoundException stack traces logged at debug level
-    "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.grpc.internal.ServerImplBuilder=INFO",
-    "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.grpc.internal.ManagedChannelImplBuilder=INFO",
-    "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.perfmark.PerfMark=INFO",
-    "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.grpc.Context=INFO",
-    "-Dotel.java.experimental.span-attributes.copy-from-baggage.include=test-baggage-key-1,test-baggage-key-2",
-    "-Dotel.instrumentation.common.peer-service-mapping=127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service"
-  )
+  override fun asArguments(): Iterable<String> {
+    val list = mutableListOf(
+      "-Dotel.javaagent.debug=true",
+      "-javaagent:${agentShadowJar.absolutePath}",
+      // make the path to the javaagent available to tests
+      "-Dotel.javaagent.testing.javaagent-jar-path=${agentShadowJar.absolutePath}",
+      "-Dotel.javaagent.experimental.initializer.jar=${shadowJar.absolutePath}",
+      "-Dotel.javaagent.testing.additional-library-ignores.enabled=false",
+      "-Dotel.javaagent.testing.fail-on-context-leak=${findProperty("failOnContextLeak") != false}",
+      // prevent sporadic gradle deadlocks, see SafeLogger for more details
+      "-Dotel.javaagent.testing.transform-safe-logging.enabled=true",
+      // Reduce noise in assertion messages since we don't need to verify this in most tests. We check
+      // in smoke tests instead.
+      "-Dotel.javaagent.add-thread-details=false",
+      "-Dotel.javaagent.experimental.indy=${findProperty("testIndy") == "true"}",
+      // suppress repeated logging of "No metric data to export - skipping export."
+      // since PeriodicMetricReader is configured with a short interval
+      "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.opentelemetry.sdk.metrics.export.PeriodicMetricReader=INFO",
+      // suppress a couple of verbose ClassNotFoundException stack traces logged at debug level
+      "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.grpc.internal.ServerImplBuilder=INFO",
+      "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.grpc.internal.ManagedChannelImplBuilder=INFO",
+      "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.perfmark.PerfMark=INFO",
+      "-Dio.opentelemetry.javaagent.slf4j.simpleLogger.log.io.grpc.Context=INFO",
+      "-Dotel.java.experimental.span-attributes.copy-from-baggage.include=test-baggage-key-1,test-baggage-key-2",
+      "-Dotel.instrumentation.common.peer-service-mapping=127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service"
+    )
+    if (denyUnsafe) {
+      list += listOf(
+        "-Dsun.misc.unsafe.memory.access=deny",
+        "-Dotel.instrumentation.deny-unsafe.enabled=true",
+        "-Dio.netty.noUnsafe=true"
+      )
+    }
+    return list
+  }
 }
 
 // need to run this after evaluate because testSets plugin adds new test tasks

conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts

@@ -187,24 +187,6 @@ testing {
       implementation("org.mockito:mockito-junit-jupiter")
 
       implementation("org.objenesis:objenesis")
-      implementation("org.spockframework:spock-core") {
-        with(this as ExternalDependency) {
-          // exclude optional dependencies
-          exclude(group = "cglib", module = "cglib-nodep")
-          exclude(group = "net.bytebuddy", module = "byte-buddy")
-          exclude(group = "org.junit.platform", module = "junit-platform-testkit")
-          exclude(group = "org.jetbrains", module = "annotations")
-          exclude(group = "org.objenesis", module = "objenesis")
-          exclude(group = "org.ow2.asm", module = "asm")
-        }
-      }
-      implementation("org.spockframework:spock-junit4") {
-        with(this as ExternalDependency) {
-          // spock-core is already added as dependency
-          // exclude it here to avoid pulling in optional dependencies
-          exclude(group = "org.spockframework", module = "spock-core")
-        }
-      }
       implementation("ch.qos.logback:logback-classic")
       implementation("org.slf4j:log4j-over-slf4j")
       implementation("org.slf4j:jcl-over-slf4j")
@@ -342,7 +324,10 @@ tasks.withType<Test>().configureEach {
   val useJ9 = gradle.startParameter.projectProperties["testJavaVM"]?.run { this == "openj9" }
     ?: false
   if (useJ9 && testJavaVersion != null && testJavaVersion.isJava8) {
-    jvmArgs("-Xjit:exclude={io/opentelemetry/testing/internal/io/netty/buffer/HeapByteBufUtil.*},exclude={io/opentelemetry/testing/internal/io/netty/buffer/UnpooledHeapByteBuf.*},exclude={io/opentelemetry/testing/internal/io/netty/buffer/AbstractByteBuf.*}")
+    jvmArgs("-Xjit:exclude={io/opentelemetry/testing/internal/io/netty/buffer/HeapByteBufUtil.*}," +
+        "exclude={io/opentelemetry/testing/internal/io/netty/buffer/UnpooledHeapByteBuf.*}," +
+        "exclude={io/opentelemetry/testing/internal/io/netty/buffer/AbstractByteBuf.*}," +
+        "exclude={io/opentelemetry/testing/internal/io/netty/handler/codec/base64/Base64.*}")
   }
 
   // There's no real harm in setting this for all tests even if any happen to not be using context

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -1,5 +1,3 @@
-// Enable testing scala code in groovy spock tests.
-
 plugins {
   scala
 }

conventions/src/main/kotlin/otel.scala-conventions.gradle.kts

@@ -81,11 +81,9 @@ val CORE_DEPENDENCIES = listOf(
 // this top level to help consistently satisfy large numbers of transitive dependencies.
 val DEPENDENCIES = listOf(
   "org.junit.jupiter:junit-jupiter-api:5.14.0",
-  "org.spockframework:spock-core:2.4-M6-groovy-4.0",
-  "org.spockframework:spock-junit4:2.4-M6-groovy-4.0",
 
   "io.r2dbc:r2dbc-proxy:1.1.6.RELEASE",
-  "ch.qos.logback:logback-classic:1.3.15", // 1.4+ requires Java 11+
+  "ch.qos.logback:logback-classic:1.3.16", // 1.4+ requires Java 11+
   "uk.org.webcompere:system-stubs-jupiter:2.0.3",
   "com.uber.nullaway:nullaway:0.12.10",
   "commons-beanutils:commons-beanutils:1.11.0",

dependencyManagement/build.gradle.kts

@@ -209,6 +209,7 @@ List of possible options:
 * `AUTO_INSTRUMENTATION_SHIM`: Instrumentation that adapts or bridges instrumentation from upstream libraries or frameworks
 * `CONTROLLER_SPANS`: Instrumentation that generates controller-level spans for controller/handler methods in web frameworks (disabled by default, experimental)
 * `VIEW_SPANS`: Instrumentation that generates view-level spans for view rendering such as templates or JSP (disabled by default, experimental)
+* `LOGGING_BRIDGE`: Instrumentation that bridges logging framework events to the OpenTelemetry Logs API. These instrumentations capture log records from standard logging frameworks and emit them as OpenTelemetry log records.
 
 ### Library Link
 

docs/contributing/documenting-instrumentation.md

@@ -226,7 +226,7 @@ a `testImplementation` dependency on the `testing` submodule. Then, create a tes
 the abstract test class from `testing`. You should implement the abstract `configure()` method to
 initialize the library using the exposed mechanism to register interceptors/listeners, perhaps a
 method like `registerInterceptor`. You can also wrap the object with the instrumentation decorator.
-Make sure that the test class is marked as a library instrumentation test. Both JUnit and Spock test
+Make sure that the test class is marked as a library instrumentation test. JUnit test
 utilities expose a way to specify whether you're running a library or javaagent test. If the tests
 pass, the library instrumentation is working.