Skip to content

Commit 885514a

Browse files
committed
error.type and db.response.status_code all dbs
1 parent e3725fb commit 885514a

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchTransportClientTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import static io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.orderByRootSpanName;
1212
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1313
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
14+
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
1415
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
1516
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
1617
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
@@ -145,6 +146,8 @@ void elasticsearchError(Runnable action) {
145146
maybeStable(DB_SYSTEM),
146147
DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH),
147148
equalTo(maybeStable(DB_OPERATION), "GetAction"),
149+
equalTo(
150+
ERROR_TYPE, "org.elasticsearch.transport.RemoteTransportException"),
148151
equalTo(ELASTICSEARCH_ACTION, "GetAction"),
149152
equalTo(ELASTICSEARCH_REQUEST, "GetRequest"),
150153
equalTo(ELASTICSEARCH_REQUEST_INDICES, "invalid-index")),

instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
1010
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1111
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
12+
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
1213
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1314
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1415
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
@@ -423,7 +424,8 @@ void testCommandCompletesExceptionally() {
423424
.hasAttributesSatisfyingExactly(
424425
equalTo(maybeStable(DB_SYSTEM), "redis"),
425426
equalTo(maybeStable(DB_STATEMENT), "DEL key1 key2"),
426-
equalTo(maybeStable(DB_OPERATION), "DEL"))));
427+
equalTo(maybeStable(DB_OPERATION), "DEL"),
428+
equalTo(maybeStable(ERROR_TYPE), "java.lang.IllegalStateException"))));
427429
}
428430

429431
@Test

instrumentation/spymemcached-2.12/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -884,9 +884,7 @@ void decrException() {
884884
maybeStable(DB_SYSTEM),
885885
DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED),
886886
equalTo(maybeStable(DB_OPERATION), "decr"),
887-
equalTo(
888-
ERROR_TYPE,
889-
"net.spy.memcached.internal.CheckedOperationTimeoutException"))));
887+
equalTo(ERROR_TYPE, "java.lang.IllegalArgumentException"))));
890888
}
891889

892890
@Test

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

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
1010
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1111
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
12+
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
1213
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
1314
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
1415
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
@@ -199,6 +200,7 @@ void testInvalidQuery() throws Exception {
199200
equalTo(maybeStable(DB_NAME), DB),
200201
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : USER_DB),
201202
equalTo(maybeStable(DB_STATEMENT), "invalid"),
203+
equalTo(ERROR_TYPE, "io.vertx.pgclient.PgException"),
202204
equalTo(SERVER_ADDRESS, host),
203205
equalTo(SERVER_PORT, port)),
204206
span ->

0 commit comments

Comments
 (0)