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 a73102414..9f294d4fb 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 @@ -7,8 +7,8 @@ import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_ELASTIC_BEANSTALK; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderValues.AWS; +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_VERSION; diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java index d857bd811..d4bdb4228 100644 --- a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java +++ b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java @@ -10,7 +10,7 @@ import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_REGION; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_EC2; +import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_EC2; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_ID; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_IMAGE_ID; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_NAME; @@ -89,7 +89,7 @@ static Resource buildResource(String endpoint) { String hostname = fetchHostname(hostnameUrl, token); AttributesBuilder attrBuilders = Attributes.builder(); - attrBuilders.put(CLOUD_PROVIDER, IncubatingAttributes.CloudProviderValues.AWS); + attrBuilders.put(CLOUD_PROVIDER, IncubatingAttributes.CloudProviderIncubatingValues.AWS); attrBuilders.put(CLOUD_PLATFORM, AWS_EC2); try (JsonParser parser = JSON_FACTORY.createParser(identity)) { diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java index a5ea04d51..8ee74bd47 100644 --- a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java +++ b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java @@ -24,8 +24,8 @@ import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_ID; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_IMAGE_NAME; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_NAME; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_ECS; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderValues.AWS; +import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_ECS; +import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResource.java index 8126255ba..8ed3fb512 100644 --- a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResource.java +++ b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResource.java @@ -8,8 +8,8 @@ import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_ID; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_EKS; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderValues.AWS; +import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_EKS; +import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.K8S_CLUSTER_NAME; import com.fasterxml.jackson.core.JsonFactory; 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 6033f5bcf..c973b50f5 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 @@ -27,20 +27,20 @@ private IncubatingAttributes() {} public static final AttributeKey CLOUD_RESOURCE_ID = AttributeKey.stringKey("cloud.resource_id"); - public static final class CloudPlatformValues { + public static final class CloudPlatformIncubatingValues { public static final String AWS_EC2 = "aws_ec2"; public static final String AWS_ECS = "aws_ecs"; public static final String AWS_EKS = "aws_eks"; public static final String AWS_LAMBDA = "aws_lambda"; public static final String AWS_ELASTIC_BEANSTALK = "aws_elastic_beanstalk"; - private CloudPlatformValues() {} + private CloudPlatformIncubatingValues() {} } - public static final class CloudProviderValues { + public static final class CloudProviderIncubatingValues { public static final String AWS = "aws"; - private CloudProviderValues() {} + private CloudProviderIncubatingValues() {} } public static final AttributeKey SERVICE_INSTANCE_ID = diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResource.java index 74763c929..4108ef786 100644 --- a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResource.java +++ b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResource.java @@ -8,8 +8,8 @@ import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_REGION; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_LAMBDA; -import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderValues.AWS; +import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_LAMBDA; +import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.FAAS_NAME; import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.FAAS_VERSION; diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 0b6e9a912..fcdcc901d 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -25,7 +25,7 @@ val errorProneVersion = "2.33.0" val prometheusVersion = "0.16.0" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.16" -val semConvVersion = "1.27.0-alpha" +val semConvVersion = "1.28.0-alpha" val CORE_DEPENDENCIES = listOf( "com.google.auto.service:auto-service:${autoServiceVersion}", diff --git a/gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProvider.java b/gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProvider.java index cba73f85e..b7e49c1a9 100644 --- a/gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProvider.java +++ b/gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProvider.java @@ -34,12 +34,12 @@ import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CLOUD_PLATFORM; import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CLOUD_PROVIDER; import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CLOUD_REGION; -import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP; -import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_APP_ENGINE; -import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_CLOUD_FUNCTIONS; -import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_CLOUD_RUN; -import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_COMPUTE_ENGINE; -import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_KUBERNETES_ENGINE; +import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP; +import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_APP_ENGINE; +import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_FUNCTIONS; +import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_RUN; +import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_COMPUTE_ENGINE; +import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_KUBERNETES_ENGINE; import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.FAAS_INSTANCE; import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.FAAS_NAME; import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.FAAS_VERSION; diff --git a/gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/IncubatingAttributes.java b/gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/IncubatingAttributes.java index 551353288..745d440fd 100644 --- a/gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/IncubatingAttributes.java +++ b/gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/IncubatingAttributes.java @@ -25,8 +25,8 @@ private IncubatingAttributes() {} AttributeKey.stringKey("cloud.provider"); public static final AttributeKey CLOUD_REGION = AttributeKey.stringKey("cloud.region"); - public static final class CloudPlatformValues { - private CloudPlatformValues() {} + public static final class CloudPlatformIncubatingValues { + private CloudPlatformIncubatingValues() {} public static final String GCP_COMPUTE_ENGINE = "gcp_compute_engine"; public static final String GCP_CLOUD_RUN = "gcp_cloud_run"; diff --git a/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java b/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java index a399fce7f..9b17b22d2 100644 --- a/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java +++ b/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java @@ -36,12 +36,12 @@ 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.CloudPlatformValues.GCP_APP_ENGINE; -import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformValues.GCP_CLOUD_FUNCTIONS; -import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformValues.GCP_CLOUD_RUN; -import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformValues.GCP_COMPUTE_ENGINE; -import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformValues.GCP_KUBERNETES_ENGINE; -import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudProviderValues.GCP; +import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_APP_ENGINE; +import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_FUNCTIONS; +import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_RUN; +import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_COMPUTE_ENGINE; +import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_KUBERNETES_ENGINE; +import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudProviderIncubatingValues.GCP; import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_INSTANCE; import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_NAME; import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_VERSION;