Skip to content

Commit f784bf0

Browse files
pellaredpellared
authored
Merge branch 'main' into rm-baggagetrace
2 parents 210a4aa + ae9a304 commit f784bf0

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed

‎detectors/aws/ec2/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module go.opentelemetry.io/contrib/detectors/aws/ec2
33
go 1.21
44

55
require (
6-
github.com/aws/aws-sdk-go v1.54.13
6+
github.com/aws/aws-sdk-go v1.54.14
77
github.com/stretchr/testify v1.9.0
88
go.opentelemetry.io/otel v1.28.0
99
go.opentelemetry.io/otel/sdk v1.28.0

‎detectors/aws/ec2/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/aws/aws-sdk-go v1.54.13 h1:zpCuiG+/mFdDY/klKJvmSioAZWk45F4rLGq0JWVAAzk=
2-
github.com/aws/aws-sdk-go v1.54.13/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
1+
github.com/aws/aws-sdk-go v1.54.14 h1:llJ60MzLzovyDE/rEDbUjS1cICh7krk1PwQwNlKRoeQ=
2+
github.com/aws/aws-sdk-go v1.54.14/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
33
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
44
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
55
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

‎detectors/aws/eks/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
gopkg.in/yaml.v3 v3.0.1 // indirect
4646
k8s.io/api v0.29.4 // indirect
4747
k8s.io/klog/v2 v2.130.1 // indirect
48-
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b // indirect
48+
k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 // indirect
4949
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
5050
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
5151
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

‎detectors/aws/eks/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ k8s.io/client-go v0.29.4 h1:79ytIedxVfyXV8rpH3jCBW0u+un0fxHDwX5F9K8dPR8=
137137
k8s.io/client-go v0.29.4/go.mod h1:kC1thZQ4zQWYwldsfI088BbK6RkxK+aF5ebV8y9Q4tk=
138138
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
139139
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
140-
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b h1:Q9xmGWBvOGd8UJyccgpYlLosk/JlfP3xQLNkQlHJeXw=
141-
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
140+
k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 h1:T5TEV4a+pEjc+j9Xui3MGGeoDLIN6uzZrx8NYotFMgQ=
141+
k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
142142
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak=
143143
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
144144
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ replace (
1111

1212
require (
1313
github.com/aws/aws-lambda-go v1.47.0
14-
github.com/aws/aws-sdk-go-v2/config v1.27.23
14+
github.com/aws/aws-sdk-go-v2/config v1.27.24
1515
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0
1616
go.opentelemetry.io/contrib/detectors/aws/lambda v0.53.0
1717
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.53.0
@@ -25,7 +25,7 @@ require (
2525
require (
2626
github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect
2727
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
28-
github.com/aws/aws-sdk-go-v2/credentials v1.17.23 // indirect
28+
github.com/aws/aws-sdk-go-v2/credentials v1.17.24 // indirect
2929
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 // indirect
3030
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect
3131
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect
@@ -39,7 +39,7 @@ require (
3939
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.13 // indirect
4040
github.com/aws/aws-sdk-go-v2/service/sqs v1.34.1 // indirect
4141
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 // indirect
42-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1 // indirect
42+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2 // indirect
4343
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 // indirect
4444
github.com/aws/smithy-go v1.20.3 // indirect
4545
github.com/felixge/httpsnoop v1.0.4 // indirect

‎instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NP
44
github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc=
55
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg=
66
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM=
7-
github.com/aws/aws-sdk-go-v2/config v1.27.23 h1:Cr/gJEa9NAS7CDAjbnB7tHYb3aLZI2gVggfmSAasDac=
8-
github.com/aws/aws-sdk-go-v2/config v1.27.23/go.mod h1:WMMYHqLCFu5LH05mFOF5tsq1PGEMfKbu083VKqLCd0o=
9-
github.com/aws/aws-sdk-go-v2/credentials v1.17.23 h1:G1CfmLVoO2TdQ8z9dW+JBc/r8+MqyPQhXCafNZcXVZo=
10-
github.com/aws/aws-sdk-go-v2/credentials v1.17.23/go.mod h1:V/DvSURn6kKgcuKEk4qwSwb/fZ2d++FFARtWSbXnLqY=
7+
github.com/aws/aws-sdk-go-v2/config v1.27.24 h1:NM9XicZ5o1CBU/MZaHwFtimRpWx9ohAUAqkG6AqSqPo=
8+
github.com/aws/aws-sdk-go-v2/config v1.27.24/go.mod h1:aXzi6QJTuQRVVusAO8/NxpdTeTyr/wRcybdDtfUwJSs=
9+
github.com/aws/aws-sdk-go-v2/credentials v1.17.24 h1:YclAsrnb1/GTQNt2nzv+756Iw4mF8AOzcDfweWwwm/M=
10+
github.com/aws/aws-sdk-go-v2/credentials v1.17.24/go.mod h1:Hld7tmnAkoBQdTMNYZGzztzKRdA4fCdn9L83LOoigac=
1111
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 h1:Aznqksmd6Rfv2HQN9cpqIV/lQRMaIpJkLLaJ1ZI76no=
1212
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9/go.mod h1:WQr3MY7AxGNxaqAtsDWn+fBxmd4XvLkzeqQ8P1VM0/w=
1313
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 h1:5SAoZ4jYpGH4721ZNoS1znQrhOfZinOhc4XuTXx/nVc=
@@ -36,8 +36,8 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.34.1 h1:Tp1oKSfWHE8fTz0H+DuD05cXPJ96
3636
github.com/aws/aws-sdk-go-v2/service/sqs v1.34.1/go.mod h1:5gGM2xv51W5Hkyr3vj7JTEf/b5oOCb7rXcEVbXrcTAU=
3737
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 h1:p1GahKIjyMDZtiKoIn0/jAj/TkMzfzndDv5+zi2Mhgc=
3838
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1/go.mod h1:/vWdhoIoYA5hYoPZ6fm7Sv4d8701PiG5VKe8/pPJL60=
39-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1 h1:lCEv9f8f+zJ8kcFeAjRZsekLd/x5SAm96Cva+VbUdo8=
40-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1/go.mod h1:xyFHA4zGxgYkdD73VeezHt3vSKEG9EmFnGwoKlP00u4=
39+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2 h1:ORnrOK0C4WmYV/uYt3koHEWBLYsRDwk2Np+eEoyV4Z0=
40+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2/go.mod h1:xyFHA4zGxgYkdD73VeezHt3vSKEG9EmFnGwoKlP00u4=
4141
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 h1:+woJ607dllHJQtsnJLi52ycuqHMwlW+Wqm2Ppsfp4nQ=
4242
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1/go.mod h1:jiNR3JqT15Dm+QWq2SRgh0x0bCNSRP2L25+CqPNpJlQ=
4343
github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE=

‎instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2
66

77
require (
88
github.com/aws/aws-sdk-go-v2 v1.30.1
9-
github.com/aws/aws-sdk-go-v2/config v1.27.23
9+
github.com/aws/aws-sdk-go-v2/config v1.27.24
1010
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.1
1111
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0
1212
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.53.0
@@ -18,7 +18,7 @@ require (
1818

1919
require (
2020
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
21-
github.com/aws/aws-sdk-go-v2/credentials v1.17.23 // indirect
21+
github.com/aws/aws-sdk-go-v2/credentials v1.17.24 // indirect
2222
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 // indirect
2323
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect
2424
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect
@@ -31,7 +31,7 @@ require (
3131
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.13 // indirect
3232
github.com/aws/aws-sdk-go-v2/service/sqs v1.34.1 // indirect
3333
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 // indirect
34-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2 // indirect
3535
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 // indirect
3636
github.com/aws/smithy-go v1.20.3 // indirect
3737
github.com/go-logr/logr v1.4.2 // indirect

‎instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NP
22
github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc=
33
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg=
44
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM=
5-
github.com/aws/aws-sdk-go-v2/config v1.27.23 h1:Cr/gJEa9NAS7CDAjbnB7tHYb3aLZI2gVggfmSAasDac=
6-
github.com/aws/aws-sdk-go-v2/config v1.27.23/go.mod h1:WMMYHqLCFu5LH05mFOF5tsq1PGEMfKbu083VKqLCd0o=
7-
github.com/aws/aws-sdk-go-v2/credentials v1.17.23 h1:G1CfmLVoO2TdQ8z9dW+JBc/r8+MqyPQhXCafNZcXVZo=
8-
github.com/aws/aws-sdk-go-v2/credentials v1.17.23/go.mod h1:V/DvSURn6kKgcuKEk4qwSwb/fZ2d++FFARtWSbXnLqY=
5+
github.com/aws/aws-sdk-go-v2/config v1.27.24 h1:NM9XicZ5o1CBU/MZaHwFtimRpWx9ohAUAqkG6AqSqPo=
6+
github.com/aws/aws-sdk-go-v2/config v1.27.24/go.mod h1:aXzi6QJTuQRVVusAO8/NxpdTeTyr/wRcybdDtfUwJSs=
7+
github.com/aws/aws-sdk-go-v2/credentials v1.17.24 h1:YclAsrnb1/GTQNt2nzv+756Iw4mF8AOzcDfweWwwm/M=
8+
github.com/aws/aws-sdk-go-v2/credentials v1.17.24/go.mod h1:Hld7tmnAkoBQdTMNYZGzztzKRdA4fCdn9L83LOoigac=
99
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 h1:Aznqksmd6Rfv2HQN9cpqIV/lQRMaIpJkLLaJ1ZI76no=
1010
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9/go.mod h1:WQr3MY7AxGNxaqAtsDWn+fBxmd4XvLkzeqQ8P1VM0/w=
1111
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 h1:5SAoZ4jYpGH4721ZNoS1znQrhOfZinOhc4XuTXx/nVc=
@@ -34,8 +34,8 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.34.1 h1:Tp1oKSfWHE8fTz0H+DuD05cXPJ96
3434
github.com/aws/aws-sdk-go-v2/service/sqs v1.34.1/go.mod h1:5gGM2xv51W5Hkyr3vj7JTEf/b5oOCb7rXcEVbXrcTAU=
3535
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 h1:p1GahKIjyMDZtiKoIn0/jAj/TkMzfzndDv5+zi2Mhgc=
3636
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1/go.mod h1:/vWdhoIoYA5hYoPZ6fm7Sv4d8701PiG5VKe8/pPJL60=
37-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1 h1:lCEv9f8f+zJ8kcFeAjRZsekLd/x5SAm96Cva+VbUdo8=
38-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1/go.mod h1:xyFHA4zGxgYkdD73VeezHt3vSKEG9EmFnGwoKlP00u4=
37+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2 h1:ORnrOK0C4WmYV/uYt3koHEWBLYsRDwk2Np+eEoyV4Z0=
38+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2/go.mod h1:xyFHA4zGxgYkdD73VeezHt3vSKEG9EmFnGwoKlP00u4=
3939
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 h1:+woJ607dllHJQtsnJLi52ycuqHMwlW+Wqm2Ppsfp4nQ=
4040
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1/go.mod h1:jiNR3JqT15Dm+QWq2SRgh0x0bCNSRP2L25+CqPNpJlQ=
4141
github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE=

‎instrumentation/net/http/otelhttp/handler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@ func (h *middleware) serveHTTP(w http.ResponseWriter, r *http.Request, next http
232232
attributes = append(attributes, semconv.HTTPStatusCode(rww.statusCode))
233233
}
234234
o := metric.WithAttributeSet(attribute.NewSet(attributes...))
235-
addOpts := []metric.AddOption{o} // Allocate vararg slice once.
236-
h.requestBytesCounter.Add(ctx, bw.read.Load(), addOpts...)
237-
h.responseBytesCounter.Add(ctx, rww.written, addOpts...)
235+
236+
h.requestBytesCounter.Add(ctx, bw.read.Load(), o)
237+
h.responseBytesCounter.Add(ctx, rww.written, o)
238238

239239
// Use floating point division here for higher precision (instead of Millisecond method).
240240
elapsedTime := float64(time.Since(requestStartTime)) / float64(time.Millisecond)

‎instrumentation/net/http/otelhttp/transport.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ func (t *Transport) RoundTrip(r *http.Request) (*http.Response, error) {
172172
metricAttrs = append(metricAttrs, semconv.HTTPStatusCode(res.StatusCode))
173173
}
174174
o := metric.WithAttributeSet(attribute.NewSet(metricAttrs...))
175-
addOpts := []metric.AddOption{o} // Allocate vararg slice once.
176-
t.requestBytesCounter.Add(ctx, bw.read.Load(), addOpts...)
175+
176+
t.requestBytesCounter.Add(ctx, bw.read.Load(), o)
177177
// For handling response bytes we leverage a callback when the client reads the http response
178178
readRecordFunc := func(n int64) {
179-
t.responseBytesCounter.Add(ctx, n, addOpts...)
179+
t.responseBytesCounter.Add(ctx, n, o)
180180
}
181181

182182
// traces

0 commit comments

Comments
 (0)