Skip to content

Commit

Permalink
chore: update minimum tested go to 1.21 / move to 1.23 release (#220)
Browse files Browse the repository at this point in the history 
Now that `go1.23.0` is out, we no longer need to test against `go1.21`,
and dropping it allows us to move `k8s.io/client-go` to latest version,
as these require a `go1.22`+ toolchain.
  • Loading branch information
@RomainMuller
RomainMuller authored Aug 14, 2024
1 parent e5fd213 commit e60296e
Show file tree
Hide file tree
Showing 13 changed files with 489 additions and 485 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deps-update.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
# Passing "go@<version>" to "go get -u" ensures no dependencies get upgraded to a release that
# does not support that specific go release.
- name: "Update: Project root"
run: go get -t -u go@1.21 gopkg.in/DataDog/dd-trace-go.v1@${{ steps.dd-trace-go.outputs.version }} ./... && go mod tidy
run: go get -t -u go@1.22 gopkg.in/DataDog/dd-trace-go.v1@${{ steps.dd-trace-go.outputs.version }} ./... && go mod tidy
- name: "Update: Samples"
run: go get -t -u go@1.21 gopkg.in/DataDog/dd-trace-go.v1@${{ steps.dd-trace-go.outputs.version }} ./... && go mod tidy
run: go get -t -u go@1.22 gopkg.in/DataDog/dd-trace-go.v1@${{ steps.dd-trace-go.outputs.version }} ./... && go mod tidy
working-directory: samples
- name: "Update: Integration Tests"
run: go get -t -u go@1.21 gopkg.in/DataDog/dd-trace-go.v1@${{ steps.dd-trace-go.outputs.version }} ./... && go mod tidy
run: go get -t -u go@1.22 gopkg.in/DataDog/dd-trace-go.v1@${{ steps.dd-trace-go.outputs.version }} ./... && go mod tidy
working-directory: _integration-tests

- id: is-tree-dirty
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: ['1.21', '1.22', '1.23.0-rc.2']
go-version: ['1.22', '1.23']
name: Unit tests (go${{ matrix.go-version }})
steps:
- name: Checkout
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
fail-fast: false
matrix:
runs-on: [macos, ubuntu, windows]
go-version: ['1.21', '1.22', '1.23.0-rc.2']
go-version: ['1.22', '1.23']
build-mode: [DRIVER]
include:
# Alternate build modes (only on ubuntu, latest go; to save CI time)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_call.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
with:
go-version: '1.21'
go-version: 'stable'
cache-dependency-path: "**/*.sum"
- name: Setup python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5
Expand Down
8 changes: 4 additions & 4 deletions LICENSE-3rdparty.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ orchestrion,github.com/urfave/cli/v2,MIT,Copyright (c) 2022 urfave/cli maintaine
orchestrion,github.com/xrash/smetrics,MIT,Copyright (C) 2016 Felipe da Cunha Gonçalves
orchestrion,github.com/yusufpapurcu/wmi,MIT,Copyright (c) 2013 Stack Exchange
orchestrion,go.uber.org/atomic,MIT,"Copyright (c) 2016 Uber Technologies, Inc."
orchestrion,golang.org/x/crypto,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved.
orchestrion,golang.org/x/crypto,BSD-3-Clause,Copyright 2009 The Go Authors.
orchestrion,golang.org/x/mod/semver,BSD-3-Clause,Copyright 2009 The Go Authors.
orchestrion,golang.org/x/sync/errgroup,BSD-3-Clause,Copyright 2009 The Go Authors.
orchestrion,golang.org/x/sys,BSD-3-Clause,Copyright 2009 The Go Authors.
orchestrion,golang.org/x/term,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved.
orchestrion,golang.org/x/text,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved.
orchestrion,golang.org/x/term,BSD-3-Clause,Copyright 2009 The Go Authors.
orchestrion,golang.org/x/text,BSD-3-Clause,Copyright 2009 The Go Authors.
orchestrion,golang.org/x/time/rate,BSD-3-Clause,Copyright 2009 The Go Authors.
orchestrion,golang.org/x/tools,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved.
orchestrion,golang.org/x/tools,BSD-3-Clause,Copyright 2009 The Go Authors.
orchestrion,golang.org/x/xerrors,BSD-3-Clause,Copyright 2019 The Go Authors.
orchestrion,google.golang.org/protobuf,BSD-3-Clause,Copyright (c) 2018 The Go Authors. All rights reserved.
orchestrion,gopkg.in/DataDog/dd-trace-go.v1,Apache-2.0,"Copyright 2016 Datadog, Inc. | Copyright (c) 2016-Present, Datadog <info@datadoghq.com> | Copyright 2016-Present Datadog, Inc."
Expand Down
90 changes: 47 additions & 43 deletions _integration-tests/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module orchestrion/integration

go 1.21.12
go 1.22.6

replace github.com/datadog/orchestrion => ../

Expand All @@ -17,7 +17,7 @@ require (
github.com/gomodule/redigo v1.9.2
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
github.com/hashicorp/vault/api v1.9.2
github.com/hashicorp/vault/api v1.14.0
github.com/jinzhu/gorm v1.9.16
github.com/labstack/echo/v4 v4.12.0
github.com/mattn/go-sqlite3 v1.14.22
Expand All @@ -27,26 +27,26 @@ require (
github.com/testcontainers/testcontainers-go/modules/redis v0.32.0
github.com/testcontainers/testcontainers-go/modules/vault v0.32.0
github.com/xlab/treeprint v1.2.0
go.mongodb.org/mongo-driver v1.16.0
go.mongodb.org/mongo-driver v1.16.1
google.golang.org/grpc v1.65.0
google.golang.org/grpc/examples v0.0.0-20240802160953-e524655becd8
google.golang.org/grpc/examples v0.0.0-20240813234153-3cb33421c5d3
gopkg.in/DataDog/dd-trace-go.v1 v1.67.0-rc.1
gorm.io/driver/sqlite v1.5.6
gorm.io/gorm v1.25.11
gotest.tools/v3 v3.5.1
k8s.io/apimachinery v0.30.0-alpha.3
k8s.io/client-go v0.30.0-alpha.3
k8s.io/apimachinery v0.31.0
k8s.io/client-go v0.31.0
)

require (
cloud.google.com/go v0.115.0 // indirect
cloud.google.com/go/auth v0.7.3 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
cloud.google.com/go v0.115.1 // indirect
cloud.google.com/go/auth v0.8.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/iam v1.1.12 // indirect
cloud.google.com/go/iam v1.1.13 // indirect
cloud.google.com/go/storage v1.43.0 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 // indirect
Expand All @@ -56,11 +56,11 @@ require (
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 // indirect
github.com/DataDog/appsec-internal-go v1.7.0 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.55.2 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.55.2 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.55.3 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.55.3 // indirect
github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
github.com/DataDog/go-libddwaf/v3 v3.3.0 // indirect
github.com/DataDog/go-sqllexer v0.0.12 // indirect
github.com/DataDog/go-sqllexer v0.0.13 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
github.com/DataDog/gostackparse v0.7.0 // indirect
github.com/DataDog/sketches-go v1.4.6 // indirect
Expand Down Expand Up @@ -97,15 +97,15 @@ require (
github.com/bep/godartsass v1.2.0 // indirect
github.com/bep/godartsass/v2 v2.1.0 // indirect
github.com/bep/golibsass v1.1.1 // indirect
github.com/bep/gowebp v0.3.0 // indirect
github.com/bep/imagemeta v0.7.5 // indirect
github.com/bep/lazycache v0.4.0 // indirect
github.com/bep/gowebp v0.4.0 // indirect
github.com/bep/imagemeta v0.8.0 // indirect
github.com/bep/lazycache v0.5.0 // indirect
github.com/bep/logg v0.4.0 // indirect
github.com/bep/mclib v1.20400.20402 // indirect
github.com/bep/overlayfs v0.9.2 // indirect
github.com/bep/simplecobra v0.4.0 // indirect
github.com/bep/tmc v0.5.1 // indirect
github.com/bytedance/sonic v1.12.0 // indirect
github.com/bytedance/sonic v1.12.1 // indirect
github.com/bytedance/sonic/loader v0.2.0 // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
Expand All @@ -127,7 +127,7 @@ require (
github.com/disintegration/gift v1.2.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/dlclark/regexp2 v1.11.4 // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/docker v27.1.2+incompatible // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
Expand All @@ -138,12 +138,13 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/frankban/quicktest v1.14.6 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
github.com/getkin/kin-openapi v0.127.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-chi/chi v1.5.4 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-chi/chi v1.5.5 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
Expand All @@ -160,9 +161,9 @@ require (
github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e // indirect
github.com/gohugoio/hashstructure v0.1.0 // indirect
github.com/gohugoio/httpcache v0.7.0 // indirect
github.com/gohugoio/hugo v0.131.0 // indirect
github.com/gohugoio/hugo v0.132.1 // indirect
github.com/gohugoio/hugo-goldmark-extensions/extras v0.2.0 // indirect
github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.2.0 // indirect
github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.3.0 // indirect
github.com/gohugoio/locales v0.14.0 // indirect
github.com/gohugoio/localescompressed v1.0.1 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
Expand All @@ -174,7 +175,7 @@ require (
github.com/google/go-licenses/v2 v2.0.0-alpha.1 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/licenseclassifier/v2 v2.0.0 // indirect
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/google/wire v0.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
Expand All @@ -191,7 +192,7 @@ require (
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/hashicorp/vault/sdk v0.9.2 // indirect
github.com/hashicorp/vault/sdk v0.13.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/invopop/yaml v0.3.1 // indirect
Expand Down Expand Up @@ -225,7 +226,8 @@ require (
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/user v0.2.0 // indirect
github.com/moby/sys/user v0.3.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -237,7 +239,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nats-io/jwt/v2 v2.5.8 // indirect
github.com/nats-io/nats-server/v2 v2.10.18 // indirect
github.com/nats-io/nats.go v1.36.0 // indirect
github.com/nats-io/nats.go v1.37.0 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/niklasfasching/go-org v1.7.0 // indirect
Expand Down Expand Up @@ -266,22 +268,24 @@ require (
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/fsync v0.10.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tdewolff/minify/v2 v2.20.37 // indirect
github.com/tdewolff/parse/v2 v2.7.15 // indirect
github.com/tetratelabs/wazero v1.7.4-0.20240805170331-2b12e189eeec // indirect
github.com/tinylib/msgp v1.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
github.com/urfave/cli/v2 v2.27.3 // indirect
github.com/urfave/cli/v2 v2.27.4 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.55.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/valyala/tcplisten v1.0.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
Expand All @@ -300,31 +304,31 @@ require (
go.uber.org/automaxprocs v1.5.3 // indirect
gocloud.dev v0.38.0 // indirect
golang.org/x/arch v0.9.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/image v0.18.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
golang.org/x/image v0.19.0 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.23.0 // indirect
golang.org/x/tools v0.24.0 // indirect
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
google.golang.org/api v0.190.0 // indirect
google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
google.golang.org/api v0.192.0 // indirect
google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.1 // indirect
k8s.io/api v0.30.0-alpha.3 // indirect
k8s.io/api v0.31.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect
k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
Loading

0 comments on commit e60296e

Please sign in to comment.