Skip to content

Commit 1552cd2

Browse files
AlixBaAlixBa
committed
Refactor tests/names & minor fixes
1 parent a20de0f commit 1552cd2

File tree

21 files changed

+370
-366
lines changed

21 files changed

+370
-366
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ public void transform(TypeTransformer transformer) {
4747
.and(takesArgument(0, String.class))
4848
.and(takesArgument(1, named("io.nats.client.impl.Headers")))
4949
.and(takesArgument(2, byte[].class)),
50-
ConnectionPublishInstrumentation.class.getName() + "$PublishBodyHeadersAdvice");
50+
ConnectionPublishInstrumentation.class.getName() + "$PublishHeadersBodyAdvice");
5151
transformer.applyAdviceToMethod(
5252
isPublic()
5353
.and(named("publish"))
5454
.and(takesArguments(3))
5555
.and(takesArgument(0, String.class))
5656
.and(takesArgument(1, String.class))
5757
.and(takesArgument(2, byte[].class)),
58-
ConnectionPublishInstrumentation.class.getName() + "$PublishBodyReplyToAdvice");
58+
ConnectionPublishInstrumentation.class.getName() + "$PublishReplyToBodyAdvice");
5959
transformer.applyAdviceToMethod(
6060
isPublic()
6161
.and(named("publish"))
@@ -64,7 +64,7 @@ public void transform(TypeTransformer transformer) {
6464
.and(takesArgument(1, String.class))
6565
.and(takesArgument(2, named("io.nats.client.impl.Headers")))
6666
.and(takesArgument(3, byte[].class)),
67-
ConnectionPublishInstrumentation.class.getName() + "$PublishBodyReplyToHeadersAdvice");
67+
ConnectionPublishInstrumentation.class.getName() + "$PublishReplyToHeadersBodyAdvice");
6868
transformer.applyAdviceToMethod(
6969
isPublic()
7070
.and(named("publish"))
@@ -85,7 +85,7 @@ public static void onEnter(
8585
@Advice.Local("otelScope") Scope otelScope,
8686
@Advice.Local("natsRequest") NatsRequest natsRequest) {
8787
Context parentContext = Context.current();
88-
natsRequest = NatsRequest.create(connection, subject, body);
88+
natsRequest = NatsRequest.create(connection, null, subject, null, body);
8989

9090
if (!PRODUCER_INSTRUMENTER.shouldStart(parentContext, natsRequest)) {
9191
return;
@@ -113,7 +113,7 @@ public static void onExit(
113113
}
114114

115115
@SuppressWarnings("unused")
116-
public static class PublishBodyHeadersAdvice {
116+
public static class PublishHeadersBodyAdvice {
117117

118118
@Advice.OnMethodEnter(suppress = Throwable.class)
119119
public static void onEnter(
@@ -125,7 +125,7 @@ public static void onEnter(
125125
@Advice.Local("otelScope") Scope otelScope,
126126
@Advice.Local("natsRequest") NatsRequest natsRequest) {
127127
Context parentContext = Context.current();
128-
natsRequest = NatsRequest.create(connection, subject, headers, body);
128+
natsRequest = NatsRequest.create(connection, null, subject, headers, body);
129129

130130
if (!PRODUCER_INSTRUMENTER.shouldStart(parentContext, natsRequest)) {
131131
return;
@@ -154,7 +154,7 @@ public static void onExit(
154154
}
155155

156156
@SuppressWarnings("unused")
157-
public static class PublishBodyReplyToAdvice {
157+
public static class PublishReplyToBodyAdvice {
158158

159159
@Advice.OnMethodEnter(suppress = Throwable.class)
160160
public static void onEnter(
@@ -166,7 +166,7 @@ public static void onEnter(
166166
@Advice.Local("otelScope") Scope otelScope,
167167
@Advice.Local("natsRequest") NatsRequest natsRequest) {
168168
Context parentContext = Context.current();
169-
natsRequest = NatsRequest.create(connection, subject, body);
169+
natsRequest = NatsRequest.create(connection, replyTo, subject, null, body);
170170

171171
if (!PRODUCER_INSTRUMENTER.shouldStart(parentContext, natsRequest)) {
172172
return;
@@ -195,7 +195,7 @@ public static void onExit(
195195
}
196196

197197
@SuppressWarnings("unused")
198-
public static class PublishBodyReplyToHeadersAdvice {
198+
public static class PublishReplyToHeadersBodyAdvice {
199199

200200
@Advice.OnMethodEnter(suppress = Throwable.class)
201201
public static void onEnter(
@@ -208,7 +208,7 @@ public static void onEnter(
208208
@Advice.Local("otelScope") Scope otelScope,
209209
@Advice.Local("natsRequest") NatsRequest natsRequest) {
210210
Context parentContext = Context.current();
211-
natsRequest = NatsRequest.create(connection, subject, headers, body);
211+
natsRequest = NatsRequest.create(connection, replyTo, subject, headers, body);
212212

213213
if (!PRODUCER_INSTRUMENTER.shouldStart(parentContext, natsRequest)) {
214214
return;

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void transform(TypeTransformer transformer) {
5656
.and(takesArgument(2, byte[].class))
5757
.and(takesArgument(3, Duration.class))
5858
.and(returns(named("io.nats.client.Message"))),
59-
ConnectionRequestInstrumentation.class.getName() + "$RequestBodyHeadersAdvice");
59+
ConnectionRequestInstrumentation.class.getName() + "$RequestHeadersBodyAdvice");
6060
transformer.applyAdviceToMethod(
6161
isPublic()
6262
.and(named("request"))
@@ -81,7 +81,7 @@ public void transform(TypeTransformer transformer) {
8181
.and(takesArgument(1, named("io.nats.client.impl.Headers")))
8282
.and(takesArgument(2, byte[].class))
8383
.and(returns(named("java.util.concurrent.CompletableFuture"))),
84-
ConnectionRequestInstrumentation.class.getName() + "$RequestFutureBodyHeadersAdvice");
84+
ConnectionRequestInstrumentation.class.getName() + "$RequestFutureHeadersBodyAdvice");
8585
transformer.applyAdviceToMethod(
8686
isPublic()
8787
.and(named("request"))
@@ -97,7 +97,7 @@ public void transform(TypeTransformer transformer) {
9797
.and(takesArgument(1, byte[].class))
9898
.and(takesArgument(2, Duration.class))
9999
.and(returns(named("java.util.concurrent.CompletableFuture"))),
100-
ConnectionRequestInstrumentation.class.getName() + "$RequestFutureTimeoutBodyAdvice");
100+
ConnectionRequestInstrumentation.class.getName() + "$RequestTimeoutFutureBodyAdvice");
101101
transformer.applyAdviceToMethod(
102102
isPublic()
103103
.and(named("requestWithTimeout"))
@@ -108,15 +108,15 @@ public void transform(TypeTransformer transformer) {
108108
.and(takesArgument(3, Duration.class))
109109
.and(returns(named("java.util.concurrent.CompletableFuture"))),
110110
ConnectionRequestInstrumentation.class.getName()
111-
+ "$RequestFutureTimeoutBodyHeadersAdvice");
111+
+ "$RequestTimeoutFutureHeadersBodyAdvice");
112112
transformer.applyAdviceToMethod(
113113
isPublic()
114114
.and(named("requestWithTimeout"))
115115
.and(takesArguments(2))
116116
.and(takesArgument(0, named("io.nats.client.Message")))
117117
.and(takesArgument(1, Duration.class))
118118
.and(returns(named("java.util.concurrent.CompletableFuture"))),
119-
ConnectionRequestInstrumentation.class.getName() + "$RequestFutureTimeoutMessageAdvice");
119+
ConnectionRequestInstrumentation.class.getName() + "$RequestTimeoutFutureMessageAdvice");
120120
}
121121

122122
@SuppressWarnings("unused")
@@ -130,7 +130,7 @@ public static void onEnter(
130130
@Advice.Local("otelContext") Context otelContext,
131131
@Advice.Local("otelScope") Scope otelScope,
132132
@Advice.Local("natsRequest") NatsRequest natsRequest) {
133-
natsRequest = NatsRequest.create(connection, subject, body);
133+
natsRequest = NatsRequest.create(connection, null, subject, null, body);
134134
Context parentContext = Context.current();
135135

136136
if (!CLIENT_INSTRUMENTER.shouldStart(parentContext, natsRequest)) {
@@ -167,7 +167,7 @@ public static void onExit(
167167
}
168168

169169
@SuppressWarnings("unused")
170-
public static class RequestBodyHeadersAdvice {
170+
public static class RequestHeadersBodyAdvice {
171171

172172
@Advice.OnMethodEnter(suppress = Throwable.class)
173173
public static void onEnter(
@@ -178,7 +178,7 @@ public static void onEnter(
178178
@Advice.Local("otelContext") Context otelContext,
179179
@Advice.Local("otelScope") Scope otelScope,
180180
@Advice.Local("natsRequest") NatsRequest natsRequest) {
181-
natsRequest = NatsRequest.create(connection, subject, headers, body);
181+
natsRequest = NatsRequest.create(connection, null, subject, headers, body);
182182
Context parentContext = Context.current();
183183

184184
if (!CLIENT_INSTRUMENTER.shouldStart(parentContext, natsRequest)) {
@@ -272,7 +272,7 @@ public static void onEnter(
272272
@Advice.Local("otelParentContext") Context otelParentContext,
273273
@Advice.Local("otelScope") Scope otelScope,
274274
@Advice.Local("natsRequest") NatsRequest natsRequest) {
275-
natsRequest = NatsRequest.create(connection, subject, body);
275+
natsRequest = NatsRequest.create(connection, null, subject, null, body);
276276
otelParentContext = Context.current();
277277

278278
if (!CLIENT_INSTRUMENTER.shouldStart(otelParentContext, natsRequest)) {
@@ -308,7 +308,7 @@ public static void onExit(
308308
}
309309

310310
@SuppressWarnings("unused")
311-
public static class RequestFutureBodyHeadersAdvice {
311+
public static class RequestFutureHeadersBodyAdvice {
312312

313313
@Advice.OnMethodEnter(suppress = Throwable.class)
314314
public static void onEnter(
@@ -320,7 +320,7 @@ public static void onEnter(
320320
@Advice.Local("otelParentContext") Context otelParentContext,
321321
@Advice.Local("otelScope") Scope otelScope,
322322
@Advice.Local("natsRequest") NatsRequest natsRequest) {
323-
natsRequest = NatsRequest.create(connection, subject, headers, body);
323+
natsRequest = NatsRequest.create(connection, null, subject, headers, body);
324324
otelParentContext = Context.current();
325325

326326
if (!CLIENT_INSTRUMENTER.shouldStart(otelParentContext, natsRequest)) {
@@ -402,7 +402,7 @@ public static void onExit(
402402
}
403403

404404
@SuppressWarnings("unused")
405-
public static class RequestFutureTimeoutBodyAdvice {
405+
public static class RequestTimeoutFutureBodyAdvice {
406406

407407
@Advice.OnMethodEnter(suppress = Throwable.class)
408408
public static void onEnter(
@@ -413,7 +413,7 @@ public static void onEnter(
413413
@Advice.Local("otelParentContext") Context otelParentContext,
414414
@Advice.Local("otelScope") Scope otelScope,
415415
@Advice.Local("natsRequest") NatsRequest natsRequest) {
416-
natsRequest = NatsRequest.create(connection, subject, body);
416+
natsRequest = NatsRequest.create(connection, null, subject, null, body);
417417
otelParentContext = Context.current();
418418

419419
if (!CLIENT_INSTRUMENTER.shouldStart(otelParentContext, natsRequest)) {
@@ -449,7 +449,7 @@ public static void onExit(
449449
}
450450

451451
@SuppressWarnings("unused")
452-
public static class RequestFutureTimeoutBodyHeadersAdvice {
452+
public static class RequestTimeoutFutureHeadersBodyAdvice {
453453

454454
@Advice.OnMethodEnter(suppress = Throwable.class)
455455
public static void onEnter(
@@ -461,7 +461,7 @@ public static void onEnter(
461461
@Advice.Local("otelParentContext") Context otelParentContext,
462462
@Advice.Local("otelScope") Scope otelScope,
463463
@Advice.Local("natsRequest") NatsRequest natsRequest) {
464-
natsRequest = NatsRequest.create(connection, subject, headers, body);
464+
natsRequest = NatsRequest.create(connection, null, subject, headers, body);
465465
otelParentContext = Context.current();
466466

467467
if (!CLIENT_INSTRUMENTER.shouldStart(otelParentContext, natsRequest)) {
@@ -497,7 +497,7 @@ public static void onExit(
497497
}
498498

499499
@SuppressWarnings("unused")
500-
public static class RequestFutureTimeoutMessageAdvice {
500+
public static class RequestTimeoutFutureMessageAdvice {
501501

502502
@Advice.OnMethodEnter(suppress = Throwable.class)
503503
public static void onEnter(

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ public static void onExit(
7272
return;
7373
}
7474

75-
NatsRequest natsRequest = NatsRequest.create(connection, subscription.getSubject());
75+
NatsRequest natsRequest =
76+
NatsRequest.create(connection, null, subscription.getSubject(), null, null);
77+
7678
if (message == null) {
7779
timeout = new TimeoutException("Timed out waiting for message");
7880
} else {

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,4 @@ public void accept(Message message, Throwable throwable) {
4242
instrumenter.end(context, request, null, throwable);
4343
}
4444
}
45-
46-
/*messageFuture = messageFuture.whenComplete((message, exception) -> {
47-
if (message != null) {
48-
NatsRequest response = NatsRequest.create(connection, message);
49-
CLIENT_INSTRUMENTER.end(otelContext, natsRequest, response, throwable);
50-
} else {
51-
CLIENT_INSTRUMENTER.end(otelContext, natsRequest, null, exception);
52-
}
53-
});*/
5445
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void afterEach() throws InterruptedException {
7474
}
7575

7676
@Test
77-
void testPublishBodyNoHeaders() throws InterruptedException {
77+
void testPublishBody() throws InterruptedException {
7878
// when
7979
testing.runWithSpan("parent", () -> connection.publish("sub", new byte[] {0}));
8080

@@ -84,7 +84,7 @@ void testPublishBodyNoHeaders() throws InterruptedException {
8484
}
8585

8686
@Test
87-
void testPublishBodyWithHeaders() throws InterruptedException {
87+
void testPublishHeadersBody() throws InterruptedException {
8888
// when
8989
testing.runWithSpan("parent", () -> connection.publish("sub", new Headers(), new byte[] {0}));
9090

@@ -94,7 +94,7 @@ void testPublishBodyWithHeaders() throws InterruptedException {
9494
}
9595

9696
@Test
97-
void testPublishBodyReplyToNoHeaders() throws InterruptedException {
97+
void testPublishReplyToBody() throws InterruptedException {
9898
// when
9999
testing.runWithSpan("parent", () -> connection.publish("sub", "rt", new byte[] {0}));
100100

@@ -104,7 +104,7 @@ void testPublishBodyReplyToNoHeaders() throws InterruptedException {
104104
}
105105

106106
@Test
107-
void testPublishBodyReplyToWithHeaders() throws InterruptedException {
107+
void testPublishReplyToHeadersBody() throws InterruptedException {
108108
// when
109109
testing.runWithSpan(
110110
"parent", () -> connection.publish("sub", "rt", new Headers(), new byte[] {0}));
@@ -115,7 +115,7 @@ void testPublishBodyReplyToWithHeaders() throws InterruptedException {
115115
}
116116

117117
@Test
118-
void testPublishMessageNoHeaders() throws InterruptedException {
118+
void testPublishMessage() throws InterruptedException {
119119
NatsMessage message = NatsMessage.builder().subject("sub").data("x").build();
120120

121121
// when

0 commit comments

Comments
 (0)