Skip to content

Commit 5cf76cb

Browse files
committed
pr review
1 parent fa2d573 commit 5cf76cb

File tree

4 files changed

+5
-24
lines changed

4 files changed

+5
-24
lines changed

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static java.util.logging.Level.FINE;
99

1010
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
11-
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbResponseStatusUtil;
1211
import java.io.BufferedReader;
1312
import java.io.IOException;
1413
import java.io.InputStreamReader;
@@ -98,8 +97,8 @@ public String getDbOperationName(ElasticsearchRestRequest request) {
9897
@Override
9998
public String getResponseStatus(@Nullable Response response, @Nullable Throwable error) {
10099
if (response != null) {
101-
return DbResponseStatusUtil.httpStatusToResponseStatus(
102-
response.getStatusLine().getStatusCode());
100+
int httpStatus = response.getStatusLine().getStatusCode();
101+
return httpStatus >= 400 && httpStatus < 600 ? Integer.toString(httpStatus) : null;
103102
}
104103
return null;
105104
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
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;
109
import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
1110
import javax.annotation.Nullable;
1211
import org.opensearch.client.Response;
@@ -56,8 +55,8 @@ public String getDbOperationName(OpenSearchRestRequest request) {
5655
@Override
5756
public String getResponseStatus(@Nullable Response response, @Nullable Throwable error) {
5857
if (response != null) {
59-
return DbResponseStatusUtil.httpStatusToResponseStatus(
60-
response.getStatusLine().getStatusCode());
58+
int httpStatus = response.getStatusLine().getStatusCode();
59+
return httpStatus >= 400 && httpStatus < 600 ? Integer.toString(httpStatus) : null;
6160
}
6261
return null;
6362
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public Collection<String> getRawQueryTexts(VertxSqlClientRequest request) {
5050
@Override
5151
public String getResponseStatus(@Nullable Void response, @Nullable Throwable error) {
5252
try {
53+
// loaded via reflection, because this class is not available in all versions that we support
5354
Class<?> ex = Class.forName("io.vertx.pgclient.PgException");
5455
if (ex.isInstance(error)) {
5556
return (String) ex.getMethod("getCode").invoke(error);

0 commit comments

Comments
 (0)