open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove incorrect API of Dubbo (#13076)

This commit is contained in:
Steve Rao 2025-01-21 23:00:46 +08:00 committed by GitHub
parent ab09fcee98
commit d0795ecd48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,23 +35,13 @@ public final class DubboTelemetry {
this.clientInstrumenter = clientInstrumenter;
}
/**
* Returns a new Dubbo {@link Filter} that traces Dubbo RPC invocations.
*
* @deprecated Use {@link #newClientFilter} and {@link #newServerFilter} instead.
*/
@Deprecated
public Filter newFilter() {
return TracingFilter.newFilter(serverInstrumenter, clientInstrumenter);
}
/** Returns a new Dubbo client {@link Filter} that traces Dubbo RPC invocations. */
public Filter newClientFilter() {
return TracingFilter.newClientFilter(clientInstrumenter);
return new TracingFilter(clientInstrumenter, true);
}
/** Returns a new Dubbo server {@link Filter} that traces Dubbo RPC invocations. */
public Filter newServerFilter() {
return TracingFilter.newServerFilter(serverInstrumenter);
return new TracingFilter(serverInstrumenter, false);
}
}

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

@ -18,52 +18,13 @@ import org.apache.dubbo.rpc.RpcInvocation;
final class TracingFilter implements Filter {
private final InstrumenterSupplier instrumenterSupplier;
private final Instrumenter<DubboRequest, Result> instrumenter;
private TracingFilter(InstrumenterSupplier instrumenterSupplier) {
this.instrumenterSupplier = instrumenterSupplier;
}
private final boolean isClientSide;
static TracingFilter newClientFilter(Instrumenter<DubboRequest, Result> clientInstrumenter) {
return newFilter(clientInstrumenter, true);
}
static TracingFilter newServerFilter(Instrumenter<DubboRequest, Result> serverInstrumenter) {
return newFilter(serverInstrumenter, false);
}
private static TracingFilter newFilter(
Instrumenter<DubboRequest, Result> instrumenter, boolean isClientSide) {
return new TracingFilter(
new InstrumenterSupplier() {
@Override
public Instrumenter<DubboRequest, Result> get(RpcContext rpcContext) {
return instrumenter;
}
@Override
public boolean isClientSide(RpcContext rpcContext) {
return isClientSide;
}
});
}
static TracingFilter newFilter(
Instrumenter<DubboRequest, Result> serverInstrumenter,
Instrumenter<DubboRequest, Result> clientInstrumenter) {
return new TracingFilter(
new InstrumenterSupplier() {
@Override
public Instrumenter<DubboRequest, Result> get(RpcContext rpcContext) {
return rpcContext.isConsumerSide() ? clientInstrumenter : serverInstrumenter;
}
@Override
public boolean isClientSide(RpcContext rpcContext) {
return rpcContext.isConsumerSide();
}
});
TracingFilter(Instrumenter<DubboRequest, Result> instrumenter, boolean isClientSide) {
this.instrumenter = instrumenter;
this.isClientSide = isClientSide;
}
@Override
@ -78,7 +39,6 @@ final class TracingFilter implements Filter {
return invoker.invoke(invocation);
}
Instrumenter<DubboRequest, Result> instrumenter = instrumenterSupplier.get(rpcContext);
Context parentContext = Context.current();
DubboRequest request = DubboRequest.create((RpcInvocation) invocation, rpcContext);
@ -91,7 +51,7 @@ final class TracingFilter implements Filter {
boolean isSynchronous = true;
try (Scope ignored = context.makeCurrent()) {
result = invoker.invoke(invocation);
if (instrumenterSupplier.isClientSide(rpcContext)) {
if (isClientSide) {
CompletableFuture<Object> future = rpcContext.getCompletableFuture();
if (future != null) {
isSynchronous = false;
@ -108,10 +68,4 @@ final class TracingFilter implements Filter {
}
return result;
}
private interface InstrumenterSupplier {
Instrumenter<DubboRequest, Result> get(RpcContext rpcContext);
boolean isClientSide(RpcContext rpcContext);
}
}