Apache Solr open-source search software
SOLR-16532 Further improvements to opentelemetry module (#1275)
Jan Høydahl0e33bfe3169e
diff --git a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.javaindex b368941fd0c..ee7fb962ce9 100644--- a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java+++ b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/ClosableTracerShim.java@@ -78,7 +78,7 @@ public class ClosableTracerShim implements Tracer {@Overridepublic void close() {shim.close();- log.info("Closing wrapped OTEL tracer instance.");+ log.debug("Closing wrapped OTEL tracer instance.");sdkTracerProvider.forceFlush();sdkTracerProvider.close();}diff --git a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.javaindex a2f97931abb..b6797df3313 100644--- a/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java+++ b/solr/modules/opentelemetry/src/java/org/apache/solr/opentelemetry/OtelTracerConfigurator.java@@ -47,13 +47,7 @@ public class OtelTracerConfigurator extends TracerConfigurator {setDefaultIfNotConfigured("OTEL_EXPORTER_OTLP_PROTOCOL", "grpc");setDefaultIfNotConfigured("OTEL_TRACES_SAMPLER", "parentbased_always_on");- final String currentConfig =- String.join(- "; ",- getCurrentOtelConfig().entrySet().stream()- .map(e -> e.getKey() + "=" + e.getValue())- .collect(Collectors.toSet()));-+ final String currentConfig = getCurrentOtelConfigAsString();log.info("OpenTelemetry tracer enabled with configuration: {}", currentConfig);// Need to disable the exporters for metrics and logs@@ -72,6 +66,14 @@ public class OtelTracerConfigurator extends TracerConfigurator {return new ClosableTracerShim(shim, otelSdk.getSdkTracerProvider());}+ /** Prepares a string with all configuration K/V pairs sorted and semicolon separated */+ String getCurrentOtelConfigAsString() {+ return getCurrentOtelConfig().entrySet().stream()+ .sorted(Map.Entry.comparingByKey())+ .map(e -> e.getKey() + "=" + e.getValue())+ .collect(Collectors.joining("; "));+ }+/*** Finds all configuration based on environment with prefix <code>OTEL_</code> or System* Properties with prefix <code>otel.</code>.diff --git a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.javaindex 69c7d96cc97..4de4eca64ce 100644--- a/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java+++ b/solr/modules/opentelemetry/src/test/org/apache/solr/opentelemetry/OtelTracerConfiguratorTest.java@@ -69,6 +69,13 @@ public class OtelTracerConfiguratorTest extends SolrTestCaseJ4 {assertEquals(expected, instance.getCurrentOtelConfig());}+ @Test+ public void testGetCurrentOtelConfigAsString() {+ assertEquals(+ "OTEL_K1=prop-k1; OTEL_K2=env-k2; OTEL_K3=prop-k3",+ instance.getCurrentOtelConfigAsString());+ }+@Testpublic void testGetEnvOrSysprop() {assertEquals("prop-k1", instance.getEnvOrSysprop("OTEL_K1"));