error.type and db.response.status_code all dbs

Author: zeitlinger

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
+import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
@@ -29,7 +30,6 @@ abstract class DbClientCommonAttributesExtractor<
   private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user");
   private static final AttributeKey<String> DB_CONNECTION_STRING =
       AttributeKey.stringKey("db.connection_string");
-  private static final AttributeKey<String> ERROR_TYPE = AttributeKey.stringKey("error.type");
   private static final AttributeKey<String> DB_RESPONSE_STATUS_CODE =
       AttributeKey.stringKey("db.response.status_code");
 

instrumentation/vertx/vertx-sql-client-4.0/javaagent/build.gradle.kts

@@ -13,6 +13,7 @@ muzzle {
 
 dependencies {
   library("io.vertx:vertx-sql-client:4.0.0")
+  compileOnly("io.vertx:vertx-pg-client:4.0.0")
   compileOnly("io.vertx:vertx-codegen:4.0.0")
 
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))

instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientAttributesGetter.java

@@ -10,6 +10,7 @@
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter;
 import java.util.Collection;
 import javax.annotation.Nullable;
+import io.vertx.pgclient.PgException;
 
 public enum VertxSqlClientAttributesGetter
     implements SqlClientAttributesGetter<VertxSqlClientRequest, Void> {
@@ -48,11 +49,9 @@ public Collection<String> getRawQueryTexts(VertxSqlClientRequest request) {
   @Nullable
   @Override
   public String getResponseStatusFromException(Throwable throwable) {
-    // todo
-    // 4.4.2 has this
-    //    if (throwable instanceof io.vertx.sqlclient.DatabaseException) {
-    //
-    //    }
+    if (throwable instanceof PgException) {
+      return ((PgException) throwable).getCode();
+    }
     return null;
   }
 }

instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java

@@ -17,6 +17,7 @@
 import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
+import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_RESPONSE_STATUS_CODE;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
@@ -200,6 +201,7 @@ void testInvalidQuery() throws Exception {
                             equalTo(maybeStable(DB_NAME), DB),
                             equalTo(DB_USER, emitStableDatabaseSemconv() ? null : USER_DB),
                             equalTo(maybeStable(DB_STATEMENT), "invalid"),
+                            equalTo(DB_RESPONSE_STATUS_CODE, "42601"),
                             equalTo(ERROR_TYPE, "io.vertx.pgclient.PgException"),
                             equalTo(SERVER_ADDRESS, host),
                             equalTo(SERVER_PORT, port)),