Skip to content

Commit cba8fd8

Browse files
authored
add azure resource provider like gcp and aws (#13627)
1 parent 2dad6f5 commit cba8fd8

File tree

7 files changed

+55
-32
lines changed

7 files changed

+55
-32
lines changed

.github/renovate.json5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
},
2929
{
3030
matchPackageNames: [
31+
'io.opentelemetry.contrib:opentelemetry-azure-resources',
3132
'io.opentelemetry.contrib:opentelemetry-aws-resources',
3233
'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator',
3334
'io.opentelemetry.contrib:opentelemetry-gcp-resources',

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ val DEPENDENCIES = listOf(
102102
"commons-logging:commons-logging:1.3.5",
103103
"commons-validator:commons-validator:1.9.0",
104104
"io.netty:netty:3.10.6.Final",
105+
"io.opentelemetry.contrib:opentelemetry-azure-resources:${otelContribVersion}",
105106
"io.opentelemetry.contrib:opentelemetry-aws-resources:${otelContribVersion}",
106107
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:${otelContribVersion}",
107108
"io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ void specialListProperties() {
8888
configProperties.getList("otel.java.disabled.resource.providers"))
8989
.containsExactlyInAnyOrder(
9090
"d",
91+
"io.opentelemetry.contrib.azure.resource.AzureAksResourceProvider",
92+
"io.opentelemetry.contrib.azure.resource.AzureAppServiceResourceProvider",
93+
"io.opentelemetry.contrib.azure.resource.AzureContainersResourceProvider",
94+
"io.opentelemetry.contrib.azure.resource.AzureFunctionsResourceProvider",
95+
"io.opentelemetry.contrib.azure.resource.AzureVmResourceProvider",
9196
"io.opentelemetry.contrib.aws.resource.BeanstalkResourceProvider",
9297
"io.opentelemetry.contrib.aws.resource.Ec2ResourceProvider",
9398
"io.opentelemetry.contrib.aws.resource.EcsResourceProvider",

instrumentation/spring/starters/spring-boot-starter/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ dependencies {
2121
api("io.opentelemetry:opentelemetry-exporter-otlp")
2222
api("io.opentelemetry:opentelemetry-sdk")
2323

24+
implementation("io.opentelemetry.contrib:opentelemetry-azure-resources")
2425
implementation("io.opentelemetry.contrib:opentelemetry-aws-resources")
2526
implementation("io.opentelemetry.contrib:opentelemetry-gcp-resources")
2627
implementation("io.opentelemetry.contrib:opentelemetry-baggage-processor")

javaagent-tooling/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ dependencies {
4141

4242
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
4343

44+
implementation("io.opentelemetry.contrib:opentelemetry-azure-resources")
4445
implementation("io.opentelemetry.contrib:opentelemetry-aws-resources")
4546
implementation("io.opentelemetry.contrib:opentelemetry-gcp-resources")
4647
implementation("io.opentelemetry.contrib:opentelemetry-baggage-processor")

licenses/licenses.md

Lines changed: 36 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk-autoconfigure-support/src/main/java/io/opentelemetry/instrumentation/resources/ResourceProviderPropertiesCustomizer.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ public class ResourceProviderPropertiesCustomizer implements AutoConfigurationCu
2222
private static final Map<String, String> DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS = new HashMap<>();
2323

2424
static {
25+
DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put(
26+
"io.opentelemetry.contrib.azure.resource.AzureAksResourceProvider", "azure");
27+
DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put(
28+
"io.opentelemetry.contrib.azure.resource.AzureAppServiceResourceProvider", "azure");
29+
DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put(
30+
"io.opentelemetry.contrib.azure.resource.AzureContainersResourceProvider", "azure");
31+
DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put(
32+
"io.opentelemetry.contrib.azure.resource.AzureFunctionsResourceProvider", "azure");
33+
DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put(
34+
"io.opentelemetry.contrib.azure.resource.AzureVmResourceProvider", "azure");
2535
DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put(
2636
"io.opentelemetry.contrib.aws.resource.BeanstalkResourceProvider", "aws");
2737
DISABLED_BY_DEFAULT_RESOURCE_PROVIDERS.put(

0 commit comments

Comments
 (0)