Skip to content

Commit 1d5a419

Browse files
committed
./gradlew spotlessApply
1 parent a19c835 commit 1d5a419

2 files changed

Lines changed: 34 additions & 29 deletions

File tree

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,12 @@ public Map<String, String> apply(ConfigProperties otelConfig) {
118118

119119
String metricsExporter = otelConfig.getString("otel.metrics.exporter");
120120
String aksNamespaceId = System.getenv("AKS_ARM_NAMESPACE_ID");
121-
String metricsToLogAnalyticsEnabled = otelConfig.getString("applicationinsights.metrics.to.loganalytics.enabled");
121+
String metricsToLogAnalyticsEnabled =
122+
otelConfig.getString("applicationinsights.metrics.to.loganalytics.enabled");
122123
if (isAksAttach(aksNamespaceId)) {
123-
properties.put("otel.metrics.exporter", updateMetricsExporter(metricsExporter, metricsToLogAnalyticsEnabled));
124+
properties.put(
125+
"otel.metrics.exporter",
126+
updateMetricsExporter(metricsExporter, metricsToLogAnalyticsEnabled));
124127
} else if (metricsExporter == null) {
125128
// this overrides the default "otlp" so the exporter can be configured later
126129
properties.put("otel.metrics.exporter", "none");
@@ -358,7 +361,8 @@ static boolean isAksAttach(String aksNamespaceId) {
358361
static String updateMetricsExporter(String metricsExporter, String metricsToLogAnalyticsEnabled) {
359362
String azureMonitorName = AzureMonitorExporterProviderKeys.EXPORTER_NAME;
360363
if (metricsExporter == null || metricsExporter.isEmpty()) {
361-
if (metricsToLogAnalyticsEnabled == null || Boolean.parseBoolean(metricsToLogAnalyticsEnabled)) {
364+
if (metricsToLogAnalyticsEnabled == null
365+
|| Boolean.parseBoolean(metricsToLogAnalyticsEnabled)) {
362366
return azureMonitorName + ",otlp";
363367
} else {
364368
return azureMonitorName;

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizerTest.java

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import static org.assertj.core.api.Assertions.assertThat;
77

88
import java.util.stream.Stream;
9-
109
import org.junit.jupiter.api.Test;
1110
import org.junit.jupiter.params.ParameterizedTest;
1211
import org.junit.jupiter.params.provider.Arguments;
@@ -28,44 +27,45 @@ void updateMetricsExporter_ExporterUnset() {
2827
assertThat(AiConfigCustomizer.updateMetricsExporter(null, null))
2928
.isEqualTo("azure_monitor,otlp");
3029

31-
assertThat(AiConfigCustomizer.updateMetricsExporter("", null))
32-
.isEqualTo("azure_monitor,otlp");
33-
30+
assertThat(AiConfigCustomizer.updateMetricsExporter("", null)).isEqualTo("azure_monitor,otlp");
31+
3432
assertThat(AiConfigCustomizer.updateMetricsExporter(null, "true"))
3533
.isEqualTo("azure_monitor,otlp");
36-
34+
3735
assertThat(AiConfigCustomizer.updateMetricsExporter(null, "True"))
3836
.isEqualTo("azure_monitor,otlp");
3937
}
4038

4139
static Stream<Arguments> stringPairs() {
4240
return Stream.of(
43-
Arguments.of("none", "none"),
44-
Arguments.of("azure_monitor", "azure_monitor,otlp"),
41+
Arguments.of("none", "none"),
42+
Arguments.of("azure_monitor", "azure_monitor,otlp"),
4543
Arguments.of("azure_monitor,otlp", "azure_monitor,otlp"),
46-
Arguments.of("otlp", "otlp"));
47-
}
48-
44+
Arguments.of("otlp", "otlp"));
45+
}
46+
4947
@ParameterizedTest
5048
@MethodSource("stringPairs")
51-
void updateMetricsExporter_ExporterSet_AMLE_Unset(String metricsExporter, String expectAzureMonitor) {
49+
void updateMetricsExporter_ExporterSet_AMLE_Unset(
50+
String metricsExporter, String expectAzureMonitor) {
5251
assertThat(AiConfigCustomizer.updateMetricsExporter(metricsExporter, null))
5352
.isEqualTo(expectAzureMonitor);
5453
assertThat(AiConfigCustomizer.updateMetricsExporter(metricsExporter, ""))
5554
.isEqualTo(expectAzureMonitor);
5655
}
57-
56+
5857
static Stream<Arguments> stringPairs2() {
5958
return Stream.of(
60-
Arguments.of("none", "azure_monitor,otlp"),
61-
Arguments.of("azure_monitor", "azure_monitor,otlp"),
62-
Arguments.of("azure_monitor,otlp", "azure_monitor,otlp"),
63-
Arguments.of("otlp", "otlp,azure_monitor"));
64-
}
65-
59+
Arguments.of("none", "azure_monitor,otlp"),
60+
Arguments.of("azure_monitor", "azure_monitor,otlp"),
61+
Arguments.of("azure_monitor,otlp", "azure_monitor,otlp"),
62+
Arguments.of("otlp", "otlp,azure_monitor"));
63+
}
64+
6665
@ParameterizedTest
6766
@MethodSource("stringPairs2")
68-
void updateMetricsExporter_ExporterSet_AMLE_True(String metricsExporter, String expectAzureMonitor) {
67+
void updateMetricsExporter_ExporterSet_AMLE_True(
68+
String metricsExporter, String expectAzureMonitor) {
6969
assertThat(AiConfigCustomizer.updateMetricsExporter(metricsExporter, "true"))
7070
.isEqualTo(expectAzureMonitor);
7171
assertThat(AiConfigCustomizer.updateMetricsExporter(metricsExporter, "True"))
@@ -74,15 +74,16 @@ void updateMetricsExporter_ExporterSet_AMLE_True(String metricsExporter, String
7474

7575
static Stream<Arguments> stringPairs3() {
7676
return Stream.of(
77-
Arguments.of("none", "none"),
78-
Arguments.of("azure_monitor", "azure_monitor"),
79-
Arguments.of("azure_monitor,otlp", "azure_monitor"),
80-
Arguments.of("otlp", "otlp"));
81-
}
82-
77+
Arguments.of("none", "none"),
78+
Arguments.of("azure_monitor", "azure_monitor"),
79+
Arguments.of("azure_monitor,otlp", "azure_monitor"),
80+
Arguments.of("otlp", "otlp"));
81+
}
82+
8383
@ParameterizedTest
8484
@MethodSource("stringPairs3")
85-
void updateMetricsExporter_ExporterSet_AMLE_False(String metricsExporter, String expectAzureMonitor) {
85+
void updateMetricsExporter_ExporterSet_AMLE_False(
86+
String metricsExporter, String expectAzureMonitor) {
8687
assertThat(AiConfigCustomizer.updateMetricsExporter(metricsExporter, "false"))
8788
.isEqualTo(expectAzureMonitor);
8889
assertThat(AiConfigCustomizer.updateMetricsExporter(metricsExporter, "False"))

0 commit comments

Comments
 (0)