diff --git a/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/IncubatingAttributes.java b/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/IncubatingAttributes.java index 491cb99a8..524ca8727 100644 --- a/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/IncubatingAttributes.java +++ b/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/IncubatingAttributes.java @@ -24,10 +24,10 @@ final class IncubatingAttributes { AttributeKey.stringKey("cloud.resource_id"); public static final class CloudPlatformIncubatingValues { - public static final String AZURE_VM = "azure_vm"; - public static final String AZURE_AKS = "azure_aks"; - public static final String AZURE_FUNCTIONS = "azure_functions"; - public static final String AZURE_APP_SERVICE = "azure_app_service"; + public static final String AZURE_VM = "azure.vm"; + public static final String AZURE_AKS = "azure.aks"; + public static final String AZURE_FUNCTIONS = "azure.functions"; + public static final String AZURE_APP_SERVICE = "azure.app_service"; private CloudPlatformIncubatingValues() {} } diff --git a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProviderTest.java b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProviderTest.java index 75360f0e9..90a7d27b5 100644 --- a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProviderTest.java +++ b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProviderTest.java @@ -48,7 +48,7 @@ void defaultValues() { createResource(DEFAULT_ENV_VARS) .containsEntry(SERVICE_NAME, TEST_WEBSITE_SITE_NAME) .containsEntry(CLOUD_PROVIDER, "azure") - .containsEntry(CLOUD_PLATFORM, "azure_app_service") + .containsEntry(CLOUD_PLATFORM, "azure.app_service") .containsEntry( CLOUD_RESOURCE_ID, "/subscriptions/TEST_WEBSITE_OWNER_NAME/resourceGroups/TEST_WEBSITE_RESOURCE_GROUP/providers/Microsoft.Web/sites/TEST_WEBSITE_SITE_NAME") diff --git a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureFunctionsResourceProviderTest.java b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureFunctionsResourceProviderTest.java index e2c39cc7a..b680088e8 100644 --- a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureFunctionsResourceProviderTest.java +++ b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureFunctionsResourceProviderTest.java @@ -38,7 +38,7 @@ class AzureFunctionsResourceProviderTest { void defaultValues() { createResource(DEFAULT_ENV_VARS) .containsEntry(CLOUD_PROVIDER, "azure") - .containsEntry(CLOUD_PLATFORM, "azure_functions") + .containsEntry(CLOUD_PLATFORM, "azure.functions") .containsEntry(FAAS_NAME, TEST_WEBSITE_SITE_NAME) .containsEntry(FAAS_VERSION, TEST_FUNCTION_VERSION) .containsEntry(FAAS_INSTANCE, TEST_WEBSITE_INSTANCE_ID) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 48f443d67..f72c44034 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -77,7 +77,7 @@ tasks { exceptionFormat = TestExceptionFormat.FULL showStandardStreams = true } - + configure { // only care about code coverage for code in this repository // (in particular avoiding netty classes which sometimes end up diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 637f8fbac..0f55bae81 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -14,14 +14,14 @@ dependencies { // under JvmTestSuite so they don't show up as runtime dependencies in license and vulnerability scans // (the constraints section below doesn't have this issue, and will only show up // as runtime dependencies if they are actually used as runtime dependencies) - api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}")) - api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.20.0")) - api(enforcedPlatform("com.google.protobuf:protobuf-bom:4.32.1")) - api(enforcedPlatform("com.squareup.okhttp3:okhttp-bom:5.1.0")) + api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}")) + api(platform("com.fasterxml.jackson:jackson-bom:2.20.0")) + api(platform("com.google.protobuf:protobuf-bom:4.32.1")) + api(platform("com.squareup.okhttp3:okhttp-bom:5.1.0")) constraints { api("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}") - api("io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semconvVersion}") + api("io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semconvVersion}-alpha") api("com.google.auto.service:auto-service:1.1.1") api("com.google.auto.service:auto-service-annotations:1.1.1")