Skip to content

Commit a89bd63

Browse files
cyrille-leclerccyrille-leclerc
committed
Fix code formatting
1 parent ecb469b commit a89bd63

File tree

2 files changed

+52
-45
lines changed

2 files changed

+52
-45
lines changed

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

Lines changed: 46 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -59,44 +59,52 @@ public OpenTelemetrySdkService() {
5959
AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk =
6060
AutoConfiguredOpenTelemetrySdk.builder()
6161
.setServiceClassLoader(getClass().getClassLoader())
62-
.addPropertiesCustomizer(configProperties -> {
63-
// The OTel SDK by default sends data to the OTLP gRPC endpoint at localhost:4317.
64-
// Change this behavior to disable by default the OTel SDK in the Maven extension so
65-
// that it must be explicitly enabled by the user.
66-
// To change this default behavior, we set "otel.[traces,metrics,logs].exporter" to
67-
// "none" if the endpoint has not been specified
68-
if (configProperties.getString("otel.exporter.otlp.endpoint") == null) {
69-
Map<String, String> properties = new HashMap<>();
70-
if (Objects.equals("otlp",
71-
configProperties.getString("otel.traces.exporter", "otlp"))
72-
&& configProperties.getString("otel.exporter.otlp.traces.endpoint") == null) {
73-
properties.put("otel.traces.exporter", "none");
74-
}
75-
if (Objects.equals("otlp",
76-
configProperties.getString("otel.metrics.exporter", "otlp"))
77-
&& configProperties.getString("otel.exporter.otlp.metrics.endpoint") == null) {
78-
properties.put("otel.metrics.exporter", "none");
79-
}
80-
if (Objects.equals("otlp",
81-
configProperties.getString("otel.logs.exporter", "otlp"))
82-
&& configProperties.getString("otel.exporter.otlp.logs.endpoint") == null) {
83-
properties.put("otel.logs.exporter", "none");
84-
}
85-
return properties;
86-
} else {
87-
return Collections.emptyMap();
88-
}
89-
})
90-
.addPropertiesCustomizer(config -> {
91-
// keep a reference to the computed config properties for future use in the extension
92-
this.configProperties = config;
93-
return Collections.emptyMap();
94-
})
95-
.addResourceCustomizer((res, configProperties) -> {
96-
// keep a reference to the computed Resource for future use in the extension
97-
this.resource = Resource.builder().putAll(res).build();
98-
return this.resource;
99-
})
62+
.addPropertiesCustomizer(
63+
configProperties -> {
64+
// The OTel SDK by default sends data to the OTLP gRPC endpoint at localhost:4317.
65+
// Change this behavior to disable by default the OTel SDK in the Maven extension
66+
// so
67+
// that it must be explicitly enabled by the user.
68+
// To change this default behavior, we set "otel.[traces,metrics,logs].exporter"
69+
// to
70+
// "none" if the endpoint has not been specified
71+
if (configProperties.getString("otel.exporter.otlp.endpoint") == null) {
72+
Map<String, String> properties = new HashMap<>();
73+
if (Objects.equals(
74+
"otlp", configProperties.getString("otel.traces.exporter", "otlp"))
75+
&& configProperties.getString("otel.exporter.otlp.traces.endpoint")
76+
== null) {
77+
properties.put("otel.traces.exporter", "none");
78+
}
79+
if (Objects.equals(
80+
"otlp", configProperties.getString("otel.metrics.exporter", "otlp"))
81+
&& configProperties.getString("otel.exporter.otlp.metrics.endpoint")
82+
== null) {
83+
properties.put("otel.metrics.exporter", "none");
84+
}
85+
if (Objects.equals(
86+
"otlp", configProperties.getString("otel.logs.exporter", "otlp"))
87+
&& configProperties.getString("otel.exporter.otlp.logs.endpoint") == null) {
88+
properties.put("otel.logs.exporter", "none");
89+
}
90+
return properties;
91+
} else {
92+
return Collections.emptyMap();
93+
}
94+
})
95+
.addPropertiesCustomizer(
96+
config -> {
97+
// keep a reference to the computed config properties for future use in the
98+
// extension
99+
this.configProperties = config;
100+
return Collections.emptyMap();
101+
})
102+
.addResourceCustomizer(
103+
(res, configProperties) -> {
104+
// keep a reference to the computed Resource for future use in the extension
105+
this.resource = Resource.builder().putAll(res).build();
106+
return this.resource;
107+
})
100108
.disableShutdownHook()
101109
.build();
102110

‎maven-extension/src/test/java/io/opentelemetry/maven/OpenTelemetrySdkServiceTest.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public void testOverwrittenExporterConfiguration_1() {
6060
try (OpenTelemetrySdkService openTelemetrySdkService = new OpenTelemetrySdkService()) {
6161

6262
ConfigProperties configProperties = openTelemetrySdkService.getConfigProperties();
63-
assertThat(configProperties.getString("otel.exporter.otlp.endpoint")).isEqualTo(
64-
"http://example.com:4317");
63+
assertThat(configProperties.getString("otel.exporter.otlp.endpoint"))
64+
.isEqualTo("http://example.com:4317");
6565
assertThat(configProperties.getString("otel.traces.exporter")).isNull();
6666
assertThat(configProperties.getString("otel.metrics.exporter")).isNull();
6767
assertThat(configProperties.getString("otel.logs.exporter")).isNull();
@@ -82,8 +82,8 @@ public void testOverwrittenExporterConfiguration_2() {
8282

8383
ConfigProperties configProperties = openTelemetrySdkService.getConfigProperties();
8484
assertThat(configProperties.getString("otel.exporter.otlp.endpoint")).isNull();
85-
assertThat(configProperties.getString("otel.exporter.otlp.traces.endpoint")).isEqualTo(
86-
"http://example.com:4317/");
85+
assertThat(configProperties.getString("otel.exporter.otlp.traces.endpoint"))
86+
.isEqualTo("http://example.com:4317/");
8787
assertThat(configProperties.getString("otel.traces.exporter")).isNull();
8888
assertThat(configProperties.getString("otel.metrics.exporter")).isEqualTo("none");
8989
assertThat(configProperties.getString("otel.logs.exporter")).isEqualTo("none");
@@ -106,9 +106,8 @@ public void testOverwrittenExporterConfiguration_3() {
106106

107107
ConfigProperties configProperties = openTelemetrySdkService.getConfigProperties();
108108
assertThat(configProperties.getString("otel.exporter.otlp.endpoint")).isNull();
109-
assertThat(
110-
configProperties.getString("otel.exporter.otlp.traces.endpoint")).isEqualTo(
111-
"http://example.com:4317/");
109+
assertThat(configProperties.getString("otel.exporter.otlp.traces.endpoint"))
110+
.isEqualTo("http://example.com:4317/");
112111
assertThat(configProperties.getString("otel.traces.exporter")).isNull();
113112
assertThat(configProperties.getString("otel.metrics.exporter")).isEqualTo("none");
114113
assertThat(configProperties.getString("otel.logs.exporter")).isEqualTo("none");

0 commit comments

Comments
 (0)