Merge branch 'main' into delete-flaky-test-reporter

Author: trask

instrumentation/hikaricp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/hikaricp/AbstractHikariInstrumentationTest.java

@@ -34,11 +34,14 @@
 @ExtendWith(MockitoExtension.class)
 public abstract class AbstractHikariInstrumentationTest {
 
-  @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.hikaricp-3.0";
 
-  @Mock DataSource dataSourceMock;
-  @Mock Connection connectionMock;
-  @Mock IMetricsTracker userMetricsMock;
+  @RegisterExtension
+  private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+
+  @Mock private DataSource dataSourceMock;
+  @Mock private Connection connectionMock;
+  @Mock private IMetricsTracker userMetricsMock;
 
   protected abstract InstrumentationExtension testing();
 
@@ -60,7 +63,7 @@ void shouldReportMetrics() throws SQLException, InterruptedException {
     hikariConnection.close();
 
     // then
-    DbConnectionPoolMetricsAssertions.create(testing(), "io.opentelemetry.hikaricp-3.0", "testPool")
+    DbConnectionPoolMetricsAssertions.create(testing(), INSTRUMENTATION_NAME, "testPool")
         .disableMaxIdleConnections()
         // no timeouts happen during this test
         .disableConnectionTimeouts()
@@ -77,24 +80,22 @@ void shouldReportMetrics() throws SQLException, InterruptedException {
     // then
     testing()
         .waitAndAssertMetrics(
-            "io.opentelemetry.hikaricp-3.0",
+            INSTRUMENTATION_NAME,
             emitStableDatabaseSemconv()
                 ? "db.client.connection.count"
                 : "db.client.connections.usage",
             AbstractIterableAssert::isEmpty);
     testing()
         .waitAndAssertMetrics(
-            "io.opentelemetry.hikaricp-3.0",
+            INSTRUMENTATION_NAME,
             "db.client.connections.idle.min",
             AbstractIterableAssert::isEmpty);
     testing()
         .waitAndAssertMetrics(
-            "io.opentelemetry.hikaricp-3.0",
-            "db.client.connections.max",
-            AbstractIterableAssert::isEmpty);
+            INSTRUMENTATION_NAME, "db.client.connections.max", AbstractIterableAssert::isEmpty);
     testing()
         .waitAndAssertMetrics(
-            "io.opentelemetry.hikaricp-3.0",
+            INSTRUMENTATION_NAME,
             "db.client.connections.pending_requests",
             AbstractIterableAssert::isEmpty);
   }
@@ -118,8 +119,7 @@ void shouldNotBreakCustomUserMetrics() throws SQLException, InterruptedException
     hikariConnection.close();
 
     // then
-    DbConnectionPoolMetricsAssertions.create(
-            testing(), "io.opentelemetry.hikaricp-3.0", "anotherTestPool")
+    DbConnectionPoolMetricsAssertions.create(testing(), INSTRUMENTATION_NAME, "anotherTestPool")
         .disableMaxIdleConnections()
         // no timeouts happen during this test
         .disableConnectionTimeouts()
@@ -156,8 +156,7 @@ void shouldReportTimeouts() throws SQLException {
     // then
     assertThat(thrown).isNotNull();
 
-    DbConnectionPoolMetricsAssertions.create(
-            testing(), "io.opentelemetry.hikaricp-3.0", "timingOutPool")
+    DbConnectionPoolMetricsAssertions.create(testing(), INSTRUMENTATION_NAME, "timingOutPool")
         .disableMaxIdleConnections()
         // the connection is not even acquired
         .disableUseTime()

instrumentation/hystrix-1.4/metadata.yaml

@@ -3,7 +3,7 @@ description: This instrumentation enables spans for Hystrix command executions a
 library_link: https://github.com/Netflix/Hystrix
 configurations:
   - name: otel.instrumentation.hystrix.experimental-span-attributes
+    declarative_name: java.hystrix.experimental_span_attributes/development
     description: Enables capturing the experimental `hystrix.command`, `hystrix.circuit_open` and `hystrix.group` span attributes.
     type: boolean
     default: false
-

instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergMetricsReporter.java

@@ -85,7 +85,7 @@ public void report(MetricsReport report) {
     }
   }
 
-  void reportScanMetrics(ScanReport scanReport) {
+  private void reportScanMetrics(ScanReport scanReport) {
     Attributes scanAttributes =
         Attributes.of(
             SCHEMA_ID,

instrumentation/iceberg-1.8/testing/build.gradle.kts

@@ -4,8 +4,8 @@ plugins {
 
 dependencies {
   implementation("org.apache.iceberg:iceberg-core:1.8.1")
-  // The following dependency allows us to use the following Iceberg test classes TestTables and TestTable
-  // which are not published by default
+  // The following dependency allows use of Iceberg test classes such as TestTables,
+  // which are not published by default.
   implementation("org.apache.iceberg:iceberg-core:1.8.1") {
     artifact {
       classifier = "tests"

instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbImplInstrumentation.java

@@ -17,6 +17,7 @@
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -102,7 +103,7 @@ public static Object[] onEnter(
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void onExit(
-        @Advice.Thrown Throwable throwable, @Advice.Enter Object[] enterArgs) {
+        @Advice.Thrown @Nullable Throwable throwable, @Advice.Enter @Nullable Object[] enterArgs) {
       CallDepth callDepth = CallDepth.forClass(InfluxDBImpl.class);
       if (callDepth.decrementAndGet() > 0 || enterArgs == null) {
         return;
@@ -159,7 +160,7 @@ public static InfluxDbScope onEnter(
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void onExit(
-        @Advice.Thrown Throwable throwable, @Advice.Enter InfluxDbScope scope) {
+        @Advice.Thrown @Nullable Throwable throwable, @Advice.Enter @Nullable InfluxDbScope scope) {
       CallDepth callDepth = CallDepth.forClass(InfluxDBImpl.class);
       if (callDepth.decrementAndGet() > 0 || scope == null) {
         return;

instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbScope.java

@@ -9,6 +9,7 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import javax.annotation.Nullable;
 
 /** Container used to carry state between enter and exit advices */
 public class InfluxDbScope {
@@ -27,7 +28,7 @@ public static InfluxDbScope start(Context parentContext, InfluxDbRequest influxD
     return new InfluxDbScope(influxDbRequest, context, context.makeCurrent());
   }
 
-  public void end(Throwable throwable) {
+  public void end(@Nullable Throwable throwable) {
     scope.close();
 
     instrumenter().end(context, influxDbRequest, null, throwable);

instrumentation/influxdb-2.4/metadata.yaml

@@ -6,6 +6,7 @@ semantic_conventions:
 library_link: https://github.com/influxdata/influxdb-java
 configurations:
   - name: otel.instrumentation.common.db.query-sanitization.enabled
+    declarative_name: java.common.db.query_sanitization.enabled
     description: Enables or disables query sanitization for database queries.
     type: boolean
     default: true

instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ResourceInjectionTest.java

@@ -19,7 +19,6 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,23 +29,21 @@ class ResourceInjectionTest {
   private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
 
   @Test
-  @SuppressWarnings("UnnecessaryAsync")
   void resourcesInjectedToNonDelegatingClassLoader() throws Exception {
     String resourceName = "test-resources/test-resource.txt";
     URL[] urls = {SystemUtils.class.getProtectionDomain().getCodeSource().getLocation()};
-    AtomicReference<URLClassLoader> emptyLoader =
-        new AtomicReference<>(new URLClassLoader(urls, null));
+    URLClassLoader emptyLoader = new URLClassLoader(urls, null);
 
-    Enumeration<URL> resourceUrls = emptyLoader.get().getResources(resourceName);
+    Enumeration<URL> resourceUrls = emptyLoader.getResources(resourceName);
     assertThat(resourceUrls.hasMoreElements()).isFalse();
     resourceUrls = null;
 
     URLClassLoader notInjectedLoader = new URLClassLoader(urls, null);
     cleanup.deferCleanup(notInjectedLoader);
     // this triggers resource injection
-    emptyLoader.get().loadClass(SystemUtils.class.getName());
+    emptyLoader.loadClass(SystemUtils.class.getName());
 
-    List<URL> resourceList = Collections.list(emptyLoader.get().getResources(resourceName));
+    List<URL> resourceList = Collections.list(emptyLoader.getResources(resourceName));
 
     assertThat(resourceList).hasSize(2);
     assertThat(readLine(resourceList.get(0))).isEqualTo("Hello world!");
@@ -55,9 +52,9 @@ void resourcesInjectedToNonDelegatingClassLoader() throws Exception {
     assertThat(notInjectedLoader.getResources(resourceName).hasMoreElements()).isFalse();
 
     // references to emptyloader are gone
-    emptyLoader.get().close(); // cleanup
-    WeakReference<URLClassLoader> ref = new WeakReference<>(emptyLoader.get());
-    emptyLoader.set(null);
+    emptyLoader.close(); // cleanup
+    WeakReference<URLClassLoader> ref = new WeakReference<>(emptyLoader);
+    emptyLoader = null;
 
     awaitGc(ref, Duration.ofSeconds(10));
 

instrumentation/internal/internal-class-loader/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/JbossClassloadingTest.java

@@ -13,7 +13,6 @@
 import org.jboss.modules.ModuleClassLoader;
 import org.jboss.modules.ModuleFinder;
 import org.jboss.modules.ModuleIdentifier;
-import org.jboss.modules.ModuleLoadException;
 import org.jboss.modules.ModuleLoader;
 import org.jboss.modules.ModuleSpec;
 import org.junit.jupiter.api.Test;
@@ -25,8 +24,7 @@ class JbossClassloadingTest {
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
   @Test
-  void testDelegatesToBootstrapClassLoaderForAgentClasses()
-      throws ModuleLoadException, ClassNotFoundException {
+  void testDelegatesToBootstrapClassLoaderForAgentClasses() throws Exception {
     ModuleFinder[] moduleFinders = new ModuleFinder[1];
     moduleFinders[0] = (identifier, delegateLoader) -> ModuleSpec.build(identifier).create();