Skip to content

Commit 80ac85e

Browse files
hanyuancheunghanyuancheung
authored
Merge branch 'main' into gcp_resource_v2
2 parents 17ac1b7 + b5f405f commit 80ac85e

File tree

8 files changed

+281
-80
lines changed

8 files changed

+281
-80
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.17
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.20
6+
github.com/aws/aws-sdk-go v1.44.24
77
github.com/stretchr/testify v1.7.1
88
go.opentelemetry.io/otel v1.7.0
99
go.opentelemetry.io/otel/sdk v1.7.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.44.20 h1:nllTRN24EfhDSeKsNbIc6HoC8Ogd2NCJTRB8l84kDlM=
2-
github.com/aws/aws-sdk-go v1.44.20/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
1+
github.com/aws/aws-sdk-go v1.44.24 h1:3nOkwJBJLiGBmJKWp3z0utyXuBkxyGkRRwWjrTItJaY=
2+
github.com/aws/aws-sdk-go v1.44.24/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
33
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
44
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

‎detectors/aws/eks/go.mod

+28-18
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,49 @@ require (
66
github.com/stretchr/testify v1.7.1
77
go.opentelemetry.io/otel v1.7.0
88
go.opentelemetry.io/otel/sdk v1.7.0
9-
k8s.io/apimachinery v0.22.4
10-
k8s.io/client-go v0.22.4
9+
k8s.io/apimachinery v0.24.1
10+
k8s.io/client-go v0.24.1
1111
)
1212

1313
require (
14+
github.com/PuerkitoBio/purell v1.1.1 // indirect
15+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
1416
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
1518
github.com/go-logr/logr v1.2.3 // indirect
1619
github.com/go-logr/stdr v1.2.2 // indirect
20+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
21+
github.com/go-openapi/jsonreference v0.19.5 // indirect
22+
github.com/go-openapi/swag v0.19.14 // indirect
1723
github.com/gogo/protobuf v1.3.2 // indirect
1824
github.com/golang/protobuf v1.5.2 // indirect
19-
github.com/google/go-cmp v0.5.7 // indirect
25+
github.com/google/gnostic v0.5.7-v3refs // indirect
2026
github.com/google/gofuzz v1.1.0 // indirect
21-
github.com/googleapis/gnostic v0.5.5 // indirect
22-
github.com/json-iterator/go v1.1.11 // indirect
27+
github.com/josharian/intern v1.0.0 // indirect
28+
github.com/json-iterator/go v1.1.12 // indirect
29+
github.com/mailru/easyjson v0.7.6 // indirect
2330
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
24-
github.com/modern-go/reflect2 v1.0.1 // indirect
31+
github.com/modern-go/reflect2 v1.0.2 // indirect
32+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2533
github.com/pmezard/go-difflib v1.0.0 // indirect
2634
github.com/stretchr/objx v0.1.0 // indirect
2735
go.opentelemetry.io/otel/trace v1.7.0 // indirect
28-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
29-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
30-
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
31-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
32-
golang.org/x/text v0.3.6 // indirect
33-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
34-
google.golang.org/appengine v1.6.5 // indirect
35-
google.golang.org/protobuf v1.26.0 // indirect
36+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
37+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
38+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
39+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
40+
golang.org/x/text v0.3.7 // indirect
41+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
42+
google.golang.org/appengine v1.6.7 // indirect
43+
google.golang.org/protobuf v1.27.1 // indirect
3644
gopkg.in/inf.v0 v0.9.1 // indirect
3745
gopkg.in/yaml.v2 v2.4.0 // indirect
3846
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
39-
k8s.io/api v0.22.4 // indirect
40-
k8s.io/klog/v2 v2.30.0 //indirect
41-
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
42-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
47+
k8s.io/api v0.24.1 // indirect
48+
k8s.io/klog/v2 v2.60.1 //indirect
49+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
50+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
51+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
52+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
4353
sigs.k8s.io/yaml v1.2.0 // indirect
4454
)

‎detectors/aws/eks/go.sum

+232-41
Large diffs are not rendered by default.

‎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.32.0
14-
github.com/aws/aws-sdk-go-v2/config v1.15.7
14+
github.com/aws/aws-sdk-go-v2/config v1.15.9
1515
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.10
1616
go.opentelemetry.io/contrib/detectors/aws/lambda v0.32.0
1717
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.32.0
@@ -25,7 +25,7 @@ require (
2525
require (
2626
github.com/aws/aws-sdk-go-v2 v1.16.4 // indirect
2727
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 // indirect
28-
github.com/aws/aws-sdk-go-v2/credentials v1.12.2 // indirect
28+
github.com/aws/aws-sdk-go-v2/credentials v1.12.4 // indirect
2929
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 // indirect
3030
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 // indirect
3131
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5 // indirect
@@ -37,7 +37,7 @@ require (
3737
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.5 // indirect
3838
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5 // indirect
3939
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.5 // indirect
40-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.5 // indirect
40+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 // indirect
4141
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 // indirect
4242
github.com/aws/smithy-go v1.11.2 // indirect
4343
github.com/felixge/httpsnoop v1.0.3 // 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.16.4 h1:swQTEQUyJF/UkEA94/Ga55miiKFoXmm/Zd67XHgm
44
github.com/aws/aws-sdk-go-v2 v1.16.4/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU=
55
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 h1:SdK4Ppk5IzLs64ZMvr6MrSficMtjY2oS0WOORXTlxwU=
66
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1/go.mod h1:n8Bs1ElDD2wJ9kCRTczA83gYbBmjSwZp3umc6zF4EeM=
7-
github.com/aws/aws-sdk-go-v2/config v1.15.7 h1:PrzhYjDpWnGSpjedmEapldQKPW4x8cCNzUI8XOho1CM=
8-
github.com/aws/aws-sdk-go-v2/config v1.15.7/go.mod h1:exERlvqx1OoUHrxQpMgrmfSW0H6B1+r3xziZD3bBXRg=
9-
github.com/aws/aws-sdk-go-v2/credentials v1.12.2 h1:tX4EHQFU4+O9at5QjnwIKb/Qgv7MbgbUNtqTRF0Vu2M=
10-
github.com/aws/aws-sdk-go-v2/credentials v1.12.2/go.mod h1:/XWqDVuzclEKvzileqtD7/t+wIhOogv//6JFlKEe0Wc=
7+
github.com/aws/aws-sdk-go-v2/config v1.15.9 h1:TK5yNEnFDQ9iaO04gJS/3Y+eW8BioQiCUafW75/Wc3Q=
8+
github.com/aws/aws-sdk-go-v2/config v1.15.9/go.mod h1:rv/l/TbZo67kp99v/3Kb0qV6Fm1KEtKyruEV2GvVfgs=
9+
github.com/aws/aws-sdk-go-v2/credentials v1.12.4 h1:xggwS+qxCukXRVXJBJWQJGyUsvuxGC8+J1kKzv2cxuw=
10+
github.com/aws/aws-sdk-go-v2/credentials v1.12.4/go.mod h1:7g+GGSp7xtR823o1jedxKmqRZGqLdoHQfI4eFasKKxs=
1111
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 h1:YPxclBeE07HsLQE8vtjC8T2emcTjM9nzqsnDi2fv5UM=
1212
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5/go.mod h1:WAPnuhG5IQ/i6DETFl5NmX3kKqCzw7aau9NHAGcm4QE=
1313
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 h1:gsqHplNh1DaQunEKZISK56wlpbCg0yKxNVvGWCFuF1k=
@@ -32,8 +32,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.5 h1:DyPYkrH4R2zn+P
3232
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.5/go.mod h1:XtL92YWo0Yq80iN3AgYRERJqohg4TozrqRlxYhHGJ7g=
3333
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.10 h1:GWdLZK0r1AK5sKb8rhB9bEXqXCK8WNuyv4TBAD6ZviQ=
3434
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.10/go.mod h1:+O7qJxF8nLorAhuIVhYTHse6okjHJJm4EwhhzvpnkT0=
35-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.5 h1:TfJ/zuOYvHnxkvohSwAF3Ppn9KT/SrGZuOZHTPy8Guw=
36-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.5/go.mod h1:TFVe6Rr2joVLsYQ1ABACXgOC6lXip/qpX2x5jWg/A9w=
35+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 h1:suAGD+RyiHWPPihZzY+jw4mCZlOFWgmdjb2AeTenz7c=
36+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7/go.mod h1:TFVe6Rr2joVLsYQ1ABACXgOC6lXip/qpX2x5jWg/A9w=
3737
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 h1:aYToU0/iazkMY67/BYLt3r6/LT/mUtarLAF5mGof1Kg=
3838
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6/go.mod h1:rP1rEOKAGZoXp4iGDxSXFvODAtXpm34Egf0lL0eshaQ=
3939
github.com/aws/smithy-go v1.11.2 h1:eG/N+CcUMAvsdffgMvjMKwfyDzIkjM6pfxMJ8Mzc6mE=

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ replace (
99

1010
require (
1111
github.com/aws/aws-sdk-go-v2 v1.16.4
12-
github.com/aws/aws-sdk-go-v2/config v1.15.7
12+
github.com/aws/aws-sdk-go-v2/config v1.15.9
1313
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.15.5
1414
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.10
1515
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.32.0
@@ -21,7 +21,7 @@ require (
2121

2222
require (
2323
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 // indirect
24-
github.com/aws/aws-sdk-go-v2/credentials v1.12.2 // indirect
24+
github.com/aws/aws-sdk-go-v2/credentials v1.12.4 // indirect
2525
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 // indirect
2626
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 // indirect
2727
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.5 // indirect
3333
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5 // indirect
3434
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.5 // indirect
35-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.5 // indirect
35+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 // indirect
3636
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 // indirect
3737
github.com/aws/smithy-go v1.11.2 // indirect
3838
github.com/go-logr/logr v1.2.3 // 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.16.4 h1:swQTEQUyJF/UkEA94/Ga55miiKFoXmm/Zd67XHgm
22
github.com/aws/aws-sdk-go-v2 v1.16.4/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU=
33
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 h1:SdK4Ppk5IzLs64ZMvr6MrSficMtjY2oS0WOORXTlxwU=
44
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1/go.mod h1:n8Bs1ElDD2wJ9kCRTczA83gYbBmjSwZp3umc6zF4EeM=
5-
github.com/aws/aws-sdk-go-v2/config v1.15.7 h1:PrzhYjDpWnGSpjedmEapldQKPW4x8cCNzUI8XOho1CM=
6-
github.com/aws/aws-sdk-go-v2/config v1.15.7/go.mod h1:exERlvqx1OoUHrxQpMgrmfSW0H6B1+r3xziZD3bBXRg=
7-
github.com/aws/aws-sdk-go-v2/credentials v1.12.2 h1:tX4EHQFU4+O9at5QjnwIKb/Qgv7MbgbUNtqTRF0Vu2M=
8-
github.com/aws/aws-sdk-go-v2/credentials v1.12.2/go.mod h1:/XWqDVuzclEKvzileqtD7/t+wIhOogv//6JFlKEe0Wc=
5+
github.com/aws/aws-sdk-go-v2/config v1.15.9 h1:TK5yNEnFDQ9iaO04gJS/3Y+eW8BioQiCUafW75/Wc3Q=
6+
github.com/aws/aws-sdk-go-v2/config v1.15.9/go.mod h1:rv/l/TbZo67kp99v/3Kb0qV6Fm1KEtKyruEV2GvVfgs=
7+
github.com/aws/aws-sdk-go-v2/credentials v1.12.4 h1:xggwS+qxCukXRVXJBJWQJGyUsvuxGC8+J1kKzv2cxuw=
8+
github.com/aws/aws-sdk-go-v2/credentials v1.12.4/go.mod h1:7g+GGSp7xtR823o1jedxKmqRZGqLdoHQfI4eFasKKxs=
99
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 h1:YPxclBeE07HsLQE8vtjC8T2emcTjM9nzqsnDi2fv5UM=
1010
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5/go.mod h1:WAPnuhG5IQ/i6DETFl5NmX3kKqCzw7aau9NHAGcm4QE=
1111
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 h1:gsqHplNh1DaQunEKZISK56wlpbCg0yKxNVvGWCFuF1k=
@@ -30,8 +30,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.5 h1:DyPYkrH4R2zn+P
3030
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.5/go.mod h1:XtL92YWo0Yq80iN3AgYRERJqohg4TozrqRlxYhHGJ7g=
3131
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.10 h1:GWdLZK0r1AK5sKb8rhB9bEXqXCK8WNuyv4TBAD6ZviQ=
3232
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.10/go.mod h1:+O7qJxF8nLorAhuIVhYTHse6okjHJJm4EwhhzvpnkT0=
33-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.5 h1:TfJ/zuOYvHnxkvohSwAF3Ppn9KT/SrGZuOZHTPy8Guw=
34-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.5/go.mod h1:TFVe6Rr2joVLsYQ1ABACXgOC6lXip/qpX2x5jWg/A9w=
33+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 h1:suAGD+RyiHWPPihZzY+jw4mCZlOFWgmdjb2AeTenz7c=
34+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7/go.mod h1:TFVe6Rr2joVLsYQ1ABACXgOC6lXip/qpX2x5jWg/A9w=
3535
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 h1:aYToU0/iazkMY67/BYLt3r6/LT/mUtarLAF5mGof1Kg=
3636
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6/go.mod h1:rP1rEOKAGZoXp4iGDxSXFvODAtXpm34Egf0lL0eshaQ=
3737
github.com/aws/smithy-go v1.11.2 h1:eG/N+CcUMAvsdffgMvjMKwfyDzIkjM6pfxMJ8Mzc6mE=

0 commit comments

Comments
 (0)