Skip to content

Fix khttp client instrumentation #2705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laurit merged 2 commits into from
Mar 14, 2026
+6 −4
Merged

Fix khttp client instrumentation #2705

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
405d01e
port is required now, so default back to scheme if needed.
breedx-splk Mar 13, 2026
4722802
simplify
laurit Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...a/com/splunk/opentelemetry/instrumentation/khttp/KHttpHttpClientHttpAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;

import io.opentelemetry.instrumentation.api.internal.HttpConstants;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
import java.net.URI;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -74,10 +76,10 @@ public String getServerAddress(RequestWrapper requestWrapper) {
@Nullable
@Override
public Integer getServerPort(RequestWrapper requestWrapper) {
if (requestWrapper.parsedUri != null && requestWrapper.parsedUri.getPort() > 0) {
return requestWrapper.parsedUri.getPort();
}
return null;
URI uri = requestWrapper.parsedUri;
return uri != null
? HttpConstants.portOrDefaultFromScheme(uri.getPort(), uri.getScheme())
: null;
}

@Nullable
Expand Down
Loading