File tree 10 files changed +29
-29
lines changed
aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource
main/java/io/opentelemetry/contrib/gcp/resource
test/java/io/opentelemetry/contrib/gcp/resource
10 files changed +29
-29
lines changed Original file line number Diff line number Diff line change 7
7
8
8
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .CLOUD_PLATFORM ;
9
9
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 ;
12
12
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .SERVICE_INSTANCE_ID ;
13
13
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .SERVICE_NAMESPACE ;
14
14
import static io .opentelemetry .semconv .ServiceAttributes .SERVICE_VERSION ;
Original file line number Diff line number Diff line change 10
10
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .CLOUD_PLATFORM ;
11
11
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .CLOUD_PROVIDER ;
12
12
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 ;
14
14
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .HOST_ID ;
15
15
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .HOST_IMAGE_ID ;
16
16
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .HOST_NAME ;
@@ -89,7 +89,7 @@ static Resource buildResource(String endpoint) {
89
89
String hostname = fetchHostname (hostnameUrl , token );
90
90
91
91
AttributesBuilder attrBuilders = Attributes .builder ();
92
- attrBuilders .put (CLOUD_PROVIDER , IncubatingAttributes .CloudProviderValues .AWS );
92
+ attrBuilders .put (CLOUD_PROVIDER , IncubatingAttributes .CloudProviderIncubatingValues .AWS );
93
93
attrBuilders .put (CLOUD_PLATFORM , AWS_EC2 );
94
94
95
95
try (JsonParser parser = JSON_FACTORY .createParser (identity )) {
Original file line number Diff line number Diff line change 24
24
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .CONTAINER_ID ;
25
25
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .CONTAINER_IMAGE_NAME ;
26
26
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 ;
29
29
30
30
import com .fasterxml .jackson .core .JsonFactory ;
31
31
import com .fasterxml .jackson .core .JsonParser ;
Original file line number Diff line number Diff line change 8
8
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .CLOUD_PLATFORM ;
9
9
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .CLOUD_PROVIDER ;
10
10
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 ;
13
13
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .K8S_CLUSTER_NAME ;
14
14
15
15
import com .fasterxml .jackson .core .JsonFactory ;
Original file line number Diff line number Diff line change @@ -27,20 +27,20 @@ private IncubatingAttributes() {}
27
27
public static final AttributeKey <String > CLOUD_RESOURCE_ID =
28
28
AttributeKey .stringKey ("cloud.resource_id" );
29
29
30
- public static final class CloudPlatformValues {
30
+ public static final class CloudPlatformIncubatingValues {
31
31
public static final String AWS_EC2 = "aws_ec2" ;
32
32
public static final String AWS_ECS = "aws_ecs" ;
33
33
public static final String AWS_EKS = "aws_eks" ;
34
34
public static final String AWS_LAMBDA = "aws_lambda" ;
35
35
public static final String AWS_ELASTIC_BEANSTALK = "aws_elastic_beanstalk" ;
36
36
37
- private CloudPlatformValues () {}
37
+ private CloudPlatformIncubatingValues () {}
38
38
}
39
39
40
- public static final class CloudProviderValues {
40
+ public static final class CloudProviderIncubatingValues {
41
41
public static final String AWS = "aws" ;
42
42
43
- private CloudProviderValues () {}
43
+ private CloudProviderIncubatingValues () {}
44
44
}
45
45
46
46
public static final AttributeKey <String > SERVICE_INSTANCE_ID =
Original file line number Diff line number Diff line change 8
8
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .CLOUD_PLATFORM ;
9
9
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .CLOUD_PROVIDER ;
10
10
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 ;
13
13
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .FAAS_NAME ;
14
14
import static io .opentelemetry .contrib .aws .resource .IncubatingAttributes .FAAS_VERSION ;
15
15
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ val errorProneVersion = "2.33.0"
25
25
val prometheusVersion = " 0.16.0"
26
26
val mockitoVersion = " 4.11.0"
27
27
val slf4jVersion = " 2.0.16"
28
- val semConvVersion = " 1.27 .0-alpha"
28
+ val semConvVersion = " 1.28 .0-alpha"
29
29
30
30
val CORE_DEPENDENCIES = listOf (
31
31
" com.google.auto.service:auto-service:${autoServiceVersion} " ,
Original file line number Diff line number Diff line change 34
34
import static io .opentelemetry .contrib .gcp .resource .IncubatingAttributes .CLOUD_PLATFORM ;
35
35
import static io .opentelemetry .contrib .gcp .resource .IncubatingAttributes .CLOUD_PROVIDER ;
36
36
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 ;
43
43
import static io .opentelemetry .contrib .gcp .resource .IncubatingAttributes .FAAS_INSTANCE ;
44
44
import static io .opentelemetry .contrib .gcp .resource .IncubatingAttributes .FAAS_NAME ;
45
45
import static io .opentelemetry .contrib .gcp .resource .IncubatingAttributes .FAAS_VERSION ;
Original file line number Diff line number Diff line change @@ -25,8 +25,8 @@ private IncubatingAttributes() {}
25
25
AttributeKey .stringKey ("cloud.provider" );
26
26
public static final AttributeKey <String > CLOUD_REGION = AttributeKey .stringKey ("cloud.region" );
27
27
28
- public static final class CloudPlatformValues {
29
- private CloudPlatformValues () {}
28
+ public static final class CloudPlatformIncubatingValues {
29
+ private CloudPlatformIncubatingValues () {}
30
30
31
31
public static final String GCP_COMPUTE_ENGINE = "gcp_compute_engine" ;
32
32
public static final String GCP_CLOUD_RUN = "gcp_cloud_run" ;
Original file line number Diff line number Diff line change 36
36
import static io .opentelemetry .semconv .incubating .CloudIncubatingAttributes .CLOUD_PLATFORM ;
37
37
import static io .opentelemetry .semconv .incubating .CloudIncubatingAttributes .CLOUD_PROVIDER ;
38
38
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 ;
45
45
import static io .opentelemetry .semconv .incubating .FaasIncubatingAttributes .FAAS_INSTANCE ;
46
46
import static io .opentelemetry .semconv .incubating .FaasIncubatingAttributes .FAAS_NAME ;
47
47
import static io .opentelemetry .semconv .incubating .FaasIncubatingAttributes .FAAS_VERSION ;
You can’t perform that action at this time.
0 commit comments