Skip to content

Commit 512d83d

Browse files
committed
error.type and db.response.status_code all dbs
1 parent ade4502 commit 512d83d

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

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

-6
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,4 @@ default String getResponseStatusFromException(Throwable throwable) {
5454
default String getResponseStatus(RESPONSE response) {
5555
return null;
5656
}
57-
58-
@Nullable
59-
default String httpStatusToResponseStatus(int httpStatus) {
60-
int hundreds = httpStatus / 100;
61-
return hundreds == 4 || hundreds == 5 ? Integer.toString(httpStatus) : null;
62-
}
6357
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package io.opentelemetry.instrumentation.api.incubator.semconv.db;
2+
3+
import javax.annotation.Nullable;
4+
5+
/** Utility class for database response status. */
6+
public class DbResponseStatusUtil {
7+
private DbResponseStatusUtil() {
8+
}
9+
10+
@Nullable
11+
public static String httpStatusToResponseStatus(int httpStatus) {
12+
return httpStatus >= 400 && httpStatus< 600 ? Integer.toString(httpStatus) : null;
13+
}
14+
}

instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.util.logging.Logger;
1616
import java.util.stream.Collectors;
1717
import javax.annotation.Nullable;
18+
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbResponseStatusUtil;
1819
import org.apache.http.HttpEntity;
1920
import org.elasticsearch.client.Response;
2021

@@ -95,6 +96,6 @@ public String getDbOperationName(ElasticsearchRestRequest request) {
9596

9697
@Override
9798
public String getResponseStatus(Response response) {
98-
return httpStatusToResponseStatus(response.getStatusLine().getStatusCode());
99+
return DbResponseStatusUtil.httpStatusToResponseStatus(response.getStatusLine().getStatusCode());
99100
}
100101
}

instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.opensearch.rest;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
9+
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbResponseStatusUtil;
910
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
1011
import javax.annotation.Nullable;
1112
import org.opensearch.client.Response;
@@ -53,6 +54,6 @@ public String getDbOperationName(OpenSearchRestRequest request) {
5354

5455
@Override
5556
public String getResponseStatus(Response response) {
56-
return httpStatusToResponseStatus(response.getStatusLine().getStatusCode());
57+
return DbResponseStatusUtil.httpStatusToResponseStatus(response.getStatusLine().getStatusCode());
5758
}
5859
}

0 commit comments

Comments
 (0)