build(deps): bump github.com/jjti/go-spancheck from 0.5.3 to 0.6.0 (#4670)

dependabot[bot] · ldez · web-flow · commit 1611bca2ff25 · 2024-04-22T20:47:55.000+02:00
Co-authored-by: Fernandez Ludovic &lt;ldez@users.noreply.github.com&gt;
diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml
@@ -2051,7 +2051,13 @@ linters-settings:
     # Default: []
     ignore-check-signatures:
       - "telemetry.RecordError"
-
+    # A list of regexes for additional function signatures that create spans.
+    # This is useful if you have a utility method to create spans.
+    # Each entry should be of the form `<regex>:<telemetry-type>`, where `telemetry-type` can be `opentelemetry` or `opencensus`.
+    # https://github.com/jjti/go-spancheck#extra-start-span-signatures
+    # Default: []
+    extra-start-span-signatures:
+      - "github.com/user/repo/telemetry/trace.Start:opentelemetry"
   staticcheck:
     # Deprecated: use the global `run.go` instead.
     go: "1.15"
diff --git a/go.mod b/go.mod
@@ -57,7 +57,7 @@ require (
 	github.com/jgautheron/goconst v1.7.1
 	github.com/jingyugao/rowserrcheck v1.1.1
 	github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af
-	github.com/jjti/go-spancheck v0.5.3
+	github.com/jjti/go-spancheck v0.6.0
 	github.com/julz/importas v0.1.0
 	github.com/karamaru-alpha/copyloopvar v1.1.0
 	github.com/kisielk/errcheck v1.7.0
diff --git a/go.sum b/go.sum
diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
@@ -2337,6 +2337,13 @@
               "items": {
                 "type": "string"
               }
+            },
+            "extra-start-span-signatures": {
+              "description": "A list of regexes for additional function signatures that create spans.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             }
           }
         },
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -823,8 +823,9 @@ type SlogLintSettings struct {
 }
 
 type SpancheckSettings struct {
-	Checks                []string `mapstructure:"checks"`
-	IgnoreCheckSignatures []string `mapstructure:"ignore-check-signatures"`
+	Checks                   []string `mapstructure:"checks"`
+	IgnoreCheckSignatures    []string `mapstructure:"ignore-check-signatures"`
+	ExtraStartSpanSignatures []string `mapstructure:"extra-start-span-signatures"`
 }
 
 type StaticCheckSettings struct {
diff --git a/pkg/golinters/spancheck/spancheck.go b/pkg/golinters/spancheck/spancheck.go
@@ -19,6 +19,10 @@ func New(settings *config.SpancheckSettings) *goanalysis.Linter {
 		if settings.IgnoreCheckSignatures != nil {
 			cfg.IgnoreChecksSignaturesSlice = settings.IgnoreCheckSignatures
 		}
+
+		if settings.ExtraStartSpanSignatures != nil {
+			cfg.StartSpanMatchersSlice = settings.ExtraStartSpanSignatures
+		}
 	}
 
 	a := spancheck.NewAnalyzerWithConfig(cfg)

-Original file line number
+Diff line change
 	github.com/jgautheron/goconst v1.7.1
 	github.com/jingyugao/rowserrcheck v1.1.1
 	github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af
 -	github.com/jjti/go-spancheck v0.5.3
 +	github.com/jjti/go-spancheck v0.6.0
 	github.com/julz/importas v0.1.0
 	github.com/karamaru-alpha/copyloopvar v1.1.0
 	github.com/kisielk/errcheck v1.7.0
Original file line number	Diff line number	Diff line change
`@@ -2337,6 +2337,13 @@`
`2337`	`2337`	`"items": {`
`2338`	`2338`	`"type": "string"`
`2339`	`2339`	`}`
	`2340`	`+ },`
	`2341`	`+ "extra-start-span-signatures": {`
	`2342`	`+ "description": "A list of regexes for additional function signatures that create spans.",`
	`2343`	`+ "type": "array",`
	`2344`	`+ "items": {`
	`2345`	`+ "type": "string"`
	`2346`	`+ }`
`2340`	`2347`	`}`
`2341`	`2348`	`}`
`2342`	`2349`	`},`
Original file line number	Diff line number	Diff line change
`@@ -823,8 +823,9 @@ type SlogLintSettings struct {`
`823`	`823`	`}`
`824`	`824`
`825`	`825`	`type SpancheckSettings struct {`
`826`		- Checks []string `mapstructure:"checks"`
`827`		- IgnoreCheckSignatures []string `mapstructure:"ignore-check-signatures"`
	`826`	+ Checks []string `mapstructure:"checks"`
	`827`	+ IgnoreCheckSignatures []string `mapstructure:"ignore-check-signatures"`
	`828`	+ ExtraStartSpanSignatures []string `mapstructure:"extra-start-span-signatures"`
`828`	`829`	`}`
`829`	`830`
`830`	`831`	`type StaticCheckSettings struct {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ func New(settings config.SpancheckSettings) goanalysis.Linter {`
`19`	`19`	`if settings.IgnoreCheckSignatures != nil {`
`20`	`20`	`cfg.IgnoreChecksSignaturesSlice = settings.IgnoreCheckSignatures`
`21`	`21`	`}`
	`22`	`+`
	`23`	`+ if settings.ExtraStartSpanSignatures != nil {`
	`24`	`+ cfg.StartSpanMatchersSlice = settings.ExtraStartSpanSignatures`
	`25`	`+ }`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`a := spancheck.NewAnalyzerWithConfig(cfg)`