fix version resolution for semconv

Author: zeitlinger

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() {}
   }

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")

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)

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -19,6 +19,7 @@ base.archivesName.set("opentelemetry-${project.name}")
 
 // Version to use to compile code and run tests.
 val DEFAULT_JAVA_VERSION = JavaVersion.VERSION_17
+val semconvVersion = "1.37.0"
 
 java {
   toolchain {
@@ -77,7 +78,7 @@ tasks {
       exceptionFormat = TestExceptionFormat.FULL
       showStandardStreams = true
     }
-    
+
     configure<JacocoTaskExtension> {
       // only care about code coverage for code in this repository
       // (in particular avoiding netty classes which sometimes end up
@@ -145,6 +146,13 @@ dependencies {
   compileOnly("com.google.errorprone:error_prone_annotations")
 }
 
+configurations.all {
+  resolutionStrategy {
+    force("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")
+    force("io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semconvVersion}-alpha")
+  }
+}
+
 testing {
   suites.withType(JvmTestSuite::class).configureEach {
     dependencies {

dependencyManagement/build.gradle.kts

@@ -3,7 +3,6 @@ plugins {
 }
 
 val otelInstrumentationVersion = "2.19.0-alpha"
-val semconvVersion = "1.37.0"
 
 javaPlatform {
   allowDependencies()
@@ -20,9 +19,6 @@ dependencies {
   api(enforcedPlatform("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("com.google.auto.service:auto-service:1.1.1")
     api("com.google.auto.service:auto-service-annotations:1.1.1")
     api("com.google.auto.value:auto-value:1.11.0")