Skip to content

Commit 7b02979

Browse files
committed
Address review comments
1 parent b9a24b1 commit 7b02979

File tree

2 files changed

+8
-37
lines changed

2 files changed

+8
-37
lines changed

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public static DubboTelemetryBuilder builder(OpenTelemetry openTelemetry) {
3737

3838
/** Returns a new Dubbo client {@link Filter} that traces Dubbo RPC invocations. */
3939
public Filter newClientFilter() {
40-
return TracingFilter.newClientFilter(clientInstrumenter);
40+
return new TracingFilter(clientInstrumenter, true);
4141
}
4242

4343
/** Returns a new Dubbo server {@link Filter} that traces Dubbo RPC invocations. */
4444
public Filter newServerFilter() {
45-
return TracingFilter.newServerFilter(serverInstrumenter);
45+
return new TracingFilter(serverInstrumenter, false);
4646
}
4747
}

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/TracingFilter.java

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,13 @@
1818

1919
final class TracingFilter implements Filter {
2020

21-
private final InstrumenterSupplier instrumenterSupplier;
21+
private final Instrumenter<DubboRequest, Result> instrumenter;
2222

23-
private TracingFilter(InstrumenterSupplier instrumenterSupplier) {
24-
this.instrumenterSupplier = instrumenterSupplier;
25-
}
26-
27-
static TracingFilter newClientFilter(Instrumenter<DubboRequest, Result> clientInstrumenter) {
28-
return newFilter(clientInstrumenter, true);
29-
}
30-
31-
static TracingFilter newServerFilter(Instrumenter<DubboRequest, Result> serverInstrumenter) {
32-
return newFilter(serverInstrumenter, false);
33-
}
23+
private final boolean isClientSide;
3424

35-
private static TracingFilter newFilter(
36-
Instrumenter<DubboRequest, Result> instrumenter, boolean isClientSide) {
37-
return new TracingFilter(
38-
new InstrumenterSupplier() {
39-
40-
@Override
41-
public Instrumenter<DubboRequest, Result> get(RpcContext rpcContext) {
42-
return instrumenter;
43-
}
44-
45-
@Override
46-
public boolean isClientSide(RpcContext rpcContext) {
47-
return isClientSide;
48-
}
49-
});
25+
TracingFilter(Instrumenter<DubboRequest, Result> instrumenter, boolean isClientSide) {
26+
this.instrumenter = instrumenter;
27+
this.isClientSide = isClientSide;
5028
}
5129

5230
@Override
@@ -61,7 +39,6 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) {
6139
return invoker.invoke(invocation);
6240
}
6341

64-
Instrumenter<DubboRequest, Result> instrumenter = instrumenterSupplier.get(rpcContext);
6542
Context parentContext = Context.current();
6643
DubboRequest request = DubboRequest.create((RpcInvocation) invocation, rpcContext);
6744

@@ -74,7 +51,7 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) {
7451
boolean isSynchronous = true;
7552
try (Scope ignored = context.makeCurrent()) {
7653
result = invoker.invoke(invocation);
77-
if (instrumenterSupplier.isClientSide(rpcContext)) {
54+
if (isClientSide) {
7855
CompletableFuture<Object> future = rpcContext.getCompletableFuture();
7956
if (future != null) {
8057
isSynchronous = false;
@@ -91,10 +68,4 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) {
9168
}
9269
return result;
9370
}
94-
95-
private interface InstrumenterSupplier {
96-
Instrumenter<DubboRequest, Result> get(RpcContext rpcContext);
97-
98-
boolean isClientSide(RpcContext rpcContext);
99-
}
10071
}

0 commit comments

Comments
 (0)