diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResource.java index 7441b7c819..7dd40ef9ef 100644 --- a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResource.java +++ b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResource.java @@ -9,8 +9,8 @@ import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_ELASTIC_BEANSTALK; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.SERVICE_INSTANCE_ID; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.SERVICE_NAMESPACE; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_INSTANCE_ID; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAMESPACE; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION; import static java.util.logging.Level.WARNING; diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/IncubatingAttributes.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/IncubatingAttributes.java index 91349a6778..9f82aacbf9 100644 --- a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/IncubatingAttributes.java +++ b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/IncubatingAttributes.java @@ -45,11 +45,6 @@ public static final class CloudProviderIncubatingValues { private CloudProviderIncubatingValues() {} } - public static final AttributeKey SERVICE_INSTANCE_ID = - AttributeKey.stringKey("service.instance.id"); - public static final AttributeKey SERVICE_NAMESPACE = - AttributeKey.stringKey("service.namespace"); - public static final AttributeKey HOST_ID = AttributeKey.stringKey("host.id"); public static final AttributeKey HOST_IMAGE_ID = AttributeKey.stringKey("host.image.id"); public static final AttributeKey HOST_NAME = AttributeKey.stringKey("host.name"); diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceTest.java index c706428900..8ecf4376da 100644 --- a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceTest.java +++ b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceTest.java @@ -6,11 +6,11 @@ package io.opentelemetry.contrib.aws.resource; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_INSTANCE_ID; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAMESPACE; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION; import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM; import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER; -import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_INSTANCE_ID; -import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_NAMESPACE; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.entry; 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 3a658428ae..b4ea849fd5 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 @@ -10,7 +10,7 @@ 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.contrib.azure.resource.IncubatingAttributes.SERVICE_INSTANCE_ID; +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/AzureContainersResourceProvider.java b/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureContainersResourceProvider.java index 014ec5b41a..b55842574d 100644 --- a/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureContainersResourceProvider.java +++ b/azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureContainersResourceProvider.java @@ -5,7 +5,7 @@ package io.opentelemetry.contrib.azure.resource; -import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.SERVICE_INSTANCE_ID; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_INSTANCE_ID; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION; 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 524ca87278..f633cd3cc7 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 @@ -10,10 +10,6 @@ // copied from opentelemetry-semconv-incubating final class IncubatingAttributes { - // service attributes - public static final AttributeKey SERVICE_INSTANCE_ID = - AttributeKey.stringKey("service.instance.id"); - // cloud attributes public static final AttributeKey CLOUD_PLATFORM = AttributeKey.stringKey("cloud.platform"); 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 90a7d27b59..b439e16597 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,6 +6,7 @@ package io.opentelemetry.contrib.azure.resource; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; +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; @@ -13,7 +14,6 @@ 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 static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_INSTANCE_ID; import com.google.common.collect.ImmutableMap; import io.opentelemetry.sdk.testing.assertj.AttributesAssert; diff --git a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureContainersResourceProviderTest.java b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureContainersResourceProviderTest.java index 082ceaf6aa..1b7f620332 100644 --- a/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureContainersResourceProviderTest.java +++ b/azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/AzureContainersResourceProviderTest.java @@ -6,11 +6,11 @@ package io.opentelemetry.contrib.azure.resource; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_INSTANCE_ID; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME; import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION; import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM; import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER; -import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_INSTANCE_ID; import com.google.common.collect.ImmutableMap; import io.opentelemetry.sdk.testing.assertj.AttributesAssert; diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 5f2d71621d..9568a7f671 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } val otelInstrumentationVersion = "2.25.0-alpha" -val semconvVersion = "1.39.0" +val semconvVersion = "1.40.0" javaPlatform { allowDependencies() diff --git a/jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java b/jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java index 366fa48ca6..3c8327fa0d 100644 --- a/jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java +++ b/jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java @@ -5,7 +5,7 @@ package io.opentelemetry.contrib.jmxscraper; -import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_INSTANCE_ID; +import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_INSTANCE_ID; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.logging.Level.INFO;