From 9cb24eb50537e1bbf4949ed71e6276ebc616ac83 Mon Sep 17 00:00:00 2001 From: Vidyadhara Murthy Date: Tue, 29 Oct 2024 14:18:45 +0530 Subject: [PATCH 1/2] Changing the log levels in error scenarios --- .../java/io/opentelemetry/opentracingshim/TracerShim.java | 7 ++++--- .../io/opentelemetry/opentracingshim/TracerShimTest.java | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/TracerShim.java b/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/TracerShim.java index caec9b7c949..82b48410df1 100644 --- a/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/TracerShim.java +++ b/opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/TracerShim.java @@ -80,12 +80,13 @@ public SpanBuilder buildSpan(String operationName) { @Override public void inject(SpanContext context, Format format, C carrier) { if (context == null) { - logger.log(Level.INFO, "Cannot inject a null span context."); + logger.log(Level.WARNING, "Cannot inject a null span context."); return; } SpanContextShim contextShim = ShimUtil.getContextShim(context); if (contextShim == null) { + logger.log(Level.WARNING, "Cannot inject a null span context shim."); return; } @@ -107,7 +108,7 @@ public SpanContext extract(Format format, C carrier) { } } catch (RuntimeException e) { logger.log( - Level.INFO, + Level.WARNING, "Exception caught while extracting span context; returning null. " + "Exception: [{0}] Message: [{1}]", new String[] {e.getClass().getName(), e.getMessage()}); @@ -127,7 +128,7 @@ public void close() { try { ((Closeable) provider).close(); } catch (RuntimeException | IOException e) { - logger.log(Level.INFO, "Exception caught while closing TracerProvider.", e); + logger.log(Level.WARNING, "Exception caught while closing TracerProvider.", e); } } } diff --git a/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java b/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java index 8a961288c23..769dba336b0 100644 --- a/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java +++ b/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java @@ -357,6 +357,12 @@ void extract_onlyBaggage() { assertThat(spanContextShim.getBaggage()).isEqualTo(baggage); } + @Test + void extract_null_spanctx() { + SpanContext spanContext = tracerShim.extract(Format.Builtin.TEXT_MAP, null); + assertThat(spanContext).isNull(); + } + @Test void close_OpenTelemetrySdk() { SdkTracerProvider sdkProvider = mock(SdkTracerProvider.class); From ec8024595e9b27534d6cbb37c53e1cb5f836f6ad Mon Sep 17 00:00:00 2001 From: John Watson Date: Thu, 11 Sep 2025 09:19:14 -0700 Subject: [PATCH 2/2] Update opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java Co-authored-by: jason plumb <75337021+breedx-splk@users.noreply.github.com> --- .../io/opentelemetry/opentracingshim/TracerShimTest.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java b/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java index 769dba336b0..8a961288c23 100644 --- a/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java +++ b/opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/TracerShimTest.java @@ -357,12 +357,6 @@ void extract_onlyBaggage() { assertThat(spanContextShim.getBaggage()).isEqualTo(baggage); } - @Test - void extract_null_spanctx() { - SpanContext spanContext = tracerShim.extract(Format.Builtin.TEXT_MAP, null); - assertThat(spanContext).isNull(); - } - @Test void close_OpenTelemetrySdk() { SdkTracerProvider sdkProvider = mock(SdkTracerProvider.class);