Commit 5307b46

authored

vertx-redis: avoid double span creation and double handler calls (DataDog#6334)

* vertx-redis: avoid double span creation * vertx-redis: avoid double span creation

1 parent 2a7762c commit 5307b46Copy full SHA for 5307b46

File tree

+13

-4

lines changed

dd-java-agent/instrumentation/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client

+13

-4

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;`
`5`	`5`	`import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan;`
`6`	`6`	`import static datadog.trace.instrumentation.vertx_redis_client.VertxRedisClientDecorator.DECORATE;`
	`7`	`+import static datadog.trace.instrumentation.vertx_redis_client.VertxRedisClientDecorator.REDIS_COMMAND;`
`7`	`8`
`8`	`9`	`import datadog.trace.bootstrap.CallDepthThreadLocalMap;`
`9`	`10`	`import datadog.trace.bootstrap.ContextStore;`
`@@ -52,8 +53,14 @@ public static AgentScope beforeSend(`
`52`	`53`	`return AgentTracer.NoopAgentScope.INSTANCE;`
`53`	`54`	`}`
`54`	`55`
`55`		`- AgentSpan parentSan = activeSpan();`
`56`		`- AgentScope.Continuation parentContinuation = null == parentSan ? null : captureSpan(parentSan);`
	`56`	`+ AgentSpan parentSpan = activeSpan();`
	`57`	`+`
	`58`	`+ if (parentSpan != null && REDIS_COMMAND.equals(parentSpan.getOperationName())) {`
	`59`	`+ return null;`
	`60`	`+ }`
	`61`	`+`
	`62`	`+ AgentScope.Continuation parentContinuation =`
	`63`	`+ null == parentSpan ? null : captureSpan(parentSpan);`
`57`	`64`	`final AgentSpan clientSpan =`
`58`	`65`	`DECORATE.startAndDecorateSpan(`
`59`	`66`	`request.command(), InstrumentationContext.get(Command.class, UTF8BytesString.class));`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public class ResponseHandler implements Handler<AsyncResult<Response>> {`
`13`	`13`	`public final AgentSpan clientSpan;`
`14`	`14`	`private final AgentScope.Continuation continuation;`
`15`	`15`	`private final Promise<Response> promise;`
	`16`	`+ private boolean handled = false;`
`16`	`17`
`17`	`18`	`public ResponseHandler(`
`18`	`19`	`final Promise<Response> promise,`
`@@ -25,7 +26,8 @@ public ResponseHandler(`
`25`	`26`
`26`	`27`	`@Override`
`27`	`28`	`public void handle(final AsyncResult<Response> event) {`
`28`		`- if (clientSpan != null) {`
	`29`	`+ if (!handled && clientSpan != null) {`
	`30`	`+ handled = true;`
`29`	`31`	`AgentScope scope = null;`
`30`	`32`	`try {`
`31`	`33`	`// Close client scope and span`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public void handle(final AsyncResult<Response> event) {`
`31`	`31`	`already set so the handler state must be tracked here to prevent double execution`
`32`	`32`	`*/`
`33`	`33`	`if (!handled) {`
	`34`	`+ handled = true;`
`34`	`35`	`AgentScope scope = null;`
`35`	`36`	`try {`
`36`	`37`	`if (null != clientSpan) {`
`@@ -44,7 +45,6 @@ public void handle(final AsyncResult<Response> event) {`
`44`	`45`	`if (null != scope) {`
`45`	`46`	`scope.close();`
`46`	`47`	`}`
`47`		`- handled = true;`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`

Comments

(0)