diff --git a/aws-xray/build.gradle.kts b/aws-xray/build.gradle.kts index 3a14bbe99..9ef301fe3 100644 --- a/aws-xray/build.gradle.kts +++ b/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") diff --git a/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProvider.java b/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProvider.java index b4ea849fd..5693c8fba 100644 --- a/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProvider.java +++ b/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; 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 a49e09fb7..571c8b4c4 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 @@ -35,10 +35,6 @@ public static final class CloudProviderIncubatingValues { private CloudProviderIncubatingValues() {} } - // deployment attributes - public static final AttributeKey DEPLOYMENT_ENVIRONMENT_NAME = - AttributeKey.stringKey("deployment.environment.name"); - // host attributes public static final AttributeKey HOST_ID = AttributeKey.stringKey("host.id"); public static final AttributeKey HOST_NAME = AttributeKey.stringKey("host.name"); 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 b439e1659..8e59eefc1 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 @@ -6,13 +6,13 @@ package io.opentelemetry.contrib.azure.resource; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; +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 io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM; 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.incubating.HostIncubatingAttributes.HOST_ID; import com.google.common.collect.ImmutableMap; diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 9e622ada9..64d449b6d 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } val otelInstrumentationVersion = "2.27.0-alpha" -val semconvVersion = "1.40.0" +val semconvVersion = "1.41.0" javaPlatform { allowDependencies()