error.type and db.response.status_code for jdbc

zeitlinger · zeitlinger · commit 01c55044b7ee · 2025-02-17T16:22:00.000+01:00
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesGetter.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesGetter.java
@@ -18,7 +18,8 @@
  * from the attribute methods, but implement as many as possible for best compliance with the
  * OpenTelemetry specification.
  */
-public interface DbClientAttributesGetter<REQUEST, RESPONSE> extends DbClientCommonAttributesGetter<REQUEST, RESPONSE> {
+public interface DbClientAttributesGetter<REQUEST, RESPONSE>
+    extends DbClientCommonAttributesGetter<REQUEST, RESPONSE> {
 
   /**
    * @deprecated Use {@link #getDbQueryText(REQUEST)} instead.
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java
@@ -66,7 +66,8 @@ public final void onEnd(
       @Nullable Throwable error) {
     if (error != null) {
       internalSet(attributes, ERROR_TYPE, error.getClass().getName());
-      internalSet(attributes, DB_RESPONSE_STATUS_CODE, getter.getResponseStatusFromException(error));
+      internalSet(
+          attributes, DB_RESPONSE_STATUS_CODE, getter.getResponseStatusFromException(error));
     }
     if (response != null) {
       internalSet(attributes, DB_RESPONSE_STATUS_CODE, getter.getResponseStatus(response));
diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java
@@ -21,7 +21,8 @@
 
 class DbClientAttributesExtractorTest {
 
-  static final class TestAttributesGetter implements DbClientAttributesGetter<Map<String, String>, Void> {
+  static final class TestAttributesGetter
+      implements DbClientAttributesGetter<Map<String, String>, Void> {
     @Override
     public String getDbSystem(Map<String, String> map) {
       return map.get("db.system");
diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java
@@ -26,7 +26,8 @@
 @SuppressWarnings("deprecation") // using deprecated semconv
 class SqlClientAttributesExtractorTest {
 
-  static class TestAttributesGetter implements SqlClientAttributesGetter<Map<String, Object>, Void> {
+  static class TestAttributesGetter
+      implements SqlClientAttributesGetter<Map<String, Object>, Void> {
 
     @Override
     public Collection<String> getRawQueryTexts(Map<String, Object> map) {
diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java
@@ -12,7 +12,8 @@
 import java.util.Collection;
 import javax.annotation.Nullable;
 
-final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest, Void> {
+final class CassandraSqlAttributesGetter
+    implements SqlClientAttributesGetter<CassandraRequest, Void> {
 
   @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
   @Override
diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java
@@ -13,7 +13,8 @@
 import java.util.Collection;
 import javax.annotation.Nullable;
 
-final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest, Void> {
+final class CassandraSqlAttributesGetter
+    implements SqlClientAttributesGetter<CassandraRequest, Void> {
 
   @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
   @Override
diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java
@@ -12,7 +12,8 @@
 import java.util.Collection;
 import javax.annotation.Nullable;
 
-final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest, Void> {
+final class CassandraSqlAttributesGetter
+    implements SqlClientAttributesGetter<CassandraRequest, Void> {
   // copied from DbIncubatingAttributes.DbSystemIncubatingValues
   private static final String CASSANDRA = "cassandra";
 
diff --git a/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java b/instrumentation/clickhouse-client-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseAttributesGetter.java
@@ -9,7 +9,8 @@
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import javax.annotation.Nullable;
 
-final class ClickHouseAttributesGetter implements DbClientAttributesGetter<ClickHouseDbRequest, Void> {
+final class ClickHouseAttributesGetter
+    implements DbClientAttributesGetter<ClickHouseDbRequest, Void> {
 
   @Nullable
   @Override
diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java
@@ -9,7 +9,8 @@
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import javax.annotation.Nullable;
 
-final class CouchbaseAttributesGetter implements DbClientAttributesGetter<CouchbaseRequestInfo, Void> {
+final class CouchbaseAttributesGetter
+    implements DbClientAttributesGetter<CouchbaseRequestInfo, Void> {
 
   @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
   @Override
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java
@@ -7,8 +7,8 @@
 
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
-import org.elasticsearch.client.Response;
 import javax.annotation.Nullable;
+import org.elasticsearch.client.Response;
 
 final class ElasticsearchTransportAttributesGetter
     implements DbClientAttributesGetter<ElasticTransportRequest, Response> {
diff --git a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java
@@ -85,10 +85,11 @@ void error() throws SQLException {
     DataSource dataSource = telemetry.wrap(source);
 
     assertThatCode(
-        () -> testing.runWithSpan(
-            "parent", () -> dataSource.getConnection()
-                    .createStatement().execute("SELECT 1;"))
-    ).isInstanceOf(SQLException.class);
+            () ->
+                testing.runWithSpan(
+                    "parent",
+                    () -> dataSource.getConnection().createStatement().execute("SELECT 1;")))
+        .isInstanceOf(SQLException.class);
 
     testing.waitAndAssertTraces(
         trace ->
@@ -98,8 +99,7 @@ void error() throws SQLException {
                 span ->
                     span.hasName("SELECT dbname")
                         .hasAttribute(equalTo(DB_RESPONSE_STATUS_CODE, "42"))
-                        .hasAttribute(equalTo(ERROR_TYPE, "java.sql.SQLException"))
-            ));
+                        .hasAttribute(equalTo(ERROR_TYPE, "java.sql.SQLException"))));
 
     assertDurationMetric(
         testing,
diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java
@@ -10,7 +10,8 @@
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import javax.annotation.Nullable;
 
-final class LettuceDbAttributesGetter implements DbClientAttributesGetter<RedisCommand<?, ?, ?>, Void> {
+final class LettuceDbAttributesGetter
+    implements DbClientAttributesGetter<RedisCommand<?, ?, ?>, Void> {
 
   @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
   @Override
diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java
@@ -15,7 +15,8 @@
 import java.util.List;
 import javax.annotation.Nullable;
 
-final class LettuceDbAttributesGetter implements DbClientAttributesGetter<RedisCommand<?, ?, ?>, Void> {
+final class LettuceDbAttributesGetter
+    implements DbClientAttributesGetter<RedisCommand<?, ?, ?>, Void> {
 
   private static final RedisCommandSanitizer sanitizer =
       RedisCommandSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled());
diff --git a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java
@@ -11,7 +11,8 @@
 import javax.annotation.Nullable;
 import redis.RedisCommand;
 
-final class RediscalaAttributesGetter implements DbClientAttributesGetter<RedisCommand<?, ?>, Void> {
+final class RediscalaAttributesGetter
+    implements DbClientAttributesGetter<RedisCommand<?, ?>, Void> {
 
   @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
   @Override
diff --git a/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedAttributesGetter.java b/instrumentation/spymemcached-2.12/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedAttributesGetter.java
@@ -8,7 +8,8 @@
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
 import javax.annotation.Nullable;
 
-public class SpymemcachedAttributesGetter implements DbClientAttributesGetter<SpymemcachedRequest, Void> {
+public class SpymemcachedAttributesGetter
+    implements DbClientAttributesGetter<SpymemcachedRequest, Void> {
 
   @Override
   public String getDbSystem(SpymemcachedRequest spymemcachedRequest) {
