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

Use new semantic attribute constants (#6946)

This commit is contained in:
Trask Stalnaker 2022-10-23 09:32:03 -07:00 committed by GitHub
parent b7602c746b
commit 94e2248940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
52 changed files with 490 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetAttributes.java
View File

@ -1,26 +0,0 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.instrumentation.api.instrumenter.net;
import io.opentelemetry.api.common.AttributeKey;
// this class will be removed once SemanticAttributes contains all new net.* attributes
final class NetAttributes {
static final AttributeKey<String> NET_SOCK_FAMILY = AttributeKey.stringKey("net.sock.family");
static final AttributeKey<String> NET_SOCK_PEER_ADDR =
AttributeKey.stringKey("net.sock.peer.addr");
static final AttributeKey<String> NET_SOCK_PEER_NAME =
AttributeKey.stringKey("net.sock.peer.name");
static final AttributeKey<Long> NET_SOCK_PEER_PORT = AttributeKey.longKey("net.sock.peer.port");
static final AttributeKey<String> NET_SOCK_HOST_ADDR =
AttributeKey.stringKey("net.sock.host.addr");
static final AttributeKey<Long> NET_SOCK_HOST_PORT = AttributeKey.longKey("net.sock.host.port");
static final String SOCK_FAMILY_INET = "inet";
private NetAttributes() {}
}

10
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractor.java
View File

@ -63,21 +63,21 @@ public final class NetClientAttributesExtractor<REQUEST, RESPONSE>
String sockPeerAddr = getter.sockPeerAddr(request, response);
if (sockPeerAddr != null && !sockPeerAddr.equals(peerName)) {
internalSet(attributes, NetAttributes.NET_SOCK_PEER_ADDR, sockPeerAddr);
internalSet(attributes, SemanticAttributes.NET_SOCK_PEER_ADDR, sockPeerAddr);
Integer sockPeerPort = getter.sockPeerPort(request, response);
if (sockPeerPort != null && sockPeerPort > 0 && !sockPeerPort.equals(peerPort)) {
internalSet(attributes, NetAttributes.NET_SOCK_PEER_PORT, (long) sockPeerPort);
internalSet(attributes, SemanticAttributes.NET_SOCK_PEER_PORT, (long) sockPeerPort);
}
String sockFamily = getter.sockFamily(request, response);
if (sockFamily != null && !NetAttributes.SOCK_FAMILY_INET.equals(sockFamily)) {
internalSet(attributes, NetAttributes.NET_SOCK_FAMILY, sockFamily);
if (sockFamily != null && !SemanticAttributes.NetSockFamilyValues.INET.equals(sockFamily)) {
internalSet(attributes, SemanticAttributes.NET_SOCK_FAMILY, sockFamily);
}
String sockPeerName = getter.sockPeerName(request, response);
if (sockPeerName != null && !sockPeerName.equals(peerName)) {
internalSet(attributes, NetAttributes.NET_SOCK_PEER_NAME, sockPeerName);
internalSet(attributes, SemanticAttributes.NET_SOCK_PEER_NAME, sockPeerName);
}
}
}

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

@ -82,12 +82,12 @@ class InetSocketAddressNetClientAttributesGetterTest {
AttributesBuilder builder = Attributes.builder();
builder.put(SemanticAttributes.NET_TRANSPORT, SemanticAttributes.NetTransportValues.IP_TCP);
builder.put(NetAttributes.NET_SOCK_PEER_ADDR, address.getAddress().getHostAddress());
builder.put(SemanticAttributes.NET_SOCK_PEER_ADDR, address.getAddress().getHostAddress());
if (!ipv4) {
builder.put(NetAttributes.NET_SOCK_FAMILY, "inet6");
builder.put(SemanticAttributes.NET_SOCK_FAMILY, "inet6");
}
builder.put(NetAttributes.NET_SOCK_PEER_NAME, "api.github.com");
builder.put(NetAttributes.NET_SOCK_PEER_PORT, 456L);
builder.put(SemanticAttributes.NET_SOCK_PEER_NAME, "api.github.com");
builder.put(SemanticAttributes.NET_SOCK_PEER_PORT, 456L);
assertThat(endAttributes.build()).isEqualTo(builder.build());
}

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

@ -85,12 +85,12 @@ class InetSocketAddressNetServerAttributesGetterTest {
AttributesBuilder builder = Attributes.builder();
builder.put(SemanticAttributes.NET_TRANSPORT, SemanticAttributes.NetTransportValues.IP_TCP);
if (!request.isIpv4()) {
builder.put(NetAttributes.NET_SOCK_FAMILY, "inet6");
builder.put(SemanticAttributes.NET_SOCK_FAMILY, "inet6");
}
builder.put(NetAttributes.NET_SOCK_PEER_ADDR, request.peer.getAddress().getHostAddress());
builder.put(NetAttributes.NET_SOCK_PEER_PORT, 123L);
builder.put(NetAttributes.NET_SOCK_HOST_ADDR, request.host.getAddress().getHostAddress());
builder.put(NetAttributes.NET_SOCK_HOST_PORT, 456L);
builder.put(SemanticAttributes.NET_SOCK_PEER_ADDR, request.peer.getAddress().getHostAddress());
builder.put(SemanticAttributes.NET_SOCK_PEER_PORT, 123L);
builder.put(SemanticAttributes.NET_SOCK_HOST_ADDR, request.host.getAddress().getHostAddress());
builder.put(SemanticAttributes.NET_SOCK_HOST_PORT, 456L);
assertThat(startAttributes.build()).isEqualTo(builder.build());

18
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java
View File

@ -96,10 +96,10 @@ class NetClientAttributesExtractorTest {
assertThat(endAttributes.build())
.containsOnly(
entry(SemanticAttributes.NET_TRANSPORT, IP_TCP),
entry(NetAttributes.NET_SOCK_FAMILY, "inet6"),
entry(NetAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"),
entry(NetAttributes.NET_SOCK_PEER_NAME, "proxy.opentelemetry.io"),
entry(NetAttributes.NET_SOCK_PEER_PORT, 123L));
entry(SemanticAttributes.NET_SOCK_FAMILY, "inet6"),
entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"),
entry(SemanticAttributes.NET_SOCK_PEER_NAME, "proxy.opentelemetry.io"),
entry(SemanticAttributes.NET_SOCK_PEER_PORT, 123L));
}
@Test
@ -182,8 +182,8 @@ class NetClientAttributesExtractorTest {
assertThat(endAttributes.build())
.containsOnly(
entry(SemanticAttributes.NET_TRANSPORT, IP_TCP),
entry(NetAttributes.NET_SOCK_FAMILY, "inet6"),
entry(NetAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"));
entry(SemanticAttributes.NET_SOCK_FAMILY, "inet6"),
entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"));
}
@Test
@ -209,7 +209,7 @@ class NetClientAttributesExtractorTest {
.containsOnly(entry(SemanticAttributes.NET_PEER_NAME, "opentelemetry.io"));
assertThat(endAttributes.build())
.containsOnly(entry(NetAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"));
.containsOnly(entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"));
}
@Test
@ -218,7 +218,7 @@ class NetClientAttributesExtractorTest {
Map<String, String> map = new HashMap<>();
map.put("peerName", "opentelemetry.io");
map.put("sockPeerAddr", "1.2.3.4");
map.put("sockFamily", NetAttributes.SOCK_FAMILY_INET);
map.put("sockFamily", SemanticAttributes.NetSockFamilyValues.INET);
Context context = Context.root();
@ -234,6 +234,6 @@ class NetClientAttributesExtractorTest {
.containsOnly(entry(SemanticAttributes.NET_PEER_NAME, "opentelemetry.io"));
assertThat(endAttributes.build())
.containsOnly(entry(NetAttributes.NET_SOCK_PEER_ADDR, "1.2.3.4"));
.containsOnly(entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1.2.3.4"));
}
}

22
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java
View File

@ -105,11 +105,11 @@ class NetServerAttributesExtractorTest {
entry(SemanticAttributes.NET_TRANSPORT, IP_TCP),
entry(SemanticAttributes.NET_HOST_NAME, "opentelemetry.io"),
entry(SemanticAttributes.NET_HOST_PORT, 80L),
entry(NetAttributes.NET_SOCK_FAMILY, "inet6"),
entry(NetAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"),
entry(NetAttributes.NET_SOCK_PEER_PORT, 42L),
entry(NetAttributes.NET_SOCK_HOST_ADDR, "4:3:2:1::"),
entry(NetAttributes.NET_SOCK_HOST_PORT, 8080L));
entry(SemanticAttributes.NET_SOCK_FAMILY, "inet6"),
entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"),
entry(SemanticAttributes.NET_SOCK_PEER_PORT, 42L),
entry(SemanticAttributes.NET_SOCK_HOST_ADDR, "4:3:2:1::"),
entry(SemanticAttributes.NET_SOCK_HOST_PORT, 8080L));
assertThat(endAttributes.build()).isEmpty();
}
@ -191,8 +191,8 @@ class NetServerAttributesExtractorTest {
entry(SemanticAttributes.NET_TRANSPORT, IP_TCP),
entry(SemanticAttributes.NET_HOST_NAME, "opentelemetry.io"),
entry(SemanticAttributes.NET_HOST_PORT, 80L),
entry(NetAttributes.NET_SOCK_FAMILY, "inet6"),
entry(NetAttributes.NET_SOCK_HOST_ADDR, "4:3:2:1::"));
entry(SemanticAttributes.NET_SOCK_FAMILY, "inet6"),
entry(SemanticAttributes.NET_SOCK_HOST_ADDR, "4:3:2:1::"));
assertThat(endAttributes.build()).isEmpty();
}
@ -221,8 +221,8 @@ class NetServerAttributesExtractorTest {
assertThat(startAttributes.build())
.containsOnly(
entry(SemanticAttributes.NET_HOST_NAME, "opentelemetry.io"),
entry(NetAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"),
entry(NetAttributes.NET_SOCK_HOST_ADDR, "4:3:2:1::"));
entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"),
entry(SemanticAttributes.NET_SOCK_HOST_ADDR, "4:3:2:1::"));
assertThat(endAttributes.build()).isEmpty();
}
@ -233,7 +233,7 @@ class NetServerAttributesExtractorTest {
Map<String, String> map = new HashMap<>();
map.put("hostName", "opentelemetry.io");
map.put("sockPeerAddr", "1.2.3.4");
map.put("sockFamily", NetAttributes.SOCK_FAMILY_INET);
map.put("sockFamily", SemanticAttributes.NetSockFamilyValues.INET);
Context context = Context.root();
@ -248,7 +248,7 @@ class NetServerAttributesExtractorTest {
assertThat(startAttributes.build())
.containsOnly(
entry(SemanticAttributes.NET_HOST_NAME, "opentelemetry.io"),
entry(NetAttributes.NET_SOCK_PEER_ADDR, "1.2.3.4"));
entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1.2.3.4"));
assertThat(endAttributes.build()).isEmpty();
}

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

@ -96,11 +96,11 @@ class RestCamelTest extends AgentInstrumentationSpecification implements RetryOn
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_ROUTE" "/api/{module}/unit/{unitId}"
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.host.name" "localhost"
"net.host.port" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
it.span(3) {

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

@ -132,10 +132,10 @@ class TwoServicesWithDirectClientCamelTest extends AgentInstrumentationSpecifica
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" Long
"$SemanticAttributes.HTTP_ROUTE" "/serviceTwo"
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.host.name" "127.0.0.1"
"net.host.port" portTwo
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"$SemanticAttributes.NET_HOST_NAME" "127.0.0.1"
"$SemanticAttributes.NET_HOST_PORT" portTwo
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
}
}
it.span(5) {

12
instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy
View File

@ -111,9 +111,9 @@ abstract class AbstractDubboTest extends InstrumentationSpecification {
"$SemanticAttributes.RPC_SYSTEM" "apache_dubbo"
"$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"
"$SemanticAttributes.RPC_METHOD" "hello"
"net.sock.peer.addr" String
"net.sock.peer.port" Long
"net.sock.family" { it == "inet6" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" String
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
}
}
}
@ -182,9 +182,9 @@ abstract class AbstractDubboTest extends InstrumentationSpecification {
"$SemanticAttributes.RPC_SYSTEM" "apache_dubbo"
"$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"
"$SemanticAttributes.RPC_METHOD" "hello"
"net.sock.peer.addr" String
"net.sock.peer.port" Long
"net.sock.family" { it == "inet6" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" String
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
}
}
}

18
instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy
View File

@ -139,9 +139,9 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification
"$SemanticAttributes.RPC_SYSTEM" "apache_dubbo"
"$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService"
"$SemanticAttributes.RPC_METHOD" "hello"
"net.sock.peer.addr" String
"net.sock.peer.port" Long
"net.sock.family" { it == "inet6" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" String
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
}
}
span(3) {
@ -154,9 +154,9 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification
"$SemanticAttributes.RPC_METHOD" "\$invoke"
"$SemanticAttributes.NET_PEER_NAME" "localhost"
"$SemanticAttributes.NET_PEER_PORT" Long
"net.sock.peer.addr" { it == null || String }
"net.sock.peer.port" { it == null || Long }
"net.sock.peer.name" { it == null || String }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == null || String }
"$SemanticAttributes.NET_SOCK_PEER_PORT" { it == null || Long }
"$SemanticAttributes.NET_SOCK_PEER_NAME" { it == null || String }
}
}
span(4) {
@ -167,9 +167,9 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification
"$SemanticAttributes.RPC_SYSTEM" "apache_dubbo"
"$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"
"$SemanticAttributes.RPC_METHOD" "hello"
"net.sock.peer.addr" String
"net.sock.peer.port" Long
"net.sock.family" { it == "inet6" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" String
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
}
}
}

6
instrumentation/cassandra/cassandra-3.0/javaagent/src/test/groovy/CassandraClientTest.groovy
View File

@ -147,9 +147,9 @@ class CassandraClientTest extends AgentInstrumentationSpecification {
childOf((SpanData) parentSpan)
}
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" cassandraPort
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" cassandraPort
"$SemanticAttributes.DB_SYSTEM" "cassandra"
"$SemanticAttributes.DB_NAME" keyspace
"$SemanticAttributes.DB_STATEMENT" statement

6
instrumentation/cassandra/cassandra-4.0/javaagent/src/test/groovy/CassandraClientTest.groovy
View File

@ -120,9 +120,9 @@ class CassandraClientTest extends AgentInstrumentationSpecification {
childOf((SpanData) parentSpan)
}
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" cassandraPort
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" cassandraPort
"$SemanticAttributes.DB_SYSTEM" "cassandra"
"$SemanticAttributes.DB_NAME" keyspace
"$SemanticAttributes.DB_STATEMENT" statement

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

@ -36,9 +36,9 @@ class CouchbaseSpanUtil {
"$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP }
// Because of caching, not all requests hit the server so these attributes may be absent
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"net.sock.peer.name" { it == "localhost" || it == "127.0.0.1" || it == null }
"net.sock.peer.port" { it == null || it instanceof Number }
"$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_PORT" { it == null || it instanceof Number }
// Because of caching, not all requests hit the server so this tag may be absent
"couchbase.local.address" { it == null || it instanceof String }

40
instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy
View File

@ -125,10 +125,10 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl
name "ClusterHealthAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "ClusterHealthAction"
"elasticsearch.action" "ClusterHealthAction"
@ -243,10 +243,10 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl
name "CreateIndexAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "CreateIndexAction"
"elasticsearch.action" "CreateIndexAction"
@ -260,10 +260,10 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl
name "GetAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GetAction"
"elasticsearch.action" "GetAction"
@ -292,10 +292,10 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl
name "IndexAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "IndexAction"
"elasticsearch.action" "IndexAction"
@ -314,10 +314,10 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl
name "GetAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GetAction"
"elasticsearch.action" "GetAction"

40
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy
View File

@ -131,10 +131,10 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC
kind CLIENT
childOf(span(0))
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "ClusterHealthAction"
"elasticsearch.action" "ClusterHealthAction"
@ -248,10 +248,10 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC
name "CreateIndexAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "CreateIndexAction"
"elasticsearch.action" "CreateIndexAction"
@ -265,10 +265,10 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC
name "GetAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GetAction"
"elasticsearch.action" "GetAction"
@ -297,10 +297,10 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC
name "IndexAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "IndexAction"
"elasticsearch.action" "IndexAction"
@ -320,10 +320,10 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC
name "GetAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.host
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GetAction"
"elasticsearch.action" "GetAction"

40
instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy
View File

@ -105,10 +105,10 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl
kind CLIENT
childOf(span(0))
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.address().hostString
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.address().hostString
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "ClusterHealthAction"
"elasticsearch.action" "ClusterHealthAction"
@ -225,10 +225,10 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl
name "CreateIndexAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.address().hostString
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.address().hostString
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "CreateIndexAction"
"elasticsearch.action" "CreateIndexAction"
@ -242,10 +242,10 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl
name "GetAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.address().hostString
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.address().hostString
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GetAction"
"elasticsearch.action" "GetAction"
@ -274,10 +274,10 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl
name "IndexAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.address().hostString
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.address().hostString
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "IndexAction"
"elasticsearch.action" "IndexAction"
@ -297,10 +297,10 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl
name "GetAction"
kind CLIENT
attributes {
"net.sock.family" { it == "inet6" || it == null }
"net.sock.peer.addr" tcpPublishAddress.address
"net.sock.peer.name" tcpPublishAddress.address().hostString
"net.sock.peer.port" tcpPublishAddress.port
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" tcpPublishAddress.address
"$SemanticAttributes.NET_SOCK_PEER_NAME" tcpPublishAddress.address().hostString
"$SemanticAttributes.NET_SOCK_PEER_PORT" tcpPublishAddress.port
"$SemanticAttributes.DB_SYSTEM" "elasticsearch"
"$SemanticAttributes.DB_OPERATION" "GetAction"
"elasticsearch.action" "GetAction"

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

@ -18,7 +18,6 @@ import io.grpc.Server;
import io.grpc.ServerBuilder;
import io.grpc.Status;
import io.grpc.stub.StreamObserver;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable;
@ -204,9 +203,9 @@ public abstract class AbstractGrpcStreamingTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfyingExactly(events.toArray(new Consumer[0]))));
testing()

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

@ -40,7 +40,6 @@ import io.grpc.reflection.v1alpha.ServerReflectionGrpc;
import io.grpc.reflection.v1alpha.ServerReflectionRequest;
import io.grpc.reflection.v1alpha.ServerReflectionResponse;
import io.grpc.stub.StreamObserver;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@ -172,9 +171,9 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfyingExactly(
event ->
@ -360,9 +359,9 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfyingExactly(
event ->
@ -559,9 +558,9 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfyingExactly(
event ->
@ -722,9 +721,9 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfying(
events -> {
@ -884,9 +883,9 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfying(
events -> {
@ -1147,9 +1146,9 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfyingExactly(
event ->
@ -1290,9 +1289,9 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfyingExactly(
event ->
@ -1433,9 +1432,9 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfyingExactly(
event ->
@ -1559,9 +1558,9 @@ public abstract class AbstractGrpcTest {
SemanticAttributes.NetTransportValues.IP_TCP),
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
equalTo(SemanticAttributes.NET_HOST_PORT, server.getPort()),
equalTo(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
satisfies(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
val -> assertThat(val).isNotNull()))
.hasEventsSatisfyingExactly(
event ->

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

@ -111,7 +111,7 @@ abstract class JaxRsClientTest extends HttpClientTest<Invocation.Builder> implem
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" uri.host
"$SemanticAttributes.NET_PEER_PORT" uri.port > 0 ? uri.port : { it == null || it == 443 }
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.HTTP_URL" "${uri}"
"$SemanticAttributes.HTTP_METHOD" method
"$SemanticAttributes.HTTP_STATUS_CODE" statusCode

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

@ -270,9 +270,9 @@ abstract class AbstractJaxRsHttpServerTest<S> extends HttpServerTest<S> implemen
attributes {
"$SemanticAttributes.NET_HOST_NAME" fullUrl.host
"$SemanticAttributes.NET_HOST_PORT" fullUrl.port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.HTTP_SCHEME" fullUrl.getScheme()
"$SemanticAttributes.HTTP_TARGET" fullUrl.getPath() + (fullUrl.getQuery() != null ? "?" + fullUrl.getQuery() : "")
"$SemanticAttributes.HTTP_METHOD" method

10
instrumentation/jedis/jedis-3.0/javaagent/src/test/groovy/Jedis30ClientTest.groovy
View File

@ -53,7 +53,7 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_OPERATION" "SET"
"$SemanticAttributes.NET_PEER_NAME" "localhost"
"$SemanticAttributes.NET_PEER_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
}
}
@ -80,7 +80,7 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_OPERATION" "SET"
"$SemanticAttributes.NET_PEER_NAME" "localhost"
"$SemanticAttributes.NET_PEER_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
}
}
@ -95,7 +95,7 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_OPERATION" "GET"
"$SemanticAttributes.NET_PEER_NAME" "localhost"
"$SemanticAttributes.NET_PEER_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
}
}
@ -122,7 +122,7 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_OPERATION" "SET"
"$SemanticAttributes.NET_PEER_NAME" "localhost"
"$SemanticAttributes.NET_PEER_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
}
}
@ -137,7 +137,7 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_OPERATION" "RANDOMKEY"
"$SemanticAttributes.NET_PEER_NAME" "localhost"
"$SemanticAttributes.NET_PEER_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
}
}

30
instrumentation/jedis/jedis-4.0/javaagent/src/test/groovy/Jedis40ClientTest.groovy
View File

@ -52,9 +52,9 @@ class Jedis40ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_STATEMENT" "SET foo ?"
"$SemanticAttributes.DB_OPERATION" "SET"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" { it == "localhost" || it == "127.0.0.1" }
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" { it == "localhost" || it == "127.0.0.1" }
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
}
}
}
@ -79,9 +79,9 @@ class Jedis40ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_STATEMENT" "SET foo ?"
"$SemanticAttributes.DB_OPERATION" "SET"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" { it == "localhost" || it == "127.0.0.1" }
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" { it == "localhost" || it == "127.0.0.1" }
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
}
}
}
@ -94,9 +94,9 @@ class Jedis40ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_STATEMENT" "GET foo"
"$SemanticAttributes.DB_OPERATION" "GET"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" { it == "localhost" || it == "127.0.0.1" }
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" { it == "localhost" || it == "127.0.0.1" }
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
}
}
}
@ -121,9 +121,9 @@ class Jedis40ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_STATEMENT" "SET foo ?"
"$SemanticAttributes.DB_OPERATION" "SET"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" { it == "localhost" || it == "127.0.0.1" }
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" { it == "localhost" || it == "127.0.0.1" }
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
}
}
}
@ -136,9 +136,9 @@ class Jedis40ClientTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.DB_STATEMENT" "RANDOMKEY"
"$SemanticAttributes.DB_OPERATION" "RANDOMKEY"
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" { it == "localhost" || it == "127.0.0.1" }
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" { it == "localhost" || it == "127.0.0.1" }
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
}
}
}

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

@ -100,9 +100,9 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_SCHEME" "http"
"$SemanticAttributes.HTTP_TARGET" "/jetty-context/" + path

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

@ -101,9 +101,9 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -159,9 +159,9 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -214,9 +214,9 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -277,9 +277,9 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -345,9 +345,9 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -394,9 +394,9 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -475,9 +475,9 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -525,9 +525,9 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
}

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

@ -98,9 +98,9 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -168,9 +168,9 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -217,9 +217,9 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -314,9 +314,9 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -397,9 +397,9 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -459,9 +459,9 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {

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

@ -45,9 +45,9 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest implem
childOf span(0)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET a ?"
}
@ -64,9 +64,9 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest implem
childOf span(0)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET a"
}

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

@ -160,9 +160,9 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET TESTSETKEY ?"
}
@ -211,9 +211,9 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET TESTKEY"
}
@ -286,9 +286,9 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
childOf(span(0))
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET NON_EXISTENT_KEY"
}
@ -350,9 +350,9 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
childOf(span(0))
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_STATEMENT" "RANDOMKEY"
"$SemanticAttributes.DB_SYSTEM" "redis"
}
@ -417,9 +417,9 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "HMSET TESTHM firstname ? lastname ? age ?"
}
@ -437,9 +437,9 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "HGETALL TESTHM"
}

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

@ -102,9 +102,9 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
childOf(span(0))
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET TESTSETKEY ?"
}
@ -140,9 +140,9 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET TESTKEY"
}
@ -191,9 +191,9 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
childOf(span(0))
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET NON_EXISTENT_KEY"
}
@ -235,9 +235,9 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_STATEMENT" "RANDOMKEY"
"$SemanticAttributes.DB_SYSTEM" "redis"
}
@ -264,9 +264,9 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_STATEMENT" "COMMAND"
"$SemanticAttributes.DB_SYSTEM" "redis"
}
@ -312,9 +312,9 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
childOf span(0)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET a ?"
}
@ -331,9 +331,9 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
childOf span(0)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET a"
}
@ -370,9 +370,9 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
childOf span(0)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET a ?"
}
@ -389,9 +389,9 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
childOf span(0)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET a"
}

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

@ -68,9 +68,9 @@ abstract class AbstractLettuceSyncClientAuthTest extends InstrumentationSpecific
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "AUTH ?"
}

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

@ -124,9 +124,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET TESTSETKEY ?"
}
@ -157,9 +157,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET TESTSETKEY ?"
}
@ -191,9 +191,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET TESTKEY"
}
@ -221,9 +221,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET NON_EXISTENT_KEY"
}
@ -251,9 +251,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_STATEMENT" "RANDOMKEY"
"$SemanticAttributes.DB_SYSTEM" "redis"
}
@ -281,9 +281,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "LPUSH TESTLIST ?"
}
@ -311,9 +311,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "HMSET user firstname ? lastname ? age ?"
}
@ -341,9 +341,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "HGETALL TESTHM"
}
@ -376,9 +376,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "EVAL $b64Script 1 TESTLIST ? ?"
}
@ -410,9 +410,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
kind CLIENT
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "MSET key1 ? key2 ?"
}
@ -440,9 +440,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
// Disconnect not an actual error even though an exception is recorded.
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "DEBUG SEGFAULT"
}
@ -476,9 +476,9 @@ abstract class AbstractLettuceSyncClientTest extends InstrumentationSpecificatio
}
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" expectedHostAttributeValue
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" expectedHostAttributeValue
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SHUTDOWN NOSAVE"
if (!Boolean.getBoolean("testLatestDeps")) {

16
instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientSslTest.groovy
View File

@ -92,7 +92,7 @@ class Netty40ClientSslTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" uri.host
"$SemanticAttributes.NET_PEER_PORT" uri.port
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
}
}
span(2) {
@ -104,9 +104,9 @@ class Netty40ClientSslTest extends AgentInstrumentationSpecification {
errorEventWithAnyMessage(SSLHandshakeException)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"net.sock.peer.name" uri.host
"net.sock.peer.port" uri.port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_NAME" uri.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" uri.port
}
}
}
@ -148,7 +148,7 @@ class Netty40ClientSslTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" uri.host
"$SemanticAttributes.NET_PEER_PORT" uri.port
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
}
}
span(2) {
@ -157,9 +157,9 @@ class Netty40ClientSslTest extends AgentInstrumentationSpecification {
childOf span(0)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"net.sock.peer.name" uri.host
"net.sock.peer.port" uri.port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_NAME" uri.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" uri.port
}
}
span(3) {

4
instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ConnectionSpanTest.groovy
View File

@ -108,7 +108,7 @@ class Netty40ConnectionSpanTest extends InstrumentationSpecification implements
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" uri.host
"$SemanticAttributes.NET_PEER_PORT" uri.port
"net.sock.peer.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
}
}
span(2) {
@ -156,7 +156,7 @@ class Netty40ConnectionSpanTest extends InstrumentationSpecification implements
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" uri.host
"$SemanticAttributes.NET_PEER_PORT" uri.port
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
}
}
}

16
instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy
View File

@ -107,7 +107,7 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" uri.host
"$SemanticAttributes.NET_PEER_PORT" uri.port
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
}
}
span(3) {
@ -119,9 +119,9 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification {
errorEventWithAnyMessage(SSLHandshakeException)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"net.sock.peer.name" uri.host
"net.sock.peer.port" uri.port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_NAME" uri.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" uri.port
}
}
}
@ -175,7 +175,7 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" uri.host
"$SemanticAttributes.NET_PEER_PORT" uri.port
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
}
}
span(3) {
@ -184,9 +184,9 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification {
childOf span(0)
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"net.sock.peer.name" uri.host
"net.sock.peer.port" uri.port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_NAME" uri.host
"$SemanticAttributes.NET_SOCK_PEER_PORT" uri.port
}
}
span(4) {

4
instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy
View File

@ -121,7 +121,7 @@ class Netty41ConnectionSpanTest extends InstrumentationSpecification implements
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" uri.host
"$SemanticAttributes.NET_PEER_PORT" uri.port
"net.sock.peer.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
}
}
span(3) {
@ -181,7 +181,7 @@ class Netty41ConnectionSpanTest extends InstrumentationSpecification implements
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" uri.host
"$SemanticAttributes.NET_PEER_PORT" uri.port
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
}
}
}

11
instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/RabbitMqTest.groovy
View File

@ -16,8 +16,6 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
import io.opentelemetry.instrumentation.test.asserts.TraceAssert
import io.opentelemetry.sdk.trace.data.SpanData
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import org.springframework.amqp.core.AmqpAdmin
import org.springframework.amqp.core.AmqpTemplate
import org.springframework.amqp.core.Queue
@ -25,6 +23,9 @@ import org.springframework.amqp.rabbit.connection.CachingConnectionFactory
import org.springframework.amqp.rabbit.core.RabbitAdmin
import org.springframework.amqp.rabbit.core.RabbitTemplate
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.CONSUMER
import static io.opentelemetry.api.trace.SpanKind.PRODUCER
@ -414,9 +415,9 @@ class RabbitMqTest extends AgentInstrumentationSpecification implements WithRabb
attributes {
// listener does not have access to net attributes
if (rabbitCommand != "basic.deliver") {
"net.sock.peer.addr" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"net.sock.peer.port" Long
"net.sock.family" { it == null || it == "inet6" }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
}
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"

6
instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/ReactorRabbitMqTest.groovy
View File

@ -37,9 +37,9 @@ class ReactorRabbitMqTest extends AgentInstrumentationSpecification implements W
name 'exchange.declare'
kind SpanKind.CLIENT
attributes {
"net.sock.peer.addr" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"net.sock.peer.port" Long
"net.sock.family" { it == null || it == "inet6" }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
"rabbitmq.command" "exchange.declare"

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

@ -98,10 +98,10 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" { it == "localhost" || it == null }
"$SemanticAttributes.NET_HOST_PORT" { it == app.bindPort || it == null }
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"net.sock.peer.port" { it instanceof Long || it == null }
"net.sock.host.addr" { it == "127.0.0.1" || it == null }
"net.sock.host.port" { it instanceof Long || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_PORT" { it instanceof Long || it == null }
"$SemanticAttributes.NET_SOCK_HOST_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_HOST_PORT" { it instanceof Long || it == null }
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.HTTP_FLAVOR" "1.1"

4
instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.groovy
View File

@ -76,7 +76,7 @@ class ReactorNettyConnectionSpanTest extends InstrumentationSpecification implem
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" "localhost"
"$SemanticAttributes.NET_PEER_PORT" server.httpPort()
"net.sock.peer.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
}
}
span(3) {
@ -142,7 +142,7 @@ class ReactorNettyConnectionSpanTest extends InstrumentationSpecification implem
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_PEER_NAME" "localhost"
"$SemanticAttributes.NET_PEER_PORT" PortUtils.UNUSABLE_PORT
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
}
}
}

20
instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java
View File

@ -5,8 +5,6 @@
package io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0;
import static io.opentelemetry.api.common.AttributeKey.longKey;
import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static io.opentelemetry.api.trace.SpanKind.CLIENT;
import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
import static io.opentelemetry.api.trace.SpanKind.SERVER;
@ -112,7 +110,7 @@ class ReactorNettyClientSslTest {
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, server.httpsPort()),
equalTo(stringKey("net.sock.peer.addr"), "127.0.0.1")),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1")),
span ->
span.hasName("SSL handshake")
.hasKind(INTERNAL)
@ -123,9 +121,9 @@ class ReactorNettyClientSslTest {
.hasEventsSatisfying(ReactorNettyClientSslTest::isSslHandshakeException)
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(stringKey("net.sock.peer.name"), "localhost"),
equalTo(longKey("net.sock.peer.port"), server.httpsPort()))));
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, server.httpsPort()))));
}
@Test
@ -163,7 +161,7 @@ class ReactorNettyClientSslTest {
AbstractLongAssert::isNotNegative),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, server.httpsPort()),
equalTo(stringKey("net.sock.peer.addr"), "127.0.0.1")),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1")),
span ->
span.hasName("RESOLVE")
.hasKind(INTERNAL)
@ -180,16 +178,16 @@ class ReactorNettyClientSslTest {
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, server.httpsPort()),
equalTo(stringKey("net.sock.peer.addr"), "127.0.0.1")),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1")),
span ->
span.hasName("SSL handshake")
.hasKind(INTERNAL)
.hasParent(trace.getSpan(1))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(stringKey("net.sock.peer.addr"), "127.0.0.1"),
equalTo(stringKey("net.sock.peer.name"), "localhost"),
equalTo(longKey("net.sock.peer.port"), server.httpsPort())),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"),
equalTo(SemanticAttributes.NET_SOCK_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_SOCK_PEER_PORT, server.httpsPort())),
span ->
span.hasName("test-http-server").hasKind(SERVER).hasParent(trace.getSpan(1))));
}

7
instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java
View File

@ -5,7 +5,6 @@
package io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0;
import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static io.opentelemetry.api.trace.SpanKind.CLIENT;
import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
import static io.opentelemetry.api.trace.SpanKind.SERVER;
@ -88,7 +87,7 @@ class ReactorNettyConnectionSpanTest {
AbstractLongAssert::isNotNegative),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, server.httpPort()),
equalTo(stringKey("net.sock.peer.addr"), "127.0.0.1")),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1")),
span ->
span.hasName("RESOLVE")
.hasKind(INTERNAL)
@ -105,7 +104,7 @@ class ReactorNettyConnectionSpanTest {
equalTo(SemanticAttributes.NET_TRANSPORT, IP_TCP),
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, server.httpPort()),
equalTo(stringKey("net.sock.peer.addr"), "127.0.0.1")),
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1")),
span ->
span.hasName("test-http-server").hasKind(SERVER).hasParent(trace.getSpan(1))));
}
@ -175,7 +174,7 @@ class ReactorNettyConnectionSpanTest {
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
equalTo(SemanticAttributes.NET_PEER_PORT, PortUtils.UNUSABLE_PORT),
satisfies(
stringKey("net.sock.peer.addr"),
SemanticAttributes.NET_SOCK_PEER_ADDR,
val -> val.isIn(null, "127.0.0.1")))));
}
}

12
instrumentation/redisson/redisson-common/testing/src/main/groovy/AbstractRedissonAsyncClientTest.groovy
View File

@ -78,9 +78,9 @@ abstract class AbstractRedissonAsyncClientTest extends AgentInstrumentationSpeci
name "SET"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET foo ?"
"$SemanticAttributes.DB_OPERATION" "SET"
@ -118,9 +118,9 @@ abstract class AbstractRedissonAsyncClientTest extends AgentInstrumentationSpeci
kind CLIENT
childOf(span(0))
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SADD set1 ?"
"$SemanticAttributes.DB_OPERATION" "SADD"

66
instrumentation/redisson/redisson-common/testing/src/main/groovy/AbstractRedissonClientTest.groovy
View File

@ -77,9 +77,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "SET"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET foo ?"
"$SemanticAttributes.DB_OPERATION" "SET"
@ -91,9 +91,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "GET"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "GET foo"
"$SemanticAttributes.DB_OPERATION" "GET"
@ -117,9 +117,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "DB Query"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SET batch1 ?;SET batch2 ?"
"$SemanticAttributes.DB_OPERATION" null
@ -141,9 +141,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "RPUSH"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "RPUSH list1 ?"
"$SemanticAttributes.DB_OPERATION" "RPUSH"
@ -168,9 +168,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "EVAL"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "EVAL $script 1 map1 ? ?"
"$SemanticAttributes.DB_OPERATION" "EVAL"
@ -182,9 +182,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "HGET"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "HGET map1 key1"
"$SemanticAttributes.DB_OPERATION" "HGET"
@ -206,9 +206,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "SADD"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "SADD set1 ?"
"$SemanticAttributes.DB_OPERATION" "SADD"
@ -234,9 +234,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "ZADD"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "ZADD sort_set1 ? ? ? ? ? ?"
"$SemanticAttributes.DB_OPERATION" "ZADD"
@ -258,9 +258,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "INCR"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" "INCR AtomicLong"
"$SemanticAttributes.DB_OPERATION" "INCR"
@ -287,9 +287,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "EVAL"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" { lockScriptPattern.matcher(it).matches() }
"$SemanticAttributes.DB_OPERATION" "EVAL"
@ -303,9 +303,9 @@ abstract class AbstractRedissonClientTest extends AgentInstrumentationSpecificat
name "EVAL"
kind CLIENT
attributes {
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.name" "localhost"
"net.sock.peer.port" port
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
"$SemanticAttributes.NET_SOCK_PEER_PORT" port
"$SemanticAttributes.DB_SYSTEM" "redis"
"$SemanticAttributes.DB_STATEMENT" { lockScriptPattern.matcher(it).matches() }
"$SemanticAttributes.DB_OPERATION" "EVAL"

6
instrumentation/spark-2.3/javaagent/src/test/groovy/SparkJavaBasedTest.groovy
View File

@ -57,9 +57,9 @@ class SparkJavaBasedTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
}

18
instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy
View File

@ -46,9 +46,9 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i
childOf span(1)
kind CLIENT
attributes {
"net.sock.peer.addr" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"net.sock.peer.port" Long
"net.sock.family" { it == null || it == "inet6" }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
}
@ -59,9 +59,9 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i
childOf span(1)
kind PRODUCER
attributes {
"net.sock.peer.addr" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"net.sock.peer.port" Long
"net.sock.family" { it == null || it == "inet6" }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION" "testTopic"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
@ -113,9 +113,9 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i
name "basic.ack"
kind CLIENT
attributes {
"net.sock.peer.addr" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"net.sock.peer.port" Long
"net.sock.family" { it == null || it == "inet6" }
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
}

8
instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy
View File

@ -100,8 +100,8 @@ class ContextPropagationTest extends AgentInstrumentationSpecification {
kind PRODUCER
childOf span(0)
attributes {
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"net.sock.peer.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION" "<default>"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
@ -158,8 +158,8 @@ class ContextPropagationTest extends AgentInstrumentationSpecification {
name "basic.ack"
kind CLIENT
attributes {
"net.sock.peer.addr" { it == "127.0.0.1" || it == null }
"net.sock.peer.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
}

90
instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/SpringWebfluxTest.groovy
View File

@ -81,11 +81,11 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" urlPath
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200
@ -151,11 +151,11 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" urlPath
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200
@ -241,11 +241,11 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" urlPath
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200
@ -309,11 +309,11 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification {
status UNSET
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" "/notfoundgreet"
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 404
@ -356,11 +356,11 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" "/echo"
"$SemanticAttributes.HTTP_METHOD" "POST"
"$SemanticAttributes.HTTP_STATUS_CODE" 202
@ -408,11 +408,11 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" urlPath
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 500
@ -475,11 +475,11 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" "/double-greet-redirect"
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 307
@ -507,11 +507,11 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" "/double-greet"
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200
@ -557,11 +557,11 @@ class SpringWebfluxTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" urlPath
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200

12
instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy
View File

@ -151,9 +151,9 @@ class UndertowServerTest extends HttpServerTest<Undertow> implements AgentTestTr
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"$SemanticAttributes.NET_HOST_NAME" uri.host
"$SemanticAttributes.NET_HOST_PORT" uri.port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {
@ -205,9 +205,9 @@ class UndertowServerTest extends HttpServerTest<Undertow> implements AgentTestTr
"$SemanticAttributes.NET_TRANSPORT" SemanticAttributes.NetTransportValues.IP_TCP
"$SemanticAttributes.NET_HOST_NAME" uri.host
"$SemanticAttributes.NET_HOST_PORT" uri.port
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
}
}
span(1) {

20
instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy
View File

@ -64,11 +64,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" "/listProducts"
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200
@ -157,11 +157,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
childOf(span(0))
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" "$baseUrl?$TEST_REQUEST_ID_PARAMETER=$requestId"
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200

20
instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy
View File

@ -64,11 +64,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" "/listProducts"
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200
@ -157,11 +157,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
childOf(span(0))
attributes {
"$SemanticAttributes.NET_TRANSPORT" IP_TCP
"net.sock.peer.addr" "127.0.0.1"
"net.sock.peer.port" Long
"net.sock.host.addr" "127.0.0.1"
"net.host.name" "localhost"
"net.host.port" Long
"$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1"
"$SemanticAttributes.NET_HOST_NAME" "localhost"
"$SemanticAttributes.NET_HOST_PORT" Long
"$SemanticAttributes.HTTP_TARGET" "$baseUrl?$TEST_REQUEST_ID_PARAMETER=$requestId"
"$SemanticAttributes.HTTP_METHOD" "GET"
"$SemanticAttributes.HTTP_STATUS_CODE" 200

2
testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy
View File

@ -149,7 +149,7 @@ abstract class HttpServerTest<SERVER> extends InstrumentationSpecification imple
[
SemanticAttributes.HTTP_ROUTE,
SemanticAttributes.NET_TRANSPORT,
AttributeKey.stringKey("net.sock.peer.port")
SemanticAttributes.NET_SOCK_PEER_PORT
] as Set
}

8
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java
View File

@ -988,14 +988,14 @@ public abstract class AbstractHttpClientTest<REQUEST> {
}
// TODO: Move to test knob rather than always treating as optional
if (attrs.get(AttributeKey.stringKey("net.sock.peer.addr")) != null) {
if (attrs.get(SemanticAttributes.NET_SOCK_PEER_ADDR) != null) {
assertThat(attrs)
.containsEntry(AttributeKey.stringKey("net.sock.peer.addr"), "127.0.0.1");
.containsEntry(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1");
}
if (attrs.get(AttributeKey.stringKey("net.sock.peer.port")) != null) {
if (attrs.get(SemanticAttributes.NET_SOCK_PEER_PORT) != null) {
assertThat(attrs)
.containsEntry(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
"https".equals(uri.getScheme()) ? server.httpsPort() : server.httpPort());
}
}

14
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java
View File

@ -557,24 +557,22 @@ public abstract class AbstractHttpServerTest<SERVER> {
if (attrs.get(SemanticAttributes.NET_HOST_PORT) != null) {
assertThat(attrs).containsEntry(SemanticAttributes.NET_HOST_PORT, port);
}
if (attrs.get(AttributeKey.longKey("net.sock.peer.port")) != null) {
if (attrs.get(SemanticAttributes.NET_SOCK_PEER_PORT) != null) {
assertThat(attrs)
.hasEntrySatisfying(
AttributeKey.longKey("net.sock.peer.port"),
SemanticAttributes.NET_SOCK_PEER_PORT,
value ->
assertThat(value)
.isInstanceOf(Long.class)
.isNotEqualTo(Long.valueOf(port)));
}
if (attrs.get(AttributeKey.stringKey("net.sock.peer.addr")) != null) {
if (attrs.get(SemanticAttributes.NET_SOCK_PEER_ADDR) != null) {
assertThat(attrs)
.containsEntry(
AttributeKey.stringKey("net.sock.peer.addr"),
options.sockPeerAddr.apply(endpoint));
SemanticAttributes.NET_SOCK_PEER_ADDR, options.sockPeerAddr.apply(endpoint));
}
if (attrs.get(AttributeKey.stringKey("net.sock.host.addr")) != null) {
assertThat(attrs)
.containsEntry(AttributeKey.stringKey("net.sock.host.addr"), "127.0.0.1");
if (attrs.get(SemanticAttributes.NET_SOCK_HOST_ADDR) != null) {
assertThat(attrs).containsEntry(SemanticAttributes.NET_SOCK_HOST_ADDR, "127.0.0.1");
}
assertThat(attrs)