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

Make net.transport an optional attribute (#8279)

This commit is contained in:
Mateusz Rzeszutek 2023-04-20 17:14:03 +02:00 committed by GitHub
parent 04097b3093
commit e3944a53a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
120 changed files with 40 additions and 765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java
View File

@ -18,7 +18,9 @@ import javax.annotation.Nullable;
public interface NetClientAttributesGetter<REQUEST, RESPONSE> { public interface NetClientAttributesGetter<REQUEST, RESPONSE> {
@Nullable @Nullable
String getTransport(REQUEST request, @Nullable RESPONSE response); default String getTransport(REQUEST request, @Nullable RESPONSE response) {
return null;
}
/** /**
* Returns the application protocol used. * Returns the application protocol used.

4
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java
View File

@ -18,7 +18,9 @@ import javax.annotation.Nullable;
public interface NetServerAttributesGetter<REQUEST> { public interface NetServerAttributesGetter<REQUEST> {
@Nullable @Nullable
String getTransport(REQUEST request); default String getTransport(REQUEST request) {
return null;
}
/** /**
* Returns the application protocol used. * Returns the application protocol used.

10
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.api.instrumenter.http; package io.opentelemetry.instrumentation.api.instrumenter.http;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;
@ -72,13 +71,6 @@ class HttpClientAttributesExtractorTest {
static class TestNetClientAttributesGetter static class TestNetClientAttributesGetter
implements NetClientAttributesGetter<Map<String, String>, Map<String, String>> { implements NetClientAttributesGetter<Map<String, String>, Map<String, String>> {
@Nullable
@Override
public String getTransport(
Map<String, String> request, @Nullable Map<String, String> response) {
return response == null ? null : response.get("transport");
}
@Nullable @Nullable
@Override @Override
public String getProtocolName( public String getProtocolName(
@ -124,7 +116,6 @@ class HttpClientAttributesExtractorTest {
response.put("statusCode", "202"); response.put("statusCode", "202");
response.put("header.content-length", "20"); response.put("header.content-length", "20");
response.put("header.custom-response-header", "654,321"); response.put("header.custom-response-header", "654,321");
response.put("transport", IP_TCP);
ToIntFunction<Context> resendCountFromContext = context -> 2; ToIntFunction<Context> resendCountFromContext = context -> 2;
@ -160,7 +151,6 @@ class HttpClientAttributesExtractorTest {
entry( entry(
AttributeKey.stringArrayKey("http.response.header.custom_response_header"), AttributeKey.stringArrayKey("http.response.header.custom_response_header"),
asList("654", "321")), asList("654", "321")),
entry(SemanticAttributes.NET_TRANSPORT, IP_TCP),
entry(NetAttributes.NET_PROTOCOL_NAME, "http"), entry(NetAttributes.NET_PROTOCOL_NAME, "http"),
entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1")); entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"));
} }

5
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java
View File

@ -81,11 +81,6 @@ class HttpServerAttributesExtractorTest {
static class TestNetServerAttributesGetter static class TestNetServerAttributesGetter
implements NetServerAttributesGetter<Map<String, Object>> { implements NetServerAttributesGetter<Map<String, Object>> {
@Nullable
@Override
public String getTransport(Map<String, Object> request) {
return (String) request.get("transport");
}
@Nullable @Nullable
@Override @Override

14
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetClientAttributesGetterTest.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.api.instrumenter.net; package io.opentelemetry.instrumentation.api.instrumenter.net;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
@ -25,10 +24,6 @@ class InetSocketAddressNetClientAttributesGetterTest {
private final InetSocketAddressNetClientAttributesGetter<InetSocketAddress, InetSocketAddress> private final InetSocketAddressNetClientAttributesGetter<InetSocketAddress, InetSocketAddress>
getter = getter =
new InetSocketAddressNetClientAttributesGetter<InetSocketAddress, InetSocketAddress>() { new InetSocketAddressNetClientAttributesGetter<InetSocketAddress, InetSocketAddress>() {
@Override
public String getTransport(InetSocketAddress request, InetSocketAddress response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getPeerName(InetSocketAddress request) { public String getPeerName(InetSocketAddress request) {
@ -56,9 +51,7 @@ class InetSocketAddressNetClientAttributesGetterTest {
AttributesBuilder attributes = Attributes.builder(); AttributesBuilder attributes = Attributes.builder();
extractor.onEnd(attributes, Context.root(), null, null, null); extractor.onEnd(attributes, Context.root(), null, null, null);
assertThat(attributes.build()) assertThat(attributes.build()).isEmpty();
.containsOnly(
entry(SemanticAttributes.NET_TRANSPORT, SemanticAttributes.NetTransportValues.IP_TCP));
} }
@Test @Test
@ -82,7 +75,6 @@ class InetSocketAddressNetClientAttributesGetterTest {
assertThat(startAttributes.build()).isEmpty(); assertThat(startAttributes.build()).isEmpty();
AttributesBuilder builder = Attributes.builder(); AttributesBuilder builder = Attributes.builder();
builder.put(SemanticAttributes.NET_TRANSPORT, SemanticAttributes.NetTransportValues.IP_TCP);
builder.put(SemanticAttributes.NET_SOCK_PEER_ADDR, address.getAddress().getHostAddress()); builder.put(SemanticAttributes.NET_SOCK_PEER_ADDR, address.getAddress().getHostAddress());
if (!ipv4) { if (!ipv4) {
builder.put(SemanticAttributes.NET_SOCK_FAMILY, "inet6"); builder.put(SemanticAttributes.NET_SOCK_FAMILY, "inet6");
@ -111,8 +103,6 @@ class InetSocketAddressNetClientAttributesGetterTest {
// then // then
assertThat(startAttributes.build()).isEmpty(); assertThat(startAttributes.build()).isEmpty();
assertThat(endAttributes.build()) assertThat(endAttributes.build()).isEmpty();
.containsOnly(
entry(SemanticAttributes.NET_TRANSPORT, SemanticAttributes.NetTransportValues.IP_TCP));
} }
} }

15
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/InetSocketAddressNetServerAttributesGetterTest.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.api.instrumenter.net; package io.opentelemetry.instrumentation.api.instrumenter.net;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.common.AttributesBuilder;
@ -25,11 +24,6 @@ class InetSocketAddressNetServerAttributesGetterTest {
final InetSocketAddressNetServerAttributesGetter<Addresses> getter = final InetSocketAddressNetServerAttributesGetter<Addresses> getter =
new InetSocketAddressNetServerAttributesGetter<Addresses>() { new InetSocketAddressNetServerAttributesGetter<Addresses>() {
@Override
public String getTransport(Addresses request) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getHostName(Addresses request) { public String getHostName(Addresses request) {
// net.host.name and net.host.port are tested in NetClientAttributesExtractorTest // net.host.name and net.host.port are tested in NetClientAttributesExtractorTest
@ -59,9 +53,7 @@ class InetSocketAddressNetServerAttributesGetterTest {
void noInetSocketAddress() { void noInetSocketAddress() {
AttributesBuilder attributes = Attributes.builder(); AttributesBuilder attributes = Attributes.builder();
extractor.onStart(attributes, Context.root(), new Addresses(null, null)); extractor.onStart(attributes, Context.root(), new Addresses(null, null));
assertThat(attributes.build()) assertThat(attributes.build()).isEmpty();
.containsOnly(
entry(SemanticAttributes.NET_TRANSPORT, SemanticAttributes.NetTransportValues.IP_TCP));
} }
@Test @Test
@ -84,7 +76,6 @@ class InetSocketAddressNetServerAttributesGetterTest {
// then // then
AttributesBuilder builder = Attributes.builder(); AttributesBuilder builder = Attributes.builder();
builder.put(SemanticAttributes.NET_TRANSPORT, SemanticAttributes.NetTransportValues.IP_TCP);
if (!request.isIpv4()) { if (!request.isIpv4()) {
builder.put(SemanticAttributes.NET_SOCK_FAMILY, "inet6"); builder.put(SemanticAttributes.NET_SOCK_FAMILY, "inet6");
} }
@ -118,9 +109,7 @@ class InetSocketAddressNetServerAttributesGetterTest {
extractor.onEnd(endAttributes, context, request, request, null); extractor.onEnd(endAttributes, context, request, request, null);
// then // then
assertThat(startAttributes.build()) assertThat(startAttributes.build()).isEmpty();
.containsOnly(
entry(SemanticAttributes.NET_TRANSPORT, SemanticAttributes.NetTransportValues.IP_TCP));
assertThat(endAttributes.build()).isEmpty(); assertThat(endAttributes.build()).isEmpty();
} }

7
instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java
View File

@ -11,7 +11,6 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttribut
import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesGetter;
import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -95,12 +94,6 @@ public class InstrumenterBenchmark {
private static final InetSocketAddress PEER_ADDRESS = private static final InetSocketAddress PEER_ADDRESS =
InetSocketAddress.createUnresolved("localhost", 8080); InetSocketAddress.createUnresolved("localhost", 8080);
@Nullable
@Override
public String getTransport(Void request, @Nullable Void response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(Void unused, @Nullable Void unused2) { public String getProtocolName(Void unused, @Nullable Void unused2) {

6
instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpNetAttributesGetter.java
View File

@ -9,16 +9,10 @@ import akka.http.scaladsl.model.HttpRequest;
import akka.http.scaladsl.model.HttpResponse; import akka.http.scaladsl.model.HttpResponse;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil; import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
class AkkaHttpNetAttributesGetter implements NetClientAttributesGetter<HttpRequest, HttpResponse> { class AkkaHttpNetAttributesGetter implements NetClientAttributesGetter<HttpRequest, HttpResponse> {
@Override
public String getTransport(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { public String getProtocolName(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) {

6
instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaNetServerAttributesGetter.java
View File

@ -13,12 +13,6 @@ import javax.annotation.Nullable;
// TODO (trask) capture net attributes? // TODO (trask) capture net attributes?
class AkkaNetServerAttributesGetter implements NetServerAttributesGetter<HttpRequest> { class AkkaNetServerAttributesGetter implements NetServerAttributesGetter<HttpRequest> {
@Nullable
@Override
public String getTransport(HttpRequest request) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(HttpRequest request) { public String getProtocolName(HttpRequest request) {

6
instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesGetter.java
View File

@ -18,12 +18,6 @@ import org.apache.dubbo.rpc.Result;
public final class DubboNetClientAttributesGetter public final class DubboNetClientAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<DubboRequest, Result> { extends InetSocketAddressNetClientAttributesGetter<DubboRequest, Result> {
@Override
@Nullable
public String getTransport(DubboRequest request, @Nullable Result response) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(DubboRequest request) { public String getPeerName(DubboRequest request) {

6
instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesGetter.java
View File

@ -17,12 +17,6 @@ import javax.annotation.Nullable;
public final class DubboNetServerAttributesGetter public final class DubboNetServerAttributesGetter
extends InetSocketAddressNetServerAttributesGetter<DubboRequest> { extends InetSocketAddressNetServerAttributesGetter<DubboRequest> {
@Override
@Nullable
public String getTransport(DubboRequest request) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getHostName(DubboRequest request) { public String getHostName(DubboRequest request) {

6
instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient; package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
@ -14,11 +13,6 @@ import org.apache.http.HttpResponse;
final class ApacheHttpAsyncClientNetAttributesGetter final class ApacheHttpAsyncClientNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<ApacheHttpClientRequest, HttpResponse> { extends InetSocketAddressNetClientAttributesGetter<ApacheHttpClientRequest, HttpResponse> {
@Override
public String getTransport(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getProtocolName(ApacheHttpClientRequest request, @Nullable HttpResponse response) { public String getProtocolName(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
return request.getProtocolName(); return request.getProtocolName();

6
instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v2_0; package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v2_0;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.apache.commons.httpclient.HostConfiguration; import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.HttpMethod;
@ -15,11 +14,6 @@ import org.apache.commons.httpclient.HttpMethodBase;
final class ApacheHttpClientNetAttributesGetter final class ApacheHttpClientNetAttributesGetter
implements NetClientAttributesGetter<HttpMethod, HttpMethod> { implements NetClientAttributesGetter<HttpMethod, HttpMethod> {
@Override
public String getTransport(HttpMethod request, @Nullable HttpMethod response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getProtocolName(HttpMethod request, @Nullable HttpMethod response) { public String getProtocolName(HttpMethod request, @Nullable HttpMethod response) {
return "http"; return "http";

6
instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientNetAttributesGetter.java
View File

@ -6,18 +6,12 @@
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0; package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
final class ApacheHttpClientNetAttributesGetter final class ApacheHttpClientNetAttributesGetter
implements NetClientAttributesGetter<ApacheHttpClientRequest, HttpResponse> { implements NetClientAttributesGetter<ApacheHttpClientRequest, HttpResponse> {
@Override
public String getTransport(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getProtocolName(ApacheHttpClientRequest request, @Nullable HttpResponse response) { public String getProtocolName(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
return request.getProtocolName(); return request.getProtocolName();

6
instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.apachehttpclient.v4_3; package io.opentelemetry.instrumentation.apachehttpclient.v4_3;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
@ -14,11 +13,6 @@ import org.apache.http.HttpResponse;
final class ApacheHttpClientNetAttributesGetter final class ApacheHttpClientNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<ApacheHttpClientRequest, HttpResponse> { extends InetSocketAddressNetClientAttributesGetter<ApacheHttpClientRequest, HttpResponse> {
@Override
public String getTransport(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getProtocolName(ApacheHttpClientRequest request, @Nullable HttpResponse response) { public String getProtocolName(ApacheHttpClientRequest request, @Nullable HttpResponse response) {
return request.getProtocolName(); return request.getProtocolName();

6
instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0; package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpResponse;
@ -15,11 +14,6 @@ import org.apache.hc.core5.http.ProtocolVersion;
final class ApacheHttpClientNetAttributesGetter final class ApacheHttpClientNetAttributesGetter
implements NetClientAttributesGetter<HttpRequest, HttpResponse> { implements NetClientAttributesGetter<HttpRequest, HttpResponse> {
@Override
public String getTransport(HttpRequest request, @Nullable HttpResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(HttpRequest request, @Nullable HttpResponse response) { public String getProtocolName(HttpRequest request, @Nullable HttpResponse response) {

6
instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaNetServerAttributesGetter.java
View File

@ -8,7 +8,6 @@ package io.opentelemetry.instrumentation.armeria.v1_3;
import com.linecorp.armeria.common.RequestContext; import com.linecorp.armeria.common.RequestContext;
import com.linecorp.armeria.common.SessionProtocol; import com.linecorp.armeria.common.SessionProtocol;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetServerAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetServerAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -16,11 +15,6 @@ import javax.annotation.Nullable;
final class ArmeriaNetServerAttributesGetter final class ArmeriaNetServerAttributesGetter
extends InetSocketAddressNetServerAttributesGetter<RequestContext> { extends InetSocketAddressNetServerAttributesGetter<RequestContext> {
@Override
public String getTransport(RequestContext ctx) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getProtocolName(RequestContext ctx) { public String getProtocolName(RequestContext ctx) {
return "http"; return "http";

6
instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaNetClientAttributesGetter.java
View File

@ -10,7 +10,6 @@ import com.linecorp.armeria.common.RequestContext;
import com.linecorp.armeria.common.SessionProtocol; import com.linecorp.armeria.common.SessionProtocol;
import com.linecorp.armeria.common.logging.RequestLog; import com.linecorp.armeria.common.logging.RequestLog;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -22,11 +21,6 @@ import javax.annotation.Nullable;
public final class ArmeriaNetClientAttributesGetter public final class ArmeriaNetClientAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<RequestContext, RequestLog> { extends InetSocketAddressNetClientAttributesGetter<RequestContext, RequestLog> {
@Override
public String getTransport(RequestContext ctx, @Nullable RequestLog requestLog) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getProtocolName(RequestContext ctx, @Nullable RequestLog requestLog) { public String getProtocolName(RequestContext ctx, @Nullable RequestLog requestLog) {
return "http"; return "http";

6
instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientNetAttributesGetter.java
View File

@ -8,17 +8,11 @@ package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
import com.ning.http.client.Request; import com.ning.http.client.Request;
import com.ning.http.client.Response; import com.ning.http.client.Response;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
final class AsyncHttpClientNetAttributesGetter final class AsyncHttpClientNetAttributesGetter
implements NetClientAttributesGetter<Request, Response> { implements NetClientAttributesGetter<Request, Response> {
@Override
public String getTransport(Request request, @Nullable Response response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(Request request, @Nullable Response response) { public String getProtocolName(Request request, @Nullable Response response) {

6
instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientNetAttributesGetter.java
View File

@ -8,7 +8,6 @@ package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.HttpVersion;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.asynchttpclient.Response; import org.asynchttpclient.Response;
@ -17,11 +16,6 @@ import org.asynchttpclient.netty.request.NettyRequest;
final class AsyncHttpClientNetAttributesGetter final class AsyncHttpClientNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<RequestContext, Response> { extends InetSocketAddressNetClientAttributesGetter<RequestContext, Response> {
@Override
public String getTransport(RequestContext request, @Nullable Response response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(RequestContext request, @Nullable Response response) { public String getProtocolName(RequestContext request, @Nullable Response response) {

30
instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy
View File

@ -9,7 +9,6 @@ import spock.lang.Shared
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.CONSUMER import static io.opentelemetry.api.trace.SpanKind.CONSUMER
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
class S3TracingTest extends AgentInstrumentationSpecification { class S3TracingTest extends AgentInstrumentationSpecification {
@ -61,7 +60,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -87,7 +85,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -113,7 +110,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -139,7 +135,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -165,7 +160,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -190,7 +184,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -215,7 +208,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -239,7 +231,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.url" String "http.url" String
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -269,7 +260,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -294,7 +284,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -319,7 +308,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 204 "http.status_code" 204
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -344,7 +332,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 204 "http.status_code" 204
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -369,7 +356,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -424,7 +410,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -449,7 +434,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -474,7 +458,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -498,7 +481,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -522,7 +504,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -547,7 +528,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -571,7 +551,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -596,7 +575,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -622,7 +600,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -647,7 +624,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -676,7 +652,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -702,7 +677,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.url" String "http.url" String
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -727,7 +701,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -752,7 +725,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 204 "http.status_code" 204
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -777,7 +749,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 204 "http.status_code" 204
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -802,7 +773,6 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }

9
instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy
View File

@ -9,7 +9,6 @@ import spock.lang.Shared
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.CONSUMER import static io.opentelemetry.api.trace.SpanKind.CONSUMER
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
class SnsTracingTest extends AgentInstrumentationSpecification { class SnsTracingTest extends AgentInstrumentationSpecification {
@ -54,7 +53,6 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -79,7 +77,6 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -104,7 +101,6 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -128,7 +124,6 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -152,7 +147,6 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -175,7 +169,6 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -198,7 +191,6 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
"http.url" String "http.url" String
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }
@ -226,7 +218,6 @@ class SnsTracingTest extends AgentInstrumentationSpecification {
"http.status_code" 200 "http.status_code" 200
"http.url" String "http.url" String
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.port" { it == null || Number } "net.peer.port" { it == null || Number }

2
instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy
View File

@ -19,7 +19,6 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import static io.opentelemetry.api.trace.StatusCode.ERROR import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
class Aws1ClientTest extends AbstractAws1ClientTest implements AgentTestTrait { class Aws1ClientTest extends AbstractAws1ClientTest implements AgentTestTrait {
@Override @Override
@ -97,7 +96,6 @@ class Aws1ClientTest extends AbstractAws1ClientTest implements AgentTestTrait {
errorEvent IllegalStateException, "bad handler" errorEvent IllegalStateException, "bad handler"
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.HTTP_URL" "https://s3.amazonaws.com" "$SemanticAttributes.HTTP_URL" "https://s3.amazonaws.com"
"$SemanticAttributes.HTTP_METHOD" "HEAD" "$SemanticAttributes.HTTP_METHOD" "HEAD"
"$SemanticAttributes.NET_PEER_NAME" "s3.amazonaws.com" "$SemanticAttributes.NET_PEER_NAME" "s3.amazonaws.com"

5
instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy
View File

@ -34,7 +34,6 @@ import java.time.Duration
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.StatusCode.ERROR import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.instrumentation.test.utils.PortUtils.UNUSABLE_PORT import static io.opentelemetry.instrumentation.test.utils.PortUtils.UNUSABLE_PORT
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
class Aws0ClientTest extends AgentInstrumentationSpecification { class Aws0ClientTest extends AgentInstrumentationSpecification {
@ -105,7 +104,6 @@ class Aws0ClientTest extends AgentInstrumentationSpecification {
kind CLIENT kind CLIENT
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.HTTP_URL" "${server.httpUri()}" "$SemanticAttributes.HTTP_URL" "${server.httpUri()}"
"$SemanticAttributes.HTTP_METHOD" "$method" "$SemanticAttributes.HTTP_METHOD" "$method"
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
@ -170,7 +168,6 @@ class Aws0ClientTest extends AgentInstrumentationSpecification {
errorEvent AmazonClientException, ~/Unable to execute HTTP request/ errorEvent AmazonClientException, ~/Unable to execute HTTP request/
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.HTTP_URL" "http://localhost:${UNUSABLE_PORT}" "$SemanticAttributes.HTTP_URL" "http://localhost:${UNUSABLE_PORT}"
"$SemanticAttributes.HTTP_METHOD" "$method" "$SemanticAttributes.HTTP_METHOD" "$method"
"$SemanticAttributes.NET_PEER_PORT" 61 "$SemanticAttributes.NET_PEER_PORT" 61
@ -218,7 +215,6 @@ class Aws0ClientTest extends AgentInstrumentationSpecification {
errorEvent IllegalStateException, "bad handler" errorEvent IllegalStateException, "bad handler"
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.HTTP_URL" "https://s3.amazonaws.com" "$SemanticAttributes.HTTP_URL" "https://s3.amazonaws.com"
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.NET_PEER_NAME" "s3.amazonaws.com" "$SemanticAttributes.NET_PEER_NAME" "s3.amazonaws.com"
@ -261,7 +257,6 @@ class Aws0ClientTest extends AgentInstrumentationSpecification {
errorEvent AmazonClientException, ~/Unable to execute HTTP request/ errorEvent AmazonClientException, ~/Unable to execute HTTP request/
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.HTTP_URL" "${server.httpUri()}" "$SemanticAttributes.HTTP_URL" "${server.httpUri()}"
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_PORT" server.httpPort()

6
instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkNetAttributesGetter.java
View File

@ -9,18 +9,12 @@ import com.amazonaws.Request;
import com.amazonaws.Response; import com.amazonaws.Response;
import com.amazonaws.http.HttpResponse; import com.amazonaws.http.HttpResponse;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.apache.http.ProtocolVersion; import org.apache.http.ProtocolVersion;
import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.client.methods.HttpRequestBase;
class AwsSdkNetAttributesGetter implements NetClientAttributesGetter<Request<?>, Response<?>> { class AwsSdkNetAttributesGetter implements NetClientAttributesGetter<Request<?>, Response<?>> {
@Override
public String getTransport(Request<?> request, @Nullable Response<?> response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(Request<?> request, @Nullable Response<?> response) { public String getProtocolName(Request<?> request, @Nullable Response<?> response) {

4
instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy
View File

@ -43,7 +43,6 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.PRODUCER import static io.opentelemetry.api.trace.SpanKind.PRODUCER
import static io.opentelemetry.api.trace.StatusCode.ERROR import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.instrumentation.test.utils.PortUtils.UNUSABLE_PORT import static io.opentelemetry.instrumentation.test.utils.PortUtils.UNUSABLE_PORT
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
abstract class AbstractAws1ClientTest extends InstrumentationSpecification { abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
@ -103,7 +102,6 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
kind operation == "SendMessage" ? PRODUCER : CLIENT kind operation == "SendMessage" ? PRODUCER : CLIENT
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.HTTP_URL" "${server.httpUri()}" "$SemanticAttributes.HTTP_URL" "${server.httpUri()}"
"$SemanticAttributes.HTTP_METHOD" "$method" "$SemanticAttributes.HTTP_METHOD" "$method"
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
@ -184,7 +182,6 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
errorEvent SdkClientException, ~/Unable to execute HTTP request/ errorEvent SdkClientException, ~/Unable to execute HTTP request/
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.HTTP_URL" "http://127.0.0.1:${UNUSABLE_PORT}" "$SemanticAttributes.HTTP_URL" "http://127.0.0.1:${UNUSABLE_PORT}"
"$SemanticAttributes.HTTP_METHOD" "$method" "$SemanticAttributes.HTTP_METHOD" "$method"
"$SemanticAttributes.NET_PEER_NAME" "127.0.0.1" "$SemanticAttributes.NET_PEER_NAME" "127.0.0.1"
@ -240,7 +237,6 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
} }
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.HTTP_URL" "${server.httpUri()}" "$SemanticAttributes.HTTP_URL" "${server.httpUri()}"
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_PORT" server.httpPort()

5
instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.groovy
View File

@ -21,7 +21,6 @@ import spock.lang.Shared
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.CONSUMER import static io.opentelemetry.api.trace.SpanKind.CONSUMER
import static io.opentelemetry.api.trace.SpanKind.PRODUCER import static io.opentelemetry.api.trace.SpanKind.PRODUCER
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
abstract class AbstractSqsTracingTest extends InstrumentationSpecification { abstract class AbstractSqsTracingTest extends InstrumentationSpecification {
@ -80,7 +79,6 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification {
"http.url" "http://localhost:$sqsPort" "http.url" "http://localhost:$sqsPort"
"net.peer.name" "localhost" "net.peer.name" "localhost"
"net.peer.port" sqsPort "net.peer.port" sqsPort
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long
@ -104,7 +102,6 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification {
"http.url" "http://localhost:$sqsPort" "http.url" "http://localhost:$sqsPort"
"net.peer.name" "localhost" "net.peer.name" "localhost"
"net.peer.port" sqsPort "net.peer.port" sqsPort
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long
@ -127,7 +124,6 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification {
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"net.peer.name" "localhost" "net.peer.name" "localhost"
"net.peer.port" sqsPort "net.peer.port" sqsPort
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long
@ -155,7 +151,6 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification {
"http.url" "http://localhost:$sqsPort" "http.url" "http://localhost:$sqsPort"
"net.peer.name" "localhost" "net.peer.name" "localhost"
"net.peer.port" sqsPort "net.peer.port" sqsPort
"net.transport" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long

6
instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.awssdk.v2_2; package io.opentelemetry.instrumentation.awssdk.v2_2;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.http.SdkHttpRequest;
@ -15,11 +14,6 @@ import software.amazon.awssdk.http.SdkHttpResponse;
class AwsSdkNetAttributesGetter class AwsSdkNetAttributesGetter
implements NetClientAttributesGetter<ExecutionAttributes, SdkHttpResponse> { implements NetClientAttributesGetter<ExecutionAttributes, SdkHttpResponse> {
@Override
public String getTransport(ExecutionAttributes request, @Nullable SdkHttpResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
@Nullable @Nullable
public String getPeerName(ExecutionAttributes request) { public String getPeerName(ExecutionAttributes request) {

7
instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy
View File

@ -59,7 +59,6 @@ import static com.google.common.collect.ImmutableMap.of
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.PRODUCER import static io.opentelemetry.api.trace.SpanKind.PRODUCER
import static io.opentelemetry.api.trace.StatusCode.ERROR import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
@Unroll @Unroll
abstract class AbstractAws2ClientTest extends InstrumentationSpecification { abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
@ -161,7 +160,6 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
kind CLIENT kind CLIENT
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" "127.0.0.1" "$SemanticAttributes.NET_PEER_NAME" "127.0.0.1"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_PORT" server.httpPort()
"$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") } "$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") }
@ -198,7 +196,6 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
kind CLIENT kind CLIENT
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" "127.0.0.1" "$SemanticAttributes.NET_PEER_NAME" "127.0.0.1"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_PORT" server.httpPort()
"$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") } "$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") }
@ -234,7 +231,6 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
kind CLIENT kind CLIENT
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" "127.0.0.1" "$SemanticAttributes.NET_PEER_NAME" "127.0.0.1"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_PORT" server.httpPort()
"$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") } "$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") }
@ -348,7 +344,6 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
kind operation != "SendMessage" ? CLIENT : PRODUCER kind operation != "SendMessage" ? CLIENT : PRODUCER
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" "127.0.0.1" "$SemanticAttributes.NET_PEER_NAME" "127.0.0.1"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_PORT" server.httpPort()
"$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") } "$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") }
@ -439,7 +434,6 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
kind operation != "SendMessage" ? CLIENT : PRODUCER kind operation != "SendMessage" ? CLIENT : PRODUCER
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" "127.0.0.1" "$SemanticAttributes.NET_PEER_NAME" "127.0.0.1"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_PORT" server.httpPort()
"$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") } "$SemanticAttributes.HTTP_URL" { it.startsWith("${server.httpUri()}${path}") }
@ -540,7 +534,6 @@ abstract class AbstractAws2ClientTest extends InstrumentationSpecification {
errorEvent SdkClientException, "Unable to execute HTTP request: Read timed out" errorEvent SdkClientException, "Unable to execute HTTP request: Read timed out"
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" "127.0.0.1" "$SemanticAttributes.NET_PEER_NAME" "127.0.0.1"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_PORT" server.httpPort()
"$SemanticAttributes.HTTP_URL" "${server.httpUri()}${path}" "$SemanticAttributes.HTTP_URL" "${server.httpUri()}${path}"

5
instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy
View File

@ -23,7 +23,6 @@ import spock.lang.Shared
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.CONSUMER import static io.opentelemetry.api.trace.SpanKind.CONSUMER
import static io.opentelemetry.api.trace.SpanKind.PRODUCER import static io.opentelemetry.api.trace.SpanKind.PRODUCER
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification {
@ -103,7 +102,6 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification {
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"net.peer.name" "localhost" "net.peer.name" "localhost"
"net.peer.port" sqsPort "net.peer.port" sqsPort
"net.transport" IP_TCP
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
} }
@ -127,7 +125,6 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification {
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"net.peer.name" "localhost" "net.peer.name" "localhost"
"net.peer.port" sqsPort "net.peer.port" sqsPort
"net.transport" IP_TCP
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
} }
@ -146,7 +143,6 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification {
"http.url" { it.startsWith("http://localhost:$sqsPort") } "http.url" { it.startsWith("http://localhost:$sqsPort") }
"net.peer.name" "localhost" "net.peer.name" "localhost"
"net.peer.port" sqsPort "net.peer.port" sqsPort
"net.transport" IP_TCP
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
} }
@ -174,7 +170,6 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification {
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"net.peer.name" "localhost" "net.peer.name" "localhost"
"net.peer.port" sqsPort "net.peer.port" sqsPort
"net.transport" IP_TCP
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
} }

6
instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy
View File

@ -15,8 +15,9 @@ import org.springframework.boot.SpringApplication
import org.springframework.context.ConfigurableApplicationContext import org.springframework.context.ConfigurableApplicationContext
import spock.lang.Shared import spock.lang.Shared
import static io.opentelemetry.api.trace.SpanKind.* import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP import static io.opentelemetry.api.trace.SpanKind.INTERNAL
import static io.opentelemetry.api.trace.SpanKind.SERVER
class RestCamelTest extends AgentInstrumentationSpecification implements RetryOnAddressAlreadyInUseTrait { class RestCamelTest extends AgentInstrumentationSpecification implements RetryOnAddressAlreadyInUseTrait {
@ -92,7 +93,6 @@ class RestCamelTest extends AgentInstrumentationSpecification implements RetryOn
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_ROUTE" "/api/{module}/unit/{unitId}" "$SemanticAttributes.HTTP_ROUTE" "/api/{module}/unit/{unitId}"
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"

6
instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy
View File

@ -17,8 +17,9 @@ import org.springframework.boot.SpringApplication
import org.springframework.context.ConfigurableApplicationContext import org.springframework.context.ConfigurableApplicationContext
import spock.lang.Shared import spock.lang.Shared
import static io.opentelemetry.api.trace.SpanKind.* import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP import static io.opentelemetry.api.trace.SpanKind.INTERNAL
import static io.opentelemetry.api.trace.SpanKind.SERVER
class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecification implements RetryOnAddressAlreadyInUseTrait { class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecification implements RetryOnAddressAlreadyInUseTrait {
@ -128,7 +129,6 @@ class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecifica
"$SemanticAttributes.USER_AGENT_ORIGINAL" "Jakarta Commons-HttpClient/3.1" "$SemanticAttributes.USER_AGENT_ORIGINAL" "Jakarta Commons-HttpClient/3.1"
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" Long
"$SemanticAttributes.HTTP_ROUTE" "/serviceTwo" "$SemanticAttributes.HTTP_ROUTE" "/serviceTwo"
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "127.0.0.1" "$SemanticAttributes.NET_HOST_NAME" "127.0.0.1"

4
instrumentation/camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpan.groovy
View File

@ -9,7 +9,6 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
class AwsSpan { class AwsSpan {
@ -35,7 +34,6 @@ class AwsSpan {
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.name" String "net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || it instanceof Number } "net.peer.port" { it == null || it instanceof Number }
} }
} }
@ -68,7 +66,6 @@ class AwsSpan {
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.name" String "net.peer.name" String
"net.peer.port" { it == null || it instanceof Number } "net.peer.port" { it == null || it instanceof Number }
"net.transport" IP_TCP
} }
} }
} }
@ -95,7 +92,6 @@ class AwsSpan {
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"net.peer.name" String "net.peer.name" String
"net.peer.port" { it == null || it instanceof Number } "net.peer.port" { it == null || it instanceof Number }
"net.transport" IP_TCP
} }
} }
} }

6
instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraNetAttributesGetter.java
View File

@ -13,12 +13,6 @@ import javax.annotation.Nullable;
final class CassandraNetAttributesGetter final class CassandraNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<CassandraRequest, ExecutionInfo> { extends InetSocketAddressNetClientAttributesGetter<CassandraRequest, ExecutionInfo> {
@Override
@Nullable
public String getTransport(CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(CassandraRequest request) { public String getPeerName(CassandraRequest request) {

6
instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraNetAttributesGetter.java
View File

@ -15,12 +15,6 @@ import javax.annotation.Nullable;
final class CassandraNetAttributesGetter final class CassandraNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<CassandraRequest, ExecutionInfo> { extends InetSocketAddressNetClientAttributesGetter<CassandraRequest, ExecutionInfo> {
@Override
@Nullable
public String getTransport(CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(CassandraRequest request) { public String getPeerName(CassandraRequest request) {

6
instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraNetAttributesGetter.java
View File

@ -15,12 +15,6 @@ import javax.annotation.Nullable;
final class CassandraNetAttributesGetter final class CassandraNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<CassandraRequest, ExecutionInfo> { extends InetSocketAddressNetClientAttributesGetter<CassandraRequest, ExecutionInfo> {
@Override
@Nullable
public String getTransport(CassandraRequest request, @Nullable ExecutionInfo executionInfo) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(CassandraRequest request) { public String getPeerName(CassandraRequest request) {

8
instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseNetAttributesGetter.java
View File

@ -6,20 +6,12 @@
package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0; package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class CouchbaseNetAttributesGetter public class CouchbaseNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<CouchbaseRequestInfo, Void> { extends InetSocketAddressNetClientAttributesGetter<CouchbaseRequestInfo, Void> {
@Nullable
@Override
public String getTransport(CouchbaseRequestInfo couchbaseRequest, @Nullable Void unused) {
return couchbaseRequest.getPeerAddress() != null
? SemanticAttributes.NetTransportValues.IP_TCP
: null;
}
@Nullable @Nullable
@Override @Override

2
instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy
View File

@ -8,7 +8,6 @@ import io.opentelemetry.sdk.trace.data.SpanData
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
class CouchbaseSpanUtil { class CouchbaseSpanUtil {
// Reusable span assertion method. Cannot directly override AbstractCouchbaseTest.assertCouchbaseSpan because // Reusable span assertion method. Cannot directly override AbstractCouchbaseTest.assertCouchbaseSpan because
@ -34,7 +33,6 @@ class CouchbaseSpanUtil {
"$SemanticAttributes.DB_STATEMENT" statement "$SemanticAttributes.DB_STATEMENT" statement
"$SemanticAttributes.DB_OPERATION"(operation ?: spanName) "$SemanticAttributes.DB_OPERATION"(operation ?: spanName)
"$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP }
// Because of caching, not all requests hit the server so these attributes may be absent // Because of caching, not all requests hit the server so these attributes may be absent
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null } "$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_NAME" { it == "localhost" || it == "127.0.0.1" || it == null } "$SemanticAttributes.NET_SOCK_PEER_NAME" { it == "localhost" || it == "127.0.0.1" || it == null }

4
instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/groovy/ElasticsearchRest5Test.groovy
View File

@ -79,7 +79,6 @@ class ElasticsearchRest5Test extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_SYSTEM" "elasticsearch" "$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GET" "$SemanticAttributes.DB_OPERATION" "GET"
"$SemanticAttributes.DB_STATEMENT" "GET _cluster/health" "$SemanticAttributes.DB_STATEMENT" "GET _cluster/health"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
} }
} }
span(1) { span(1) {
@ -87,7 +86,6 @@ class ElasticsearchRest5Test extends AgentInstrumentationSpecification {
kind CLIENT kind CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"$SemanticAttributes.NET_PEER_NAME" httpHost.hostName "$SemanticAttributes.NET_PEER_NAME" httpHost.hostName
"$SemanticAttributes.NET_PEER_PORT" httpHost.port "$SemanticAttributes.NET_PEER_PORT" httpHost.port
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"
@ -153,7 +151,6 @@ class ElasticsearchRest5Test extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_SYSTEM" "elasticsearch" "$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GET" "$SemanticAttributes.DB_OPERATION" "GET"
"$SemanticAttributes.DB_STATEMENT" "GET _cluster/health" "$SemanticAttributes.DB_STATEMENT" "GET _cluster/health"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
} }
} }
span(2) { span(2) {
@ -161,7 +158,6 @@ class ElasticsearchRest5Test extends AgentInstrumentationSpecification {
kind CLIENT kind CLIENT
childOf span(1) childOf span(1)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"$SemanticAttributes.NET_PEER_NAME" httpHost.hostName "$SemanticAttributes.NET_PEER_NAME" httpHost.hostName
"$SemanticAttributes.NET_PEER_PORT" httpHost.port "$SemanticAttributes.NET_PEER_PORT" httpHost.port
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"

4
instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/groovy/ElasticsearchRest6Test.groovy
View File

@ -73,7 +73,6 @@ class ElasticsearchRest6Test extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_SYSTEM" "elasticsearch" "$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GET" "$SemanticAttributes.DB_OPERATION" "GET"
"$SemanticAttributes.DB_STATEMENT" "GET _cluster/health" "$SemanticAttributes.DB_STATEMENT" "GET _cluster/health"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
} }
} }
span(1) { span(1) {
@ -81,7 +80,6 @@ class ElasticsearchRest6Test extends AgentInstrumentationSpecification {
kind CLIENT kind CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"$SemanticAttributes.NET_PEER_NAME" httpHost.hostName "$SemanticAttributes.NET_PEER_NAME" httpHost.hostName
"$SemanticAttributes.NET_PEER_PORT" httpHost.port "$SemanticAttributes.NET_PEER_PORT" httpHost.port
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"
@ -146,7 +144,6 @@ class ElasticsearchRest6Test extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_SYSTEM" "elasticsearch" "$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GET" "$SemanticAttributes.DB_OPERATION" "GET"
"$SemanticAttributes.DB_STATEMENT" "GET _cluster/health" "$SemanticAttributes.DB_STATEMENT" "GET _cluster/health"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
} }
} }
span(2) { span(2) {
@ -154,7 +151,6 @@ class ElasticsearchRest6Test extends AgentInstrumentationSpecification {
kind CLIENT kind CLIENT
childOf span(1) childOf span(1)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"$SemanticAttributes.NET_PEER_NAME" httpHost.hostName "$SemanticAttributes.NET_PEER_NAME" httpHost.hostName
"$SemanticAttributes.NET_PEER_PORT" httpHost.port "$SemanticAttributes.NET_PEER_PORT" httpHost.port
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"

4
instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/groovy/ElasticsearchRest7Test.groovy
View File

@ -72,7 +72,6 @@ class ElasticsearchRest7Test extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_SYSTEM" "elasticsearch" "$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GET" "$SemanticAttributes.DB_OPERATION" "GET"
"$SemanticAttributes.DB_STATEMENT" "GET _cluster/health" "$SemanticAttributes.DB_STATEMENT" "GET _cluster/health"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
} }
} }
span(1) { span(1) {
@ -80,7 +79,6 @@ class ElasticsearchRest7Test extends AgentInstrumentationSpecification {
kind CLIENT kind CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"$SemanticAttributes.NET_PEER_NAME" httpHost.hostName "$SemanticAttributes.NET_PEER_NAME" httpHost.hostName
"$SemanticAttributes.NET_PEER_PORT" httpHost.port "$SemanticAttributes.NET_PEER_PORT" httpHost.port
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"
@ -145,7 +143,6 @@ class ElasticsearchRest7Test extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_SYSTEM" "elasticsearch" "$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GET" "$SemanticAttributes.DB_OPERATION" "GET"
"$SemanticAttributes.DB_STATEMENT" "GET _cluster/health" "$SemanticAttributes.DB_STATEMENT" "GET _cluster/health"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
} }
} }
span(2) { span(2) {
@ -153,7 +150,6 @@ class ElasticsearchRest7Test extends AgentInstrumentationSpecification {
kind CLIENT kind CLIENT
childOf span(1) childOf span(1)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"$SemanticAttributes.NET_PEER_NAME" httpHost.hostName "$SemanticAttributes.NET_PEER_NAME" httpHost.hostName
"$SemanticAttributes.NET_PEER_PORT" httpHost.port "$SemanticAttributes.NET_PEER_PORT" httpHost.port
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"

6
instrumentation/elasticsearch/elasticsearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestNetResponseAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.elasticsearch.rest; package io.opentelemetry.javaagent.instrumentation.elasticsearch.rest;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.Inet6Address; import java.net.Inet6Address;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
@ -14,11 +13,6 @@ import org.elasticsearch.client.Response;
final class ElasticsearchRestNetResponseAttributesGetter final class ElasticsearchRestNetResponseAttributesGetter
implements NetClientAttributesGetter<ElasticsearchRestRequest, Response> { implements NetClientAttributesGetter<ElasticsearchRestRequest, Response> {
@Override
public String getTransport(ElasticsearchRestRequest request, Response response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
@Nullable @Nullable
public String getPeerName(ElasticsearchRestRequest request) { public String getPeerName(ElasticsearchRestRequest request) {

5
instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportNetAttributesGetter.java
View File

@ -13,11 +13,6 @@ import org.elasticsearch.action.ActionResponse;
public class Elasticsearch6TransportNetAttributesGetter public class Elasticsearch6TransportNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<ElasticTransportRequest, ActionResponse> { extends InetSocketAddressNetClientAttributesGetter<ElasticTransportRequest, ActionResponse> {
@Override
@Nullable
public String getTransport(ElasticTransportRequest request, @Nullable ActionResponse response) {
return null;
}
@Nullable @Nullable
@Override @Override

6
instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticTransportNetResponseAttributesGetter.java
View File

@ -12,12 +12,6 @@ import org.elasticsearch.action.ActionResponse;
public class ElasticTransportNetResponseAttributesGetter public class ElasticTransportNetResponseAttributesGetter
implements NetClientAttributesGetter<ElasticTransportRequest, ActionResponse> { implements NetClientAttributesGetter<ElasticTransportRequest, ActionResponse> {
@Override
@Nullable
public String getTransport(ElasticTransportRequest request, @Nullable ActionResponse response) {
return null;
}
@Override @Override
@Nullable @Nullable
public String getPeerName(ElasticTransportRequest request) { public String getPeerName(ElasticTransportRequest request) {

6
instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientNetAttributesGetter.java
View File

@ -8,17 +8,11 @@ package io.opentelemetry.javaagent.instrumentation.googlehttpclient;
import com.google.api.client.http.HttpRequest; import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpResponse; import com.google.api.client.http.HttpResponse;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
final class GoogleHttpClientNetAttributesGetter final class GoogleHttpClientNetAttributesGetter
implements NetClientAttributesGetter<HttpRequest, HttpResponse> { implements NetClientAttributesGetter<HttpRequest, HttpResponse> {
@Override
public String getTransport(HttpRequest request, @Nullable HttpResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
@Nullable @Nullable
public String getPeerName(HttpRequest request) { public String getPeerName(HttpRequest request) {

5
instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java
View File

@ -96,10 +96,7 @@ public abstract class AbstractGoogleHttpClientTest extends AbstractHttpClientTes
.hasAttributesSatisfying( .hasAttributesSatisfying(
attrs -> attrs ->
assertThat(attrs) assertThat(attrs)
.hasSize(7) .hasSize(6)
.containsEntry(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP)
.containsEntry(SemanticAttributes.NET_PEER_NAME, "localhost") .containsEntry(SemanticAttributes.NET_PEER_NAME, "localhost")
.hasEntrySatisfying( .hasEntrySatisfying(
SemanticAttributes.NET_PEER_PORT, SemanticAttributes.NET_PEER_PORT,

10
instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyNetAttributesGetter.java
View File

@ -10,14 +10,22 @@ import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTr
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.glassfish.grizzly.Transport;
import org.glassfish.grizzly.http.HttpRequestPacket; import org.glassfish.grizzly.http.HttpRequestPacket;
import org.glassfish.grizzly.nio.transport.TCPNIOTransport; import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
import org.glassfish.grizzly.nio.transport.UDPNIOTransport;
final class GrizzlyNetAttributesGetter implements NetServerAttributesGetter<HttpRequestPacket> { final class GrizzlyNetAttributesGetter implements NetServerAttributesGetter<HttpRequestPacket> {
@Override @Override
public String getTransport(HttpRequestPacket request) { public String getTransport(HttpRequestPacket request) {
return request.getConnection().getTransport() instanceof TCPNIOTransport ? IP_TCP : IP_UDP; Transport transport = request.getConnection().getTransport();
if (transport instanceof TCPNIOTransport) {
return IP_TCP;
} else if (transport instanceof UDPNIOTransport) {
return IP_UDP;
}
return null;
} }
@Nullable @Nullable

6
instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetClientAttributesGetter.java
View File

@ -8,7 +8,6 @@ package io.opentelemetry.instrumentation.grpc.v1_6.internal;
import io.grpc.Status; import io.grpc.Status;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.instrumentation.grpc.v1_6.GrpcRequest; import io.opentelemetry.instrumentation.grpc.v1_6.GrpcRequest;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -20,11 +19,6 @@ import javax.annotation.Nullable;
public final class GrpcNetClientAttributesGetter public final class GrpcNetClientAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<GrpcRequest, Status> { extends InetSocketAddressNetClientAttributesGetter<GrpcRequest, Status> {
@Override
public String getTransport(GrpcRequest request, @Nullable Status response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(GrpcRequest grpcRequest) { public String getPeerName(GrpcRequest grpcRequest) {

6
instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/internal/GrpcNetServerAttributesGetter.java
View File

@ -7,7 +7,6 @@ package io.opentelemetry.instrumentation.grpc.v1_6.internal;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetServerAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetServerAttributesGetter;
import io.opentelemetry.instrumentation.grpc.v1_6.GrpcRequest; import io.opentelemetry.instrumentation.grpc.v1_6.GrpcRequest;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -19,11 +18,6 @@ import javax.annotation.Nullable;
public final class GrpcNetServerAttributesGetter public final class GrpcNetServerAttributesGetter
extends InetSocketAddressNetServerAttributesGetter<GrpcRequest> { extends InetSocketAddressNetServerAttributesGetter<GrpcRequest> {
@Override
public String getTransport(GrpcRequest request) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getHostName(GrpcRequest grpcRequest) { public String getHostName(GrpcRequest grpcRequest) {

8
instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java
View File

@ -180,9 +180,6 @@ public abstract class AbstractGrpcStreamingTest {
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"),
equalTo(SemanticAttributes.RPC_METHOD, "Conversation"), equalTo(SemanticAttributes.RPC_METHOD, "Conversation"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
@ -201,9 +198,6 @@ public abstract class AbstractGrpcStreamingTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
@ -225,7 +219,6 @@ public abstract class AbstractGrpcStreamingTest {
histogram.hasPointsSatisfying( histogram.hasPointsSatisfying(
point -> point ->
point.hasAttributesSatisfying( point.hasAttributesSatisfying(
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo( equalTo(
SemanticAttributes.NET_HOST_NAME, "localhost"), SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo( equalTo(
@ -256,7 +249,6 @@ public abstract class AbstractGrpcStreamingTest {
equalTo( equalTo(
SemanticAttributes.NET_PEER_PORT, SemanticAttributes.NET_PEER_PORT,
server.getPort()), server.getPort()),
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo( equalTo(
SemanticAttributes.RPC_METHOD, "Conversation"), SemanticAttributes.RPC_METHOD, "Conversation"),
equalTo( equalTo(

64
instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java
View File

@ -136,9 +136,6 @@ public abstract class AbstractGrpcTest {
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
@ -179,9 +176,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
@ -226,7 +220,6 @@ public abstract class AbstractGrpcTest {
histogram.hasPointsSatisfying( histogram.hasPointsSatisfying(
point -> point ->
point.hasAttributesSatisfying( point.hasAttributesSatisfying(
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo( equalTo(
SemanticAttributes.NET_HOST_NAME, "localhost"), SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
@ -256,7 +249,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.NET_PEER_PORT, SemanticAttributes.NET_PEER_PORT,
server.getPort()), server.getPort()),
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
@ -326,9 +318,6 @@ public abstract class AbstractGrpcTest {
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
@ -369,9 +358,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
@ -419,7 +405,6 @@ public abstract class AbstractGrpcTest {
histogram.hasPointsSatisfying( histogram.hasPointsSatisfying(
point -> point ->
point.hasAttributesSatisfying( point.hasAttributesSatisfying(
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo( equalTo(
SemanticAttributes.NET_HOST_NAME, "localhost"), SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
@ -449,7 +434,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.NET_PEER_PORT, SemanticAttributes.NET_PEER_PORT,
server.getPort()), server.getPort()),
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
@ -527,9 +511,6 @@ public abstract class AbstractGrpcTest {
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
@ -570,9 +551,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
@ -620,7 +598,6 @@ public abstract class AbstractGrpcTest {
histogram.hasPointsSatisfying( histogram.hasPointsSatisfying(
point -> point ->
point.hasAttributesSatisfying( point.hasAttributesSatisfying(
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo( equalTo(
SemanticAttributes.NET_HOST_NAME, "localhost"), SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
@ -650,7 +627,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.NET_PEER_PORT, SemanticAttributes.NET_PEER_PORT,
server.getPort()), server.getPort()),
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
@ -702,9 +678,6 @@ public abstract class AbstractGrpcTest {
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) status.getCode().value()), (long) status.getCode().value()),
@ -735,9 +708,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) status.getCode().value()), (long) status.getCode().value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
@ -778,7 +748,6 @@ public abstract class AbstractGrpcTest {
histogram.hasPointsSatisfying( histogram.hasPointsSatisfying(
point -> point ->
point.hasAttributesSatisfying( point.hasAttributesSatisfying(
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo( equalTo(
SemanticAttributes.NET_HOST_NAME, "localhost"), SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
@ -808,7 +777,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.NET_PEER_PORT, SemanticAttributes.NET_PEER_PORT,
server.getPort()), server.getPort()),
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
@ -866,9 +834,6 @@ public abstract class AbstractGrpcTest {
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.UNKNOWN.getCode().value()), (long) Status.UNKNOWN.getCode().value()),
@ -899,9 +864,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.UNKNOWN.value()), (long) Status.Code.UNKNOWN.value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
@ -937,7 +899,6 @@ public abstract class AbstractGrpcTest {
histogram.hasPointsSatisfying( histogram.hasPointsSatisfying(
point -> point ->
point.hasAttributesSatisfying( point.hasAttributesSatisfying(
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo( equalTo(
SemanticAttributes.NET_HOST_NAME, "localhost"), SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
@ -967,7 +928,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.NET_PEER_PORT, SemanticAttributes.NET_PEER_PORT,
server.getPort()), server.getPort()),
equalTo(SemanticAttributes.NET_TRANSPORT, "ip_tcp"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo( equalTo(
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
@ -1121,9 +1081,6 @@ public abstract class AbstractGrpcTest {
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
@ -1164,9 +1121,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
@ -1265,9 +1219,6 @@ public abstract class AbstractGrpcTest {
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"),
equalTo(SemanticAttributes.RPC_METHOD, "SayMultipleHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayMultipleHello"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.CANCELLED.value()), (long) Status.Code.CANCELLED.value()),
@ -1309,9 +1260,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.CANCELLED.value()), (long) Status.Code.CANCELLED.value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
@ -1408,9 +1356,6 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_SERVICE,
"grpc.reflection.v1alpha.ServerReflection"), "grpc.reflection.v1alpha.ServerReflection"),
equalTo(SemanticAttributes.RPC_METHOD, "ServerReflectionInfo"), equalTo(SemanticAttributes.RPC_METHOD, "ServerReflectionInfo"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
@ -1454,9 +1399,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
@ -1539,9 +1481,6 @@ public abstract class AbstractGrpcTest {
equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"),
equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"),
equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
@ -1582,9 +1521,6 @@ public abstract class AbstractGrpcTest {
equalTo( equalTo(
SemanticAttributes.RPC_GRPC_STATUS_CODE, SemanticAttributes.RPC_GRPC_STATUS_CODE,
(long) Status.Code.OK.value()), (long) Status.Code.OK.value()),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()), equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),

7
instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlNetAttributesGetter.java
View File

@ -6,18 +6,11 @@
package io.opentelemetry.javaagent.instrumentation.httpurlconnection; package io.opentelemetry.javaagent.instrumentation.httpurlconnection;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import javax.annotation.Nullable; import javax.annotation.Nullable;
class HttpUrlNetAttributesGetter implements NetClientAttributesGetter<HttpURLConnection, Integer> { class HttpUrlNetAttributesGetter implements NetClientAttributesGetter<HttpURLConnection, Integer> {
@Override
@Nullable
public String getTransport(HttpURLConnection connection, @Nullable Integer status) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(HttpURLConnection connection, @Nullable Integer integer) { public String getProtocolName(HttpURLConnection connection, @Nullable Integer integer) {

6
instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java
View File

@ -11,7 +11,6 @@ import static io.opentelemetry.api.trace.SpanKind.SERVER;
import static io.opentelemetry.javaagent.instrumentation.httpurlconnection.StreamUtils.readLines; import static io.opentelemetry.javaagent.instrumentation.httpurlconnection.StreamUtils.readLines;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span;
@ -136,7 +135,6 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest<HttpURLConnection> {
.hasKind(CLIENT) .hasKind(CLIENT)
.hasParent(trace.getSpan(0)) .hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(stringKey("net.protocol.name"), "http"), equalTo(stringKey("net.protocol.name"), "http"),
equalTo(stringKey("net.protocol.version"), "1.1"), equalTo(stringKey("net.protocol.version"), "1.1"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
@ -154,7 +152,6 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest<HttpURLConnection> {
.hasKind(CLIENT) .hasKind(CLIENT)
.hasParent(trace.getSpan(0)) .hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(stringKey("net.protocol.name"), "http"), equalTo(stringKey("net.protocol.name"), "http"),
equalTo(stringKey("net.protocol.version"), "1.1"), equalTo(stringKey("net.protocol.version"), "1.1"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
@ -193,7 +190,6 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest<HttpURLConnection> {
.hasKind(CLIENT) .hasKind(CLIENT)
.hasParent(trace.getSpan(0)) .hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(stringKey("net.protocol.name"), "http"), equalTo(stringKey("net.protocol.name"), "http"),
equalTo(stringKey("net.protocol.version"), "1.1"), equalTo(stringKey("net.protocol.version"), "1.1"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
@ -245,7 +241,6 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest<HttpURLConnection> {
.hasKind(CLIENT) .hasKind(CLIENT)
.hasParent(trace.getSpan(0)) .hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(stringKey("net.protocol.name"), "http"), equalTo(stringKey("net.protocol.name"), "http"),
equalTo(stringKey("net.protocol.version"), "1.1"), equalTo(stringKey("net.protocol.version"), "1.1"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
@ -302,7 +297,6 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest<HttpURLConnection> {
.hasKind(CLIENT) .hasKind(CLIENT)
.hasParent(trace.getSpan(0)) .hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(stringKey("net.protocol.name"), "http"), equalTo(stringKey("net.protocol.name"), "http"),
equalTo(stringKey("net.protocol.version"), "1.1"), equalTo(stringKey("net.protocol.version"), "1.1"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),

2
instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/UrlConnectionTest.java
View File

@ -9,7 +9,6 @@ import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.CLIENT;
import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.Assertions.catchThrowable;
@ -65,7 +64,6 @@ class UrlConnectionTest {
.hasStatus(StatusData.error()) .hasStatus(StatusData.error())
.hasException(thrown) .hasException(thrown)
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(stringKey("net.protocol.name"), "http"), equalTo(stringKey("net.protocol.name"), "http"),
equalTo(stringKey("net.protocol.version"), "1.1"), equalTo(stringKey("net.protocol.version"), "1.1"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),

6
instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/internal/JavaHttpClientNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.httpclient.internal; package io.opentelemetry.instrumentation.httpclient.internal;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.http.HttpClient; import java.net.http.HttpClient;
import java.net.http.HttpRequest; import java.net.http.HttpRequest;
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
@ -19,11 +18,6 @@ import javax.annotation.Nullable;
public class JavaHttpClientNetAttributesGetter public class JavaHttpClientNetAttributesGetter
implements NetClientAttributesGetter<HttpRequest, HttpResponse<?>> { implements NetClientAttributesGetter<HttpRequest, HttpResponse<?>> {
@Override
public String getTransport(HttpRequest request, @Nullable HttpResponse<?> response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(HttpRequest request, @Nullable HttpResponse<?> response) { public String getProtocolName(HttpRequest request, @Nullable HttpResponse<?> response) {

6
instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientNetAttributesGetter.java
View File

@ -8,17 +8,11 @@ package io.opentelemetry.javaagent.instrumentation.jaxrsclient.v1_1;
import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientRequest;
import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
final class JaxRsClientNetAttributesGetter final class JaxRsClientNetAttributesGetter
implements NetClientAttributesGetter<ClientRequest, ClientResponse> { implements NetClientAttributesGetter<ClientRequest, ClientResponse> {
@Override
public String getTransport(ClientRequest request, @Nullable ClientResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
@Nullable @Nullable
public String getPeerName(ClientRequest request) { public String getPeerName(ClientRequest request) {

2
instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy
View File

@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.StatusCode.ERROR import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
abstract class JaxRsClientTest extends HttpClientTest<Invocation.Builder> implements AgentTestTrait { abstract class JaxRsClientTest extends HttpClientTest<Invocation.Builder> implements AgentTestTrait {
@ -108,7 +107,6 @@ abstract class JaxRsClientTest extends HttpClientTest<Invocation.Builder> implem
kind CLIENT kind CLIENT
status ERROR status ERROR
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_PEER_NAME" uri.host "$SemanticAttributes.NET_PEER_NAME" uri.host

2
instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy
View File

@ -19,7 +19,6 @@ import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.PATH_PARAM import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.PATH_PARAM
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
import static java.util.concurrent.TimeUnit.SECONDS import static java.util.concurrent.TimeUnit.SECONDS
import static org.junit.jupiter.api.Assumptions.assumeTrue import static org.junit.jupiter.api.Assumptions.assumeTrue
@ -293,7 +292,6 @@ abstract class AbstractJaxRsHttpServerTest<S> extends HttpServerTest<S> implemen
"$SemanticAttributes.HTTP_STATUS_CODE" statusCode "$SemanticAttributes.HTTP_STATUS_CODE" statusCode
"$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT
"$SemanticAttributes.HTTP_CLIENT_IP" TEST_CLIENT_IP "$SemanticAttributes.HTTP_CLIENT_IP" TEST_CLIENT_IP
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
// Optional // Optional
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_ROUTE" path "$SemanticAttributes.HTTP_ROUTE" path

6
instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcNetAttributesGetter.java
View File

@ -14,12 +14,6 @@ import javax.annotation.Nullable;
*/ */
public final class JdbcNetAttributesGetter implements NetClientAttributesGetter<DbRequest, Void> { public final class JdbcNetAttributesGetter implements NetClientAttributesGetter<DbRequest, Void> {
@Nullable
@Override
public String getTransport(DbRequest request, @Nullable Void unused) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(DbRequest request) { public String getPeerName(DbRequest request) {

7
instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisNetAttributesGetter.java
View File

@ -6,16 +6,9 @@
package io.opentelemetry.javaagent.instrumentation.jedis.v1_4; package io.opentelemetry.javaagent.instrumentation.jedis.v1_4;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import javax.annotation.Nullable;
final class JedisNetAttributesGetter implements NetClientAttributesGetter<JedisRequest, Void> { final class JedisNetAttributesGetter implements NetClientAttributesGetter<JedisRequest, Void> {
@Override
@Nullable
public String getTransport(JedisRequest request, @Nullable Void unused) {
return null;
}
@Override @Override
public String getPeerName(JedisRequest request) { public String getPeerName(JedisRequest request) {
return request.getConnection().getHost(); return request.getConnection().getHost();

6
instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.jedis.v3_0; package io.opentelemetry.javaagent.instrumentation.jedis.v3_0;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.Socket; import java.net.Socket;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -14,11 +13,6 @@ import javax.annotation.Nullable;
final class JedisNetAttributesGetter final class JedisNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<JedisRequest, Void> { extends InetSocketAddressNetClientAttributesGetter<JedisRequest, Void> {
@Override
public String getTransport(JedisRequest jedisRequest, @Nullable Void unused) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(JedisRequest jedisRequest) { public String getPeerName(JedisRequest jedisRequest) {

25
instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java
View File

@ -66,10 +66,7 @@ class Jedis30ClientTest {
equalTo(SemanticAttributes.DB_OPERATION, "SET"), equalTo(SemanticAttributes.DB_OPERATION, "SET"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, port), equalTo(SemanticAttributes.NET_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"))));
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP))));
} }
@Test @Test
@ -91,10 +88,7 @@ class Jedis30ClientTest {
equalTo(SemanticAttributes.DB_OPERATION, "SET"), equalTo(SemanticAttributes.DB_OPERATION, "SET"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, port), equalTo(SemanticAttributes.NET_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"))),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP))),
trace -> trace ->
trace.hasSpansSatisfyingExactly( trace.hasSpansSatisfyingExactly(
span -> span ->
@ -106,10 +100,7 @@ class Jedis30ClientTest {
equalTo(SemanticAttributes.DB_OPERATION, "GET"), equalTo(SemanticAttributes.DB_OPERATION, "GET"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, port), equalTo(SemanticAttributes.NET_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"))));
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP))));
} }
@Test @Test
@ -131,10 +122,7 @@ class Jedis30ClientTest {
equalTo(SemanticAttributes.DB_OPERATION, "SET"), equalTo(SemanticAttributes.DB_OPERATION, "SET"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, port), equalTo(SemanticAttributes.NET_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"))),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP))),
trace -> trace ->
trace.hasSpansSatisfyingExactly( trace.hasSpansSatisfyingExactly(
span -> span ->
@ -146,9 +134,6 @@ class Jedis30ClientTest {
equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"), equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, port), equalTo(SemanticAttributes.NET_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"))));
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP))));
} }
} }

6
instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.jedis.v4_0; package io.opentelemetry.javaagent.instrumentation.jedis.v4_0;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -14,11 +13,6 @@ import javax.annotation.Nullable;
final class JedisNetAttributesGetter final class JedisNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<JedisRequest, Void> { extends InetSocketAddressNetClientAttributesGetter<JedisRequest, Void> {
@Override
public String getTransport(JedisRequest jedisRequest, @Nullable Void unused) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(JedisRequest jedisRequest) { public String getPeerName(JedisRequest jedisRequest) {

15
instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java
View File

@ -65,9 +65,6 @@ class Jedis40ClientTest {
equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_SYSTEM, "redis"),
equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"),
equalTo(SemanticAttributes.DB_OPERATION, "SET"), equalTo(SemanticAttributes.DB_OPERATION, "SET"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port), equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies( satisfies(
@ -92,9 +89,6 @@ class Jedis40ClientTest {
equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_SYSTEM, "redis"),
equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"),
equalTo(SemanticAttributes.DB_OPERATION, "SET"), equalTo(SemanticAttributes.DB_OPERATION, "SET"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port), equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies( satisfies(
@ -109,9 +103,6 @@ class Jedis40ClientTest {
equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_SYSTEM, "redis"),
equalTo(SemanticAttributes.DB_STATEMENT, "GET foo"), equalTo(SemanticAttributes.DB_STATEMENT, "GET foo"),
equalTo(SemanticAttributes.DB_OPERATION, "GET"), equalTo(SemanticAttributes.DB_OPERATION, "GET"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port), equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies( satisfies(
@ -136,9 +127,6 @@ class Jedis40ClientTest {
equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_SYSTEM, "redis"),
equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"),
equalTo(SemanticAttributes.DB_OPERATION, "SET"), equalTo(SemanticAttributes.DB_OPERATION, "SET"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port), equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies( satisfies(
@ -153,9 +141,6 @@ class Jedis40ClientTest {
equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_SYSTEM, "redis"),
equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"),
equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"), equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port), equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, port),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies( satisfies(

6
instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClientNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal; package io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Response;
@ -19,11 +18,6 @@ import org.eclipse.jetty.http.HttpVersion;
public class JettyHttpClientNetAttributesGetter public class JettyHttpClientNetAttributesGetter
implements NetClientAttributesGetter<Request, Response> { implements NetClientAttributesGetter<Request, Response> {
@Override
public String getTransport(Request request, @Nullable Response response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(Request request, @Nullable Response response) { public String getProtocolName(Request request, @Nullable Response response) {

6
instrumentation/jodd-http-4.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.joddhttp.v4_2; package io.opentelemetry.javaagent.instrumentation.joddhttp.v4_2;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import jodd.http.HttpRequest; import jodd.http.HttpRequest;
import jodd.http.HttpResponse; import jodd.http.HttpResponse;
@ -14,11 +13,6 @@ import jodd.http.HttpResponse;
final class JoddHttpNetAttributesGetter final class JoddHttpNetAttributesGetter
implements NetClientAttributesGetter<HttpRequest, HttpResponse> { implements NetClientAttributesGetter<HttpRequest, HttpResponse> {
@Override
public String getTransport(HttpRequest request, @Nullable HttpResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getProtocolName(HttpRequest request, @Nullable HttpResponse response) { public String getProtocolName(HttpRequest request, @Nullable HttpResponse response) {
return "http"; return "http";

1
instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy
View File

@ -86,7 +86,6 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements
kind SpanKind.SERVER kind SpanKind.SERVER
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"

1
instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy
View File

@ -97,7 +97,6 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements
kind SpanKind.SERVER kind SpanKind.SERVER
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"

9
instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy
View File

@ -21,7 +21,6 @@ import java.nio.file.Files
import static io.opentelemetry.api.trace.SpanKind.SERVER import static io.opentelemetry.api.trace.SpanKind.SERVER
import static io.opentelemetry.api.trace.StatusCode.ERROR import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
//TODO should this be HttpServerTest? //TODO should this be HttpServerTest?
class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
@ -97,7 +96,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -156,7 +154,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -212,7 +209,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" Long
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -276,7 +272,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 500 "$SemanticAttributes.HTTP_STATUS_CODE" 500
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -345,7 +340,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -395,7 +389,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -477,7 +470,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 500 "$SemanticAttributes.HTTP_STATUS_CODE" 500
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -528,7 +520,6 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"

7
instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy
View File

@ -19,7 +19,6 @@ import java.nio.file.Files
import static io.opentelemetry.api.trace.SpanKind.SERVER import static io.opentelemetry.api.trace.SpanKind.SERVER
import static io.opentelemetry.api.trace.StatusCode.ERROR import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.api.trace.StatusCode.UNSET import static io.opentelemetry.api.trace.StatusCode.UNSET
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
@ -94,7 +93,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -165,7 +163,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -215,7 +212,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -313,7 +309,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -397,7 +392,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 500 "$SemanticAttributes.HTTP_STATUS_CODE" 500
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"
@ -460,7 +454,6 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_STATUS_CODE" 404 "$SemanticAttributes.HTTP_STATUS_CODE" 404
"$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String
"$SemanticAttributes.HTTP_ROUTE" route "$SemanticAttributes.HTTP_ROUTE" route
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_NAME" "localhost"

4
instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorNetServerAttributesGetter.kt
View File

@ -8,12 +8,8 @@ package io.opentelemetry.instrumentation.ktor.v1_0
import io.ktor.request.* import io.ktor.request.*
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter
import io.opentelemetry.instrumentation.ktor.isIpAddress import io.opentelemetry.instrumentation.ktor.isIpAddress
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
internal class KtorNetServerAttributesGetter : NetServerAttributesGetter<ApplicationRequest> { internal class KtorNetServerAttributesGetter : NetServerAttributesGetter<ApplicationRequest> {
override fun getTransport(request: ApplicationRequest): String {
return SemanticAttributes.NetTransportValues.IP_TCP
}
override fun getProtocolName(request: ApplicationRequest): String? = override fun getProtocolName(request: ApplicationRequest): String? =
if (request.httpVersion.startsWith("HTTP/")) "http" else null if (request.httpVersion.startsWith("HTTP/")) "http" else null

3
instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorNetClientAttributesGetter.kt
View File

@ -8,12 +8,9 @@ package io.opentelemetry.instrumentation.ktor.v2_0.client
import io.ktor.client.request.* import io.ktor.client.request.*
import io.ktor.client.statement.* import io.ktor.client.statement.*
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
internal object KtorNetClientAttributesGetter : NetClientAttributesGetter<HttpRequestData, HttpResponse> { internal object KtorNetClientAttributesGetter : NetClientAttributesGetter<HttpRequestData, HttpResponse> {
override fun getTransport(request: HttpRequestData, response: HttpResponse?) = IP_TCP
override fun getProtocolName(request: HttpRequestData?, response: HttpResponse?): String? = override fun getProtocolName(request: HttpRequestData?, response: HttpResponse?): String? =
response?.version?.name response?.version?.name

4
instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorNetServerAttributesGetter.kt
View File

@ -8,12 +8,8 @@ package io.opentelemetry.instrumentation.ktor.v2_0.server
import io.ktor.server.request.* import io.ktor.server.request.*
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter
import io.opentelemetry.instrumentation.ktor.isIpAddress import io.opentelemetry.instrumentation.ktor.isIpAddress
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
internal class KtorNetServerAttributesGetter : NetServerAttributesGetter<ApplicationRequest> { internal class KtorNetServerAttributesGetter : NetServerAttributesGetter<ApplicationRequest> {
override fun getTransport(request: ApplicationRequest): String {
return SemanticAttributes.NetTransportValues.IP_TCP
}
override fun getProtocolName(request: ApplicationRequest): String? = override fun getProtocolName(request: ApplicationRequest): String? =
if (request.httpVersion.startsWith("HTTP/")) "http" else null if (request.httpVersion.startsWith("HTTP/")) "http" else null

7
instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesNetAttributesGetter.java
View File

@ -7,17 +7,10 @@ package io.opentelemetry.javaagent.instrumentation.kubernetesclient;
import io.kubernetes.client.openapi.ApiResponse; import io.kubernetes.client.openapi.ApiResponse;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable;
import okhttp3.Request; import okhttp3.Request;
class KubernetesNetAttributesGetter implements NetClientAttributesGetter<Request, ApiResponse<?>> { class KubernetesNetAttributesGetter implements NetClientAttributesGetter<Request, ApiResponse<?>> {
@Override
public String getTransport(Request request, @Nullable ApiResponse<?> response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
public String getPeerName(Request request) { public String getPeerName(Request request) {
return request.url().host(); return request.url().host();

2
instrumentation/kubernetes-client-7.0/javaagent/src/test/groovy/KubernetesClientTest.groovy
View File

@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicReference
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.StatusCode.ERROR import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
class KubernetesClientTest extends AgentInstrumentationSpecification { class KubernetesClientTest extends AgentInstrumentationSpecification {
private static final String TEST_USER_AGENT = "test-user-agent" private static final String TEST_USER_AGENT = "test-user-agent"
@ -198,7 +197,6 @@ class KubernetesClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.HTTP_METHOD" "GET" "$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT
"$SemanticAttributes.HTTP_STATUS_CODE" statusCode "$SemanticAttributes.HTTP_STATUS_CODE" statusCode
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" "127.0.0.1" "$SemanticAttributes.NET_PEER_NAME" "127.0.0.1"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_PORT" server.httpPort()
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long

7
instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectNetAttributesGetter.java
View File

@ -7,16 +7,9 @@ package io.opentelemetry.javaagent.instrumentation.lettuce.v4_0;
import com.lambdaworks.redis.RedisURI; import com.lambdaworks.redis.RedisURI;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import javax.annotation.Nullable;
final class LettuceConnectNetAttributesGetter implements NetClientAttributesGetter<RedisURI, Void> { final class LettuceConnectNetAttributesGetter implements NetClientAttributesGetter<RedisURI, Void> {
@Override
@Nullable
public String getTransport(RedisURI redisUri, @Nullable Void unused) {
return null;
}
@Override @Override
public String getPeerName(RedisURI redisUri) { public String getPeerName(RedisURI redisUri) {
return redisUri.getHost(); return redisUri.getHost();

7
instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectNetAttributesGetter.java
View File

@ -7,16 +7,9 @@ package io.opentelemetry.javaagent.instrumentation.lettuce.v5_0;
import io.lettuce.core.RedisURI; import io.lettuce.core.RedisURI;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import javax.annotation.Nullable;
final class LettuceConnectNetAttributesGetter implements NetClientAttributesGetter<RedisURI, Void> { final class LettuceConnectNetAttributesGetter implements NetClientAttributesGetter<RedisURI, Void> {
@Override
@Nullable
public String getTransport(RedisURI redisUri, @Nullable Void unused) {
return null;
}
@Override @Override
public String getPeerName(RedisURI redisUri) { public String getPeerName(RedisURI redisUri) {
return redisUri.getHost(); return redisUri.getHost();

4
instrumentation/lettuce/lettuce-5.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.groovy
View File

@ -12,8 +12,6 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import reactor.core.scheduler.Schedulers import reactor.core.scheduler.Schedulers
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest implements AgentTestTrait { class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest implements AgentTestTrait {
@Override @Override
RedisClient createClient(String uri) { RedisClient createClient(String uri) {
@ -44,7 +42,6 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest implem
kind SpanKind.CLIENT kind SpanKind.CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -63,7 +60,6 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest implem
kind SpanKind.CLIENT kind SpanKind.CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port

7
instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceNetAttributesGetter.java
View File

@ -5,8 +5,6 @@
package io.opentelemetry.instrumentation.lettuce.v5_1; package io.opentelemetry.instrumentation.lettuce.v5_1;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.instrumentation.lettuce.v5_1.OpenTelemetryTracing.OpenTelemetryEndpoint; import io.opentelemetry.instrumentation.lettuce.v5_1.OpenTelemetryTracing.OpenTelemetryEndpoint;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
@ -15,11 +13,6 @@ import javax.annotation.Nullable;
final class LettuceNetAttributesGetter final class LettuceNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<OpenTelemetryEndpoint, Void> { extends InetSocketAddressNetClientAttributesGetter<OpenTelemetryEndpoint, Void> {
@Override
public String getTransport(OpenTelemetryEndpoint endpoint, @Nullable Void unused) {
return IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(OpenTelemetryEndpoint openTelemetryEndpoint) { public String getPeerName(OpenTelemetryEndpoint openTelemetryEndpoint) {

7
instrumentation/lettuce/lettuce-5.1/testing/src/main/groovy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.groovy
View File

@ -29,7 +29,6 @@ import java.util.function.Function
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.SpanKind.INTERNAL
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecification { abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecification {
public static final int DB_INDEX = 0 public static final int DB_INDEX = 0
@ -159,7 +158,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
name "SET" name "SET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -210,7 +208,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
name "GET" name "GET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -285,7 +282,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
kind CLIENT kind CLIENT
childOf(span(0)) childOf(span(0))
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -349,7 +345,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
kind CLIENT kind CLIENT
childOf(span(0)) childOf(span(0))
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -416,7 +411,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
name "HMSET" name "HMSET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -436,7 +430,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
name "HGETALL" name "HGETALL"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port

10
instrumentation/lettuce/lettuce-5.1/testing/src/main/groovy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.groovy
View File

@ -19,7 +19,6 @@ import java.util.function.Consumer
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.api.trace.SpanKind.INTERNAL
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecification { abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecification {
public static final int DB_INDEX = 0 public static final int DB_INDEX = 0
@ -101,7 +100,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
kind CLIENT kind CLIENT
childOf(span(0)) childOf(span(0))
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -139,7 +137,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
name "GET" name "GET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -190,7 +187,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
kind CLIENT kind CLIENT
childOf(span(0)) childOf(span(0))
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -234,7 +230,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
name "RANDOMKEY" name "RANDOMKEY"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -263,7 +258,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
name "COMMAND" name "COMMAND"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -311,7 +305,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
kind CLIENT kind CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -330,7 +323,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
kind CLIENT kind CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -369,7 +361,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
kind CLIENT kind CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -388,7 +379,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
kind CLIENT kind CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port

2
instrumentation/lettuce/lettuce-5.1/testing/src/main/groovy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.groovy
View File

@ -12,7 +12,6 @@ import org.testcontainers.containers.GenericContainer
import spock.lang.Shared import spock.lang.Shared
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
abstract class AbstractLettuceSyncClientAuthTest extends InstrumentationSpecification { abstract class AbstractLettuceSyncClientAuthTest extends InstrumentationSpecification {
public static final int DB_INDEX = 0 public static final int DB_INDEX = 0
@ -67,7 +66,6 @@ abstract class AbstractLettuceSyncClientAuthTest extends InstrumentationSpecific
name "AUTH" name "AUTH"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port

13
instrumentation/lettuce/lettuce-5.1/testing/src/main/groovy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.groovy
View File

@ -19,7 +19,6 @@ import spock.lang.Shared
import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.StatusCode.ERROR import static io.opentelemetry.api.trace.StatusCode.ERROR
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
import static java.nio.charset.StandardCharsets.UTF_8 import static java.nio.charset.StandardCharsets.UTF_8
abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecification { abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecification {
@ -123,7 +122,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "SET" name "SET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -156,7 +154,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "SET" name "SET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -190,7 +187,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "GET" name "GET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -220,7 +216,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "GET" name "GET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -250,7 +245,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "RANDOMKEY" name "RANDOMKEY"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -280,7 +274,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "LPUSH" name "LPUSH"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -310,7 +303,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "HMSET" name "HMSET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -340,7 +332,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "HGETALL" name "HGETALL"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -375,7 +366,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "EVAL" name "EVAL"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -409,7 +399,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
name "MSET" name "MSET"
kind CLIENT kind CLIENT
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -439,7 +428,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT kind CLIENT
// Disconnect not an actual error even though an exception is recorded. // Disconnect not an actual error even though an exception is recorded.
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port
@ -475,7 +463,6 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
status ERROR status ERROR
} }
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue "$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port "$SemanticAttributes.NET_SOCK_PEER_PORT" port

6
instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java
View File

@ -6,17 +6,11 @@
package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher; package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class LibertyDispatcherNetAttributesGetter public class LibertyDispatcherNetAttributesGetter
implements NetServerAttributesGetter<LibertyRequest> { implements NetServerAttributesGetter<LibertyRequest> {
@Override
public String getTransport(LibertyRequest request) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(LibertyRequest request) { public String getProtocolName(LibertyRequest request) {

6
instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoNetAttributesGetter.java
View File

@ -11,12 +11,6 @@ import javax.annotation.Nullable;
class MongoNetAttributesGetter implements NetClientAttributesGetter<CommandStartedEvent, Void> { class MongoNetAttributesGetter implements NetClientAttributesGetter<CommandStartedEvent, Void> {
@Override
@Nullable
public String getTransport(CommandStartedEvent event, @Nullable Void unused) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(CommandStartedEvent event) { public String getPeerName(CommandStartedEvent event) {

6
instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2NetAttributesGetter.java
View File

@ -8,17 +8,11 @@ package io.opentelemetry.javaagent.instrumentation.okhttp.v2_2;
import com.squareup.okhttp.Request; import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response; import com.squareup.okhttp.Response;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public final class OkHttp2NetAttributesGetter public final class OkHttp2NetAttributesGetter
implements NetClientAttributesGetter<Request, Response> { implements NetClientAttributesGetter<Request, Response> {
@Override
public String getTransport(Request request, @Nullable Response response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(Request request, @Nullable Response response) { public String getProtocolName(Request request, @Nullable Response response) {

6
instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/internal/OkHttpNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.okhttp.v3_0.internal; package io.opentelemetry.instrumentation.okhttp.v3_0.internal;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
@ -18,11 +17,6 @@ import okhttp3.Response;
public final class OkHttpNetAttributesGetter public final class OkHttpNetAttributesGetter
implements NetClientAttributesGetter<Request, Response> { implements NetClientAttributesGetter<Request, Response> {
@Override
public String getTransport(Request request, @Nullable Response response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(Request request, @Nullable Response response) { public String getProtocolName(Request request, @Nullable Response response) {

16
instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java
View File

@ -92,18 +92,12 @@ public class OpenSearchRestTest {
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.DB_SYSTEM, "opensearch"), equalTo(SemanticAttributes.DB_SYSTEM, "opensearch"),
equalTo(SemanticAttributes.DB_OPERATION, "GET"), equalTo(SemanticAttributes.DB_OPERATION, "GET"),
equalTo(SemanticAttributes.DB_STATEMENT, "GET _cluster/health"), equalTo(SemanticAttributes.DB_STATEMENT, "GET _cluster/health")),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP)),
span -> span ->
span.hasName("GET") span.hasName("GET")
.hasKind(SpanKind.CLIENT) .hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0)) .hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(stringKey("net.protocol.name"), "http"), equalTo(stringKey("net.protocol.name"), "http"),
equalTo(stringKey("net.protocol.version"), "1.1"), equalTo(stringKey("net.protocol.version"), "1.1"),
equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()),
@ -166,18 +160,12 @@ public class OpenSearchRestTest {
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.DB_SYSTEM, "opensearch"), equalTo(SemanticAttributes.DB_SYSTEM, "opensearch"),
equalTo(SemanticAttributes.DB_OPERATION, "GET"), equalTo(SemanticAttributes.DB_OPERATION, "GET"),
equalTo(SemanticAttributes.DB_STATEMENT, "GET _cluster/health"), equalTo(SemanticAttributes.DB_STATEMENT, "GET _cluster/health")),
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP)),
span -> span ->
span.hasName("GET") span.hasName("GET")
.hasKind(SpanKind.CLIENT) .hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(1)) .hasParent(trace.getSpan(1))
.hasAttributesSatisfyingExactly( .hasAttributesSatisfyingExactly(
equalTo(
SemanticAttributes.NET_TRANSPORT,
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(stringKey("net.protocol.name"), "http"), equalTo(stringKey("net.protocol.name"), "http"),
equalTo(stringKey("net.protocol.version"), "1.1"), equalTo(stringKey("net.protocol.version"), "1.1"),
equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()),

6
instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestNetResponseAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.opensearch.rest; package io.opentelemetry.javaagent.instrumentation.opensearch.rest;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.Inet6Address; import java.net.Inet6Address;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.opensearch.client.Response; import org.opensearch.client.Response;
@ -14,11 +13,6 @@ import org.opensearch.client.Response;
final class OpenSearchRestNetResponseAttributesGetter final class OpenSearchRestNetResponseAttributesGetter
implements NetClientAttributesGetter<OpenSearchRestRequest, Response> { implements NetClientAttributesGetter<OpenSearchRestRequest, Response> {
@Override
public String getTransport(OpenSearchRestRequest request, Response response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
@Nullable @Nullable
public String getPeerName(OpenSearchRestRequest request) { public String getPeerName(OpenSearchRestRequest request) {

6
instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockNetServerAttributesGetter.java
View File

@ -12,12 +12,6 @@ import javax.annotation.Nullable;
enum MockNetServerAttributesGetter implements NetServerAttributesGetter<String> { enum MockNetServerAttributesGetter implements NetServerAttributesGetter<String> {
INSTANCE; INSTANCE;
@Nullable
@Override
public String getTransport(String s) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getHostName(String s) { public String getHostName(String s) {

6
instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientNetAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.playws; package io.opentelemetry.javaagent.instrumentation.playws;
import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.InetSocketAddressNetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import play.shaded.ahc.org.asynchttpclient.Request; import play.shaded.ahc.org.asynchttpclient.Request;
@ -15,11 +14,6 @@ import play.shaded.ahc.org.asynchttpclient.Response;
final class PlayWsClientNetAttributesGetter final class PlayWsClientNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<Request, Response> { extends InetSocketAddressNetClientAttributesGetter<Request, Response> {
@Override
public String getTransport(Request request, @Nullable Response response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(Request request) { public String getPeerName(Request request) {

6
instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/R2dbcNetAttributesGetter.java
View File

@ -15,12 +15,6 @@ import javax.annotation.Nullable;
public enum R2dbcNetAttributesGetter implements NetClientAttributesGetter<DbExecution, Void> { public enum R2dbcNetAttributesGetter implements NetClientAttributesGetter<DbExecution, Void> {
INSTANCE; INSTANCE;
@Nullable
@Override
public String getTransport(DbExecution request, @Nullable Void unused) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(DbExecution request) { public String getPeerName(DbExecution request) {

6
instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelNetAttributesGetter.java
View File

@ -12,12 +12,6 @@ import javax.annotation.Nullable;
public class RabbitChannelNetAttributesGetter public class RabbitChannelNetAttributesGetter
implements NetClientAttributesGetter<ChannelAndMethod, Void> { implements NetClientAttributesGetter<ChannelAndMethod, Void> {
@Nullable
@Override
public String getTransport(ChannelAndMethod channelAndMethod, @Nullable Void unused) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(ChannelAndMethod channelAndMethod) { public String getPeerName(ChannelAndMethod channelAndMethod) {

6
instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitReceiveNetAttributesGetter.java
View File

@ -13,12 +13,6 @@ import javax.annotation.Nullable;
public class RabbitReceiveNetAttributesGetter public class RabbitReceiveNetAttributesGetter
implements NetClientAttributesGetter<ReceiveRequest, GetResponse> { implements NetClientAttributesGetter<ReceiveRequest, GetResponse> {
@Nullable
@Override
public String getTransport(ReceiveRequest request, @Nullable GetResponse response) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(ReceiveRequest request) { public String getPeerName(ReceiveRequest request) {

2
instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy
View File

@ -95,7 +95,7 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification {
kind SERVER kind SERVER
hasNoParent() hasNoParent()
attributes { attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP "$SemanticAttributes.NET_TRANSPORT" {it == null || it == IP_TCP }
"net.protocol.name" "http" "net.protocol.name" "http"
"net.protocol.version" "1.1" "net.protocol.version" "1.1"
"$SemanticAttributes.NET_HOST_NAME" { it == "localhost" || it == null } "$SemanticAttributes.NET_HOST_NAME" { it == "localhost" || it == null }

6
instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/RatpackNetClientAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.ratpack.v1_7.internal; package io.opentelemetry.instrumentation.ratpack.v1_7.internal;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import ratpack.http.client.HttpResponse; import ratpack.http.client.HttpResponse;
import ratpack.http.client.RequestSpec; import ratpack.http.client.RequestSpec;
@ -18,11 +17,6 @@ import ratpack.http.client.RequestSpec;
public final class RatpackNetClientAttributesGetter public final class RatpackNetClientAttributesGetter
implements NetClientAttributesGetter<RequestSpec, HttpResponse> { implements NetClientAttributesGetter<RequestSpec, HttpResponse> {
@Override
public String getTransport(RequestSpec request, @Nullable HttpResponse response) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Override @Override
@Nullable @Nullable
public String getPeerName(RequestSpec request) { public String getPeerName(RequestSpec request) {

5
instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/RatpackNetServerAttributesGetter.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.ratpack.v1_7.internal; package io.opentelemetry.instrumentation.ratpack.v1_7.internal;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import ratpack.handling.Context; import ratpack.handling.Context;
import ratpack.http.Request; import ratpack.http.Request;
@ -17,10 +16,6 @@ import ratpack.server.PublicAddress;
* any time. * any time.
*/ */
public final class RatpackNetServerAttributesGetter implements NetServerAttributesGetter<Request> { public final class RatpackNetServerAttributesGetter implements NetServerAttributesGetter<Request> {
@Override
public String getTransport(Request request) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override

6
instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyNetClientAttributesGetter.java
View File

@ -17,12 +17,6 @@ import reactor.netty.http.client.HttpClientResponse;
final class ReactorNettyNetClientAttributesGetter final class ReactorNettyNetClientAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<HttpClientConfig, HttpClientResponse> { extends InetSocketAddressNetClientAttributesGetter<HttpClientConfig, HttpClientResponse> {
@Nullable
@Override
public String getTransport(HttpClientConfig request, @Nullable HttpClientResponse response) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(HttpClientConfig request, @Nullable HttpClientResponse response) { public String getProtocolName(HttpClientConfig request, @Nullable HttpClientResponse response) {

6
instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonNetAttributesGetter.java
View File

@ -12,12 +12,6 @@ import javax.annotation.Nullable;
final class RedissonNetAttributesGetter final class RedissonNetAttributesGetter
extends InetSocketAddressNetClientAttributesGetter<RedissonRequest, Void> { extends InetSocketAddressNetClientAttributesGetter<RedissonRequest, Void> {
@Nullable
@Override
public String getTransport(RedissonRequest request, @Nullable Void unused) {
return null;
}
@Nullable @Nullable
@Override @Override
public String getPeerName(RedissonRequest redissonRequest) { public String getPeerName(RedissonRequest redissonRequest) {

6
instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletNetAttributesGetter.java
View File

@ -8,17 +8,11 @@ package io.opentelemetry.instrumentation.restlet.v1_1;
import com.noelios.restlet.http.HttpCall; import com.noelios.restlet.http.HttpCall;
import com.noelios.restlet.http.HttpRequest; import com.noelios.restlet.http.HttpRequest;
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter; import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.restlet.data.Request; import org.restlet.data.Request;
final class RestletNetAttributesGetter implements NetServerAttributesGetter<Request> { final class RestletNetAttributesGetter implements NetServerAttributesGetter<Request> {
@Override
public String getTransport(Request request) {
return SemanticAttributes.NetTransportValues.IP_TCP;
}
@Nullable @Nullable
@Override @Override
public String getProtocolName(Request request) { public String getProtocolName(Request request) {

Some files were not shown because too many files have changed in this diff Show More