Skip to content

Commit c0d12e2

Browse files
hanyuancheunghanyuancheung
authored
Merge branch 'main' into gcp_resource_v2
2 parents 441bfe1 + b8df9ac commit c0d12e2

File tree

90 files changed

+1196
-179
lines changed

Some content is hidden

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

90 files changed

+1196
-179
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
compatibility-test:
110110
strategy:
111111
matrix:
112-
go-version: [1.18, 1.17, 1.16]
112+
go-version: [1.18, 1.17]
113113
os: [ubuntu-latest, macos-latest, windows-latest]
114114
# GitHub Actions does not support arm* architectures on default
115115
# runners. It is possible to acomplish this with a self-hosted runner

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
2828
- Stopped injecting propagation context into response headers in otelhttp. (#2180)
2929
- Fix issue where attributes for DynamoDB were not added because of a string miss match. (#2272)
3030

31+
### Removed
32+
33+
- Drop support for Go 1.16.
34+
The project currently only supports Go 1.17 and above. (#2314)
35+
3136
## [1.6.0/0.31.0] - 2022-03-28
3237

3338
### Added

‎README.md

-8
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,18 @@ This project is tested on the following systems.
3535
| ------- | ---------- | ------------ |
3636
| Ubuntu | 1.18 | amd64 |
3737
| Ubuntu | 1.17 | amd64 |
38-
| Ubuntu | 1.16 | amd64 |
3938
| Ubuntu | 1.18 | 386 |
4039
| Ubuntu | 1.17 | 386 |
41-
| Ubuntu | 1.16 | 386 |
4240
| MacOS | 1.18 | amd64 |
4341
| MacOS | 1.17 | amd64 |
44-
| MacOS | 1.16 | amd64 |
4542
| Windows | 1.18 | amd64 |
4643
| Windows | 1.17 | amd64 |
47-
| Windows | 1.16 | amd64 |
4844
| Windows | 1.18 | 386 |
4945
| Windows | 1.17 | 386 |
50-
| Windows | 1.16 | 386 |
5146

5247
While this project should work for other systems, no compatibility guarantees
5348
are made for those systems currently.
5449

55-
Go 1.18 was added in March of 2022.
56-
Go 1.16 will be removed around June 2022.
57-
5850
## Contributing
5951

6052
For information on how to contribute, consult [the contributing guidelines](./CONTRIBUTING.md)

‎detectors/aws/ec2/go.mod

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
module go.opentelemetry.io/contrib/detectors/aws/ec2
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/aws/aws-sdk-go v1.44.20
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
1010
)
11+
12+
require (
13+
github.com/davecgh/go-spew v1.1.0 // indirect
14+
github.com/go-logr/logr v1.2.3 // indirect
15+
github.com/go-logr/stdr v1.2.2 // indirect
16+
github.com/jmespath/go-jmespath v0.4.0 // indirect
17+
github.com/pmezard/go-difflib v1.0.0 // indirect
18+
go.opentelemetry.io/otel/trace v1.7.0 // indirect
19+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
20+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
21+
)

‎detectors/aws/ecs/go.mod

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
module go.opentelemetry.io/contrib/detectors/aws/ecs
22

3-
go 1.16
3+
go 1.17
44

55
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
99
)
10+
11+
require (
12+
github.com/davecgh/go-spew v1.1.0 // indirect
13+
github.com/go-logr/logr v1.2.3 // indirect
14+
github.com/go-logr/stdr v1.2.2 // indirect
15+
github.com/pmezard/go-difflib v1.0.0 // indirect
16+
github.com/stretchr/objx v0.1.0 // indirect
17+
go.opentelemetry.io/otel/trace v1.7.0 // indirect
18+
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 // indirect
19+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
20+
)

‎detectors/aws/eks/go.mod

+33-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,44 @@
11
module go.opentelemetry.io/contrib/detectors/aws/eks
22

3-
go 1.16
3+
go 1.17
44

55
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
99
k8s.io/apimachinery v0.22.4
1010
k8s.io/client-go v0.22.4
11+
)
12+
13+
require (
14+
github.com/davecgh/go-spew v1.1.1 // indirect
15+
github.com/go-logr/logr v1.2.3 // indirect
16+
github.com/go-logr/stdr v1.2.2 // indirect
17+
github.com/gogo/protobuf v1.3.2 // indirect
18+
github.com/golang/protobuf v1.5.2 // indirect
19+
github.com/google/go-cmp v0.5.7 // indirect
20+
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
23+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
24+
github.com/modern-go/reflect2 v1.0.1 // indirect
25+
github.com/pmezard/go-difflib v1.0.0 // indirect
26+
github.com/stretchr/objx v0.1.0 // indirect
27+
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+
gopkg.in/inf.v0 v0.9.1 // indirect
37+
gopkg.in/yaml.v2 v2.4.0 // indirect
38+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
39+
k8s.io/api v0.22.4 // indirect
1140
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
43+
sigs.k8s.io/yaml v1.2.0 // indirect
1244
)

‎detectors/aws/lambda/go.mod

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
module go.opentelemetry.io/contrib/detectors/aws/lambda
22

3-
go 1.16
3+
go 1.17
44

55
require (
6-
github.com/davecgh/go-spew v1.1.1 // indirect
76
github.com/stretchr/testify v1.7.1
87
go.opentelemetry.io/otel v1.7.0
98
go.opentelemetry.io/otel/sdk v1.7.0
9+
)
10+
11+
require (
12+
github.com/davecgh/go-spew v1.1.1 // indirect
13+
github.com/go-logr/logr v1.2.3 // indirect
14+
github.com/go-logr/stdr v1.2.2 // indirect
15+
github.com/pmezard/go-difflib v1.0.0 // indirect
16+
go.opentelemetry.io/otel/trace v1.7.0 // indirect
17+
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 // indirect
1018
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
1119
)

‎detectors/gcp/go.mod

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/detectors/gcp
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
cloud.google.com/go/compute v1.6.1
@@ -10,3 +10,10 @@ require (
1010
go.opentelemetry.io/otel v1.7.0
1111
go.opentelemetry.io/otel/sdk v1.7.0
1212
)
13+
14+
require (
15+
github.com/go-logr/logr v1.2.3 // indirect
16+
github.com/go-logr/stdr v1.2.2 // indirect
17+
go.opentelemetry.io/otel/trace v1.7.0 // indirect
18+
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
19+
)

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module go.opentelemetry.io/contrib
22

3-
go 1.16
3+
go 1.17

‎instrumentation/github.com/Shopify/sarama/otelsarama/example/go.mod

+25-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama/example
22

3-
go 1.16
3+
go 1.17
44

55
replace (
66
go.opentelemetry.io/contrib => ../../../../../../
@@ -15,3 +15,27 @@ require (
1515
go.opentelemetry.io/otel/sdk v1.7.0
1616
go.opentelemetry.io/otel/trace v1.7.0
1717
)
18+
19+
require (
20+
github.com/davecgh/go-spew v1.1.1 // indirect
21+
github.com/eapache/go-resiliency v1.2.0 // indirect
22+
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
23+
github.com/eapache/queue v1.1.0 // indirect
24+
github.com/go-logr/logr v1.2.3 // indirect
25+
github.com/go-logr/stdr v1.2.2 // indirect
26+
github.com/golang/snappy v0.0.4 // indirect
27+
github.com/hashicorp/errwrap v1.0.0 // indirect
28+
github.com/hashicorp/go-multierror v1.1.1 // indirect
29+
github.com/hashicorp/go-uuid v1.0.2 // indirect
30+
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
31+
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
32+
github.com/jcmturner/gofork v1.0.0 // indirect
33+
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
34+
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
35+
github.com/klauspost/compress v1.15.0 // indirect
36+
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
37+
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
38+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
39+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
40+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
41+
)

‎instrumentation/github.com/Shopify/sarama/otelsarama/go.mod

+26-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama
22

3-
go 1.16
3+
go 1.17
44

55
replace go.opentelemetry.io/contrib => ../../../../..
66

@@ -10,3 +10,28 @@ require (
1010
go.opentelemetry.io/otel v1.7.0
1111
go.opentelemetry.io/otel/trace v1.7.0
1212
)
13+
14+
require (
15+
github.com/davecgh/go-spew v1.1.1 // indirect
16+
github.com/eapache/go-resiliency v1.2.0 // indirect
17+
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
18+
github.com/eapache/queue v1.1.0 // indirect
19+
github.com/go-logr/logr v1.2.3 // indirect
20+
github.com/go-logr/stdr v1.2.2 // indirect
21+
github.com/golang/snappy v0.0.4 // indirect
22+
github.com/hashicorp/errwrap v1.0.0 // indirect
23+
github.com/hashicorp/go-multierror v1.1.1 // indirect
24+
github.com/hashicorp/go-uuid v1.0.2 // indirect
25+
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
26+
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
27+
github.com/jcmturner/gofork v1.0.0 // indirect
28+
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
29+
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
30+
github.com/klauspost/compress v1.15.0 // indirect
31+
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
32+
github.com/pmezard/go-difflib v1.0.0 // indirect
33+
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
34+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
35+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
36+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
37+
)

‎instrumentation/github.com/Shopify/sarama/otelsarama/test/go.mod

+27-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama/test
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/Shopify/sarama v1.33.0
@@ -11,6 +11,32 @@ require (
1111
go.opentelemetry.io/otel/trace v1.7.0
1212
)
1313

14+
require (
15+
github.com/davecgh/go-spew v1.1.1 // indirect
16+
github.com/eapache/go-resiliency v1.2.0 // indirect
17+
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
18+
github.com/eapache/queue v1.1.0 // indirect
19+
github.com/go-logr/logr v1.2.3 // indirect
20+
github.com/go-logr/stdr v1.2.2 // indirect
21+
github.com/golang/snappy v0.0.4 // indirect
22+
github.com/hashicorp/errwrap v1.0.0 // indirect
23+
github.com/hashicorp/go-multierror v1.1.1 // indirect
24+
github.com/hashicorp/go-uuid v1.0.2 // indirect
25+
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
26+
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
27+
github.com/jcmturner/gofork v1.0.0 // indirect
28+
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
29+
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
30+
github.com/klauspost/compress v1.15.0 // indirect
31+
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
32+
github.com/pmezard/go-difflib v1.0.0 // indirect
33+
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
34+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
35+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
36+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
37+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
38+
)
39+
1440
replace go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama => ../
1541

1642
replace go.opentelemetry.io/contrib => ../../../../../../

‎instrumentation/github.com/astaxie/beego/otelbeego/example/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.16-alpine AS base
15+
FROM golang:1.17-alpine AS base
1616
COPY . /src/
1717
WORKDIR /src/instrumentation/github.com/astaxie/beego/otelbeego/example
1818

‎instrumentation/github.com/astaxie/beego/otelbeego/example/go.mod

+25-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego/example
22

3-
go 1.16
3+
go 1.17
44

55
replace (
66
go.opentelemetry.io/contrib => ../../../../../../
@@ -17,3 +17,27 @@ require (
1717
go.opentelemetry.io/otel/sdk v1.7.0
1818
go.opentelemetry.io/otel/trace v1.7.0
1919
)
20+
21+
require (
22+
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
24+
github.com/felixge/httpsnoop v1.0.3 // indirect
25+
github.com/go-logr/logr v1.2.3 // indirect
26+
github.com/go-logr/stdr v1.2.2 // indirect
27+
github.com/golang/protobuf v1.4.2 // indirect
28+
github.com/hashicorp/golang-lru v0.5.4 // indirect
29+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
30+
github.com/prometheus/client_golang v1.7.0 // indirect
31+
github.com/prometheus/client_model v0.2.0 // indirect
32+
github.com/prometheus/common v0.10.0 // indirect
33+
github.com/prometheus/procfs v0.1.3 // indirect
34+
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
35+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 // indirect
36+
go.opentelemetry.io/otel/metric v0.30.0 // indirect
37+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
38+
golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
39+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
40+
golang.org/x/text v0.3.3 // indirect
41+
google.golang.org/protobuf v1.25.0 // indirect
42+
gopkg.in/yaml.v2 v2.2.8 // indirect
43+
)

‎instrumentation/github.com/astaxie/beego/otelbeego/go.mod

+22-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego
22

3-
go 1.16
3+
go 1.17
44

55
replace (
66
go.opentelemetry.io/contrib => ../../../../..
@@ -15,8 +15,29 @@ require (
1515
go.opentelemetry.io/otel v1.7.0
1616
go.opentelemetry.io/otel/metric v0.30.0
1717
go.opentelemetry.io/otel/trace v1.7.0
18+
)
19+
20+
require (
21+
github.com/beorn7/perks v1.0.1 // indirect
22+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
23+
github.com/davecgh/go-spew v1.1.1 // indirect
24+
github.com/felixge/httpsnoop v1.0.3 // indirect
25+
github.com/go-logr/logr v1.2.3 // indirect
26+
github.com/go-logr/stdr v1.2.2 // indirect
27+
github.com/golang/protobuf v1.4.2 // indirect
28+
github.com/hashicorp/golang-lru v0.5.4 // indirect
29+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
30+
github.com/pmezard/go-difflib v1.0.0 // indirect
31+
github.com/prometheus/client_golang v1.7.0 // indirect
32+
github.com/prometheus/client_model v0.2.0 // indirect
33+
github.com/prometheus/common v0.10.0 // indirect
34+
github.com/prometheus/procfs v0.1.3 // indirect
35+
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
36+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
1837
golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
1938
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
2039
golang.org/x/text v0.3.3 // indirect
2140
google.golang.org/protobuf v1.25.0 // indirect
41+
gopkg.in/yaml.v2 v2.2.8 // indirect
42+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
2243
)

0 commit comments

Comments
 (0)