Skip to content

Commit 2110fb2

Browse files
committed
enable azure provider by default
1 parent b4eed6a commit 2110fb2

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ opentelemetryInstrumentationAlphaBom = { group = "io.opentelemetry.instrumentati
3030

3131
opentelemetryProto = { group = "io.opentelemetry.proto", name = "opentelemetry-proto", version.ref = "opentelemetryProto" }
3232

33-
awsContribResources = { group = "io.opentelemetry.contrib", name = "opentelemetry-aws-resources", version.ref = "opentelemetryContribAlpha" }
34-
gcpContribResources = { group = "io.opentelemetry.contrib", name = "opentelemetry-gcp-resources", version.ref = "opentelemetryContribAlpha" }
3533
contribResources = { group = "io.opentelemetry.contrib", name = "opentelemetry-resource-providers", version.ref = "opentelemetryContribAlpha" }
3634
contribSpanStacktrace = { group = "io.opentelemetry.contrib", name = "opentelemetry-span-stacktrace", version.ref = "opentelemetryContribAlpha" }
3735
contribInferredSpans = { group = "io.opentelemetry.contrib", name = "opentelemetry-inferred-spans", version.ref = "opentelemetryContribAlpha" }

resources/src/main/java/co/elastic/otel/resources/ResourcesAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@AutoService(AutoConfigurationCustomizerProvider.class)
2929
public class ResourcesAutoConfiguration implements AutoConfigurationCustomizerProvider {
3030

31-
private static final String[] PROVIDERS = {"aws", "gcp"};
31+
private static final String[] PROVIDERS = {"aws", "gcp", "azure"};
3232

3333
@Override
3434
public void customize(AutoConfigurationCustomizer autoConfiguration) {

resources/src/test/java/co/elastic/otel/resources/ResourcesAutoConfigurationTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class ResourcesAutoConfigurationTest {
3030

3131
public static final String GCP_ENABLED = "otel.resource.providers.gcp.enabled";
3232
public static final String AWS_ENABLED = "otel.resource.providers.aws.enabled";
33+
public static final String AZURE_ENABLED = "otel.resource.providers.azure.enabled";
3334

3435
@Test
3536
void elastic_defaults() {
@@ -39,6 +40,7 @@ void elastic_defaults() {
3940
Map<String, String> expectedResult = new HashMap<>();
4041
expectedResult.put(GCP_ENABLED, "true");
4142
expectedResult.put(AWS_ENABLED, "true");
43+
expectedResult.put(AZURE_ENABLED, "true");
4244

4345
testConfig(explicitConfig, expectedResult);
4446
}
@@ -51,6 +53,7 @@ void explicitly_enabled() {
5153
Map<String, String> expectedResult = new HashMap<>();
5254
expectedResult.put(GCP_ENABLED, "true");
5355
expectedResult.put(AWS_ENABLED, "true");
56+
expectedResult.put(AZURE_ENABLED, "true");
5457

5558
testConfig(explicitConfig, expectedResult);
5659
}
@@ -63,6 +66,7 @@ void explicitly_disabled() {
6366
Map<String, String> expectedResult = new HashMap<>();
6467
expectedResult.put(GCP_ENABLED, "false");
6568
expectedResult.put(AWS_ENABLED, "true");
69+
expectedResult.put(AZURE_ENABLED, "true");
6670

6771
testConfig(explicitConfig, expectedResult);
6872
}

0 commit comments

Comments
 (0)