Skip to content

test(rabbitmq): add coverage for new network semantic conventions #14749

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

Closed
wants to merge 4 commits into from
Closed

test(rabbitmq): add coverage for new network semantic conventions #14749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1a9b73
test(rabbitmq): add coverage for new network semantic conventions
bhawnapannu2701 Sep 22, 2025
dd5def2
test(rabbitmq): read NETWORK_PEER_PORT as Long; accept legacy or new …
bhawnapannu2701 Sep 24, 2025
4b7337f
Merge branch 'main' into rabbitmq-new-network-test
bhawnapannu2701 Sep 24, 2025
f9b6b87
./gradlew spotlessApply
otelbot[bot] Sep 24, 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
8,826 changes: 8,826 additions & 0 deletions build_rabbitmq_test.log
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 27 additions & 7 deletions ...agent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,13 +875,33 @@ private static void verifyNetAttributes(SpanDataAssert span) {
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));
// Legacy convention keys (already imported statically)
String legacyPeerAddr = attrs.get(NETWORK_PEER_ADDRESS);
String legacyType = attrs.get(NETWORK_TYPE);
Long legacyPeerPort = attrs.get(NETWORK_PEER_PORT); // <-- Long, not Integer

// New(er) semconv keys — use literal names via AttributeKey
String serverAddr = attrs.get(AttributeKey.stringKey("server.address"));
Long serverPortNum = attrs.get(AttributeKey.longKey("server.port"));
String clientAddr = attrs.get(AttributeKey.stringKey("client.address"));
Long clientPortNum = attrs.get(AttributeKey.longKey("client.port"));

boolean hasAddress =
(legacyPeerAddr != null) || (serverAddr != null) || (clientAddr != null);
boolean hasPort =
(legacyPeerPort != null)
|| (serverPortNum != null)
|| (clientPortNum != null);

assertThat(hasAddress)
.as("Expect network peer/server/client address attribute")
.isTrue();
assertThat(hasPort)
.as("Expect network peer/server/client port attribute")
.isTrue();

// Optional; if present must be ipv4/ipv6
assertThat(legacyType).isIn("ipv4", "ipv6", null);
});
});
}
Expand Down