Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ void specialListProperties() {
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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions javaagent-tooling/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ public class ResourceProviderPropertiesCustomizer implements AutoConfigurationCu
private static final Map<String, String> 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(
Expand Down
Loading