Skip to content

Commit c7e8a67

Browse files
ggivoRohanNagartishun
authored
[Backport] Reduce CPU cycles spent on setting tracing tags (#3339) (#3505)
(cherry picked from commit 5d96c67) Co-authored-by: Rohan Nagar <[email protected]> Co-authored-by: Tihomir Mateev <[email protected]>
1 parent ec0535e commit c7e8a67

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

src/main/java/io/lettuce/core/protocol/CommandHandler.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@
3030
import java.util.Collection;
3131
import java.util.LinkedHashSet;
3232
import java.util.List;
33-
import java.util.Optional;
3433
import java.util.Queue;
3534
import java.util.Set;
3635
import java.util.concurrent.atomic.AtomicLong;
3736

3837
import io.lettuce.core.ClientOptions;
39-
import io.lettuce.core.ConnectionBuilder;
4038
import io.lettuce.core.RedisConnectionException;
41-
import io.lettuce.core.RedisCredentials;
4239
import io.lettuce.core.RedisException;
43-
import io.lettuce.core.RedisURI;
4440
import io.lettuce.core.api.push.PushListener;
4541
import io.lettuce.core.api.push.PushMessage;
4642
import io.lettuce.core.datastructure.queue.HashIndexedQueue;
@@ -489,15 +485,6 @@ private void attachTracing(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> comm
489485
Tracer.Span span = tracer.nextSpan(context);
490486
span.name(command.getType().toString());
491487

492-
if (channel.hasAttr(ConnectionBuilder.REDIS_URI)) {
493-
String redisUriStr = channel.attr(ConnectionBuilder.REDIS_URI).get();
494-
RedisURI redisURI = RedisURI.create(redisUriStr);
495-
span.tag("server.address", redisURI.toString());
496-
span.tag("db.namespace", String.valueOf(redisURI.getDatabase()));
497-
span.tag("user.name", Optional.ofNullable(redisURI.getCredentialsProvider().resolveCredentials().block())
498-
.map(RedisCredentials::getUsername).orElse(""));
499-
}
500-
501488
if (tracedEndpoint != null) {
502489
span.remoteEndpoint(tracedEndpoint);
503490
} else {

src/test/java/io/lettuce/core/tracing/SynchronousIntegrationTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ public SampleTestRunnerConsumer yourCode() {
7878
.containsEntry("net.sock.peer.addr", TestSettings.host())
7979
.containsEntry("net.sock.peer.port", "" + TestSettings.port());
8080
assertThat(finishedSpan.getTags()).containsKeys("db.operation");
81-
assertThat(finishedSpan.getTags()).containsKeys("server.address");
82-
assertThat(finishedSpan.getTags()).containsKeys("db.namespace");
83-
assertThat(finishedSpan.getTags()).containsKeys("user.name");
8481
}
8582

8683
assertThat(commands).extracting(RedisCommand::getType).contains(CommandType.PING, CommandType.HELLO);

0 commit comments

Comments
 (0)