Skip to content

Commit 98ebd98

Browse files
MrAliasMrAlias
authored
Merge branch 'main' into go-1.20
2 parents a08e89d + c52452d commit 98ebd98

File tree

57 files changed

+528
-398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+528
-398
lines changed

‎CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,30 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
1313
- Add the new `go.opentelemetry.io/contrib/instrgen` package to provide auto-generated source code instrumentation. (#3068)
1414
- Support [Go 1.20]. (#3372)
1515

16+
### Changed
17+
18+
- `samplers/jaegerremote`: change to use protobuf parser instead of encoding/json to accept enums as strings. (#3183)
19+
1620
## [1.14.0/0.39.0/0.8.0] - 2023-02-07
1721

1822
### Changed
1923

2024
- Change `runtime.uptime` instrument in `go.opentelemetry.io/contrib/instrumentation/runtime` from `Int64ObservableUpDownCounter` to `Int64ObservableCounter`,
2125
since the value is monotonic. (#3347)
26+
- `samplers/jaegerremote`: change to use protobuf parser instead of encoding/json to accept enums as strings. (#3183)
2227

2328
### Fixed
2429

2530
- The GCE detector in `go.opentelemetry.io/contrib/detectors/gcp` includes the "cloud.region" attribute when appropriate. (#3367)
31+
- The span name of producer spans from `go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama` is corrected to use `publish` instead of `send`. (#3396)
32+
- Attribute types are corrected in `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws`. (#3396)
33+
- `aws.dynamodb.table_names` is now a string slice value.
34+
- `aws.dynamodb.global_secondary_indexes` is now a string slice value.
35+
- `aws.dynamodb.local_secondary_indexes` is now a string slice value.
36+
- `aws.dynamodb.attribute_definitions` is now a string slice value.
37+
- `aws.dynamodb.global_secondary_index_updates` is now a string slice value.
38+
- `aws.dynamodb.provisioned_read_capacity` is now a `float64` value.
39+
- `aws.dynamodb.provisioned_write_capacity` is now a `float64` value.
2640

2741
## [1.13.0/0.38.0/0.7.0] - 2023-01-30
2842

‎detectors/aws/ec2/ec2.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resourc
104104
attributes := []attribute.KeyValue{
105105
semconv.CloudProviderAWS,
106106
semconv.CloudPlatformAWSEC2,
107-
semconv.CloudRegionKey.String(doc.Region),
108-
semconv.CloudAvailabilityZoneKey.String(doc.AvailabilityZone),
109-
semconv.CloudAccountIDKey.String(doc.AccountID),
110-
semconv.HostIDKey.String(doc.InstanceID),
111-
semconv.HostImageIDKey.String(doc.ImageID),
112-
semconv.HostTypeKey.String(doc.InstanceType),
107+
semconv.CloudRegion(doc.Region),
108+
semconv.CloudAvailabilityZone(doc.AvailabilityZone),
109+
semconv.CloudAccountID(doc.AccountID),
110+
semconv.HostID(doc.InstanceID),
111+
semconv.HostImageID(doc.ImageID),
112+
semconv.HostType(doc.InstanceType),
113113
}
114114

115115
m := &metadata{client: client}

‎detectors/aws/ec2/ec2_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ func TestAWS_Detect(t *testing.T) {
6464
usWestIDLabels := []attribute.KeyValue{
6565
semconv.CloudProviderAWS,
6666
semconv.CloudPlatformAWSEC2,
67-
semconv.CloudRegionKey.String("us-west-2"),
68-
semconv.CloudAvailabilityZoneKey.String("us-west-2b"),
69-
semconv.CloudAccountIDKey.String("123456789012"),
70-
semconv.HostIDKey.String("i-1234567890abcdef0"),
71-
semconv.HostImageIDKey.String("ami-5fb8c835"),
72-
semconv.HostTypeKey.String("t2.micro"),
67+
semconv.CloudRegion("us-west-2"),
68+
semconv.CloudAvailabilityZone("us-west-2b"),
69+
semconv.CloudAccountID("123456789012"),
70+
semconv.HostID("i-1234567890abcdef0"),
71+
semconv.HostImageID("ami-5fb8c835"),
72+
semconv.HostType("t2.micro"),
7373
}
7474

7575
testTable := map[string]struct {
@@ -139,13 +139,13 @@ func TestAWS_Detect(t *testing.T) {
139139
semconv.SchemaURL,
140140
semconv.CloudProviderAWS,
141141
semconv.CloudPlatformAWSEC2,
142-
semconv.CloudRegionKey.String("us-west-2"),
143-
semconv.CloudAvailabilityZoneKey.String("us-west-2b"),
144-
semconv.CloudAccountIDKey.String("123456789012"),
145-
semconv.HostIDKey.String("i-1234567890abcdef0"),
146-
semconv.HostImageIDKey.String("ami-5fb8c835"),
147-
semconv.HostNameKey.String("ip-12-34-56-78.us-west-2.compute.internal"),
148-
semconv.HostTypeKey.String("t2.micro"),
142+
semconv.CloudRegion("us-west-2"),
143+
semconv.CloudAvailabilityZone("us-west-2b"),
144+
semconv.CloudAccountID("123456789012"),
145+
semconv.HostID("i-1234567890abcdef0"),
146+
semconv.HostImageID("ami-5fb8c835"),
147+
semconv.HostName("ip-12-34-56-78.us-west-2.compute.internal"),
148+
semconv.HostType("t2.micro"),
149149
)},
150150
},
151151
}

‎detectors/aws/ecs/ecs.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resourc
9393
attributes := []attribute.KeyValue{
9494
semconv.CloudProviderAWS,
9595
semconv.CloudPlatformAWSECS,
96-
semconv.ContainerNameKey.String(hostName),
97-
semconv.ContainerIDKey.String(containerID),
96+
semconv.ContainerName(hostName),
97+
semconv.ContainerID(containerID),
9898
}
9999

100100
if len(metadataURIV4) > 0 {
@@ -104,7 +104,7 @@ func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resourc
104104
}
105105
attributes = append(
106106
attributes,
107-
semconv.AWSECSContainerARNKey.String(containerMetadata.ContainerARN),
107+
semconv.AWSECSContainerARN(containerMetadata.ContainerARN),
108108
)
109109

110110
taskMetadata, err := ecsmetadata.GetTaskV4(ctx, &http.Client{})
@@ -129,11 +129,11 @@ func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resourc
129129

130130
attributes = append(
131131
attributes,
132-
semconv.AWSECSClusterARNKey.String(clusterArn),
132+
semconv.AWSECSClusterARN(clusterArn),
133133
semconv.AWSECSLaunchtypeKey.String(strings.ToLower(taskMetadata.LaunchType)),
134-
semconv.AWSECSTaskARNKey.String(taskMetadata.TaskARN),
135-
semconv.AWSECSTaskFamilyKey.String(taskMetadata.Family),
136-
semconv.AWSECSTaskRevisionKey.String(taskMetadata.Revision),
134+
semconv.AWSECSTaskARN(taskMetadata.TaskARN),
135+
semconv.AWSECSTaskFamily(taskMetadata.Family),
136+
semconv.AWSECSTaskRevision(taskMetadata.Revision),
137137
)
138138
}
139139

@@ -166,10 +166,10 @@ func (detector *resourceDetector) getLogsAttributes(metadata *ecsmetadata.Contai
166166
awsAccount := r.FindStringSubmatch(containerArn)[1]
167167

168168
return []attribute.KeyValue{
169-
semconv.AWSLogGroupNamesKey.String(logsOptions.AwsLogsGroup),
170-
semconv.AWSLogGroupARNsKey.String(fmt.Sprintf("arn:aws:logs:%s:%s:log-group:%s:*", logsRegion, awsAccount, logsOptions.AwsLogsGroup)),
171-
semconv.AWSLogStreamNamesKey.String(logsOptions.AwsLogsStream),
172-
semconv.AWSLogStreamARNsKey.String(fmt.Sprintf("arn:aws:logs:%s:%s:log-group:%s:log-stream:%s", logsRegion, awsAccount, logsOptions.AwsLogsGroup, logsOptions.AwsLogsStream)),
169+
semconv.AWSLogGroupNames(logsOptions.AwsLogsGroup),
170+
semconv.AWSLogGroupARNs(fmt.Sprintf("arn:aws:logs:%s:%s:log-group:%s:*", logsRegion, awsAccount, logsOptions.AwsLogsGroup)),
171+
semconv.AWSLogStreamNames(logsOptions.AwsLogsStream),
172+
semconv.AWSLogStreamARNs(fmt.Sprintf("arn:aws:logs:%s:%s:log-group:%s:log-stream:%s", logsRegion, awsAccount, logsOptions.AwsLogsGroup, logsOptions.AwsLogsStream)),
173173
}, nil
174174
}
175175

‎detectors/aws/ecs/ecs_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ func TestDetectV3(t *testing.T) {
5656
attributes := []attribute.KeyValue{
5757
semconv.CloudProviderAWS,
5858
semconv.CloudPlatformAWSECS,
59-
semconv.ContainerNameKey.String("container-Name"),
60-
semconv.ContainerIDKey.String("0123456789A"),
59+
semconv.ContainerName("container-Name"),
60+
semconv.ContainerID("0123456789A"),
6161
}
6262
expectedResource := resource.NewWithAttributes(semconv.SchemaURL, attributes...)
6363
detector := &resourceDetector{utils: detectorUtils}
@@ -78,8 +78,8 @@ func TestDetectCannotReadContainerID(t *testing.T) {
7878
attributes := []attribute.KeyValue{
7979
semconv.CloudProviderAWS,
8080
semconv.CloudPlatformAWSECS,
81-
semconv.ContainerNameKey.String("container-Name"),
82-
semconv.ContainerIDKey.String(""),
81+
semconv.ContainerName("container-Name"),
82+
semconv.ContainerID(""),
8383
}
8484
expectedResource := resource.NewWithAttributes(semconv.SchemaURL, attributes...)
8585
detector := &resourceDetector{utils: detectorUtils}

‎detectors/aws/ecs/test/ecs_test.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,21 @@ func TestDetectV4LaunchTypeEc2(t *testing.T) {
6767
attributes := []attribute.KeyValue{
6868
semconv.CloudProviderAWS,
6969
semconv.CloudPlatformAWSECS,
70-
semconv.ContainerNameKey.String(hostname),
70+
semconv.ContainerName(hostname),
7171
// We are not running the test in an actual container,
7272
// the container id is tested with mocks of the cgroup
7373
// file in the unit tests
74-
semconv.ContainerIDKey.String(""),
75-
semconv.AWSECSContainerARNKey.String("arn:aws:ecs:us-west-2:111122223333:container/0206b271-b33f-47ab-86c6-a0ba208a70a9"),
76-
semconv.AWSECSClusterARNKey.String("arn:aws:ecs:us-west-2:111122223333:cluster/default"),
74+
semconv.ContainerID(""),
75+
semconv.AWSECSContainerARN("arn:aws:ecs:us-west-2:111122223333:container/0206b271-b33f-47ab-86c6-a0ba208a70a9"),
76+
semconv.AWSECSClusterARN("arn:aws:ecs:us-west-2:111122223333:cluster/default"),
7777
semconv.AWSECSLaunchtypeKey.String("ec2"),
78-
semconv.AWSECSTaskARNKey.String("arn:aws:ecs:us-west-2:111122223333:task/default/158d1c8083dd49d6b527399fd6414f5c"),
79-
semconv.AWSECSTaskFamilyKey.String("curltest"),
80-
semconv.AWSECSTaskRevisionKey.String("26"),
81-
semconv.AWSLogGroupNamesKey.String("/ecs/metadata"),
82-
semconv.AWSLogGroupARNsKey.String("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata:*"),
83-
semconv.AWSLogStreamNamesKey.String("ecs/curl/8f03e41243824aea923aca126495f665"),
84-
semconv.AWSLogStreamARNsKey.String("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata:log-stream:ecs/curl/8f03e41243824aea923aca126495f665"),
78+
semconv.AWSECSTaskARN("arn:aws:ecs:us-west-2:111122223333:task/default/158d1c8083dd49d6b527399fd6414f5c"),
79+
semconv.AWSECSTaskFamily("curltest"),
80+
semconv.AWSECSTaskRevision("26"),
81+
semconv.AWSLogGroupNames("/ecs/metadata"),
82+
semconv.AWSLogGroupARNs("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata:*"),
83+
semconv.AWSLogStreamNames("ecs/curl/8f03e41243824aea923aca126495f665"),
84+
semconv.AWSLogStreamARNs("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata:log-stream:ecs/curl/8f03e41243824aea923aca126495f665"),
8585
}
8686
expectedResource := resource.NewWithAttributes(semconv.SchemaURL, attributes...)
8787
detector := ecs.NewResourceDetector()
@@ -124,21 +124,21 @@ func TestDetectV4LaunchTypeFargate(t *testing.T) {
124124
attributes := []attribute.KeyValue{
125125
semconv.CloudProviderAWS,
126126
semconv.CloudPlatformAWSECS,
127-
semconv.ContainerNameKey.String(hostname),
127+
semconv.ContainerName(hostname),
128128
// We are not running the test in an actual container,
129129
// the container id is tested with mocks of the cgroup
130130
// file in the unit tests
131-
semconv.ContainerIDKey.String(""),
132-
semconv.AWSECSContainerARNKey.String("arn:aws:ecs:us-west-2:111122223333:container/05966557-f16c-49cb-9352-24b3a0dcd0e1"),
133-
semconv.AWSECSClusterARNKey.String("arn:aws:ecs:us-west-2:111122223333:cluster/default"),
131+
semconv.ContainerID(""),
132+
semconv.AWSECSContainerARN("arn:aws:ecs:us-west-2:111122223333:container/05966557-f16c-49cb-9352-24b3a0dcd0e1"),
133+
semconv.AWSECSClusterARN("arn:aws:ecs:us-west-2:111122223333:cluster/default"),
134134
semconv.AWSECSLaunchtypeKey.String("fargate"),
135-
semconv.AWSECSTaskARNKey.String("arn:aws:ecs:us-west-2:111122223333:task/default/e9028f8d5d8e4f258373e7b93ce9a3c3"),
136-
semconv.AWSECSTaskFamilyKey.String("curltest"),
137-
semconv.AWSECSTaskRevisionKey.String("3"),
138-
semconv.AWSLogGroupNamesKey.String("/ecs/containerlogs"),
139-
semconv.AWSLogGroupARNsKey.String("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/containerlogs:*"),
140-
semconv.AWSLogStreamNamesKey.String("ecs/curl/cd189a933e5849daa93386466019ab50"),
141-
semconv.AWSLogStreamARNsKey.String("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/containerlogs:log-stream:ecs/curl/cd189a933e5849daa93386466019ab50"),
135+
semconv.AWSECSTaskARN("arn:aws:ecs:us-west-2:111122223333:task/default/e9028f8d5d8e4f258373e7b93ce9a3c3"),
136+
semconv.AWSECSTaskFamily("curltest"),
137+
semconv.AWSECSTaskRevision("3"),
138+
semconv.AWSLogGroupNames("/ecs/containerlogs"),
139+
semconv.AWSLogGroupARNs("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/containerlogs:*"),
140+
semconv.AWSLogStreamNames("ecs/curl/cd189a933e5849daa93386466019ab50"),
141+
semconv.AWSLogStreamARNs("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/containerlogs:log-stream:ecs/curl/cd189a933e5849daa93386466019ab50"),
142142
}
143143
expectedResource := resource.NewWithAttributes(semconv.SchemaURL, attributes...)
144144
detector := ecs.NewResourceDetector()

‎detectors/aws/eks/detector.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resourc
9999
return nil, err
100100
}
101101
if clusterName != "" {
102-
attributes = append(attributes, semconv.K8SClusterNameKey.String(clusterName))
102+
attributes = append(attributes, semconv.K8SClusterName(clusterName))
103103
}
104104

105105
// Get containerID and append to attributes
@@ -108,7 +108,7 @@ func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resourc
108108
return nil, err
109109
}
110110
if containerID != "" {
111-
attributes = append(attributes, semconv.ContainerIDKey.String(containerID))
111+
attributes = append(attributes, semconv.ContainerID(containerID))
112112
}
113113

114114
// Return new resource object with clusterName and containerID as attributes

‎detectors/aws/eks/detector_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ func TestEks(t *testing.T) {
6464
eksResourceLabels := []attribute.KeyValue{
6565
semconv.CloudProviderAWS,
6666
semconv.CloudPlatformAWSEKS,
67-
semconv.K8SClusterNameKey.String("my-cluster"),
68-
semconv.ContainerIDKey.String("0123456789A"),
67+
semconv.K8SClusterName("my-cluster"),
68+
semconv.ContainerID("0123456789A"),
6969
}
7070
expectedResource := resource.NewWithAttributes(semconv.SchemaURL, eksResourceLabels...)
7171

‎detectors/aws/lambda/detector.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@ func (detector *resourceDetector) Detect(context.Context) (*resource.Resource, e
6666

6767
attrs := []attribute.KeyValue{
6868
semconv.CloudProviderAWS,
69-
semconv.CloudRegionKey.String(awsRegion),
70-
semconv.FaaSInstanceKey.String(instance),
71-
semconv.FaaSNameKey.String(lambdaName),
72-
semconv.FaaSVersionKey.String(functionVersion),
69+
semconv.CloudRegion(awsRegion),
70+
semconv.FaaSInstance(instance),
71+
semconv.FaaSName(lambdaName),
72+
semconv.FaaSVersion(functionVersion),
7373
}
7474

7575
maxMemoryStr := os.Getenv(lambdaMemoryLimitEnvVar)
7676
maxMemory, err := strconv.Atoi(maxMemoryStr)
7777
if err == nil {
78-
attrs = append(attrs, semconv.FaaSMaxMemoryKey.Int(maxMemory))
78+
attrs = append(attrs, semconv.FaaSMaxMemory(maxMemory))
7979
}
8080

8181
return resource.NewWithAttributes(semconv.SchemaURL, attrs...), nil

‎detectors/aws/lambda/detector_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ func TestDetectSuccess(t *testing.T) {
3737

3838
attributes := []attribute.KeyValue{
3939
semconv.CloudProviderAWS,
40-
semconv.CloudRegionKey.String("us-texas-1"),
41-
semconv.FaaSNameKey.String("testFunction"),
42-
semconv.FaaSVersionKey.String("$LATEST"),
43-
semconv.FaaSInstanceKey.String("2023/01/01/[$LATEST]5d1edb9e525d486696cf01a3503487bc"),
44-
semconv.FaaSMaxMemoryKey.Int(128),
40+
semconv.CloudRegion("us-texas-1"),
41+
semconv.FaaSName("testFunction"),
42+
semconv.FaaSVersion("$LATEST"),
43+
semconv.FaaSInstance("2023/01/01/[$LATEST]5d1edb9e525d486696cf01a3503487bc"),
44+
semconv.FaaSMaxMemory(128),
4545
}
4646
expectedResource := resource.NewWithAttributes(semconv.SchemaURL, attributes...)
4747
detector := resourceDetector{}

0 commit comments

Comments
 (0)