Skip to content

Commit 5640b05

Browse files
authored
Add support for Go 1.23 (#6017)
Go 1.23 was released a few days ago. https://go.dev/blog/go1.23 This also upgrades golangci-lint, since it appears 1.59 doesn't work nicely with Go 1.23. otel-go counterpart: open-telemetry/opentelemetry-go#5720
1 parent c602878 commit 5640b05

File tree

5 files changed

+67
-59
lines changed

5 files changed

+67
-59
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
# backwards compatibility with the previous two minor releases and we
1515
# explicitly test our code for these versions so keeping this at prior
1616
# versions does not add value.
17-
DEFAULT_GO_VERSION: "~1.22.5"
17+
DEFAULT_GO_VERSION: "~1.23.0"
1818
jobs:
1919
lint:
2020
runs-on: ubuntu-latest
@@ -101,7 +101,7 @@ jobs:
101101
compatibility-test:
102102
strategy:
103103
matrix:
104-
go-version: ["~1.22.4", "~1.21.12"]
104+
go-version: ["1.23.0", "~1.22.4", "~1.21.12"]
105105
platform:
106106
- os: ubuntu-latest
107107
arch: "386"

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
88

99
## [Unreleased]
1010

11+
This release is the last to support [Go 1.21].
12+
The next release will require at least [Go 1.22].
13+
1114
### Added
1215

1316
- Support for stdoutlog exporter in `go.opentelemetry.io/contrib/config`. (#5850)
@@ -20,6 +23,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
2023
- The `go.opentelemetry.io/contrib/bridges/otelzerolog` module.
2124
This module provides an OpenTelemetry logging bridge for `github.com/rs/zerolog`. (#5405)
2225
- Add `WithGinFilter` filter parameter in `go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin` to allow filtering requests with `*gin.Context`. (#5743)
26+
- Support [Go 1.23]. (#6017)
2327

2428
### Removed
2529

@@ -1149,6 +1153,7 @@ First official tagged release of `contrib` repository.
11491153

11501154
<!-- Released section ended -->
11511155

1156+
[Go 1.23]: https://go.dev/doc/go1.23
11521157
[Go 1.22]: https://go.dev/doc/go1.22
11531158
[Go 1.21]: https://go.dev/doc/go1.21
11541159
[Go 1.20]: https://go.dev/doc/go1.20

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,22 @@ This project is tested on the following systems.
5050

5151
| OS | Go Version | Architecture |
5252
| -------- | ---------- | ------------ |
53+
| Ubuntu | 1.23 | amd64 |
5354
| Ubuntu | 1.22 | amd64 |
5455
| Ubuntu | 1.21 | amd64 |
56+
| Ubuntu | 1.23 | 386 |
5557
| Ubuntu | 1.22 | 386 |
5658
| Ubuntu | 1.21 | 386 |
59+
| macOS 13 | 1.23 | amd64 |
5760
| macOS 13 | 1.22 | amd64 |
5861
| macOS 13 | 1.21 | amd64 |
62+
| macOS | 1.23 | arm64 |
5963
| macOS | 1.22 | arm64 |
6064
| macOS | 1.21 | arm64 |
65+
| Windows | 1.23 | amd64 |
6166
| Windows | 1.22 | amd64 |
6267
| Windows | 1.21 | amd64 |
68+
| Windows | 1.23 | 386 |
6369
| Windows | 1.22 | 386 |
6470
| Windows | 1.21 | 386 |
6571

tools/go.mod

+20-19
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
module go.opentelemetry.io/contrib/tools
22

3-
go 1.22
3+
go 1.22.1
4+
5+
toolchain go1.23.0
46

57
exclude github.com/blizzy78/varnamelen v0.6.1
68

79
require (
810
github.com/atombender/go-jsonschema v0.16.0
911
github.com/client9/misspell v0.3.4
10-
github.com/golangci/golangci-lint v1.59.1
12+
github.com/golangci/golangci-lint v1.60.1
1113
github.com/jcchavezs/porto v0.6.0
1214
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
1315
go.opentelemetry.io/build-tools/crosslink v0.14.0
@@ -26,11 +28,11 @@ require (
2628
github.com/Abirdcfly/dupword v0.0.14 // indirect
2729
github.com/Antonboom/errname v0.1.13 // indirect
2830
github.com/Antonboom/nilnil v0.1.9 // indirect
29-
github.com/Antonboom/testifylint v1.3.1 // indirect
30-
github.com/BurntSushi/toml v1.4.0 // indirect
31-
github.com/Crocmagnon/fatcontext v0.2.2 // indirect
31+
github.com/Antonboom/testifylint v1.4.3 // indirect
32+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
33+
github.com/Crocmagnon/fatcontext v0.4.0 // indirect
3234
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
33-
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
35+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
3436
github.com/Masterminds/semver/v3 v3.2.1 // indirect
3537
github.com/Microsoft/go-winio v0.6.1 // indirect
3638
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
@@ -44,7 +46,7 @@ require (
4446
github.com/beorn7/perks v1.0.1 // indirect
4547
github.com/bkielbasa/cyclop v1.2.1 // indirect
4648
github.com/blizzy78/varnamelen v0.8.0 // indirect
47-
github.com/bombsimon/wsl/v4 v4.2.1 // indirect
49+
github.com/bombsimon/wsl/v4 v4.4.1 // indirect
4850
github.com/breml/bidichk v0.2.7 // indirect
4951
github.com/breml/errchkjson v0.3.6 // indirect
5052
github.com/butuzov/ireturn v0.3.0 // indirect
@@ -84,7 +86,7 @@ require (
8486
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
8587
github.com/gobwas/glob v0.2.3 // indirect
8688
github.com/goccy/go-yaml v1.11.3 // indirect
87-
github.com/gofrs/flock v0.8.1 // indirect
89+
github.com/gofrs/flock v0.12.1 // indirect
8890
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8991
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
9092
github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
@@ -107,7 +109,7 @@ require (
107109
github.com/jgautheron/goconst v1.7.1 // indirect
108110
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
109111
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
110-
github.com/jjti/go-spancheck v0.6.1 // indirect
112+
github.com/jjti/go-spancheck v0.6.2 // indirect
111113
github.com/julz/importas v0.1.0 // indirect
112114
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
113115
github.com/kevinburke/ssh_config v1.2.0 // indirect
@@ -129,11 +131,11 @@ require (
129131
github.com/mattn/go-colorable v0.1.13 // indirect
130132
github.com/mattn/go-isatty v0.0.20 // indirect
131133
github.com/mattn/go-runewidth v0.0.9 // indirect
132-
github.com/mgechev/revive v1.3.7 // indirect
134+
github.com/mgechev/revive v1.3.9 // indirect
133135
github.com/mitchellh/go-homedir v1.1.0 // indirect
134136
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
135137
github.com/mitchellh/mapstructure v1.5.0 // indirect
136-
github.com/moricho/tparallel v0.3.1 // indirect
138+
github.com/moricho/tparallel v0.3.2 // indirect
137139
github.com/nakabonne/nestif v0.3.1 // indirect
138140
github.com/nishanths/exhaustive v0.12.0 // indirect
139141
github.com/nishanths/predeclared v0.2.2 // indirect
@@ -143,7 +145,7 @@ require (
143145
github.com/pjbgf/sha1cd v0.3.0 // indirect
144146
github.com/pkg/errors v0.9.1 // indirect
145147
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
146-
github.com/polyfloyd/go-errorlint v1.5.2 // indirect
148+
github.com/polyfloyd/go-errorlint v1.6.0 // indirect
147149
github.com/prometheus/client_golang v1.19.0 // indirect
148150
github.com/prometheus/client_model v0.6.1 // indirect
149151
github.com/prometheus/common v0.48.0 // indirect
@@ -153,21 +155,21 @@ require (
153155
github.com/quasilyte/gogrep v0.5.0 // indirect
154156
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
155157
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
156-
github.com/ryancurrah/gomodguard v1.3.2 // indirect
158+
github.com/ryancurrah/gomodguard v1.3.3 // indirect
157159
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
158160
github.com/sagikazarmark/locafero v0.4.0 // indirect
159161
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
160162
github.com/sanity-io/litter v1.5.5 // indirect
161163
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
162164
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
163165
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
164-
github.com/sashamelentyev/usestdlibvars v1.26.0 // indirect
166+
github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
165167
github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect
166168
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
167169
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
168170
github.com/sirupsen/logrus v1.9.3 // indirect
169171
github.com/sivchari/containedctx v1.0.3 // indirect
170-
github.com/sivchari/tenv v1.7.1 // indirect
172+
github.com/sivchari/tenv v1.10.0 // indirect
171173
github.com/skeema/knownhosts v1.2.2 // indirect
172174
github.com/sonatard/noctx v0.0.2 // indirect
173175
github.com/sourcegraph/conc v0.3.0 // indirect
@@ -182,7 +184,6 @@ require (
182184
github.com/stretchr/objx v0.5.2 // indirect
183185
github.com/stretchr/testify v1.9.0 // indirect
184186
github.com/subosito/gotenv v1.6.0 // indirect
185-
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
186187
github.com/tdakkota/asciicheck v0.2.0 // indirect
187188
github.com/tetafro/godot v1.4.16 // indirect
188189
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
@@ -191,15 +192,15 @@ require (
191192
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
192193
github.com/ultraware/funlen v0.1.0 // indirect
193194
github.com/ultraware/whitespace v0.1.1 // indirect
194-
github.com/uudashr/gocognit v1.1.2 // indirect
195+
github.com/uudashr/gocognit v1.1.3 // indirect
195196
github.com/xanzy/ssh-agent v0.3.3 // indirect
196197
github.com/xen0n/gosmopolitan v1.2.2 // indirect
197198
github.com/yagipy/maintidx v1.0.0 // indirect
198199
github.com/yeya24/promlinter v0.3.0 // indirect
199200
github.com/ykadowak/zerologlint v0.1.5 // indirect
200201
gitlab.com/bosi/decorder v0.4.2 // indirect
201202
go-simpler.org/musttag v0.12.2 // indirect
202-
go-simpler.org/sloglint v0.7.1 // indirect
203+
go-simpler.org/sloglint v0.7.2 // indirect
203204
go.opentelemetry.io/build-tools v0.14.0 // indirect
204205
go.uber.org/automaxprocs v1.5.3 // indirect
205206
go.uber.org/multierr v1.11.0 // indirect
@@ -218,7 +219,7 @@ require (
218219
gopkg.in/warnings.v0 v0.1.2 // indirect
219220
gopkg.in/yaml.v2 v2.4.0 // indirect
220221
gopkg.in/yaml.v3 v3.0.1 // indirect
221-
honnef.co/go/tools v0.4.7 // indirect
222+
honnef.co/go/tools v0.5.0 // indirect
222223
mvdan.cc/gofumpt v0.6.0 // indirect
223224
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
224225
)

0 commit comments

Comments
 (0)