Skip to content

Fix rabbitmq testLatestDeps #15048

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 4 commits into from
Oct 20, 2025
Merged

Fix rabbitmq testLatestDeps #15048

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09c8939
Fix rabbitmq testLatestDeps
jaydeluca Oct 18, 2025
0ea7355
fix up test
jaydeluca Oct 18, 2025
5710b52
Merge branch 'main' into rabbit-latest-deps
jaydeluca Oct 19, 2025
50dca51
update api diffs
laurit Oct 20, 2025
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
2 changes: 2 additions & 0 deletions instrumentation/rabbitmq-2.7/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,7 @@ tasks.withType<Test>().configureEach {
jvmArgs("-Dotel.instrumentation.rabbitmq.experimental-span-attributes=true")
jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")

systemProperty("testLatestDeps", findProperty("testLatestDeps") ?: "false")

usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
}
54 changes: 26 additions & 28 deletions ...rc/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,32 @@

package io.opentelemetry.javaagent.instrumentation.rabbitmq;

import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE;
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingSystemIncubatingValues.RABBITMQ;
import static org.assertj.core.api.Assertions.assertThat;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import reactor.rabbitmq.ExchangeSpecification;
import reactor.rabbitmq.RabbitFlux;
import reactor.rabbitmq.Sender;
import reactor.rabbitmq.SenderOptions;

@DisabledIfSystemProperty(
named = "testLatestDeps",
matches = "true",
disabledReason =
"reactor-rabbitmq 1.5.6 (and earlier) still calls `void useNio()` which was removed in 5.27.0")
class ReactorRabbitMqTest extends AbstractRabbitMqTest {
@RegisterExtension
private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
Expand All @@ -33,33 +40,24 @@ void testShouldNotFailDeclaringExchange() {
Sender sender =
RabbitFlux.createSender(new SenderOptions().connectionFactory(connectionFactory));

try {
sender.declareExchange(ExchangeSpecification.exchange("testExchange")).block();
} catch (RuntimeException e) {
Assertions.fail("Should not fail declaring exchange", e);
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these changes to the test itself are just cleanups and refactoring to use our more standard approach of assertions

sender.declareExchange(ExchangeSpecification.exchange("testExchange")).block();

testing.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> {
span.hasName("exchange.declare")
.hasKind(SpanKind.CLIENT)
.hasAttribute(MESSAGING_SYSTEM, "rabbitmq")
.hasAttribute(AttributeKey.stringKey("rabbitmq.command"), "exchange.declare")
.hasAttributesSatisfying(
attributes ->
assertThat(attributes)
.satisfies(
attrs -> {
String peerAddr = attrs.get(NETWORK_PEER_ADDRESS);
assertThat(peerAddr).isIn(rabbitMqIp, null);

String networkType = attrs.get(NETWORK_TYPE);
assertThat(networkType).isIn("ipv4", "ipv6", null);

assertNotNull(attrs.get(NETWORK_PEER_PORT));
}));
}));
span ->
span.hasName("exchange.declare")
.hasKind(SpanKind.CLIENT)
.hasAttributesSatisfyingExactly(
equalTo(MESSAGING_SYSTEM, RABBITMQ),
equalTo(stringKey("rabbitmq.command"), "exchange.declare"),
satisfies(
NETWORK_PEER_ADDRESS,
addr -> addr.satisfies(a -> assertThat(a).isIn(rabbitMqIp, null))),
satisfies(
NETWORK_TYPE,
type ->
type.satisfies(t -> assertThat(t).isIn("ipv4", "ipv6", null))),
satisfies(NETWORK_PEER_PORT, port -> assertThat(port).isNotNull()))));
}
}
Loading