Skip to content

Commit 87ba6d2

Browse files
authored
chore: dependency update workflow use stable go (#662)
Using oldstable go causes candidate modules that require the stable go to fail the upgrade evaluation instead of being simply ignored. Using stable makes the process work, while still not allowing versions that require a newer Go release than configured. --- It also no longer transparently upgrades to pre-releases of the `github.com/DataDog/dd-trace-go/v2` versions, as suitable releases are now readily available. --- Includes the dependency upgrades that were overdue because the workflow had previously failed.
1 parent 739f52a commit 87ba6d2

File tree

9 files changed

+1298
-1281
lines changed

9 files changed

+1298
-1281
lines changed

.github/workflows/deps-update.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ jobs:
2121
id: setup-go
2222
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
2323
with:
24-
go-version: oldstable # Minimum supported go release
24+
# Run with current stable so we can evaluate all possible versions; as the Go toolchain
25+
# will bail out if it encounters a "candidate" that requires a newer release.
26+
go-version: stable
2527
cache-dependency-path: '**/go.mod'
2628

2729
- name: Determine latest github.com/DataDog/dd-trace-go/v2 version
2830
id: dd-trace-go
2931
run: |-
3032
set -euo pipefail
31-
version=$(go list -f '{{range .Versions}}{{.}}{{"\n"}}{{end}}' -m -versions github.com/DataDog/dd-trace-go/v2 | tail -n 1)
33+
version=$(go list -f '{{range .Versions}}{{.}}{{"\n"}}{{end}}' -m -versions github.com/DataDog/dd-trace-go/v2 | grep -v '-' | tail -n 1)
3234
echo "version=${version}" >> "${GITHUB_OUTPUT}"
3335
3436
# Passing "go@<version>" to "go get -u" ensures no dependencies get upgraded to a release that

_docs/go.mod

Lines changed: 167 additions & 159 deletions
Large diffs are not rendered by default.

_docs/go.sum

Lines changed: 367 additions & 362 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/DataDog/orchestrion
33
go 1.23.0
44

55
require (
6-
github.com/DataDog/dd-trace-go/v2 v2.1.0-rc.4
6+
github.com/DataDog/dd-trace-go/v2 v2.1.0
77
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
88
github.com/charmbracelet/lipgloss v1.1.0
99
github.com/dave/dst v0.27.3
@@ -12,46 +12,46 @@ require (
1212
github.com/goccy/go-yaml v1.18.0
1313
github.com/google/uuid v1.6.0
1414
github.com/liamg/memoryfs v1.6.0
15-
github.com/nats-io/nats-server/v2 v2.11.4
15+
github.com/nats-io/nats-server/v2 v2.11.6
1616
github.com/nats-io/nats.go v1.43.0
1717
github.com/otiai10/copy v1.14.1
1818
github.com/rs/zerolog v1.34.0
1919
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
20-
github.com/shirou/gopsutil/v4 v4.25.5
20+
github.com/shirou/gopsutil/v4 v4.25.6
2121
github.com/stretchr/testify v1.10.0
22-
github.com/urfave/cli/v2 v2.27.6
22+
github.com/urfave/cli/v2 v2.27.7
2323
github.com/xeipuuv/gojsonschema v1.2.0
24-
golang.org/x/mod v0.24.0
25-
golang.org/x/sync v0.14.0
26-
golang.org/x/sys v0.33.0
27-
golang.org/x/term v0.32.0
28-
golang.org/x/tools v0.33.0
24+
golang.org/x/mod v0.26.0
25+
golang.org/x/sync v0.16.0
26+
golang.org/x/sys v0.34.0
27+
golang.org/x/term v0.33.0
28+
golang.org/x/tools v0.35.0
2929
gotest.tools/v3 v3.5.2
3030
)
3131

3232
require (
33-
github.com/DataDog/appsec-internal-go v1.12.0 // indirect
34-
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.66.1 // indirect
35-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.66.1 // indirect
36-
github.com/DataDog/datadog-agent/pkg/proto v0.66.1 // indirect
37-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.66.1 // indirect
33+
github.com/DataDog/appsec-internal-go v1.13.0 // indirect
34+
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.68.0 // indirect
35+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.68.0 // indirect
36+
github.com/DataDog/datadog-agent/pkg/proto v0.68.0 // indirect
37+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.68.0 // indirect
3838
github.com/DataDog/datadog-agent/pkg/trace v0.66.1 // indirect
39-
github.com/DataDog/datadog-agent/pkg/util/log v0.66.1 // indirect
40-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.66.1 // indirect
41-
github.com/DataDog/datadog-agent/pkg/version v0.66.1 // indirect
39+
github.com/DataDog/datadog-agent/pkg/util/log v0.68.0 // indirect
40+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.68.0 // indirect
41+
github.com/DataDog/datadog-agent/pkg/version v0.68.0 // indirect
4242
github.com/DataDog/datadog-go/v5 v5.6.0 // indirect
43-
github.com/DataDog/go-libddwaf/v4 v4.2.0 // indirect
44-
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20250603194815-7edb7c2ad56a // indirect
43+
github.com/DataDog/go-libddwaf/v4 v4.3.0 // indirect
44+
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20250710075948-d3ee4f430e22 // indirect
4545
github.com/DataDog/go-sqllexer v0.1.6 // indirect
4646
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
47-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.28.0 // indirect
47+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.29.1 // indirect
4848
github.com/DataDog/sketches-go v1.4.7 // indirect
49-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
49+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
5050
github.com/Microsoft/go-winio v0.6.2 // indirect
5151
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
5252
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5353
github.com/charmbracelet/colorprofile v0.3.1 // indirect
54-
github.com/charmbracelet/x/ansi v0.9.2 // indirect
54+
github.com/charmbracelet/x/ansi v0.9.3 // indirect
5555
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
5656
github.com/charmbracelet/x/term v0.2.1 // indirect
5757
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
@@ -64,7 +64,7 @@ require (
6464
github.com/go-logr/logr v1.4.3 // indirect
6565
github.com/go-logr/stdr v1.2.2 // indirect
6666
github.com/go-ole/go-ole v1.3.0 // indirect
67-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
67+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
6868
github.com/gogo/protobuf v1.3.2 // indirect
6969
github.com/golang/protobuf v1.5.4 // indirect
7070
github.com/google/go-cmp v0.7.0 // indirect
@@ -80,14 +80,14 @@ require (
8080
github.com/mattn/go-runewidth v0.0.16 // indirect
8181
github.com/minio/highwayhash v1.0.3 // indirect
8282
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
83-
github.com/modern-go/reflect2 v1.0.2 // indirect
83+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8484
github.com/muesli/termenv v0.16.0 // indirect
8585
github.com/nats-io/jwt/v2 v2.7.4 // indirect
8686
github.com/nats-io/nkeys v0.4.11 // indirect
8787
github.com/nats-io/nuid v1.0.1 // indirect
8888
github.com/otiai10/mint v1.6.3 // indirect
8989
github.com/outcaste-io/ristretto v0.2.3 // indirect
90-
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
90+
github.com/philhofer/fwd v1.2.0 // indirect
9191
github.com/pkg/errors v0.9.1 // indirect
9292
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
9393
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -103,34 +103,33 @@ require (
103103
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
104104
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
105105
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
106-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
106+
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
107107
github.com/yusufpapurcu/wmi v1.2.4 // indirect
108108
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
109-
go.opentelemetry.io/collector/component v1.33.0 // indirect
110-
go.opentelemetry.io/collector/featuregate v1.33.0 // indirect
111-
go.opentelemetry.io/collector/internal/telemetry v0.127.0 // indirect
112-
go.opentelemetry.io/collector/pdata v1.33.0 // indirect
113-
go.opentelemetry.io/collector/pdata/pprofile v0.127.0 // indirect
114-
go.opentelemetry.io/collector/semconv v0.127.0 // indirect
115-
go.opentelemetry.io/contrib/bridges/otelzap v0.11.0 // indirect
116-
go.opentelemetry.io/otel v1.36.0 // indirect
117-
go.opentelemetry.io/otel/log v0.12.2 // indirect
118-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
119-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
120-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
109+
go.opentelemetry.io/collector/component v1.36.0 // indirect
110+
go.opentelemetry.io/collector/featuregate v1.36.0 // indirect
111+
go.opentelemetry.io/collector/internal/telemetry v0.130.0 // indirect
112+
go.opentelemetry.io/collector/pdata v1.36.0 // indirect
113+
go.opentelemetry.io/collector/pdata/pprofile v0.130.0 // indirect
114+
go.opentelemetry.io/collector/semconv v0.125.0 // indirect
115+
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
116+
go.opentelemetry.io/otel v1.37.0 // indirect
117+
go.opentelemetry.io/otel/log v0.13.0 // indirect
118+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
119+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
120+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
121121
go.uber.org/atomic v1.11.0 // indirect
122122
go.uber.org/multierr v1.11.0 // indirect
123123
go.uber.org/zap v1.27.0 // indirect
124-
golang.org/x/crypto v0.38.0 // indirect
125-
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b // indirect
126-
golang.org/x/net v0.40.0 // indirect
127-
golang.org/x/text v0.25.0 // indirect
124+
golang.org/x/crypto v0.40.0 // indirect
125+
golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc // indirect
126+
golang.org/x/net v0.42.0 // indirect
127+
golang.org/x/text v0.27.0 // indirect
128128
golang.org/x/time v0.12.0 // indirect
129129
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
130-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
131-
google.golang.org/grpc v1.72.2 // indirect
130+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
131+
google.golang.org/grpc v1.73.0 // indirect
132132
google.golang.org/protobuf v1.36.6 // indirect
133133
gopkg.in/ini.v1 v1.67.0 // indirect
134134
gopkg.in/yaml.v3 v3.0.1 // indirect
135-
k8s.io/apimachinery v0.32.3 // indirect
136135
)

0 commit comments

Comments
 (0)