Skip to content

Commit a56b2f2

Browse files
trasktrask
committed
Updates
1 parent 876e3eb commit a56b2f2

File tree

9 files changed

+28
-28
lines changed

9 files changed

+28
-28
lines changed

‎aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM;
99
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER;
10-
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_ELASTIC_BEANSTALK;
11-
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderValues.AWS;
10+
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_ELASTIC_BEANSTALK;
11+
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS;
1212
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.SERVICE_INSTANCE_ID;
1313
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.SERVICE_NAMESPACE;
1414
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION;

‎aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM;
1111
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER;
1212
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_REGION;
13-
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_EC2;
13+
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_EC2;
1414
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_ID;
1515
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_IMAGE_ID;
1616
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_NAME;
@@ -89,7 +89,7 @@ static Resource buildResource(String endpoint) {
8989
String hostname = fetchHostname(hostnameUrl, token);
9090

9191
AttributesBuilder attrBuilders = Attributes.builder();
92-
attrBuilders.put(CLOUD_PROVIDER, IncubatingAttributes.CloudProviderValues.AWS);
92+
attrBuilders.put(CLOUD_PROVIDER, IncubatingAttributes.CloudProviderIncubatingValues.AWS);
9393
attrBuilders.put(CLOUD_PLATFORM, AWS_EC2);
9494

9595
try (JsonParser parser = JSON_FACTORY.createParser(identity)) {

‎aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_ID;
2525
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_IMAGE_NAME;
2626
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_NAME;
27-
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_ECS;
28-
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderValues.AWS;
27+
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_ECS;
28+
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS;
2929

3030
import com.fasterxml.jackson.core.JsonFactory;
3131
import com.fasterxml.jackson.core.JsonParser;

‎aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM;
99
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER;
1010
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_ID;
11-
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_EKS;
12-
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderValues.AWS;
11+
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_EKS;
12+
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS;
1313
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.K8S_CLUSTER_NAME;
1414

1515
import com.fasterxml.jackson.core.JsonFactory;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ private IncubatingAttributes() {}
2727
public static final AttributeKey<String> CLOUD_RESOURCE_ID =
2828
AttributeKey.stringKey("cloud.resource_id");
2929

30-
public static final class CloudPlatformValues {
30+
public static final class CloudPlatformIncubatingValues {
3131
public static final String AWS_EC2 = "aws_ec2";
3232
public static final String AWS_ECS = "aws_ecs";
3333
public static final String AWS_EKS = "aws_eks";
3434
public static final String AWS_LAMBDA = "aws_lambda";
3535
public static final String AWS_ELASTIC_BEANSTALK = "aws_elastic_beanstalk";
3636

37-
private CloudPlatformValues() {}
37+
private CloudPlatformIncubatingValues() {}
3838
}
3939

40-
public static final class CloudProviderValues {
40+
public static final class CloudProviderIncubatingValues {
4141
public static final String AWS = "aws";
4242

43-
private CloudProviderValues() {}
43+
private CloudProviderIncubatingValues() {}
4444
}
4545

4646
public static final AttributeKey<String> SERVICE_INSTANCE_ID =

‎aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM;
99
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER;
1010
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_REGION;
11-
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_LAMBDA;
12-
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderValues.AWS;
11+
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_LAMBDA;
12+
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS;
1313
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.FAAS_NAME;
1414
import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.FAAS_VERSION;
1515

‎gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProvider.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CLOUD_PLATFORM;
3535
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CLOUD_PROVIDER;
3636
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CLOUD_REGION;
37-
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP;
38-
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_APP_ENGINE;
39-
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_CLOUD_FUNCTIONS;
40-
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_CLOUD_RUN;
41-
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_COMPUTE_ENGINE;
42-
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformValues.GCP_KUBERNETES_ENGINE;
37+
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP;
38+
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_APP_ENGINE;
39+
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_FUNCTIONS;
40+
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_RUN;
41+
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_COMPUTE_ENGINE;
42+
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.CloudPlatformIncubatingValues.GCP_KUBERNETES_ENGINE;
4343
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.FAAS_INSTANCE;
4444
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.FAAS_NAME;
4545
import static io.opentelemetry.contrib.gcp.resource.IncubatingAttributes.FAAS_VERSION;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ private IncubatingAttributes() {}
2525
AttributeKey.stringKey("cloud.provider");
2626
public static final AttributeKey<String> CLOUD_REGION = AttributeKey.stringKey("cloud.region");
2727

28-
public static final class CloudPlatformValues {
29-
private CloudPlatformValues() {}
28+
public static final class CloudPlatformIncubatingValues {
29+
private CloudPlatformIncubatingValues() {}
3030

3131
public static final String GCP_COMPUTE_ENGINE = "gcp_compute_engine";
3232
public static final String GCP_CLOUD_RUN = "gcp_cloud_run";

‎gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM;
3737
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
3838
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_REGION;
39-
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformValues.GCP_APP_ENGINE;
40-
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformValues.GCP_CLOUD_FUNCTIONS;
41-
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformValues.GCP_CLOUD_RUN;
42-
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformValues.GCP_COMPUTE_ENGINE;
43-
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformValues.GCP_KUBERNETES_ENGINE;
44-
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudProviderValues.GCP;
39+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_APP_ENGINE;
40+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_FUNCTIONS;
41+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_RUN;
42+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_COMPUTE_ENGINE;
43+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_KUBERNETES_ENGINE;
44+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CloudProviderIncubatingValues.GCP;
4545
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_INSTANCE;
4646
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_NAME;
4747
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_VERSION;

0 commit comments

Comments
 (0)