Use inline

instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts

@@ -48,9 +48,9 @@ tasks {
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
-   withType<Test>().configureEach {
-      usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
-    }
+  withType<Test>().configureEach {
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+  }
 
   check {
     dependsOn(testStableSemconv)

instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java

@@ -23,7 +23,8 @@ public final class CassandraSingletons {
   // could use RESPONSE "ResultSet" here, but using RESPONSE "ExecutionInfo" in cassandra-4.0
   // instrumentation (see comment over there for why), so also using here for consistency
   private static final Instrumenter<CassandraRequest, ExecutionInfo> INSTRUMENTER;
-  private static final AttributeKey<String> DB_COLLECTION_NAME = AttributeKey.stringKey("db.collection.name");
+  private static final AttributeKey<String> DB_COLLECTION_NAME =
+      AttributeKey.stringKey("db.collection.name");
 
   static {
     CassandraSqlAttributesGetter attributesGetter = new CassandraSqlAttributesGetter();

instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java

@@ -9,7 +9,6 @@
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.ResultSetFuture;
 import com.datastax.driver.core.Session;
-import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -102,7 +101,9 @@ void syncTest(Parameter parameter) {
                               equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort),
                               equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"),
                               equalTo(
-                                  getAttributeKey(DbIncubatingAttributes.DB_STATEMENT), "USE " + parameter.keyspace))),
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_STATEMENT),
+                                  "USE " + parameter.keyspace))),
           trace ->
               trace.hasSpansSatisfyingExactly(
                   span ->
@@ -116,11 +117,22 @@ void syncTest(Parameter parameter) {
                               equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp),
                               equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort),
                               equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_NAME), parameter.keyspace),
                               equalTo(
-                                  getAttributeKey(DbIncubatingAttributes.DB_STATEMENT), parameter.expectedStatement),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_OPERATION), parameter.operation),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_CASSANDRA_TABLE), parameter.table))));
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_NAME),
+                                  parameter.keyspace),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_STATEMENT),
+                                  parameter.expectedStatement),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_OPERATION),
+                                  parameter.operation),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_CASSANDRA_TABLE),
+                                  parameter.table))));
     } else {
       testing.waitAndAssertTraces(
           trace ->
@@ -136,9 +148,17 @@ void syncTest(Parameter parameter) {
                               equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort),
                               equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"),
                               equalTo(
-                                  getAttributeKey(DbIncubatingAttributes.DB_STATEMENT), parameter.expectedStatement),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_OPERATION), parameter.operation),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_CASSANDRA_TABLE), parameter.table))));
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_STATEMENT),
+                                  parameter.expectedStatement),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_OPERATION),
+                                  parameter.operation),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_CASSANDRA_TABLE),
+                                  parameter.table))));
     }
 
     session.close();
@@ -176,7 +196,8 @@ void asyncTest(Parameter parameter) {
                               equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort),
                               equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"),
                               equalTo(
-                                  getAttributeKey(DbIncubatingAttributes.DB_STATEMENT),
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_STATEMENT),
                                   "USE " + parameter.keyspace))),
           trace ->
               trace.hasSpansSatisfyingExactly(
@@ -191,11 +212,22 @@ void asyncTest(Parameter parameter) {
                               equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, cassandraIp),
                               equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort),
                               equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_NAME), parameter.keyspace),
                               equalTo(
-                                  getAttributeKey(DbIncubatingAttributes.DB_STATEMENT), parameter.expectedStatement),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_OPERATION), parameter.operation),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_CASSANDRA_TABLE), parameter.table)),
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_NAME),
+                                  parameter.keyspace),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_STATEMENT),
+                                  parameter.expectedStatement),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_OPERATION),
+                                  parameter.operation),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_CASSANDRA_TABLE),
+                                  parameter.table)),
                   span ->
                       span.hasName("callbackListener")
                           .hasKind(SpanKind.INTERNAL)
@@ -216,9 +248,17 @@ void asyncTest(Parameter parameter) {
                               equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort),
                               equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"),
                               equalTo(
-                                  getAttributeKey(DbIncubatingAttributes.DB_STATEMENT), parameter.expectedStatement),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_OPERATION), parameter.operation),
-                              equalTo(getAttributeKey(DbIncubatingAttributes.DB_CASSANDRA_TABLE), parameter.table)),
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_STATEMENT),
+                                  parameter.expectedStatement),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_OPERATION),
+                                  parameter.operation),
+                              equalTo(
+                                  SemconvStabilityUtil.getAttributeKey(
+                                      DbIncubatingAttributes.DB_CASSANDRA_TABLE),
+                                  parameter.table)),
                   span ->
                       span.hasName("callbackListener")
                           .hasKind(SpanKind.INTERNAL)
@@ -228,10 +268,6 @@ void asyncTest(Parameter parameter) {
     session.close();
   }
 
-  protected static <T> AttributeKey<T> getAttributeKey(AttributeKey<T> oldKey) {
-    return SemconvStabilityUtil.getAttributeKey(oldKey);
-  }
-
   private static Stream<Arguments> provideSyncParameters() {
     return Stream.of(
         Arguments.of(

instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts

@@ -35,12 +35,12 @@ tasks {
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
-   withType<Test>().configureEach {
-      // required on jdk17
-        jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-        jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
-        jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-    }
+  withType<Test>().configureEach {
+    // required on jdk17
+    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+    jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED")
+    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  }
 
   check {
     dependsOn(testStableSemconv)

instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts

@@ -39,14 +39,14 @@ tasks {
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
-   withType<Test>().configureEach {
-        // TODO run tests both with and without experimental span attributes
-        jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")
-
-        // required on jdk17
-        jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-        jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-    }
+  withType<Test>().configureEach {
+    // TODO run tests both with and without experimental span attributes
+    jvmArgs("-Dotel.instrumentation.couchbase.experimental-span-attributes=true")
+
+    // required on jdk17
+    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  }
 
   check {
     dependsOn(testStableSemconv)

instrumentation/redisson/redisson-3.17/javaagent/build.gradle.kts

@@ -29,10 +29,10 @@ tasks {
     jvmArgs("-Dotel.semconv-stability.opt-in=database")
   }
 
-   withType<Test>().configureEach {
-      systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
-      usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
-    }
+  withType<Test>().configureEach {
+    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+  }
 
   check {
     dependsOn(testStableSemconv)

instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Classes.java

@@ -14,13 +14,13 @@
 import java.util.List;
 
 /**
- * <p>In case you enable the preview of stable database semantic conventions (e.g. by setting the {@code
- * otel.semconv-stability.opt-in} system property to {@code database}), the metrics being exported will
- * follow <a
- * href="https://github.com/open-telemetry/semantic-conventions/tree/main/docs/database">the
- * most recent database semantic conventions</a>.
+ * In case you enable the preview of stable database semantic conventions (e.g. by setting the
+ * {@code otel.semconv-stability.opt-in} system property to {@code database}), the metrics being
+ * exported will follow <a
+ * href="https://github.com/open-telemetry/semantic-conventions/tree/main/docs/database">the most
+ * recent database semantic conventions</a>.
  *
- * Registers measurements that generate metrics about JVM classes. The metrics generated by this
+ * <p>Registers measurements that generate metrics about JVM classes. The metrics generated by this
  * class follow <a
  * href="https://github.com/open-telemetry/semantic-conventions/blob/main/docs/runtime/jvm-metrics.md">the
  * stable JVM metrics semantic conventions</a>.

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/SemconvStabilityUtil.java

@@ -5,11 +5,6 @@
 
 package io.opentelemetry.instrumentation.testing.junit.db;
 
-import io.opentelemetry.api.common.AttributeKey;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
-import java.util.HashMap;
-import java.util.Map;
-
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_TABLE;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_COSMOSDB_CONTAINER;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_MONGODB_COLLECTION;
@@ -19,14 +14,21 @@
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
 
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.instrumentation.api.internal.SemconvStability;
+import java.util.HashMap;
+import java.util.Map;
+
 // until old database semconv are dropped in 3.0
 public class SemconvStabilityUtil {
   private static final Map<AttributeKey<?>, AttributeKey<?>> oldToNewMap = new HashMap<>();
   private static final AttributeKey<String> DB_NAMESPACE = AttributeKey.stringKey("db.namespace");
   private static final AttributeKey<Long> DB_NAMESPACE_LONG = AttributeKey.longKey("db.namespace");
   private static final AttributeKey<String> DB_QUERY_TEXT = AttributeKey.stringKey("db.query.text");
-  private static final AttributeKey<String> DB_OPERATION_NAME = AttributeKey.stringKey("db.operation.name");
-  private static final AttributeKey<String> DB_COLLECTION_NAME = AttributeKey.stringKey("db.collection.name");
+  private static final AttributeKey<String> DB_OPERATION_NAME =
+      AttributeKey.stringKey("db.operation.name");
+  private static final AttributeKey<String> DB_COLLECTION_NAME =
+      AttributeKey.stringKey("db.collection.name");
 
   static {
     addKey(oldToNewMap, DB_NAME, DB_NAMESPACE);