From 8d6554287fb43ae4aa5b78598947501b15a26e26 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Wed, 8 Dec 2021 18:26:55 +0100 Subject: [PATCH] Add shouldStart() call to armeria server instrumentation (#4843) --- .../instrumentation/armeria/v1_3/OpenTelemetryService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java index 2d6c997cf2ab..2ee1f02b2e70 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java @@ -29,7 +29,12 @@ final class OpenTelemetryService extends SimpleDecoratingHttpService { @Override public HttpResponse serve(ServiceRequestContext ctx, HttpRequest req) throws Exception { - Context context = instrumenter.start(Context.current(), ctx); + Context parentContext = Context.current(); + if (!instrumenter.shouldStart(parentContext, ctx)) { + return unwrap().serve(ctx, req); + } + + Context context = instrumenter.start(parentContext, ctx); Span span = Span.fromContext(context); if (span.isRecording()) {