From c523fa2eae6a38217c493ac26ab0831e2a22114e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=A4=E7=85=9C=E5=86=AC?= <583125614@qq.com> Date: Mon, 1 Feb 2021 19:47:27 +0800 Subject: [PATCH] add abstract method getRpcSystem() (#2149) --- .../instrumentation/api/tracer/RpcClientTracer.java | 2 ++ .../instrumentation/grpc/v1_5/client/GrpcClientTracer.java | 7 ++++++- .../instrumentation/rmi/client/RmiClientTracer.java | 7 ++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/RpcClientTracer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/RpcClientTracer.java index 90e291098a..53047a70fc 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/RpcClientTracer.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/RpcClientTracer.java @@ -13,4 +13,6 @@ public abstract class RpcClientTracer extends BaseTracer { protected RpcClientTracer(Tracer tracer) { super(tracer); } + + protected abstract String getRpcSystem(); } diff --git a/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/GrpcClientTracer.java b/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/GrpcClientTracer.java index 3e2b042732..9df7d2b6b9 100644 --- a/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/GrpcClientTracer.java +++ b/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/GrpcClientTracer.java @@ -23,9 +23,14 @@ public class GrpcClientTracer extends RpcClientTracer { super(tracer); } + @Override + protected String getRpcSystem() { + return "grpc"; + } + public Span startSpan(String name) { SpanBuilder spanBuilder = tracer.spanBuilder(name).setSpanKind(CLIENT); - spanBuilder.setAttribute(SemanticAttributes.RPC_SYSTEM, "grpc"); + spanBuilder.setAttribute(SemanticAttributes.RPC_SYSTEM, getRpcSystem()); return spanBuilder.startSpan(); } diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientTracer.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientTracer.java index 5e47eb4e63..5d663b7134 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientTracer.java +++ b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/client/RmiClientTracer.java @@ -27,7 +27,7 @@ public class RmiClientTracer extends RpcClientTracer { SpanBuilder spanBuilder = tracer.spanBuilder(serviceName + "/" + methodName).setSpanKind(CLIENT); - spanBuilder.setAttribute(SemanticAttributes.RPC_SYSTEM, "java_rmi"); + spanBuilder.setAttribute(SemanticAttributes.RPC_SYSTEM, getRpcSystem()); spanBuilder.setAttribute(SemanticAttributes.RPC_SERVICE, serviceName); spanBuilder.setAttribute(SemanticAttributes.RPC_METHOD, methodName); @@ -38,4 +38,9 @@ public class RmiClientTracer extends RpcClientTracer { protected String getInstrumentationName() { return "io.opentelemetry.javaagent.rmi"; } + + @Override + protected String getRpcSystem() { + return "java_rmi"; + } }