Skip to content

Commit 405d01e

Browse files
committed
port is required now, so default back to scheme if needed.
1 parent 349326b commit 405d01e

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

instrumentation/khttp/src/main/java/com/splunk/opentelemetry/instrumentation/khttp/KHttpHttpClientHttpAttributesGetter.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
import static java.util.Collections.emptyList;
2020
import static java.util.Collections.singletonList;
2121

22+
import io.opentelemetry.instrumentation.api.internal.HttpConstants;
2223
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
24+
import java.net.URI;
2325
import java.util.List;
2426
import java.util.Map;
2527
import java.util.stream.Collectors;
@@ -74,10 +76,16 @@ public String getServerAddress(RequestWrapper requestWrapper) {
7476
@Nullable
7577
@Override
7678
public Integer getServerPort(RequestWrapper requestWrapper) {
77-
if (requestWrapper.parsedUri != null && requestWrapper.parsedUri.getPort() > 0) {
78-
return requestWrapper.parsedUri.getPort();
79+
Integer port = null;
80+
String scheme = null;
81+
URI uri = requestWrapper.parsedUri;
82+
if (uri != null) {
83+
if (uri.getPort() > 0) {
84+
port = uri.getPort();
85+
}
86+
scheme = uri.getScheme();
7987
}
80-
return null;
88+
return HttpConstants.portOrDefaultFromScheme(port, scheme);
8189
}
8290

8391
@Nullable

0 commit comments

Comments
 (0)