Skip to content

Commit cb421ec

Browse files
renovate[bot]otelbot[bot]songy23codeboten
authored
fix(deps): update module github.com/golangci/golangci-lint/v2 to v2.5.0 (open-telemetry#13884)
Coming soon: The Renovate bot (GitHub App) will be renamed to Mend. PRs from Renovate will soon appear from 'Mend'. Learn more [here](https://redirect.github.com/renovatebot/renovate/discussions/37842). This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/golangci/golangci-lint/v2](https://redirect.github.com/golangci/golangci-lint) | `v2.4.0` -> `v2.5.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgolangci%2fgolangci-lint%2fv2/v2.5.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgolangci%2fgolangci-lint%2fv2/v2.4.0/v2.5.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>golangci/golangci-lint (github.com/golangci/golangci-lint/v2)</summary> ### [`v2.5.0`](https://redirect.github.com/golangci/golangci-lint/blob/HEAD/CHANGELOG.md#v250) [Compare Source](https://redirect.github.com/golangci/golangci-lint/compare/v2.4.0...v2.5.0) 1. New linters - Add `godoclint` linter <https://github.com/godoc-lint/godoc-lint> - Add `unqueryvet` linter <https://github.com/MirrexOne/unqueryvet> - Add `iotamixing` linter <https://github.com/AdminBenni/iota-mixing> 2. Linters new features or changes - `embeddedstructfieldcheck`: from 0.3.0 to 0.4.0 (new option: `empty-line`) - `err113`: from [`aea10b5`](https://redirect.github.com/golangci/golangci-lint/commit/aea10b59be24) to 0.1.1 (skip internals of `Is` methods for `error` type) - `ginkgolinter`: from 0.20.0 to 0.21.0 (new option: `force-tonot`) - `gofumpt`: from 0.8.0 to 0.9.1 (new rule is to "clothe" naked returns for the sake of clarity) - `ineffassign`: from 0.1.0 to 0.2.0 (new option: `check-escaping-errors`) - `musttag`: from 0.13.1 to 0.14.0 (support interface methods) - `revive`: from 1.11.0 to 1.12.0 (new options: `identical-ifelseif-branches`, `identical-ifelseif-conditions`, `identical-switch-branches`, `identical-switch-conditions`, `package-directory-mismatch`, `unsecure-url-scheme`, `use-waitgroup-go`, `useless-fallthrough`) - `thelper`: from 0.6.3 to 0.7.1 (skip `t.Helper` in functions passed to `synctest.Test`) - `wsl`: from 5.1.1 to 5.2.0 (improvements related to subexpressions) 3. Linters bug fixes - `asciicheck`: from 0.4.1 to 0.5.0 - `errname`: from 1.1.0 to 1.1.1 - `fatcontext`: from 0.8.0 to 0.8.1 - `go-printf-func-name`: from 0.1.0 to 0.1.1 - `godot`: from 1.5.1 to 1.5.4 - `gosec`: from 2.22.7 to 2.22.8 - `nilerr`: from 0.1.1 to a temporary fork - `nilnil`: from 1.1.0 to 1.1.1 - `protogetter`: from 0.3.15 to 0.3.16 - `tagliatelle`: from 0.7.1 to 0.7.2 - `testifylint`: from 1.6.1 to 1.6.4 4. Misc. - fix: "no export data" errors are now handled as a standard typecheck error 5. Documentation - Improve nolint section about syntax </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZWJvdCJdfQ==--> --------- Signed-off-by: alex boten <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <[email protected]> Co-authored-by: Yang Song <[email protected]> Co-authored-by: Alex Boten <[email protected]>
1 parent f96a135 commit cb421ec

File tree

8 files changed

+115
-112
lines changed

8 files changed

+115
-112
lines changed

‎internal/telemetry/componentattribute/meter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func TestMPWA(t *testing.T) {
8181
i := slices.IndexFunc(rm.ScopeMetrics, func(sm metricdata.ScopeMetrics) bool {
8282
return sm.Scope.Name == meterName
8383
})
84-
assert.NotEqual(t, i, -1)
84+
assert.NotEqual(t, -1, i)
8585
assert.Equal(t, test.expAttrs, rm.ScopeMetrics[i].Scope.Attributes)
8686
metrics := rm.ScopeMetrics[i].Metrics
8787
require.Len(t, metrics, 1)

‎internal/telemetry/componentattribute/tracer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestTPWA(t *testing.T) {
9898
i := slices.IndexFunc(spans, func(s tracetest.SpanStub) bool {
9999
return s.InstrumentationScope.Name == tracerName
100100
})
101-
assert.NotEqual(t, i, -1)
101+
assert.NotEqual(t, -1, i)
102102
span := spans[i]
103103
assert.Equal(t, "testspan", span.Name)
104104
assert.Equal(t, test.expAttrs, span.InstrumentationScope.Attributes)

‎internal/tools/go.mod‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.25
55
require (
66
github.com/a8m/envsubst v1.4.3
77
github.com/client9/misspell v0.3.4
8-
github.com/golangci/golangci-lint/v2 v2.4.0
8+
github.com/golangci/golangci-lint/v2 v2.5.0
99
github.com/google/addlicense v1.2.0
1010
github.com/jcchavezs/porto v0.7.0
1111
github.com/pavius/impi v0.0.3
@@ -18,8 +18,8 @@ require (
1818
go.opentelemetry.io/build-tools/multimod v0.26.2
1919
go.opentelemetry.io/collector/internal/cmd/pdatagen v0.130.0
2020
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
21-
golang.org/x/tools v0.36.0
22-
golang.org/x/tools/gopls v0.20.0
21+
golang.org/x/tools v0.37.0
22+
golang.org/x/tools/gopls v0.0.0-20250922164505-4fb47d0de6dd
2323
golang.org/x/vuln v1.1.4
2424
gotest.tools/gotestsum v1.13.0
2525
mvdan.cc/gofumpt v0.9.1
@@ -34,14 +34,16 @@ require (
3434
dev.gaijin.team/go/golib v0.6.0 // indirect
3535
github.com/4meepo/tagalign v1.4.3 // indirect
3636
github.com/Abirdcfly/dupword v0.1.6 // indirect
37+
github.com/AdminBenni/iota-mixing v1.0.0 // indirect
3738
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
38-
github.com/Antonboom/errname v1.1.0 // indirect
39-
github.com/Antonboom/nilnil v1.1.0 // indirect
40-
github.com/Antonboom/testifylint v1.6.1 // indirect
39+
github.com/Antonboom/errname v1.1.1 // indirect
40+
github.com/Antonboom/nilnil v1.1.1 // indirect
41+
github.com/Antonboom/testifylint v1.6.4 // indirect
4142
github.com/BurntSushi/toml v1.5.0 // indirect
42-
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
43+
github.com/Djarvur/go-err113 v0.1.1 // indirect
4344
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4445
github.com/Microsoft/go-winio v0.6.2 // indirect
46+
github.com/MirrexOne/unqueryvet v1.2.1 // indirect
4547
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
4648
github.com/ProtonMail/go-crypto v1.3.0 // indirect
4749
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
@@ -60,7 +62,7 @@ require (
6062
github.com/blizzy78/varnamelen v0.8.0 // indirect
6163
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
6264
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
63-
github.com/bombsimon/wsl/v5 v5.1.1 // indirect
65+
github.com/bombsimon/wsl/v5 v5.2.0 // indirect
6466
github.com/breml/bidichk v0.3.3 // indirect
6567
github.com/breml/errchkjson v0.4.1 // indirect
6668
github.com/butuzov/ireturn v0.4.0 // indirect
@@ -91,7 +93,7 @@ require (
9193
github.com/firefart/nonamedreturns v1.0.6 // indirect
9294
github.com/fsnotify/fsnotify v1.9.0 // indirect
9395
github.com/fzipp/gocyclo v0.6.0 // indirect
94-
github.com/ghostiam/protogetter v0.3.15 // indirect
96+
github.com/ghostiam/protogetter v0.3.16 // indirect
9597
github.com/go-critic/go-critic v0.13.0 // indirect
9698
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
9799
github.com/go-git/go-billy/v5 v5.6.2 // indirect
@@ -106,13 +108,16 @@ require (
106108
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
107109
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
108110
github.com/gobwas/glob v0.2.3 // indirect
111+
github.com/godoc-lint/godoc-lint v0.10.0 // indirect
109112
github.com/gofrs/flock v0.12.1 // indirect
110113
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
114+
github.com/golangci/asciicheck v0.5.0 // indirect
111115
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
112-
github.com/golangci/go-printf-func-name v0.1.0 // indirect
116+
github.com/golangci/go-printf-func-name v0.1.1 // indirect
113117
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
114118
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
115119
github.com/golangci/misspell v0.7.0 // indirect
120+
github.com/golangci/nilerr v0.0.0-20250918000102-015671e622fe // indirect
116121
github.com/golangci/plugin-module-register v0.1.2 // indirect
117122
github.com/golangci/revgrep v0.8.0 // indirect
118123
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
@@ -121,11 +126,10 @@ require (
121126
github.com/google/go-github/v74 v74.0.0 // indirect
122127
github.com/google/go-querystring v1.1.0 // indirect
123128
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
124-
github.com/gordonklaus/ineffassign v0.1.0 // indirect
129+
github.com/gordonklaus/ineffassign v0.2.0 // indirect
125130
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
126131
github.com/gostaticanalysis/comment v1.5.0 // indirect
127132
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
128-
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
129133
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
130134
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
131135
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
@@ -143,18 +147,18 @@ require (
143147
github.com/kisielk/errcheck v1.9.0 // indirect
144148
github.com/kisielk/gotool v1.0.0 // indirect
145149
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
146-
github.com/kulti/thelper v0.6.3 // indirect
150+
github.com/kulti/thelper v0.7.1 // indirect
147151
github.com/kunwardeep/paralleltest v1.0.14 // indirect
148152
github.com/lasiar/canonicalheader v1.1.2 // indirect
149153
github.com/ldez/exptostd v0.4.4 // indirect
150154
github.com/ldez/gomoddirectives v0.7.0 // indirect
151-
github.com/ldez/grignotin v0.10.0 // indirect
152-
github.com/ldez/tagliatelle v0.7.1 // indirect
155+
github.com/ldez/grignotin v0.10.1 // indirect
156+
github.com/ldez/tagliatelle v0.7.2 // indirect
153157
github.com/ldez/usetesting v0.5.0 // indirect
154158
github.com/leonklingele/grouper v1.1.2 // indirect
155159
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
156160
github.com/macabu/inamedparam v0.2.0 // indirect
157-
github.com/manuelarte/embeddedstructfieldcheck v0.3.0 // indirect
161+
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
158162
github.com/manuelarte/funcorder v0.5.0 // indirect
159163
github.com/maratori/testableexamples v1.0.0 // indirect
160164
github.com/maratori/testpackage v1.1.1 // indirect
@@ -163,15 +167,15 @@ require (
163167
github.com/mattn/go-isatty v0.0.20 // indirect
164168
github.com/mattn/go-runewidth v0.0.16 // indirect
165169
github.com/mattn/go-shellwords v1.0.12 // indirect
166-
github.com/mgechev/revive v1.11.0 // indirect
170+
github.com/mgechev/revive v1.12.0 // indirect
167171
github.com/mitchellh/go-homedir v1.1.0 // indirect
168172
github.com/moricho/tparallel v0.3.2 // indirect
169173
github.com/muesli/termenv v0.16.0 // indirect
170174
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
171175
github.com/nakabonne/nestif v0.3.1 // indirect
172176
github.com/nishanths/exhaustive v0.12.0 // indirect
173177
github.com/nishanths/predeclared v0.2.2 // indirect
174-
github.com/nunnatsa/ginkgolinter v0.20.0 // indirect
178+
github.com/nunnatsa/ginkgolinter v0.21.0 // indirect
175179
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
176180
github.com/pjbgf/sha1cd v0.4.0 // indirect
177181
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -196,7 +200,7 @@ require (
196200
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
197201
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
198202
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
199-
github.com/securego/gosec/v2 v2.22.7 // indirect
203+
github.com/securego/gosec/v2 v2.22.8 // indirect
200204
github.com/sergi/go-diff v1.4.0 // indirect
201205
github.com/sirupsen/logrus v1.9.3 // indirect
202206
github.com/sivchari/containedctx v1.0.3 // indirect
@@ -206,16 +210,15 @@ require (
206210
github.com/sourcegraph/go-diff v0.7.0 // indirect
207211
github.com/spf13/afero v1.14.0 // indirect
208212
github.com/spf13/cast v1.9.2 // indirect
209-
github.com/spf13/cobra v1.9.1 // indirect
210-
github.com/spf13/pflag v1.0.7 // indirect
213+
github.com/spf13/cobra v1.10.1 // indirect
214+
github.com/spf13/pflag v1.0.10 // indirect
211215
github.com/spf13/viper v1.20.1 // indirect
212216
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
213217
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
214218
github.com/stretchr/objx v0.5.2 // indirect
215219
github.com/stretchr/testify v1.11.1 // indirect
216220
github.com/subosito/gotenv v1.6.0 // indirect
217-
github.com/tdakkota/asciicheck v0.4.1 // indirect
218-
github.com/tetafro/godot v1.5.1 // indirect
221+
github.com/tetafro/godot v1.5.4 // indirect
219222
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
220223
github.com/timonwong/loggercheck v0.11.0 // indirect
221224
github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect
@@ -231,24 +234,24 @@ require (
231234
github.com/yeya24/promlinter v0.3.0 // indirect
232235
github.com/ykadowak/zerologlint v0.1.5 // indirect
233236
gitlab.com/bosi/decorder v0.4.2 // indirect
234-
go-simpler.org/musttag v0.13.1 // indirect
237+
go-simpler.org/musttag v0.14.0 // indirect
235238
go-simpler.org/sloglint v0.11.1 // indirect
236239
go.augendre.info/arangolint v0.2.0 // indirect
237-
go.augendre.info/fatcontext v0.8.0 // indirect
240+
go.augendre.info/fatcontext v0.8.1 // indirect
238241
go.opentelemetry.io/build-tools v0.26.2 // indirect
239242
go.uber.org/automaxprocs v1.6.0 // indirect
240243
go.uber.org/multierr v1.11.0 // indirect
241244
go.uber.org/zap v1.27.0 // indirect
242245
go.yaml.in/yaml/v2 v2.4.2 // indirect
243-
golang.org/x/crypto v0.41.0 // indirect
244-
golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect
245-
golang.org/x/mod v0.27.0 // indirect
246-
golang.org/x/net v0.43.0 // indirect
246+
golang.org/x/crypto v0.42.0 // indirect
247+
golang.org/x/exp/typeparams v0.0.0-20250911091902-df9299821621 // indirect
248+
golang.org/x/mod v0.28.0 // indirect
249+
golang.org/x/net v0.44.0 // indirect
247250
golang.org/x/sync v0.17.0 // indirect
248251
golang.org/x/sys v0.36.0 // indirect
249-
golang.org/x/telemetry v0.0.0-20250807160809-1a19826ec488 // indirect
252+
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
250253
golang.org/x/term v0.35.0 // indirect
251-
golang.org/x/text v0.28.0 // indirect
254+
golang.org/x/text v0.29.0 // indirect
252255
google.golang.org/protobuf v1.36.8 // indirect
253256
gopkg.in/warnings.v0 v0.1.2 // indirect
254257
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)