Skip to content

Add parent span to more lettuce tests #15183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2025
Merged

Add parent span to more lettuce tests #15183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...in/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ void testConnectExceptionInsideTheConnectionFuture() {

@Test
void testSetCommandUsingFutureGetWithTimeout() throws Exception {
RedisFuture<String> redisFuture = asyncCommands.set("TESTSETKEY", "TESTSETVAL");
RedisFuture<String> redisFuture =
testing().runWithSpan("parent", () -> asyncCommands.set("TESTSETKEY", "TESTSETVAL"));
String res = redisFuture.get(3, TimeUnit.SECONDS);

assertThat(res).isEqualTo("OK");
Expand All @@ -156,9 +157,11 @@ void testSetCommandUsingFutureGetWithTimeout() throws Exception {
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("SET")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand Down
20 changes: 13 additions & 7 deletions ...java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,23 +117,29 @@ void testSetCommandWithSubscribeOnDefinedConsumer() throws Exception {
void testGetCommandWithLambdaFunction() throws Exception {
CompletableFuture<String> future = new CompletableFuture<>();

reactiveCommands
.get("TESTKEY")
.subscribe(
res -> {
assertThat(res).isEqualTo("TESTVAL");
future.complete(res);
});
testing()
.runWithSpan(
"parent",
() ->
reactiveCommands
.get("TESTKEY")
.subscribe(
res -> {
assertThat(res).isEqualTo("TESTVAL");
future.complete(res);
}));

assertThat(future.get(10, TimeUnit.SECONDS)).isEqualTo("TESTVAL");

testing()
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("GET")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand Down
40 changes: 31 additions & 9 deletions ...ain/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,19 @@ void testConnectException() {

@Test
void testSetCommand() {
String res = syncCommands.set("TESTSETKEY", "TESTSETVAL");
String res =
testing().runWithSpan("parent", () -> syncCommands.set("TESTSETKEY", "TESTSETVAL"));
assertThat(res).isEqualTo("OK");

testing()
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("SET")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand Down Expand Up @@ -161,16 +164,18 @@ private static AttributeKey[] toArray(List<AttributeKey<?>> expected) {

@Test
void testGetCommand() {
String res = syncCommands.get("TESTKEY");
String res = testing().runWithSpan("parent", () -> syncCommands.get("TESTKEY"));
assertThat(res).isEqualTo("TESTVAL");

testing()
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("GET")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand All @@ -185,16 +190,18 @@ void testGetCommand() {

@Test
void testGetNonExistentKeyCommand() {
String res = syncCommands.get("NON_EXISTENT_KEY");
String res = testing().runWithSpan("parent", () -> syncCommands.get("NON_EXISTENT_KEY"));
assertThat(res).isNull();

testing()
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("GET")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand All @@ -209,16 +216,18 @@ void testGetNonExistentKeyCommand() {

@Test
void testCommandWithNoArguments() {
String res = syncCommands.randomkey();
String res = testing().runWithSpan("parent", () -> syncCommands.randomkey());
assertThat(res).isNotNull();

testing()
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("RANDOMKEY")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand All @@ -243,16 +252,19 @@ void testListCommand() {
testing().clearData();
}

long res = commands.lpush("TESTLIST", "TESTLIST ELEMENT");
long res =
testing().runWithSpan("parent", () -> commands.lpush("TESTLIST", "TESTLIST ELEMENT"));
assertThat(res).isEqualTo(1);

testing()
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("LPUSH")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand All @@ -267,16 +279,18 @@ void testListCommand() {

@Test
void testHashSetCommand() {
String res = syncCommands.hmset("user", testHashMap);
String res = testing().runWithSpan("parent", () -> syncCommands.hmset("user", testHashMap));
assertThat(res).isEqualTo("OK");

testing()
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("HMSET")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand All @@ -293,16 +307,18 @@ void testHashSetCommand() {

@Test
void testHashGetallCommand() {
Map<String, String> res = syncCommands.hgetall("TESTHM");
Map<String, String> res = testing().runWithSpan("parent", () -> syncCommands.hgetall("TESTHM"));
assertThat(res).isEqualTo(testHashMap);

testing()
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("HGETALL")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand All @@ -321,8 +337,12 @@ void testEvalCommand() {
"redis.call('lpush', KEYS[1], ARGV[1], ARGV[2]); return redis.call('llen', KEYS[1])";

Long result =
syncCommands.eval(
script, ScriptOutputType.INTEGER, new String[] {"TESTLIST"}, "abc", "def");
testing()
.runWithSpan(
"parent",
() ->
syncCommands.eval(
script, ScriptOutputType.INTEGER, new String[] {"TESTLIST"}, "abc", "def"));
assertThat(result).isEqualTo(2);

String b64Script = Base64.getEncoder().encodeToString(script.getBytes(UTF_8));
Expand All @@ -331,9 +351,11 @@ void testEvalCommand() {
.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("EVAL")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
Expand Down
Loading