Skip to content

Commit e3725fb

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

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

instrumentation/clickhouse-client-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/ClickHouseClientTest.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77

88
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
10+
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
1011
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1112
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1213
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
1314
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
15+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_RESPONSE_STATUS_CODE;
1416
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
1517
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
1618
import static java.util.Arrays.asList;
@@ -34,6 +36,7 @@
3436
import io.opentelemetry.sdk.trace.data.StatusData;
3537
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
3638
import java.time.Instant;
39+
import java.util.ArrayList;
3740
import java.util.List;
3841
import java.util.concurrent.CompletableFuture;
3942
import org.junit.jupiter.api.AfterAll;
@@ -196,6 +199,10 @@ void testExecuteAndWaitThrowsException() {
196199

197200
assertThat(thrown).isInstanceOf(ClickHouseException.class);
198201

202+
List<AttributeAssertion> assertions =
203+
new ArrayList<>(attributeAssertions("select * from non_existent_table", "SELECT"));
204+
assertions.add(equalTo(DB_RESPONSE_STATUS_CODE, "60"));
205+
assertions.add(equalTo(ERROR_TYPE, "com.clickhouse.client.ClickHouseException"));
199206
testing.waitAndAssertTraces(
200207
trace ->
201208
trace.hasSpansSatisfyingExactly(
@@ -204,8 +211,7 @@ void testExecuteAndWaitThrowsException() {
204211
.hasKind(SpanKind.CLIENT)
205212
.hasStatus(StatusData.error())
206213
.hasException(thrown)
207-
.hasAttributesSatisfyingExactly(
208-
attributeAssertions("select * from non_existent_table", "SELECT"))));
214+
.hasAttributesSatisfyingExactly(assertions)));
209215
}
210216

211217
@Test

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public String getDbOperationName(CouchbaseRequestInfo couchbaseRequest) {
5555
@Override
5656
public String getResponseStatusFromException(Throwable throwable) {
5757
if (throwable instanceof CouchbaseException) {
58+
// todo
5859
// ResponseStatusDetails details = ((CouchbaseException) throwable).details();
5960
// in newer versions of the SDK, this is available as a method on the exception
6061
// check if it's available and contains the status

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
1111
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1212
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
13+
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
1314
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
1415
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
1516
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
@@ -882,7 +883,10 @@ void decrException() {
882883
equalTo(
883884
maybeStable(DB_SYSTEM),
884885
DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED),
885-
equalTo(maybeStable(DB_OPERATION), "decr"))));
886+
equalTo(maybeStable(DB_OPERATION), "decr"),
887+
equalTo(
888+
ERROR_TYPE,
889+
"net.spy.memcached.internal.CheckedOperationTimeoutException"))));
886890
}
887891

888892
@Test

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

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public Collection<String> getRawQueryTexts(VertxSqlClientRequest request) {
4848
@Nullable
4949
@Override
5050
public String getResponseStatusFromException(Throwable throwable) {
51+
// todo
5152
// 4.4.2 has this
5253
// if (throwable instanceof io.vertx.sqlclient.DatabaseException) {
5354
//

0 commit comments

Comments
 (0)