Skip to content

Commit aca1fbe

Browse files
renovate-botyurishkuromahadzaryab1
authored
fix(deps): update module github.com/golangci/golangci-lint/v2 to v2.6.2 (#7661)
This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/golangci/golangci-lint/v2](https://redirect.github.com/golangci/golangci-lint) | `v2.5.0` -> `v2.6.2` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgolangci%2fgolangci-lint%2fv2/v2.6.2?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.5.0/v2.6.2?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.6.2`](https://redirect.github.com/golangci/golangci-lint/blob/HEAD/CHANGELOG.md#v262) [Compare Source](https://redirect.github.com/golangci/golangci-lint/compare/v2.6.1...v2.6.2) *Released on 2025-11-14* 1. Bug fixes - `fmt` command with symlinks - use file depending on build configuration to invalidate cache 2. Linters bug fixes - `testableexamples`: from 1.0.0 to 1.0.1 - `testpackage`: from 1.1.1 to 1.1.2 ### [`v2.6.1`](https://redirect.github.com/golangci/golangci-lint/compare/v2.6.0...v2.6.1) [Compare Source](https://redirect.github.com/golangci/golangci-lint/compare/v2.6.0...v2.6.1) ### [`v2.6.0`](https://redirect.github.com/golangci/golangci-lint/blob/HEAD/CHANGELOG.md#v260) [Compare Source](https://redirect.github.com/golangci/golangci-lint/compare/v2.5.0...v2.6.0) 1. New linters - Add `modernize` analyzer suite 2. Linters new features or changes - `arangolint`: from 0.2.0 to 0.3.1 - `dupword`: from 0.1.6 to 0.1.7 (new option `comments-only`) - `go-critic`: from 0.13.0 to 0.14.0 (new rules/checkers: `zeroByteRepeat`, `dupOption`) - `gofumpt`: from 0.9.1 to 0.9.2 ("clothe" naked returns is now controlled by the `extra-rules` option) - `perfsprint`: from 0.9.1 to 0.10.0 (new options: `concat-loop`, `loop-other-ops`) - `wsl`: from 5.2.0 to 5.3.0 3. Linters bug fixes - `dupword`: from 0.1.6 to 0.1.7 - `durationcheck`: from 0.0.10 to 0.0.11 - `exptostd`: from 0.4.4 to 0.4.5 - `fatcontext`: from 0.8.1 to 0.9.0 - `forbidigo`: from 2.1.0 to 2.3.0 - `ginkgolinter`: from 0.21.0 to 0.21.2 - `godoc-lint`: from 0.10.0 to 0.10.1 - `gomoddirectives`: from 0.7.0 to 0.7.1 - `gosec`: from 2.22.8 to 2.22.10 - `makezero`: from 2.0.1 to 2.1.0 - `nilerr`: from 0.1.1 to 0.1.2 - `paralleltest`: from 1.0.14 to 1.0.15 - `protogetter`: from 0.3.16 to 0.3.17 - `unparam`: from [`0df0534`](https://redirect.github.com/golangci/golangci-lint/commit/0df0534333a4) to [`5beb8c8`](https://redirect.github.com/golangci/golangci-lint/commit/5beb8c8f8f15) 4. Misc. - fix: ignore some files to hash the version for custom build </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on the first day of the month" (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/jaegertracing/jaeger). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4xNi4xIiwidXBkYXRlZEluVmVyIjoiNDIuMTYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiY2hhbmdlbG9nOmRlcGVuZGVuY2llcyJdfQ==--> --------- Signed-off-by: Mend Renovate <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Signed-off-by: Mahad Zaryab <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> Co-authored-by: Mahad Zaryab <[email protected]>
1 parent 94d7282 commit aca1fbe

File tree

7 files changed

+126
-119
lines changed

7 files changed

+126
-119
lines changed

‎cmd/query/app/flags_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestQueryBuilderFlags(t *testing.T) {
4242
assert.Equal(t, "/jaeger", qOpts.BasePath)
4343
assert.Equal(t, "127.0.0.1:8080", qOpts.HTTP.Endpoint)
4444
assert.Equal(t, "127.0.0.1:8081", qOpts.GRPC.NetAddr.Endpoint)
45-
assert.Equal(t, configopaque.MapList{
45+
assert.ElementsMatch(t, configopaque.MapList{
4646
{Name: "Access-Control-Allow-Origin", Value: "blerg"},
4747
{Name: "Whatever", Value: "thing"},
4848
}, qOpts.HTTP.ResponseHeaders)

‎internal/sampling/samplingstrategy/adaptive/post_aggregator.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ func (p *PostAggregator) calculateWeightedQPS(allQPS []float64) float64 {
293293
weights := p.weightVectorCache.GetWeights(len(allQPS))
294294
var qps float64
295295
for i := 0; i < len(allQPS); i++ {
296+
// #nosec G602 GetWeights always returns a slice of the same length as allQPS
296297
qps += allQPS[i] * weights[i]
297298
}
298299
return qps

‎internal/storage/elasticsearch/client/index_client.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,11 @@ func (i *IndicesClient) IndexExists(index string) (bool, error) {
223223
}
224224

225225
func (*IndicesClient) aliasesString(aliases []Alias) string {
226-
concatAliases := ""
226+
var builder strings.Builder
227227
for _, alias := range aliases {
228-
concatAliases += fmt.Sprintf("[index: %s, alias: %s],", alias.Index, alias.Name)
228+
builder.WriteString(fmt.Sprintf("[index: %s, alias: %s],", alias.Index, alias.Name))
229229
}
230+
concatAliases := builder.String()
230231
return strings.Trim(concatAliases, ",")
231232
}
232233

‎internal/storage/integration/es_index_cleaner_test.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,23 +221,25 @@ func createEsIndices(client *elastic.Client, indices []string) error {
221221
}
222222

223223
func runEsCleaner(days int, envs []string) error {
224-
var dockerEnv string
224+
var dockerEnv strings.Builder
225225
for _, e := range envs {
226-
dockerEnv += " -e " + e
226+
dockerEnv.WriteString(" -e ")
227+
dockerEnv.WriteString(e)
227228
}
228-
args := fmt.Sprintf("docker run %s --rm --net=host %s %d http://%s", dockerEnv, indexCleanerImage, days, queryHostPort)
229+
args := fmt.Sprintf("docker run %s --rm --net=host %s %d http://%s", dockerEnv.String(), indexCleanerImage, days, queryHostPort)
229230
cmd := exec.Command("/bin/sh", "-c", args)
230231
out, err := cmd.CombinedOutput()
231232
fmt.Println(string(out))
232233
return err
233234
}
234235

235236
func runEsRollover(action string, envs []string, adaptiveSampling bool) error {
236-
var dockerEnv string
237+
var dockerEnv strings.Builder
237238
for _, e := range envs {
238-
dockerEnv += " -e " + e
239+
dockerEnv.WriteString(" -e ")
240+
dockerEnv.WriteString(e)
239241
}
240-
args := fmt.Sprintf("docker run %s --rm --net=host %s %s --adaptive-sampling=%t http://%s", dockerEnv, rolloverImage, action, adaptiveSampling, queryHostPort)
242+
args := fmt.Sprintf("docker run %s --rm --net=host %s %s --adaptive-sampling=%t http://%s", dockerEnv.String(), rolloverImage, action, adaptiveSampling, queryHostPort)
241243
cmd := exec.Command("/bin/sh", "-c", args)
242244
out, err := cmd.CombinedOutput()
243245
fmt.Println(string(out))

‎internal/storage/v1/badger/spanstore/reader.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,7 @@ func mergeJoinIds(left, right [][]byte) [][]byte {
438438
l++
439439
default:
440440
// Left matches right (case 0) - merge
441+
// #nosec G602 loop condition ensures l < len(left)
441442
merged = append(merged, left[l])
442443
// Advance both
443444
l++

‎internal/tools/go.mod‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/jaegertracing/jaeger/internal/tools
33
go 1.25.0
44

55
require (
6-
github.com/golangci/golangci-lint/v2 v2.5.0
6+
github.com/golangci/golangci-lint/v2 v2.6.2
77
github.com/josephspurrier/goversioninfo v1.5.0
88
github.com/vektra/mockery/v3 v3.5.0
9-
mvdan.cc/gofumpt v0.9.1
9+
mvdan.cc/gofumpt v0.9.2
1010
)
1111

1212
require (
@@ -16,15 +16,15 @@ require (
1616
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
1717
dev.gaijin.team/go/golib v0.6.0 // indirect
1818
github.com/4meepo/tagalign v1.4.3 // indirect
19-
github.com/Abirdcfly/dupword v0.1.6 // indirect
19+
github.com/Abirdcfly/dupword v0.1.7 // indirect
2020
github.com/AdminBenni/iota-mixing v1.0.0 // indirect
2121
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
2222
github.com/Antonboom/errname v1.1.1 // indirect
2323
github.com/Antonboom/nilnil v1.1.1 // indirect
2424
github.com/Antonboom/testifylint v1.6.4 // indirect
2525
github.com/BurntSushi/toml v1.5.0 // indirect
2626
github.com/Djarvur/go-err113 v0.1.1 // indirect
27-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
27+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2828
github.com/MirrexOne/unqueryvet v1.2.1 // indirect
2929
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
3030
github.com/akavel/rsrc v0.10.2 // indirect
@@ -35,23 +35,23 @@ require (
3535
github.com/alfatraining/structtag v1.0.0 // indirect
3636
github.com/alingse/asasalint v0.0.11 // indirect
3737
github.com/alingse/nilnesserr v0.2.0 // indirect
38-
github.com/ashanbrown/forbidigo/v2 v2.1.0 // indirect
39-
github.com/ashanbrown/makezero/v2 v2.0.1 // indirect
38+
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
39+
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
4040
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
4141
github.com/beorn7/perks v1.0.1 // indirect
4242
github.com/bkielbasa/cyclop v1.2.3 // indirect
4343
github.com/blizzy78/varnamelen v0.8.0 // indirect
4444
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
45-
github.com/bombsimon/wsl/v5 v5.2.0 // indirect
45+
github.com/bombsimon/wsl/v5 v5.3.0 // indirect
4646
github.com/breml/bidichk v0.3.3 // indirect
4747
github.com/breml/errchkjson v0.4.1 // indirect
4848
github.com/brunoga/deep v1.2.4 // indirect
4949
github.com/butuzov/ireturn v0.4.0 // indirect
5050
github.com/butuzov/mirror v1.3.0 // indirect
51-
github.com/catenacyber/perfsprint v0.9.1 // indirect
51+
github.com/catenacyber/perfsprint v0.10.0 // indirect
5252
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
5353
github.com/cespare/xxhash/v2 v2.3.0 // indirect
54-
github.com/charithe/durationcheck v0.0.10 // indirect
54+
github.com/charithe/durationcheck v0.0.11 // indirect
5555
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
5656
github.com/charmbracelet/lipgloss v1.1.0 // indirect
5757
github.com/charmbracelet/x/ansi v0.8.0 // indirect
@@ -71,8 +71,8 @@ require (
7171
github.com/firefart/nonamedreturns v1.0.6 // indirect
7272
github.com/fsnotify/fsnotify v1.8.0 // indirect
7373
github.com/fzipp/gocyclo v0.6.0 // indirect
74-
github.com/ghostiam/protogetter v0.3.16 // indirect
75-
github.com/go-critic/go-critic v0.13.0 // indirect
74+
github.com/ghostiam/protogetter v0.3.17 // indirect
75+
github.com/go-critic/go-critic v0.14.2 // indirect
7676
github.com/go-toolsmith/astcast v1.1.0 // indirect
7777
github.com/go-toolsmith/astcopy v1.1.0 // indirect
7878
github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -83,16 +83,15 @@ require (
8383
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
8484
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
8585
github.com/gobwas/glob v0.2.3 // indirect
86-
github.com/godoc-lint/godoc-lint v0.10.0 // indirect
87-
github.com/gofrs/flock v0.12.1 // indirect
86+
github.com/godoc-lint/godoc-lint v0.10.1 // indirect
87+
github.com/gofrs/flock v0.13.0 // indirect
8888
github.com/golang/protobuf v1.5.3 // indirect
8989
github.com/golangci/asciicheck v0.5.0 // indirect
9090
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
9191
github.com/golangci/go-printf-func-name v0.1.1 // indirect
9292
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
9393
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
9494
github.com/golangci/misspell v0.7.0 // indirect
95-
github.com/golangci/nilerr v0.0.0-20250918000102-015671e622fe // indirect
9695
github.com/golangci/plugin-module-register v0.1.2 // indirect
9796
github.com/golangci/revgrep v0.8.0 // indirect
9897
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
@@ -102,6 +101,7 @@ require (
102101
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
103102
github.com/gostaticanalysis/comment v1.5.0 // indirect
104103
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
104+
github.com/gostaticanalysis/nilerr v0.1.2 // indirect
105105
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
106106
github.com/hashicorp/go-version v1.7.0 // indirect
107107
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
@@ -113,7 +113,7 @@ require (
113113
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
114114
github.com/jjti/go-spancheck v0.6.5 // indirect
115115
github.com/julz/importas v0.2.0 // indirect
116-
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
116+
github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
117117
github.com/kisielk/errcheck v1.9.0 // indirect
118118
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
119119
github.com/knadh/koanf/maps v0.1.2 // indirect
@@ -124,10 +124,10 @@ require (
124124
github.com/knadh/koanf/providers/structs v0.1.0 // indirect
125125
github.com/knadh/koanf/v2 v2.2.1 // indirect
126126
github.com/kulti/thelper v0.7.1 // indirect
127-
github.com/kunwardeep/paralleltest v1.0.14 // indirect
127+
github.com/kunwardeep/paralleltest v1.0.15 // indirect
128128
github.com/lasiar/canonicalheader v1.1.2 // indirect
129-
github.com/ldez/exptostd v0.4.4 // indirect
130-
github.com/ldez/gomoddirectives v0.7.0 // indirect
129+
github.com/ldez/exptostd v0.4.5 // indirect
130+
github.com/ldez/gomoddirectives v0.7.1 // indirect
131131
github.com/ldez/grignotin v0.10.1 // indirect
132132
github.com/ldez/tagliatelle v0.7.2 // indirect
133133
github.com/ldez/usetesting v0.5.0 // indirect
@@ -136,8 +136,8 @@ require (
136136
github.com/macabu/inamedparam v0.2.0 // indirect
137137
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
138138
github.com/manuelarte/funcorder v0.5.0 // indirect
139-
github.com/maratori/testableexamples v1.0.0 // indirect
140-
github.com/maratori/testpackage v1.1.1 // indirect
139+
github.com/maratori/testableexamples v1.0.1 // indirect
140+
github.com/maratori/testpackage v1.1.2 // indirect
141141
github.com/matoous/godox v1.1.0 // indirect
142142
github.com/mattn/go-colorable v0.1.14 // indirect
143143
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -152,16 +152,16 @@ require (
152152
github.com/nakabonne/nestif v0.3.1 // indirect
153153
github.com/nishanths/exhaustive v0.12.0 // indirect
154154
github.com/nishanths/predeclared v0.2.2 // indirect
155-
github.com/nunnatsa/ginkgolinter v0.21.0 // indirect
155+
github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
156156
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
157157
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
158158
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
159159
github.com/prometheus/client_golang v1.12.1 // indirect
160160
github.com/prometheus/client_model v0.2.0 // indirect
161161
github.com/prometheus/common v0.32.1 // indirect
162162
github.com/prometheus/procfs v0.7.3 // indirect
163-
github.com/quasilyte/go-ruleguard v0.4.4 // indirect
164-
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
163+
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
164+
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
165165
github.com/quasilyte/gogrep v0.5.0 // indirect
166166
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
167167
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
@@ -176,7 +176,7 @@ require (
176176
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
177177
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
178178
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
179-
github.com/securego/gosec/v2 v2.22.8 // indirect
179+
github.com/securego/gosec/v2 v2.22.10 // indirect
180180
github.com/sirupsen/logrus v1.9.3 // indirect
181181
github.com/sivchari/containedctx v1.0.3 // indirect
182182
github.com/sonatard/noctx v0.4.0 // indirect
@@ -212,21 +212,21 @@ require (
212212
gitlab.com/bosi/decorder v0.4.2 // indirect
213213
go-simpler.org/musttag v0.14.0 // indirect
214214
go-simpler.org/sloglint v0.11.1 // indirect
215-
go.augendre.info/arangolint v0.2.0 // indirect
216-
go.augendre.info/fatcontext v0.8.1 // indirect
215+
go.augendre.info/arangolint v0.3.1 // indirect
216+
go.augendre.info/fatcontext v0.9.0 // indirect
217217
go.uber.org/automaxprocs v1.6.0 // indirect
218218
go.uber.org/multierr v1.11.0 // indirect
219219
go.uber.org/zap v1.27.0 // indirect
220220
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
221-
golang.org/x/exp/typeparams v0.0.0-20250911091902-df9299821621 // indirect
222-
golang.org/x/mod v0.28.0 // indirect
223-
golang.org/x/sync v0.17.0 // indirect
224-
golang.org/x/sys v0.36.0 // indirect
221+
golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
222+
golang.org/x/mod v0.29.0 // indirect
223+
golang.org/x/sync v0.18.0 // indirect
224+
golang.org/x/sys v0.37.0 // indirect
225225
golang.org/x/term v0.29.0 // indirect
226-
golang.org/x/text v0.29.0 // indirect
227-
golang.org/x/tools v0.37.0 // indirect
228-
google.golang.org/protobuf v1.36.6 // indirect
226+
golang.org/x/text v0.30.0 // indirect
227+
golang.org/x/tools v0.38.0 // indirect
228+
google.golang.org/protobuf v1.36.8 // indirect
229229
gopkg.in/yaml.v3 v3.0.1 // indirect
230230
honnef.co/go/tools v0.6.1 // indirect
231-
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
231+
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
232232
)

0 commit comments

Comments
 (0)