DataDog · jordan-wong · May 19, 2026 · May 19, 2026 · Jun 1, 2026 · Jun 4, 2026
@@ -27,6 +27,13 @@ public String failureReason() {
 
   @Override
   public boolean test(T t) {
-    return this.expected.equals(t);
+    if (this.expected.equals(t)) {
+      return true;
+    }
+    // Handle CharSequence comparisons (e.g., String vs UTF8BytesString)
+    if (this.expected instanceof String && t instanceof CharSequence) {
+      return ((String) this.expected).contentEquals((CharSequence) t);
+    }
+    return false;
   }
 }
@@ -5,7 +5,9 @@
 import static datadog.trace.agent.test.assertions.Matchers.isNonNull;
 import static datadog.trace.api.DDTags.BASE_SERVICE;
 import static datadog.trace.api.DDTags.DD_INTEGRATION;
+import static datadog.trace.api.DDTags.DD_SVC_SRC;
 import static datadog.trace.api.DDTags.DJM_ENABLED;
+import static datadog.trace.api.DDTags.PEER_SERVICE_SOURCE;
 import static datadog.trace.api.DDTags.DSM_ENABLED;
 import static datadog.trace.api.DDTags.ERROR_MSG;
 import static datadog.trace.api.DDTags.ERROR_STACK;
@@ -22,7 +24,10 @@
 import static datadog.trace.api.DDTags.THREAD_ID;
 import static datadog.trace.api.DDTags.THREAD_NAME;
 import static datadog.trace.api.DDTags.TRACER_HOST;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.PEER_SERVICE;
 import static datadog.trace.common.sampling.RateByServiceTraceSampler.SAMPLING_AGENT_RATE;
+import static datadog.trace.common.sampling.RuleBasedTraceSampler.SAMPLING_LIMIT_RATE;
+import static datadog.trace.common.sampling.RuleBasedTraceSampler.SAMPLING_RULE_RATE;
 import static datadog.trace.common.writer.ddagent.TraceMapper.SAMPLING_PRIORITY_KEY;
 
 import java.util.HashMap;
@@ -42,8 +47,11 @@ public static TagsMatcher defaultTags() {
     tagMatchers.put(RUNTIME_ID_TAG, any());
     tagMatchers.put(LANGUAGE_TAG_KEY, any());
     tagMatchers.put(SAMPLING_AGENT_RATE, any());
+    tagMatchers.put(SAMPLING_LIMIT_RATE, any());
+    tagMatchers.put(SAMPLING_RULE_RATE, any());
     tagMatchers.put(SAMPLING_PRIORITY_KEY.toString(), any());
     tagMatchers.put("_sample_rate", any());
+    tagMatchers.put("env", any());
     tagMatchers.put(PID_TAG, any());
     tagMatchers.put(SCHEMA_VERSION_TAG_KEY, any());
     tagMatchers.put(PROFILING_ENABLED, any());
@@ -55,6 +63,9 @@ public static TagsMatcher defaultTags() {
     tagMatchers.put(SPAN_LINKS, any()); // this is checked by LinksAsserter
     tagMatchers.put(DD_INTEGRATION, any());
     tagMatchers.put(TRACER_HOST, any());
+    tagMatchers.put(DD_SVC_SRC, any());
+    tagMatchers.put(PEER_SERVICE, any());
+    tagMatchers.put(PEER_SERVICE_SOURCE, any());
 
     for (String tagName : REQUIRED_CODE_ORIGIN_TAGS) {
       tagMatchers.put(tagName, any());

@@ -51,7 +51,7 @@ protected String dbInstance(final Connection connection) {
   }
 
   @Override
-  protected String dbHostname(Connection connection) {
+  protected String dbHostname(final Connection connection) {
     return connection.getHost();
   }
 }
@@ -1,30 +1,36 @@
 muzzle {
-  fail {
+  pass {
     group = "redis.clients"
     module = "jedis"
-    versions = "[,3.0.0)"
-    skipVersions += "jedis-3.6.2" // bad release version ("jedis-" prefix)
+    versions = "[3.0.0,4.0.0)"
+    skipVersions += "jedis-3.6.2"
   }
-
-  pass {
+  fail {
     group = "redis.clients"
     module = "jedis"
-    versions = "[3.0.0,4.0.0)"
+    versions = "[,3.0.0)"
+    skipVersions += "jedis-3.6.2"
   }
 }
 
 apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 
+// Ensure tracing is enabled in tests even if DD_TRACE_ENABLED=false is set in the environment
+tasks.withType(Test).configureEach {
+  jvmArgs "-Ddd.trace.enabled=true"
+}
+
 dependencies {
-  compileOnly group: 'redis.clients', name: 'jedis', version: '3.3.0'
+  compileOnly group: 'redis.clients', name: 'jedis', version: '3.0.0'
+  testImplementation group: 'redis.clients', name: 'jedis', version: '3.0.0'
 
-  testImplementation group: 'com.github.codemonstur', name: 'embedded-redis', version: '1.4.3'
-  testImplementation group: 'redis.clients', name: 'jedis', version: '3.3.0'
-  // ensures jedis-1.4 instrumentation does not load with jedis 3.0+ by failing
-  // the tests in the event it does. The tests will end up with double spans
-  testImplementation project(':dd-java-agent:instrumentation:jedis:jedis-1.4')
+  testImplementation (group: 'com.github.codemonstur', name: 'embedded-redis', version: '1.4.3') {
+    // Excluding redis client to avoid conflicts in instrumentation code.
+    exclude group: 'redis.clients', module: 'jedis'
+  }
 
+  // Jedis 4.0 has API changes that prevent this instrumentation from applying
   latestDepTestImplementation group: 'redis.clients', name: 'jedis', version: '3.+'
 }
@@ -1,20 +1,21 @@
 package datadog.trace.instrumentation.jedis30;
 
 import datadog.trace.api.naming.SpanNaming;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.DBTypeProcessingDatabaseClientDecorator;
 import redis.clients.jedis.Connection;
 
-public class JedisClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Connection> {
-  public static final JedisClientDecorator DECORATE = new JedisClientDecorator();
-
+public class Jedis30ClientDecorator extends DBTypeProcessingDatabaseClientDecorator<Connection> {
   private static final String REDIS = "redis";
+  private static final String REDIS_RAW_COMMAND = "redis.raw_command";
+  public static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
   public static final CharSequence OPERATION_NAME =
       UTF8BytesString.create(SpanNaming.instance().namingSchema().cache().operation(REDIS));
   private static final String SERVICE_NAME =
       SpanNaming.instance().namingSchema().cache().service(REDIS);
-  private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("redis-command");
+  public static final Jedis30ClientDecorator DECORATE = new Jedis30ClientDecorator();
 
   @Override
   protected String[] instrumentationNames() {
@@ -55,4 +56,18 @@ protected String dbInstance(final Connection connection) {
   protected String dbHostname(final Connection connection) {
     return connection.getHost();
   }
+
+  @Override
+  public AgentSpan onStatement(final AgentSpan span, final CharSequence statement) {
+    span.setTag(REDIS_RAW_COMMAND, statement.toString());
+    return super.onStatement(span, statement);
+  }
+
+  @Override
+  public AgentSpan onConnection(final AgentSpan span, final Connection connection) {
+    if (connection != null) {
+      setPeerPort(span, connection.getPort());
+    }
+    return super.onConnection(span, connection);
+  }
 }