fix up attributes

Author: breedx-splk

aws-xray/build.gradle.kts

@@ -11,7 +11,6 @@ dependencies {
   api("io.opentelemetry:opentelemetry-sdk-trace")
 
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
-  implementation("io.opentelemetry.semconv:opentelemetry-semconv:1.40.0")
 
   implementation("com.squareup.okhttp3:okhttp")
   implementation("io.opentelemetry.semconv:opentelemetry-semconv")

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProvider.java

@@ -8,8 +8,8 @@
 import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.CLOUD_REGION;
 import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.CLOUD_RESOURCE_ID;
 import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AZURE_APP_SERVICE;
-import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.DEPLOYMENT_ENVIRONMENT_NAME;
 import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.HOST_ID;
+import static io.opentelemetry.semconv.DeploymentAttributes.DEPLOYMENT_ENVIRONMENT_NAME;
 import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_INSTANCE_ID;
 import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
 import static java.util.Objects.requireNonNull;

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/IncubatingAttributes.java

@@ -35,10 +35,6 @@ public static final class CloudProviderIncubatingValues {
     private CloudProviderIncubatingValues() {}
   }
 
-  // deployment attributes
-  public static final AttributeKey<String> DEPLOYMENT_ENVIRONMENT_NAME =
-      AttributeKey.stringKey("deployment.environment.name");
-
   // host attributes
   public static final AttributeKey<String> HOST_ID = AttributeKey.stringKey("host.id");
   public static final AttributeKey<String> HOST_NAME = AttributeKey.stringKey("host.name");

azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProviderTest.java

@@ -12,7 +12,7 @@
 import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
 import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_REGION;
 import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_RESOURCE_ID;
-import static io.opentelemetry.semconv.incubating.DeploymentIncubatingAttributes.DEPLOYMENT_ENVIRONMENT_NAME;
+import static io.opentelemetry.semconv.DeploymentAttributes.DEPLOYMENT_ENVIRONMENT_NAME;
 import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_ID;
 
 import com.google.common.collect.ImmutableMap;