Skip to content

Commit 17bf85b

Browse files
committed
fix
1 parent 43af62d commit 17bf85b

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/OtelSpringProperties.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,14 @@ public void setResource(Resource resource) {
200200
* any time.
201201
*/
202202
public static final class HasExporters {
203-
private List<String> exporters = Collections.emptyList();
203+
private List<String> exporter = Collections.emptyList();
204204

205-
public List<String> getExporters() {
206-
return exporters;
205+
public List<String> getExporter() {
206+
return exporter;
207207
}
208208

209-
public void setExporters(List<String> exporters) {
210-
this.exporters = exporters;
209+
public void setExporter(List<String> exporter) {
210+
this.exporter = exporter;
211211
}
212212
}
213213

@@ -400,15 +400,15 @@ public List<String> getExperimentalResourceDisabledKeys() {
400400
}
401401

402402
public List<String> getLogsExporter() {
403-
return logs.getExporters();
403+
return logs.getExporter();
404404
}
405405

406406
public List<String> getMetricsExporter() {
407-
return metrics.getExporters();
407+
return metrics.getExporter();
408408
}
409409

410410
public List<String> getTracesExporter() {
411-
return traces.getExporters();
411+
return traces.getExporter();
412412
}
413413

414414
public List<String> getHttpClientCaptureRequestHeaders() {

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/SpringConfigProperties.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,9 @@ public List<String> getList(String name) {
205205
if (!c.isEmpty()) {
206206
return c;
207207
}
208-
return list;
208+
if (!list.isEmpty()) {
209+
return list;
210+
}
209211
}
210212

211213
return or(environment.getProperty(normalizedName, List.class), otelSdkProperties.getList(name));

0 commit comments

Comments
 (0)