Skip to content

Commit 2f78f45

Browse files
otelbot[bot]AlixBa
otelbot[bot]
authored and
AlixBa
committed
./gradlew spotlessApply
1 parent b02272e commit 2f78f45

File tree

5 files changed

+128
-88
lines changed

5 files changed

+128
-88
lines changed

‎instrumentation/nats/nats-2.21/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_21/ConnectionSubscribeInstrumentation.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ public void transform(TypeTransformer transformer) {
4141
public static class SubscribeAdvice {
4242
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
4343
public static void onExit(
44-
@Advice.This Connection connection,
45-
@Advice.Return Subscription subscription
46-
) {
44+
@Advice.This Connection connection, @Advice.Return Subscription subscription) {
4745
NatsData.addSubscription(subscription, connection);
4846
}
4947
}

‎instrumentation/nats/nats-2.21/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/nats/v2_21/MessageHandlerInstrumentation.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ public static void onEnter(
5050
@Advice.Argument(0) Message message,
5151
@Advice.Local("otelContext") Context otelContext,
5252
@Advice.Local("otelScope") Scope otelScope,
53-
@Advice.Local("natsRequest") NatsRequest natsRequest
54-
) {
53+
@Advice.Local("natsRequest") NatsRequest natsRequest) {
5554
Timer timer = Timer.start();
5655

5756
Context parentContext = Context.current();
@@ -61,8 +60,15 @@ public static void onEnter(
6160
return;
6261
}
6362

64-
Context receiveContext = InstrumenterUtil.startAndEnd(CONSUMER_RECEIVE_INSTRUMENTER, parentContext, natsRequest, null,
65-
null, timer.startTime(), timer.now());
63+
Context receiveContext =
64+
InstrumenterUtil.startAndEnd(
65+
CONSUMER_RECEIVE_INSTRUMENTER,
66+
parentContext,
67+
natsRequest,
68+
null,
69+
null,
70+
timer.startTime(),
71+
timer.now());
6672

6773
if (!CONSUMER_PROCESS_INSTRUMENTER.shouldStart(receiveContext, natsRequest)) {
6874
return;
@@ -77,8 +83,7 @@ public static void onExit(
7783
@Advice.Thrown Throwable throwable,
7884
@Advice.Local("otelContext") Context otelContext,
7985
@Advice.Local("otelScope") Scope otelScope,
80-
@Advice.Local("natsRequest") NatsRequest natsRequest
81-
) {
86+
@Advice.Local("natsRequest") NatsRequest natsRequest) {
8287
if (otelScope == null) {
8388
return;
8489
}
@@ -87,5 +92,4 @@ public static void onExit(
8792
CONSUMER_PROCESS_INSTRUMENTER.end(otelContext, natsRequest, null, throwable);
8893
}
8994
}
90-
9195
}

‎instrumentation/nats/nats-2.21/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/nats/v2_21/NatsInstrumentationRequestTest.java‎

Lines changed: 105 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -312,45 +312,59 @@ private static void assertPublishSpan() {
312312
equalTo(
313313
AttributeKey.stringKey("messaging.client_id"),
314314
String.valueOf(clientId))),
315-
span -> span
316-
.has(new Condition<>(
317-
data -> data.getName().startsWith("_INBOX.") && data.getName()
318-
.endsWith(" receive"), "Name condition"))
319-
.hasKind(SpanKind.CONSUMER)
320-
.hasParent(trace.getSpan(1))
321-
.hasAttributesSatisfyingExactly(
322-
equalTo(MESSAGING_OPERATION, "receive"),
323-
equalTo(MESSAGING_SYSTEM, "nats"),
324-
satisfies(MESSAGING_DESTINATION_NAME, name -> name.startsWith("_INBOX.")),
325-
equalTo(MESSAGING_MESSAGE_BODY_SIZE, 1),
326-
equalTo(
327-
AttributeKey.stringKey("messaging.client_id"),
328-
String.valueOf(clientId))),
329-
span -> span
330-
.has(new Condition<>(
331-
data -> data.getName().startsWith("_INBOX.") && data.getName()
332-
.endsWith(" process"), "Name condition"))
333-
.hasKind(SpanKind.INTERNAL)
334-
.hasParent(trace.getSpan(2))
335-
.hasAttributesSatisfyingExactly(
336-
equalTo(MESSAGING_OPERATION, "process"),
337-
equalTo(MESSAGING_SYSTEM, "nats"),
338-
satisfies(MESSAGING_DESTINATION_NAME, name -> name.startsWith("_INBOX.")),
339-
equalTo(MESSAGING_MESSAGE_BODY_SIZE, 1),
340-
equalTo(
341-
AttributeKey.stringKey("messaging.client_id"),
342-
String.valueOf(clientId)))),
315+
span ->
316+
span.has(
317+
new Condition<>(
318+
data ->
319+
data.getName().startsWith("_INBOX.")
320+
&& data.getName().endsWith(" receive"),
321+
"Name condition"))
322+
.hasKind(SpanKind.CONSUMER)
323+
.hasParent(trace.getSpan(1))
324+
.hasAttributesSatisfyingExactly(
325+
equalTo(MESSAGING_OPERATION, "receive"),
326+
equalTo(MESSAGING_SYSTEM, "nats"),
327+
satisfies(
328+
MESSAGING_DESTINATION_NAME, name -> name.startsWith("_INBOX.")),
329+
equalTo(MESSAGING_MESSAGE_BODY_SIZE, 1),
330+
equalTo(
331+
AttributeKey.stringKey("messaging.client_id"),
332+
String.valueOf(clientId))),
333+
span ->
334+
span.has(
335+
new Condition<>(
336+
data ->
337+
data.getName().startsWith("_INBOX.")
338+
&& data.getName().endsWith(" process"),
339+
"Name condition"))
340+
.hasKind(SpanKind.INTERNAL)
341+
.hasParent(trace.getSpan(2))
342+
.hasAttributesSatisfyingExactly(
343+
equalTo(MESSAGING_OPERATION, "process"),
344+
equalTo(MESSAGING_SYSTEM, "nats"),
345+
satisfies(
346+
MESSAGING_DESTINATION_NAME, name -> name.startsWith("_INBOX.")),
347+
equalTo(MESSAGING_MESSAGE_BODY_SIZE, 1),
348+
equalTo(
349+
AttributeKey.stringKey("messaging.client_id"),
350+
String.valueOf(clientId)))),
343351
// dispatcher receive, process, publish, not retesting all properties
344-
trace -> trace.hasSpansSatisfyingExactly(
345-
span -> span.hasName("sub receive").hasKind(SpanKind.CONSUMER).hasNoParent(),
346-
span -> span.hasName("sub process").hasKind(SpanKind.INTERNAL)
347-
.hasParent(trace.getSpan(0)),
348-
span -> span
349-
.has(new Condition<>(
350-
data -> data.getName().startsWith("_INBOX.") && data.getName()
351-
.endsWith(" publish"), "Name condition"))
352-
.hasKind(SpanKind.PRODUCER).hasParent(trace.getSpan(1))
353-
));
352+
trace ->
353+
trace.hasSpansSatisfyingExactly(
354+
span -> span.hasName("sub receive").hasKind(SpanKind.CONSUMER).hasNoParent(),
355+
span ->
356+
span.hasName("sub process")
357+
.hasKind(SpanKind.INTERNAL)
358+
.hasParent(trace.getSpan(0)),
359+
span ->
360+
span.has(
361+
new Condition<>(
362+
data ->
363+
data.getName().startsWith("_INBOX.")
364+
&& data.getName().endsWith(" publish"),
365+
"Name condition"))
366+
.hasKind(SpanKind.PRODUCER)
367+
.hasParent(trace.getSpan(1))));
354368
}
355369

356370
private static void assertPublishSpanSameTrace() {
@@ -372,45 +386,61 @@ private static void assertPublishSpanSameTrace() {
372386
String.valueOf(clientId))),
373387

374388
// dispatcher receive, process, publish, not retesting all properties
375-
span -> span.hasName("sub receive").hasKind(SpanKind.CONSUMER)
376-
.hasParent(trace.getSpan(1)),
377-
span -> span.hasName("sub process").hasKind(SpanKind.INTERNAL)
378-
.hasParent(trace.getSpan(2)),
379-
span -> span
380-
.has(new Condition<>(
381-
data -> data.getName().startsWith("_INBOX.") && data.getName()
382-
.endsWith(" publish"), "Name condition"))
383-
.hasKind(SpanKind.PRODUCER).hasParent(trace.getSpan(3)),
389+
span ->
390+
span.hasName("sub receive")
391+
.hasKind(SpanKind.CONSUMER)
392+
.hasParent(trace.getSpan(1)),
393+
span ->
394+
span.hasName("sub process")
395+
.hasKind(SpanKind.INTERNAL)
396+
.hasParent(trace.getSpan(2)),
397+
span ->
398+
span.has(
399+
new Condition<>(
400+
data ->
401+
data.getName().startsWith("_INBOX.")
402+
&& data.getName().endsWith(" publish"),
403+
"Name condition"))
404+
.hasKind(SpanKind.PRODUCER)
405+
.hasParent(trace.getSpan(3)),
384406
// end dispatcher
385407

386-
span -> span
387-
.has(new Condition<>(
388-
data -> data.getName().startsWith("_INBOX.") && data.getName()
389-
.endsWith(" receive"), "Name condition"))
390-
.hasKind(SpanKind.CONSUMER)
391-
.hasParent(trace.getSpan(1))
392-
.hasAttributesSatisfyingExactly(
393-
equalTo(MESSAGING_OPERATION, "receive"),
394-
equalTo(MESSAGING_SYSTEM, "nats"),
395-
satisfies(MESSAGING_DESTINATION_NAME, name -> name.startsWith("_INBOX.")),
396-
equalTo(MESSAGING_MESSAGE_BODY_SIZE, 1),
397-
equalTo(
398-
AttributeKey.stringKey("messaging.client_id"),
399-
String.valueOf(clientId))),
400-
span -> span
401-
.has(new Condition<>(
402-
data -> data.getName().startsWith("_INBOX.") && data.getName()
403-
.endsWith(" process"), "Name condition"))
404-
.hasKind(SpanKind.INTERNAL)
405-
.hasParent(trace.getSpan(5))
406-
.hasAttributesSatisfyingExactly(
407-
equalTo(MESSAGING_OPERATION, "process"),
408-
equalTo(MESSAGING_SYSTEM, "nats"),
409-
satisfies(MESSAGING_DESTINATION_NAME, name -> name.startsWith("_INBOX.")),
410-
equalTo(MESSAGING_MESSAGE_BODY_SIZE, 1),
411-
equalTo(
412-
AttributeKey.stringKey("messaging.client_id"),
413-
String.valueOf(clientId)))));
408+
span ->
409+
span.has(
410+
new Condition<>(
411+
data ->
412+
data.getName().startsWith("_INBOX.")
413+
&& data.getName().endsWith(" receive"),
414+
"Name condition"))
415+
.hasKind(SpanKind.CONSUMER)
416+
.hasParent(trace.getSpan(1))
417+
.hasAttributesSatisfyingExactly(
418+
equalTo(MESSAGING_OPERATION, "receive"),
419+
equalTo(MESSAGING_SYSTEM, "nats"),
420+
satisfies(
421+
MESSAGING_DESTINATION_NAME, name -> name.startsWith("_INBOX.")),
422+
equalTo(MESSAGING_MESSAGE_BODY_SIZE, 1),
423+
equalTo(
424+
AttributeKey.stringKey("messaging.client_id"),
425+
String.valueOf(clientId))),
426+
span ->
427+
span.has(
428+
new Condition<>(
429+
data ->
430+
data.getName().startsWith("_INBOX.")
431+
&& data.getName().endsWith(" process"),
432+
"Name condition"))
433+
.hasKind(SpanKind.INTERNAL)
434+
.hasParent(trace.getSpan(5))
435+
.hasAttributesSatisfyingExactly(
436+
equalTo(MESSAGING_OPERATION, "process"),
437+
equalTo(MESSAGING_SYSTEM, "nats"),
438+
satisfies(
439+
MESSAGING_DESTINATION_NAME, name -> name.startsWith("_INBOX.")),
440+
equalTo(MESSAGING_MESSAGE_BODY_SIZE, 1),
441+
equalTo(
442+
AttributeKey.stringKey("messaging.client_id"),
443+
String.valueOf(clientId)))));
414444
}
415445

416446
private static void assertTimeoutPublishSpan() {

‎instrumentation/nats/nats-2.21/library/src/main/java/io/opentelemetry/instrumentation/nats/v2_21/OpenTelemetryMessageHandler.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,15 @@ public void onMessage(Message message) throws InterruptedException {
4545
return;
4646
}
4747

48-
Context receiveContext = InstrumenterUtil.startAndEnd(consumerReceiveInstrumenter,
49-
parentContext, natsRequest, null, null, timer.startTime(), timer.now());
48+
Context receiveContext =
49+
InstrumenterUtil.startAndEnd(
50+
consumerReceiveInstrumenter,
51+
parentContext,
52+
natsRequest,
53+
null,
54+
null,
55+
timer.startTime(),
56+
timer.now());
5057

5158
if (!consumerProcessInstrumenter.shouldStart(receiveContext, natsRequest)) {
5259
delegate.onMessage(message);

‎instrumentation/nats/nats-2.21/library/src/main/java/io/opentelemetry/instrumentation/nats/v2_21/internal/NatsRequestContextCustomizer.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public NatsRequestContextCustomizer(TextMapPropagator propagator) {
3232
public Context onStart(
3333
Context parentContext, NatsRequest natsRequest, Attributes startAttributes) {
3434
if (!Span.fromContext(parentContext).getSpanContext().isValid()
35-
&& natsRequest.getReplyTo() != null && natsRequest.getReplyTo().startsWith("_INBOX.")) {
35+
&& natsRequest.getReplyTo() != null
36+
&& natsRequest.getReplyTo().startsWith("_INBOX.")) {
3637
return propagator.extract(parentContext, natsRequest, NatsRequestTextMapGetter.INSTANCE);
3738
}
3839

0 commit comments

Comments
 (0)