From cba8fd8d426a80119c730b21261dd90445176fe8 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Wed, 2 Apr 2025 08:32:37 +0200 Subject: [PATCH] add azure resource provider like gcp and aws (#13627) --- .github/renovate.json5 | 1 + dependencyManagement/build.gradle.kts | 1 + .../OpenTelemetryAutoConfigurationTest.java | 5 ++ .../spring-boot-starter/build.gradle.kts | 1 + javaagent-tooling/build.gradle.kts | 1 + licenses/licenses.md | 68 ++++++++++--------- .../ResourceProviderPropertiesCustomizer.java | 10 +++ 7 files changed, 55 insertions(+), 32 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index dc34eb781d..3875804209 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -28,6 +28,7 @@ }, { matchPackageNames: [ + 'io.opentelemetry.contrib:opentelemetry-azure-resources', 'io.opentelemetry.contrib:opentelemetry-aws-resources', 'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator', 'io.opentelemetry.contrib:opentelemetry-gcp-resources', diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index c7352a1ca8..f10bad4f6e 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -102,6 +102,7 @@ val DEPENDENCIES = listOf( "commons-logging:commons-logging:1.3.5", "commons-validator:commons-validator:1.9.0", "io.netty:netty:3.10.6.Final", + "io.opentelemetry.contrib:opentelemetry-azure-resources:${otelContribVersion}", "io.opentelemetry.contrib:opentelemetry-aws-resources:${otelContribVersion}", "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:${otelContribVersion}", "io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}", diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java index d9f62fa2d8..1dfcc17e31 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java @@ -88,6 +88,11 @@ class OpenTelemetryAutoConfigurationTest { configProperties.getList("otel.java.disabled.resource.providers")) .containsExactlyInAnyOrder( "d", + "io.opentelemetry.contrib.azure.resource.AzureAksResourceProvider", + "io.opentelemetry.contrib.azure.resource.AzureAppServiceResourceProvider", + "io.opentelemetry.contrib.azure.resource.AzureContainersResourceProvider", + "io.opentelemetry.contrib.azure.resource.AzureFunctionsResourceProvider", + "io.opentelemetry.contrib.azure.resource.AzureVmResourceProvider", "io.opentelemetry.contrib.aws.resource.BeanstalkResourceProvider", "io.opentelemetry.contrib.aws.resource.Ec2ResourceProvider", "io.opentelemetry.contrib.aws.resource.EcsResourceProvider", diff --git a/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts b/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts index 849d7f26ca..8681d8405b 100644 --- a/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts +++ b/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts @@ -21,6 +21,7 @@ dependencies { api("io.opentelemetry:opentelemetry-exporter-otlp") api("io.opentelemetry:opentelemetry-sdk") + implementation("io.opentelemetry.contrib:opentelemetry-azure-resources") implementation("io.opentelemetry.contrib:opentelemetry-aws-resources") implementation("io.opentelemetry.contrib:opentelemetry-gcp-resources") implementation("io.opentelemetry.contrib:opentelemetry-baggage-processor") diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts index b5d669f483..ddd10b1796 100644 --- a/javaagent-tooling/build.gradle.kts +++ b/javaagent-tooling/build.gradle.kts @@ -41,6 +41,7 @@ dependencies { implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator") + implementation("io.opentelemetry.contrib:opentelemetry-azure-resources") implementation("io.opentelemetry.contrib:opentelemetry-aws-resources") implementation("io.opentelemetry.contrib:opentelemetry-gcp-resources") implementation("io.opentelemetry.contrib:opentelemetry-baggage-processor") diff --git a/licenses/licenses.md b/licenses/licenses.md index debea0d195..5c8b4a5c37 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -158,173 +158,177 @@ > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**36** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-baggage-processor` **Version:** `1.45.0-alpha` +**36** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-azure-resources` **Version:** `1.45.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**37** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-gcp-resources` **Version:** `1.45.0-alpha` +**37** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-baggage-processor` **Version:** `1.45.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**38** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.30.0` +**38** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-gcp-resources` **Version:** `1.45.0-alpha` +> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) +> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) + +**39** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.30.0` > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**39** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.30.0-alpha` +**40** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.30.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**40** **Group:** `io.prometheus` **Name:** `prometheus-metrics-config` **Version:** `1.3.6` +**41** **Group:** `io.prometheus` **Name:** `prometheus-metrics-config` **Version:** `1.3.6` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**41** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exporter-common` **Version:** `1.3.6` +**42** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exporter-common` **Version:** `1.3.6` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**42** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exporter-httpserver` **Version:** `1.3.6` +**43** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exporter-httpserver` **Version:** `1.3.6` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**43** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exposition-formats` **Version:** `1.3.6` +**44** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exposition-formats` **Version:** `1.3.6` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**44** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exposition-textformats` **Version:** `1.3.6` +**45** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exposition-textformats` **Version:** `1.3.6` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**45** **Group:** `io.prometheus` **Name:** `prometheus-metrics-model` **Version:** `1.3.6` +**46** **Group:** `io.prometheus` **Name:** `prometheus-metrics-model` **Version:** `1.3.6` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**46** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-reporter` **Version:** `3.5.0` +**47** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-reporter` **Version:** `3.5.0` > - **Manifest Project URL**: [https://zipkin.io/](https://zipkin.io/) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [zipkin-reporter-3.5.0.jar/META-INF/LICENSE](zipkin-reporter-3.5.0.jar/META-INF/LICENSE) -**47** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-sender-okhttp3` **Version:** `3.5.0` +**48** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-sender-okhttp3` **Version:** `3.5.0` > - **Manifest Project URL**: [https://zipkin.io/](https://zipkin.io/) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [zipkin-sender-okhttp3-3.5.0.jar/META-INF/LICENSE](zipkin-sender-okhttp3-3.5.0.jar/META-INF/LICENSE) -**48** **Group:** `io.zipkin.zipkin2` **Name:** `zipkin` **Version:** `2.27.1` +**49** **Group:** `io.zipkin.zipkin2` **Name:** `zipkin` **Version:** `2.27.1` > - **Manifest Project URL**: [http://zipkin.io/](http://zipkin.io/) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [zipkin-2.27.1.jar/META-INF/LICENSE](zipkin-2.27.1.jar/META-INF/LICENSE) -**49** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.17.5` +**50** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.17.5` > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [byte-buddy-dep-1.17.5.jar/META-INF/LICENSE](byte-buddy-dep-1.17.5.jar/META-INF/LICENSE) - [byte-buddy-dep-1.17.5.jar/META-INF/NOTICE](byte-buddy-dep-1.17.5.jar/META-INF/NOTICE) -**50** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` +**51** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` > - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**51** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `2.1.10` +**52** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `2.1.10` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**52** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `2.1.10` +**53** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `2.1.10` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**53** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `2.1.10` +**54** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `2.1.10` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**54** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.8` +**55** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**55** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.8` +**56** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**56** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.8` +**57** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**57** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.8` +**58** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**58** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.8` +**59** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**59** **Group:** `org.snakeyaml` **Name:** `snakeyaml-engine` **Version:** `2.9` +**60** **Group:** `org.snakeyaml` **Name:** `snakeyaml-engine` **Version:** `2.9` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml-engine](https://bitbucket.org/snakeyaml/snakeyaml-engine) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**60** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `2.3` +**61** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `2.3` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) ## MIT License -**61** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.17` +**62** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.17` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) > - **Embedded license files**: [slf4j-api-2.0.17.jar/META-INF/LICENSE.txt](slf4j-api-2.0.17.jar/META-INF/LICENSE.txt) -**62** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.17` +**63** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.17` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) > - **Embedded license files**: [slf4j-simple-2.0.17.jar/META-INF/LICENSE.txt](slf4j-simple-2.0.17.jar/META-INF/LICENSE.txt) ## The 3-Clause BSD License -**63** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.8` +**64** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**64** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.8` +**65** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**65** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.8` +**66** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**66** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.8` +**67** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**67** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.8` +**68** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.8` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) diff --git a/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java b/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java index 14fa043dea..40eadb78bd 100644 --- a/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java +++ b/sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java @@ -22,6 +22,16 @@ public class ResourceProviderPropertiesCustomizer implements AutoConfigurationCu private static final Map DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS = new HashMap<>(); static { + DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put( + "io.opentelemetry.contrib.azure.resource.AzureAksResourceProvider", "azure"); + DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put( + "io.opentelemetry.contrib.azure.resource.AzureAppServiceResourceProvider", "azure"); + DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put( + "io.opentelemetry.contrib.azure.resource.AzureContainersResourceProvider", "azure"); + DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put( + "io.opentelemetry.contrib.azure.resource.AzureFunctionsResourceProvider", "azure"); + DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put( + "io.opentelemetry.contrib.azure.resource.AzureVmResourceProvider", "azure"); DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put( "io.opentelemetry.contrib.aws.resource.BeanstalkResourceProvider", "aws"); DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put(