Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

Commit 8a68d59

Browse files
authored
all: support latest go version 1.19 (DataDog#1410)
1 parent 99b17de commit 8a68d59

File tree

8 files changed

+149
-38
lines changed

8 files changed

+149
-38
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
version: 2.1
22

3-
plain-go114: &plain-go116
3+
plain-go117: &plain-go117
44
working_directory: /home/circleci/dd-trace-go.v1
55
docker:
6-
- image: circleci/golang:1.16
6+
- image: circleci/golang:1.17
77
environment:
88
GOPATH: "/home/circleci/go"
99

1010
jobs:
1111
metadata:
12-
<<: *plain-go116
12+
<<: *plain-go117
1313

1414
steps:
1515
- checkout
@@ -46,7 +46,7 @@ jobs:
4646
go run checkcopyright.go
4747
4848
lint:
49-
<<: *plain-go116
49+
<<: *plain-go117
5050

5151
steps:
5252
- checkout
@@ -88,7 +88,7 @@ jobs:
8888
environment: # environment variables for the build itself
8989
TEST_RESULTS: /tmp/test-results # path to where test results will be saved
9090
CI_APP_SERVICE_NAME: dd-trace-go
91-
<<: *plain-go116
91+
<<: *plain-go117
9292

9393
steps:
9494
- checkout
@@ -139,7 +139,7 @@ jobs:
139139
CI_APP_SERVICE_NAME: dd-trace-go
140140
working_directory: /home/circleci/dd-trace-go.v1
141141
docker:
142-
- image: circleci/golang:1.16
142+
- image: circleci/golang:1.17
143143
environment:
144144
GOPATH: "/home/circleci/go"
145145
- image: cassandra:3.7

.github/workflows/appsec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
matrix:
2020
runs-on: [ macos-latest, ubuntu-latest, windows-latest ]
21-
go-version: [ 1.18, 1.17, 1.16 ]
21+
go-version: [ 1.19, 1.18, 1.17 ]
2222
cgo_enabled: # test it compiles with and without cgo
2323
- 0
2424
- 1
@@ -66,7 +66,7 @@ jobs:
6666
image: golang:${{ matrix.go-version }}-${{ matrix.distribution }}
6767
strategy:
6868
matrix:
69-
go-version: [ 1.18, 1.17, 1.16 ]
69+
go-version: [ 1.19, 1.18, 1.17 ]
7070
distribution: [ bullseye, buster, alpine ]
7171
fail-fast: false
7272
steps:

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ Datadog APM for Go is built upon dependencies defined in specific versions of th
4040
<!-- NOTE: When updating the below section ensure you update the minimum supported version listed in the public docs here: https://docs.datadoghq.com/tracing/setup_overview/setup/go/?tab=containers#compatibility-requirements -->
4141
| **Go Version** | **Support level** |
4242
|----------------|-------------------------------------|
43+
| 1.19 | [GA](#support-ga) |
4344
| 1.18 | [GA](#support-ga) |
44-
| 1.17 | [GA](#support-ga) |
45-
| 1.16 | [Maintenance](#support-maintenance) |
45+
| 1.17 | [Maintenance](#support-maintenance) |
46+
| 1.16 | [Legacy](#support-legacy) |
4647

4748
* Datadog's Trace Agent >= 5.21.1
4849

checkmilestone.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2016 Datadog, Inc.
55

6+
//go:build ignore
67
// +build ignore
78

89
// This tool validates that the PR at the given URL has a milestone set.

contrib/google.golang.org/api/make_endpoints.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2016 Datadog, Inc.
55

6+
//go:build ignore
67
// +build ignore
78

89
// This program generates a tree of endpoints for span tagging based on the

go.mod

Lines changed: 133 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module gopkg.in/DataDog/dd-trace-go.v1
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
cloud.google.com/go/pubsub v1.4.0
@@ -16,14 +16,11 @@ require (
1616
github.com/aws/aws-sdk-go-v2/service/sqs v1.0.0
1717
github.com/aws/smithy-go v1.11.0
1818
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
19-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2019
github.com/confluentinc/confluent-kafka-go v1.4.0
2120
github.com/denisenkom/go-mssqldb v0.11.0
2221
github.com/elastic/go-elasticsearch/v6 v6.8.5
2322
github.com/elastic/go-elasticsearch/v7 v7.17.1
2423
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633
25-
github.com/fatih/color v1.9.0 // indirect
26-
github.com/frankban/quicktest v1.13.0 // indirect
2724
github.com/garyburd/redigo v1.6.3
2825
github.com/gin-gonic/gin v1.7.7
2926
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
@@ -37,47 +34,29 @@ require (
3734
github.com/gocql/gocql v0.0.0-20220224095938-0eacd3183625
3835
github.com/gofiber/fiber/v2 v2.11.0
3936
github.com/golang/protobuf v1.5.2
40-
github.com/golang/snappy v0.0.4 // indirect
4137
github.com/gomodule/redigo v1.7.0
4238
github.com/google/pprof v0.0.0-20210423192551-a2663126120b
4339
github.com/google/uuid v1.3.0
4440
github.com/gorilla/mux v1.6.2
4541
github.com/graph-gophers/graphql-go v1.3.0
4642
github.com/hashicorp/consul/api v1.0.0
47-
github.com/hashicorp/errwrap v1.1.0 // indirect
48-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
49-
github.com/hashicorp/go-hclog v0.16.2 // indirect
50-
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
51-
github.com/hashicorp/go-multierror v1.1.1 // indirect
52-
github.com/hashicorp/golang-lru v0.5.4 // indirect
53-
github.com/hashicorp/memberlist v0.1.6 // indirect
54-
github.com/hashicorp/serf v0.8.6 // indirect
5543
github.com/hashicorp/vault/api v1.1.0
5644
github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267
5745
github.com/jackc/pgx/v4 v4.14.0
5846
github.com/jinzhu/gorm v1.9.10
59-
github.com/jinzhu/now v1.1.3 // indirect
6047
github.com/jmoiron/sqlx v1.2.0
6148
github.com/julienschmidt/httprouter v1.2.0
62-
github.com/kr/text v0.2.0 // indirect
6349
github.com/labstack/echo v3.3.10+incompatible
6450
github.com/labstack/echo/v4 v4.2.0
65-
github.com/labstack/gommon v0.3.1 // indirect
6651
github.com/lib/pq v1.10.2
6752
github.com/mattn/go-sqlite3 v1.14.12
6853
github.com/miekg/dns v1.1.25
69-
github.com/mitchellh/mapstructure v1.4.2 // indirect
70-
github.com/onsi/gomega v1.16.0 // indirect
7154
github.com/opentracing/opentracing-go v1.2.0
72-
github.com/philhofer/fwd v1.1.1 // indirect
73-
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
7455
github.com/segmentio/kafka-go v0.4.29
7556
github.com/sirupsen/logrus v1.7.0
7657
github.com/stretchr/testify v1.7.0
7758
github.com/syndtr/goleveldb v1.0.0
78-
github.com/tidwall/btree v1.1.0 // indirect
7959
github.com/tidwall/buntdb v1.2.0
80-
github.com/tidwall/grect v0.1.4 // indirect
8160
github.com/tinylib/msgp v1.1.2
8261
github.com/twitchtv/twirp v8.1.1+incompatible
8362
github.com/urfave/negroni v1.0.0
@@ -87,16 +66,12 @@ require (
8766
github.com/vmihailenco/tagparser v0.1.2 // indirect
8867
github.com/zenazn/goji v1.0.1
8968
go.mongodb.org/mongo-driver v1.7.5
90-
go.opencensus.io v0.22.4 // indirect
91-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
9269
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
9370
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
9471
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
9572
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
96-
golang.org/x/tools v0.1.12 // indirect
9773
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
9874
google.golang.org/api v0.29.0
99-
google.golang.org/genproto v0.0.0-20200726014623-da3ae01ef02d // indirect
10075
google.golang.org/grpc v1.32.0
10176
google.golang.org/protobuf v1.28.0
10277
gopkg.in/jinzhu/gorm.v1 v1.9.1
@@ -110,3 +85,135 @@ require (
11085
k8s.io/apimachinery v0.17.0
11186
k8s.io/client-go v0.17.0
11287
)
88+
89+
require (
90+
cloud.google.com/go v0.57.0 // indirect
91+
github.com/BurntSushi/toml v0.3.1 // indirect
92+
github.com/DataDog/datadog-go v4.8.2+incompatible // indirect
93+
github.com/DataDog/zstd v1.3.5 // indirect
94+
github.com/Microsoft/go-winio v0.5.1 // indirect
95+
github.com/agnivade/levenshtein v1.1.0 // indirect
96+
github.com/andybalholm/brotli v1.0.4 // indirect
97+
github.com/armon/go-metrics v0.3.0 // indirect
98+
github.com/aws/aws-sdk-go-v2/credentials v1.0.0 // indirect
99+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.0 // indirect
100+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.0 // indirect
101+
github.com/aws/aws-sdk-go-v2/service/sts v1.0.0 // indirect
102+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
103+
github.com/davecgh/go-spew v1.1.1 // indirect
104+
github.com/dgraph-io/ristretto v0.1.0 // indirect
105+
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
106+
github.com/dustin/go-humanize v1.0.0 // indirect
107+
github.com/eapache/go-resiliency v1.1.0 // indirect
108+
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
109+
github.com/eapache/queue v1.1.0 // indirect
110+
github.com/fatih/color v1.9.0 // indirect
111+
github.com/frankban/quicktest v1.13.0 // indirect
112+
github.com/gin-contrib/sse v0.1.0 // indirect
113+
github.com/go-pg/zerochecker v0.2.0 // indirect
114+
github.com/go-playground/locales v0.13.0 // indirect
115+
github.com/go-playground/universal-translator v0.17.0 // indirect
116+
github.com/go-playground/validator/v10 v10.4.1 // indirect
117+
github.com/go-stack/stack v1.8.0 // indirect
118+
github.com/gogo/protobuf v1.3.2 // indirect
119+
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
120+
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
121+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
122+
github.com/golang/snappy v0.0.4 // indirect
123+
github.com/google/go-cmp v0.5.7 // indirect
124+
github.com/google/gofuzz v1.2.0 // indirect
125+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
126+
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
127+
github.com/gorilla/context v1.1.1 // indirect
128+
github.com/gorilla/websocket v1.4.2 // indirect
129+
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
130+
github.com/hashicorp/errwrap v1.1.0 // indirect
131+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
132+
github.com/hashicorp/go-hclog v0.16.2 // indirect
133+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
134+
github.com/hashicorp/go-multierror v1.1.1 // indirect
135+
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
136+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
137+
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
138+
github.com/hashicorp/golang-lru v0.5.4 // indirect
139+
github.com/hashicorp/hcl v1.0.0 // indirect
140+
github.com/hashicorp/memberlist v0.1.6 // indirect
141+
github.com/hashicorp/serf v0.8.6 // indirect
142+
github.com/imdario/mergo v0.3.5 // indirect
143+
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
144+
github.com/jackc/pgconn v1.10.1 // indirect
145+
github.com/jackc/pgio v1.0.0 // indirect
146+
github.com/jackc/pgpassfile v1.0.0 // indirect
147+
github.com/jackc/pgproto3/v2 v2.2.0 // indirect
148+
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
149+
github.com/jackc/pgtype v1.9.0 // indirect
150+
github.com/jinzhu/inflection v1.0.0 // indirect
151+
github.com/jinzhu/now v1.1.3 // indirect
152+
github.com/jmespath/go-jmespath v0.4.0 // indirect
153+
github.com/josharian/intern v1.0.0 // indirect
154+
github.com/json-iterator/go v1.1.9 // indirect
155+
github.com/jstemmer/go-junit-report v0.9.1 // indirect
156+
github.com/klauspost/compress v1.15.0 // indirect
157+
github.com/kr/text v0.2.0 // indirect
158+
github.com/labstack/gommon v0.3.1 // indirect
159+
github.com/leodido/go-urn v1.2.0 // indirect
160+
github.com/mailru/easyjson v0.7.7 // indirect
161+
github.com/mattn/go-colorable v0.1.11 // indirect
162+
github.com/mattn/go-isatty v0.0.14 // indirect
163+
github.com/mitchellh/go-homedir v1.1.0 // indirect
164+
github.com/mitchellh/mapstructure v1.4.2 // indirect
165+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
166+
github.com/modern-go/reflect2 v1.0.1 // indirect
167+
github.com/onsi/ginkgo v1.16.4 // indirect
168+
github.com/onsi/gomega v1.16.0 // indirect
169+
github.com/philhofer/fwd v1.1.1 // indirect
170+
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
171+
github.com/pierrec/lz4/v4 v4.1.14 // indirect
172+
github.com/pkg/errors v0.9.1 // indirect
173+
github.com/pmezard/go-difflib v1.0.0 // indirect
174+
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
175+
github.com/ryanuber/go-glob v1.0.0 // indirect
176+
github.com/spf13/pflag v1.0.5 // indirect
177+
github.com/tidwall/btree v1.1.0 // indirect
178+
github.com/tidwall/gjson v1.12.1 // indirect
179+
github.com/tidwall/grect v0.1.4 // indirect
180+
github.com/tidwall/match v1.1.1 // indirect
181+
github.com/tidwall/pretty v1.2.0 // indirect
182+
github.com/tidwall/rtred v0.1.2 // indirect
183+
github.com/tidwall/tinyqueue v0.1.1 // indirect
184+
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
185+
github.com/ugorji/go/codec v1.1.7 // indirect
186+
github.com/valyala/bytebufferpool v1.0.0 // indirect
187+
github.com/valyala/fasttemplate v1.2.1 // indirect
188+
github.com/valyala/tcplisten v1.0.0 // indirect
189+
github.com/vmihailenco/bufpool v0.1.11 // indirect
190+
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
191+
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
192+
github.com/xdg-go/scram v1.0.2 // indirect
193+
github.com/xdg-go/stringprep v1.0.2 // indirect
194+
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
195+
go.opencensus.io v0.22.4 // indirect
196+
go.opentelemetry.io/otel v0.11.0 // indirect
197+
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
198+
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
199+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
200+
golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925 // indirect
201+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
202+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
203+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
204+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
205+
golang.org/x/text v0.3.7 // indirect
206+
golang.org/x/tools v0.1.12 // indirect
207+
google.golang.org/appengine v1.6.6 // indirect
208+
google.golang.org/genproto v0.0.0-20200726014623-da3ae01ef02d // indirect
209+
gopkg.in/inf.v0 v0.9.1 // indirect
210+
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
211+
gopkg.in/yaml.v2 v2.4.0 // indirect
212+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
213+
honnef.co/go/tools v0.0.1-2020.1.4 // indirect
214+
k8s.io/api v0.17.0 // indirect
215+
k8s.io/klog v1.0.0 // indirect
216+
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f // indirect
217+
mellium.im/sasl v0.2.1 // indirect
218+
sigs.k8s.io/yaml v1.1.0 // indirect
219+
)

gosum.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/).
44
// Copyright 2016 Datadog, Inc.
55

6+
//go:build ignore
67
// +build ignore
78

8-
// This tool is used to valdiate that the go.sum file is up-to-date, see
9+
// This tool is used to validate that the go.sum file is up-to-date, see
910
// .circleci.
1011
package main
1112

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module escaper
22

3-
go 1.16
3+
go 1.17

0 commit comments

Comments
 (0)