Remove db.connection_string from redis instrumentation (#3094)

open-telemetry · May 27, 2021 · df0d028 · df0d028
1 parent c8ecd9a
commit df0d028
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 71 deletions.
diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesExtractor.java b/...ava/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesExtractor.java
@@ -29,7 +29,7 @@ protected String name(JedisRequest request) {
 
  @Override
  protected String connectionString(JedisRequest request) {
- return request.getConnectionString();
+ return null;
  }
 
  @Override

diff --git a/...ent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisRequest.java b/...ent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisRequest.java
@@ -21,10 +21,6 @@ public abstract class JedisRequest {
 
  public abstract List<byte[]> getArgs();
 
- public String getConnectionString() {
- return getConnection().getHost() + ":" + getConnection().getPort();
- }
-
  public static JedisRequest create(Connection connection, Protocol.Command command) {
  return new AutoValue_JedisRequest(connection, command, emptyList());
  }

diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/test/groovy/JedisClientTest.groovy b/instrumentation/jedis/jedis-1.4/javaagent/src/test/groovy/JedisClientTest.groovy
@@ -49,7 +49,6 @@ class JedisClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "SET foo ?"
  "$SemanticAttributes.DB_OPERATION.key" "SET"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"
@@ -75,7 +74,6 @@ class JedisClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "SET foo ?"
  "$SemanticAttributes.DB_OPERATION.key" "SET"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"
@@ -89,7 +87,6 @@ class JedisClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "GET foo"
  "$SemanticAttributes.DB_OPERATION.key" "GET"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"
@@ -115,7 +112,6 @@ class JedisClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "SET foo ?"
  "$SemanticAttributes.DB_OPERATION.key" "SET"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"
@@ -129,7 +125,6 @@ class JedisClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "RANDOMKEY"
  "$SemanticAttributes.DB_OPERATION.key" "RANDOMKEY"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"

diff --git a/...rc/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisClientTracer.java b/...rc/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisClientTracer.java
@@ -47,7 +47,7 @@ protected String dbSystem(Connection connection) {
 
  @Override
  protected String dbConnectionString(Connection connection) {
- return connection.getHost() + ":" + connection.getPort();
+ return null;
  }
 
  @Override

diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/groovy/Jedis30ClientTest.groovy b/instrumentation/jedis/jedis-3.0/javaagent/src/test/groovy/Jedis30ClientTest.groovy
@@ -49,7 +49,6 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "SET foo ?"
  "$SemanticAttributes.NET_PEER_IP.key" "127.0.0.1"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"
@@ -75,7 +74,6 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "SET foo ?"
  "$SemanticAttributes.NET_PEER_IP.key" "127.0.0.1"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"
@@ -89,7 +87,6 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "GET foo"
  "$SemanticAttributes.NET_PEER_IP.key" "127.0.0.1"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"
@@ -115,7 +112,6 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "SET foo ?"
  "$SemanticAttributes.NET_PEER_IP.key" "127.0.0.1"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"
@@ -129,7 +125,6 @@ class Jedis30ClientTest extends AgentInstrumentationSpecification {
  kind CLIENT
  attributes {
  "$SemanticAttributes.DB_SYSTEM.key" "redis"
- "$SemanticAttributes.DB_CONNECTION_STRING.key" "localhost:$port"
  "$SemanticAttributes.DB_STATEMENT.key" "RANDOMKEY"
  "$SemanticAttributes.NET_PEER_IP.key" "127.0.0.1"
  "$SemanticAttributes.NET_PEER_NAME.key" "localhost"

diff --git a/.../io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.groovy b/.../io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.groovy
@@ -48,7 +48,6 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest implem
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "SET a ?"
  }
@@ -67,7 +66,6 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest implem
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "GET a"
  }

diff --git a/...ary/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/...ary/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java
@@ -319,13 +319,5 @@ private void finish(Span span) {
  private static void fillEndpoint(AttributeSetter span, OpenTelemetryEndpoint endpoint) {
  span.setAttribute(SemanticAttributes.NET_TRANSPORT, IP_TCP);
  NetPeerAttributes.INSTANCE.setNetPeer(span, endpoint.name, endpoint.ip, endpoint.port);
-
- StringBuilder redisUrl =
- new StringBuilder("redis://").append(endpoint.name != null ? endpoint.name : endpoint.ip);
- if (endpoint.port > 0) {
- redisUrl.append(":").append(endpoint.port);
- }
-
- span.setAttribute(SemanticAttributes.DB_CONNECTION_STRING, redisUrl.toString());
  }
 }
diff --git a/...roovy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.groovy b/...roovy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.groovy
@@ -146,7 +146,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "SET TESTSETKEY ?"
  }
@@ -188,7 +187,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "GET TESTKEY"
  }
@@ -244,7 +242,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "GET NON_EXISTENT_KEY"
  }
@@ -286,7 +283,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_STATEMENT.key}" "RANDOMKEY"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  }
@@ -346,7 +342,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "HMSET TESTHM firstname ? lastname ? age ?"
  }
@@ -366,7 +361,6 @@ abstract class AbstractLettuceAsyncClientTest extends InstrumentationSpecificati
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "HGETALL TESTHM"
  }

diff --git a/...vy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.groovy b/...vy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.groovy
@@ -95,7 +95,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "SET TESTSETKEY ?"
  }
@@ -128,7 +127,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "GET TESTKEY"
  }
@@ -169,7 +167,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "GET NON_EXISTENT_KEY"
  }
@@ -208,7 +205,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_STATEMENT.key}" "RANDOMKEY"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  }
@@ -237,7 +233,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_STATEMENT.key}" "COMMAND"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  }
@@ -285,7 +280,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "SET a ?"
  }
@@ -304,7 +298,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "GET a"
  }
@@ -343,7 +336,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "SET a ?"
  }
@@ -362,7 +354,6 @@ abstract class AbstractLettuceReactiveClientTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "GET a"
  }

diff --git a/...vy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.groovy b/...vy/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.groovy
@@ -70,7 +70,6 @@ abstract class AbstractLettuceSyncClientAuthTest extends InstrumentationSpecific
  "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
  "${SemanticAttributes.NET_PEER_IP.key}" "127.0.0.1"
  "${SemanticAttributes.NET_PEER_PORT.key}" port
- "${SemanticAttributes.DB_CONNECTION_STRING.key}" "redis://127.0.0.1:$port"
  "${SemanticAttributes.DB_SYSTEM.key}" "redis"
  "${SemanticAttributes.DB_STATEMENT.key}" "AUTH ?"
  }