diff --git a/CHANGELOG.next-release.md b/CHANGELOG.next-release.md index 82ec452b..e25eb592 100644 --- a/CHANGELOG.next-release.md +++ b/CHANGELOG.next-release.md @@ -1,2 +1,3 @@ * Switched the default of `otel.exporter.otlp.metrics.temporality.preference` from `CUMULATIVE` to `DELTA` to improve dashboarding experience with Kibana. If you want to restore the previous behaviour, you can manually override `otel.exporter.otlp.metrics.temporality.preference` to `CUMULATIVE` via JVM-properties or environment variables. - #583 * Set elastic-specific User-Agent header for OTLP exporters - #593 +* Enable Azure resource provider by default with `otel.resource.providers.azure.enabled` = `true`. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7a939fa3..70f27ec7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,8 +30,6 @@ opentelemetryInstrumentationAlphaBom = { group = "io.opentelemetry.instrumentati opentelemetryProto = { group = "io.opentelemetry.proto", name = "opentelemetry-proto", version.ref = "opentelemetryProto" } -awsContribResources = { group = "io.opentelemetry.contrib", name = "opentelemetry-aws-resources", version.ref = "opentelemetryContribAlpha" } -gcpContribResources = { group = "io.opentelemetry.contrib", name = "opentelemetry-gcp-resources", version.ref = "opentelemetryContribAlpha" } contribResources = { group = "io.opentelemetry.contrib", name = "opentelemetry-resource-providers", version.ref = "opentelemetryContribAlpha" } contribSpanStacktrace = { group = "io.opentelemetry.contrib", name = "opentelemetry-span-stacktrace", version.ref = "opentelemetryContribAlpha" } contribInferredSpans = { group = "io.opentelemetry.contrib", name = "opentelemetry-inferred-spans", version.ref = "opentelemetryContribAlpha" } diff --git a/resources/src/main/java/co/elastic/otel/resources/ResourcesAutoConfiguration.java b/resources/src/main/java/co/elastic/otel/resources/ResourcesAutoConfiguration.java index 2056eb0e..cffc93dc 100644 --- a/resources/src/main/java/co/elastic/otel/resources/ResourcesAutoConfiguration.java +++ b/resources/src/main/java/co/elastic/otel/resources/ResourcesAutoConfiguration.java @@ -28,7 +28,7 @@ @AutoService(AutoConfigurationCustomizerProvider.class) public class ResourcesAutoConfiguration implements AutoConfigurationCustomizerProvider { - private static final String[] PROVIDERS = {"aws", "gcp"}; + private static final String[] PROVIDERS = {"aws", "gcp", "azure"}; @Override public void customize(AutoConfigurationCustomizer autoConfiguration) { diff --git a/resources/src/test/java/co/elastic/otel/resources/ResourcesAutoConfigurationTest.java b/resources/src/test/java/co/elastic/otel/resources/ResourcesAutoConfigurationTest.java index b16eb853..f0869016 100644 --- a/resources/src/test/java/co/elastic/otel/resources/ResourcesAutoConfigurationTest.java +++ b/resources/src/test/java/co/elastic/otel/resources/ResourcesAutoConfigurationTest.java @@ -21,15 +21,21 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; class ResourcesAutoConfigurationTest { - public static final String GCP_ENABLED = "otel.resource.providers.gcp.enabled"; - public static final String AWS_ENABLED = "otel.resource.providers.aws.enabled"; + private static final List LIST = + Arrays.asList(config("gcp"), config("aws"), config("azure")); + + private static String config(String provider) { + return String.format("otel.resource.providers.%s.enabled", provider); + } @Test void elastic_defaults() { @@ -37,8 +43,8 @@ void elastic_defaults() { Map explicitConfig = Collections.emptyMap(); Map expectedResult = new HashMap<>(); - expectedResult.put(GCP_ENABLED, "true"); - expectedResult.put(AWS_ENABLED, "true"); + + LIST.forEach(v -> expectedResult.put(v, "true")); testConfig(explicitConfig, expectedResult); } @@ -46,11 +52,10 @@ void elastic_defaults() { @Test void explicitly_enabled() { Map explicitConfig = new HashMap<>(); - explicitConfig.put(GCP_ENABLED, "true"); + explicitConfig.put(LIST.get(0), "true"); Map expectedResult = new HashMap<>(); - expectedResult.put(GCP_ENABLED, "true"); - expectedResult.put(AWS_ENABLED, "true"); + LIST.forEach(v -> expectedResult.put(v, "true")); testConfig(explicitConfig, expectedResult); } @@ -58,11 +63,13 @@ void explicitly_enabled() { @Test void explicitly_disabled() { Map explicitConfig = new HashMap<>(); - explicitConfig.put(GCP_ENABLED, "false"); + explicitConfig.put(LIST.get(0), "false"); Map expectedResult = new HashMap<>(); - expectedResult.put(GCP_ENABLED, "false"); - expectedResult.put(AWS_ENABLED, "true"); + expectedResult.put(LIST.get(0), "false"); + for (int i = 1; i < LIST.size(); i++) { + expectedResult.put(LIST.get(i), "true"); + } testConfig(explicitConfig, expectedResult); }