open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix server -> client reference (#5396)

This commit is contained in:
Trask Stalnaker 2022-02-19 11:49:00 -08:00 committed by GitHub
parent 53a8b85f4c
commit d7725d248b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/SpringWebNetAttributesGetter.java
View File

@ -5,31 +5,33 @@
package io.opentelemetry.instrumentation.spring.web;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpResponse;
final class SpringWebNetAttributesGetter implements NetServerAttributesGetter<HttpRequest> {
final class SpringWebNetAttributesGetter
implements NetClientAttributesGetter<HttpRequest, ClientHttpResponse> {
@Override
public String transport(HttpRequest httpRequest) {
public String transport(HttpRequest httpRequest, @Nullable ClientHttpResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override
@Nullable
public String peerName(HttpRequest httpRequest) {
public String peerName(HttpRequest httpRequest, @Nullable ClientHttpResponse response) {
return httpRequest.getURI().getHost();
}
@Override
public Integer peerPort(HttpRequest httpRequest) {
public Integer peerPort(HttpRequest httpRequest, @Nullable ClientHttpResponse response) {
return httpRequest.getURI().getPort();
}
@Override
@Nullable
public String peerIp(HttpRequest httpRequest) {
public String peerIp(HttpRequest httpRequest, @Nullable ClientHttpResponse response) {
return null;
}
}

4
instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/SpringWebTracingBuilder.java
View File

@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttribut
import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientMetrics;
import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor;
import java.util.ArrayList;
import java.util.List;
import org.springframework.http.HttpRequest;
@ -71,7 +71,7 @@ public final class SpringWebTracingBuilder {
.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributeGetter))
.addAttributesExtractor(
HttpClientAttributesExtractor.create(httpAttributeGetter, capturedHttpHeaders))
.addAttributesExtractor(NetServerAttributesExtractor.create(netAttributesGetter))
.addAttributesExtractor(NetClientAttributesExtractor.create(netAttributesGetter))
.addAttributesExtractors(additionalExtractors)
.addRequestMetrics(HttpClientMetrics.get())
.newClientInstrumenter(HttpRequestSetter.INSTANCE);