Skip to content

Commit 7a6d136

Browse files
andrusandrus
committed
refactoring - shortening configuration
1 parent 0f19643 commit 7a6d136

7 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎bootique-opentelemetry/src/main/java/io/bootique/otel/logger/SdkLoggerProviderFactory.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public class SdkLoggerProviderFactory {
4646
private final Resource resource;
4747
private final ShutdownManager shutdownManager;
4848

49-
private List<LogsExporterFactory> logExporters;
49+
private List<LogsExporterFactory> exporters;
5050

5151
@BQConfigProperty
52-
public SdkLoggerProviderFactory setLogExporters(List<LogsExporterFactory> logExporters) {
53-
this.logExporters = logExporters;
52+
public SdkLoggerProviderFactory setExporters(List<LogsExporterFactory> exporters) {
53+
this.exporters = exporters;
5454
return this;
5555
}
5656

@@ -135,9 +135,9 @@ private List<LogRecordExporterHolder> exporterHolders() {
135135
// A single "none" exporter would suppress the default "console" exporter. Though unlike the agent, having a
136136
// "none" exporter mixed with others doesn't result in an exception. It will just be ignored
137137

138-
List<LogsExporterFactory> exporters = this.logExporters == null || this.logExporters.isEmpty()
138+
List<LogsExporterFactory> exporters = this.exporters == null || this.exporters.isEmpty()
139139
? List.of(new ConsoleLogsExporterFactory())
140-
: this.logExporters;
140+
: this.exporters;
141141

142142
return exporters.stream()
143143
.map(LogsExporterFactory::create)

‎bootique-opentelemetry/src/main/java/io/bootique/otel/meter/SdkMeterProviderFactory.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public class SdkMeterProviderFactory {
4242
private final Resource resource;
4343
private final ShutdownManager shutdownManager;
4444

45-
private Duration metricExportInterval;
46-
private List<MetricsExporterFactory> metricExporters;
45+
private Duration exportInterval;
46+
private List<MetricsExporterFactory> exporters;
4747

4848

4949
@Inject
@@ -53,14 +53,14 @@ public SdkMeterProviderFactory(Resource resource, ShutdownManager shutdownManage
5353
}
5454

5555
@BQConfigProperty("Time interval between the start of two export attempts. The default is '1min'")
56-
public SdkMeterProviderFactory setMetricExportInterval(Duration metricExportInterval) {
57-
this.metricExportInterval = metricExportInterval;
56+
public SdkMeterProviderFactory setExportInterval(Duration exportInterval) {
57+
this.exportInterval = exportInterval;
5858
return this;
5959
}
6060

6161
@BQConfigProperty
62-
public SdkMeterProviderFactory setMetricExporters(List<MetricsExporterFactory> metricExporters) {
63-
this.metricExporters = metricExporters;
62+
public SdkMeterProviderFactory setExporters(List<MetricsExporterFactory> exporters) {
63+
this.exporters = exporters;
6464
return this;
6565
}
6666

@@ -89,9 +89,9 @@ private List<MetricExporter> createMetricExporters() {
8989
// A single "none" exporter would suppress the default "console" exporter. Though unlike the agent, having a
9090
// "none" exporter mixed with others doesn't result in an exception. It will just be ignored
9191

92-
List<MetricsExporterFactory> exporters = this.metricExporters == null || this.metricExporters.isEmpty()
92+
List<MetricsExporterFactory> exporters = this.exporters == null || this.exporters.isEmpty()
9393
? List.of(new ConsoleMetricsExporterFactory())
94-
: this.metricExporters;
94+
: this.exporters;
9595

9696
return exporters.stream()
9797
.map(MetricsExporterFactory::create)
@@ -107,8 +107,8 @@ private MetricReader createMetricReader(MetricExporter exporter) {
107107
}
108108

109109
private java.time.Duration getMetricExportIntervalOrDefault() {
110-
return this.metricExportInterval != null
111-
? this.metricExportInterval.getDuration()
110+
return this.exportInterval != null
111+
? this.exportInterval.getDuration()
112112
: java.time.Duration.ofMinutes(1);
113113
}
114114
}

‎bootique-opentelemetry/src/main/java/io/bootique/otel/trace/SdkTracerProviderFactory.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class SdkTracerProviderFactory {
4646
private final Resource resource;
4747
private final ShutdownManager shutdownManager;
4848

49-
private List<TracesExporterFactory> traceExporters;
49+
private List<TracesExporterFactory> exporters;
5050

5151
@Inject
5252
public SdkTracerProviderFactory(Resource resource, ShutdownManager shutdownManager) {
@@ -55,8 +55,8 @@ public SdkTracerProviderFactory(Resource resource, ShutdownManager shutdownManag
5555
}
5656

5757
@BQConfigProperty
58-
public SdkTracerProviderFactory setTraceExporters(List<TracesExporterFactory> traceExporters) {
59-
this.traceExporters = traceExporters;
58+
public SdkTracerProviderFactory setExporters(List<TracesExporterFactory> exporters) {
59+
this.exporters = exporters;
6060
return this;
6161
}
6262

@@ -138,9 +138,9 @@ private List<SpanExporterHolder> exporterHolders(Supplier<MeterProvider> meterPr
138138
// A single "none" exporter would suppress the default "console" exporter. Though unlike the agent, having a
139139
// "none" exporter mixed with others doesn't result in an exception. It will just be ignored
140140

141-
List<TracesExporterFactory> exporters = this.traceExporters == null || this.traceExporters.isEmpty()
141+
List<TracesExporterFactory> exporters = this.exporters == null || this.exporters.isEmpty()
142142
? List.of(new ConsoleTracesExporterFactory())
143-
: this.traceExporters;
143+
: this.exporters;
144144

145145
return exporters.stream()
146146
.map(f -> f.create(meterProvider))

‎bootique-opentelemetry/src/test/java/io/bootique/otel/SdkLoggerProviderIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void defaultExporter() {
5555
public void consoleExporter() {
5656
BQRuntime runtime = testFactory.app()
5757
.module(b -> BQCoreModule.extend(b)
58-
.setProperty("bq.opentelemetry.loggerProvider.logExporters[0].type", "console"))
58+
.setProperty("bq.opentelemetry.loggerProvider.exporters[0].type", "console"))
5959
.createRuntime();
6060
OpenTelemetry otel = runtime.getInstance(OpenTelemetry.class);
6161

@@ -71,7 +71,7 @@ public void consoleExporter() {
7171
public void noneExporter() {
7272
BQRuntime runtime = testFactory.app()
7373
.module(b -> BQCoreModule.extend(b)
74-
.setProperty("bq.opentelemetry.loggerProvider.logExporters[0].type", "none"))
74+
.setProperty("bq.opentelemetry.loggerProvider.exporters[0].type", "none"))
7575
.createRuntime();
7676
OpenTelemetry otel = runtime.getInstance(OpenTelemetry.class);
7777

‎bootique-opentelemetry/src/test/java/io/bootique/otel/SdkMeterProviderIT.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class SdkMeterProviderIT {
4242
public void defaultExporter() {
4343
BQRuntime runtime = testFactory.app()
4444
.module(b -> BQCoreModule.extend(b)
45-
.setProperty("bq.opentelemetry.meterProvider.metricExportInterval", "100ms"))
45+
.setProperty("bq.opentelemetry.meterProvider.exportInterval", "100ms"))
4646
.createRuntime();
4747

4848
OpenTelemetry otel = runtime.getInstance(OpenTelemetry.class);
@@ -57,8 +57,8 @@ public void defaultExporter() {
5757
public void consoleExporter() {
5858
BQRuntime runtime = testFactory.app()
5959
.module(b -> BQCoreModule.extend(b)
60-
.setProperty("bq.opentelemetry.meterProvider.metricExportInterval", "100ms")
61-
.setProperty("bq.opentelemetry.meterProvider.metricExporters[0].type", "console"))
60+
.setProperty("bq.opentelemetry.meterProvider.exportInterval", "100ms")
61+
.setProperty("bq.opentelemetry.meterProvider.exporters[0].type", "console"))
6262
.createRuntime();
6363

6464
OpenTelemetry otel = runtime.getInstance(OpenTelemetry.class);
@@ -73,8 +73,8 @@ public void consoleExporter() {
7373
public void noopExporter() {
7474
BQRuntime runtime = testFactory.app()
7575
.module(b -> BQCoreModule.extend(b)
76-
.setProperty("bq.opentelemetry.meterProvider.metricExportInterval", "100ms")
77-
.setProperty("bq.opentelemetry.meterProvider.metricExporters[0].type", "none"))
76+
.setProperty("bq.opentelemetry.meterProvider.exportInterval", "100ms")
77+
.setProperty("bq.opentelemetry.meterProvider.exporters[0].type", "none"))
7878
.createRuntime();
7979

8080
OpenTelemetry otel = runtime.getInstance(OpenTelemetry.class);

‎bootique-opentelemetry/src/test/java/io/bootique/otel/SdkTracerProviderIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void defaultExporter() {
6565
@Test
6666
public void consoleExporter() {
6767
BQRuntime runtime = testFactory.app()
68-
.module(b -> BQCoreModule.extend(b).setProperty("bq.opentelemetry.tracerProvider.traceExporters[0].type", "console"))
68+
.module(b -> BQCoreModule.extend(b).setProperty("bq.opentelemetry.tracerProvider.exporters[0].type", "console"))
6969
.createRuntime();
7070
OpenTelemetry otel = runtime.getInstance(OpenTelemetry.class);
7171

@@ -77,7 +77,7 @@ public void consoleExporter() {
7777
@Test
7878
public void noneExporter() {
7979
BQRuntime runtime = testFactory.app()
80-
.module(b -> BQCoreModule.extend(b).setProperty("bq.opentelemetry.tracerProvider.traceExporters[0].type", "none"))
80+
.module(b -> BQCoreModule.extend(b).setProperty("bq.opentelemetry.tracerProvider.exporters[0].type", "none"))
8181
.createRuntime();
8282
OpenTelemetry otel = runtime.getInstance(OpenTelemetry.class);
8383

‎bootique-opentelemetry/src/test/java/io/bootique/otel/trace/OtlpTracesExporterIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void grpcExport() throws InterruptedException {
6666

6767
BQRuntime runtime = testFactory.app()
6868
.module(b -> BQCoreModule.extend(b)
69-
.setProperty("bq.opentelemetry.tracerProvider.traceExporters[0].type", "otlp")
69+
.setProperty("bq.opentelemetry.tracerProvider.exporters[0].type", "otlp")
7070
.setProperty("bq.opentelemetry.otlp.protocol", "grpc")
7171
.setProperty("bq.opentelemetry.otlp.url",
7272
"http://localhost:" + otelCollector.getMappedPort(4317)))
@@ -98,7 +98,7 @@ public void httpProtobufExport() throws InterruptedException {
9898
// no need for BQTestFactory, we'll be doing manual shutdown,
9999
BQRuntime runtime = testFactory.app()
100100
.module(b -> BQCoreModule.extend(b)
101-
.setProperty("bq.opentelemetry.tracerProvider.traceExporters[0].type", "otlp")
101+
.setProperty("bq.opentelemetry.tracerProvider.exporters[0].type", "otlp")
102102
.setProperty("bq.opentelemetry.otlp.protocol", "http/protobuf")
103103
.setProperty("bq.opentelemetry.otlp.url",
104104
"http://localhost:" + otelCollector.getMappedPort(4318)))

0 commit comments

Comments
 (0)