Skip to content

Commit 45f8efe

Browse files
WIP
1 parent e3316a5 commit 45f8efe

File tree

1 file changed

+17
-28
lines changed

1 file changed

+17
-28
lines changed

maven-extension/src/main/java/io/opentelemetry/maven/OpenTelemetrySdkService.java

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -106,37 +106,26 @@ static Map<String, String> requireExplicitConfigOfTheOtlpExporter(
106106
ConfigProperties configProperties) {
107107

108108
Map<String, String> properties = new HashMap<>();
109-
if (configProperties.getString("otel.exporter.otlp.endpoint") == null) {
110-
for (SignalType signalType : SignalType.values()) {
111-
boolean isExporterImplicitlyConfiguredToOtlp =
112-
configProperties.getString("otel." + signalType.value + ".exporter") == null;
113-
boolean isOtlpExporterEndpointSpecified =
114-
configProperties.getString("otel.exporter.otlp." + signalType.value + ".endpoint")
115-
!= null;
116-
117-
if (isExporterImplicitlyConfiguredToOtlp && !isOtlpExporterEndpointSpecified) {
118-
logger.debug(
119-
"OpenTelemetry: Disabling default OTLP exporter endpoint for signal {} exporter",
120-
signalType.value);
121-
properties.put("otel." + signalType.value + ".exporter", "none");
122-
}
123-
}
124-
} else {
109+
if (configProperties.getString("otel.exporter.otlp.endpoint") != null) {
125110
logger.debug("OpenTelemetry: OTLP exporter endpoint is explicitly configured");
111+
return properties;
126112
}
127-
return properties;
128-
}
129-
130-
enum SignalType {
131-
TRACES("traces"),
132-
METRICS("metrics"),
133-
LOGS("logs");
134-
135-
private final String value;
136-
137-
SignalType(String value) {
138-
this.value = value;
113+
String[] signalTypes = {"traces", "metrics", "logs"};
114+
for (String signalType : signalTypes) {
115+
boolean isExporterImplicitlyConfiguredToOtlp =
116+
configProperties.getString("otel." + signalType + ".exporter") == null;
117+
boolean isOtlpExporterEndpointSpecified =
118+
configProperties.getString("otel.exporter.otlp." + signalType + ".endpoint") != null;
119+
120+
if (isExporterImplicitlyConfiguredToOtlp && !isOtlpExporterEndpointSpecified) {
121+
logger.debug(
122+
"OpenTelemetry: Disabling default OTLP exporter endpoint for signal {} exporter",
123+
signalType);
124+
properties.put("otel." + signalType + ".exporter", "none");
125+
}
139126
}
127+
128+
return properties;
140129
}
141130

142131
@PreDestroy

0 commit comments

Comments
 (0)