error.type and db.response.status_code for jdbc

zeitlinger · Feb 19, 2025 · e71e0cf · e71e0cf
1 parent 2f66869
commit e71e0cf
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/...umentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java b/...umentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringTemplateTest.java
@@ -9,6 +9,7 @@
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -177,6 +178,7 @@ void elasticsearchError() {
                                 maybeStable(DB_SYSTEM),
                                 DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
                             equalTo(maybeStable(DB_OPERATION), "RefreshAction"),
+                            equalTo(ERROR_TYPE, "org.elasticsearch.index.IndexNotFoundException"),
                             equalTo(stringKey("elasticsearch.action"), "RefreshAction"),
                             equalTo(stringKey("elasticsearch.request"), "RefreshRequest"),
                             equalTo(stringKey("elasticsearch.request.indices"), indexName))));

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java b/.../java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java
@@ -424,7 +424,7 @@ void testCommandCompletesExceptionally() {
                         .hasAttributesSatisfyingExactly(
                             equalTo(maybeStable(DB_SYSTEM), "redis"),
                             equalTo(maybeStable(DB_OPERATION), "DEL"),
-                            equalTo(maybeStable(ERROR_TYPE), "java.lang.IllegalStateException"))));
+                            equalTo(ERROR_TYPE, "java.lang.IllegalStateException"))));
   }
 
   @Test

diff --git a/...ry/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java b/...ry/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.mongo.v3_1;
 
+import com.mongodb.MongoException;
 import com.mongodb.ServerAddress;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.event.CommandStartedEvent;
@@ -97,6 +98,15 @@ public String getDbOperationName(CommandStartedEvent event) {
     return event.getCommandName();
   }
 
+  @Nullable
+  @Override
+  public String getResponseStatusFromException(Throwable throwable) {
+    if (throwable instanceof MongoException) {
+      return Integer.toString(((MongoException) throwable).getCode());
+    }
+    return null;
+  }
+
   String sanitizeStatement(BsonDocument command) {
     StringBuilderWriter stringWriter = new StringBuilderWriter(128);
     // jsonWriterSettings is generally not null but could be due to security manager or unknown

diff --git a/...n/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java b/...n/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcSqlAttributesGetter.java
@@ -8,6 +8,7 @@
 import static java.util.Collections.singleton;
 
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter;
+import io.r2dbc.spi.R2dbcException;
 import java.util.Collection;
 import javax.annotation.Nullable;
 
@@ -47,4 +48,13 @@ public String getConnectionString(DbExecution request) {
   public Collection<String> getRawQueryTexts(DbExecution request) {
     return singleton(request.getRawQueryText());
   }
+
+  @Nullable
+  @Override
+  public String getResponseStatusFromException(Throwable throwable) {
+    if (throwable instanceof R2dbcException) {
+      return ((R2dbcException) throwable).getSqlState();
+    }
+    return null;
+  }
 }