Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16997: OTEL configurator NPE when SOLR_HOST not set (#1959)

Jan Høydahladc03933add1
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index aab89a0a118..5849c78767a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -211,6 +211,8 @@ Bug Fixes
* SOLR-16991: Concurrent requests failing JWT authentication in Admin UI intermittently (Lamine Idjeraoui, janhoy)
+* SOLR-16997: OTEL configurator NPE when SOLR_HOST not set (janhoy)
+
Dependency Upgrades
---------------------
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.java
index 221cb571b7b..cdddd55c46d 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
@@ -65,7 +65,9 @@ public class OtelTracerConfigurator extends TracerConfigurator {
setDefaultIfNotConfigured("OTEL_EXPORTER_OTLP_PROTOCOL", "grpc");
setDefaultIfNotConfigured("OTEL_TRACES_SAMPLER", "parentbased_always_on");
setDefaultIfNotConfigured("OTEL_PROPAGATORS", "tracecontext,baggage");
- addOtelResourceAttributes(Map.of("host.name", System.getProperty("host")));
+ if (System.getProperty("host") != null) {
+ addOtelResourceAttributes(Map.of("host.name", System.getProperty("host")));
+ }
final String currentConfig = getCurrentOtelConfigAsString();
log.info("OpenTelemetry tracer enabled with configuration: {}", currentConfig);