Skip to content

Commit 5a7c7e6

Browse files
authored
fix: spancheck default StartSpanMatchersSlice values (#5324)
1 parent d45036a commit 5a7c7e6

File tree

4 files changed

+26
-4
lines changed

4 files changed

+26
-4
lines changed

Diff for: pkg/golinters/spancheck/spancheck.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ func New(settings *config.SpancheckSettings) *goanalysis.Linter {
1212
cfg := spancheck.NewDefaultConfig()
1313

1414
if settings != nil {
15-
if settings.Checks != nil {
15+
if len(settings.Checks) > 0 {
1616
cfg.EnabledChecks = settings.Checks
1717
}
1818

19-
if settings.IgnoreCheckSignatures != nil {
19+
if len(settings.IgnoreCheckSignatures) > 0 {
2020
cfg.IgnoreChecksSignaturesSlice = settings.IgnoreCheckSignatures
2121
}
2222

23-
if settings.ExtraStartSpanSignatures != nil {
24-
cfg.StartSpanMatchersSlice = settings.ExtraStartSpanSignatures
23+
if len(settings.ExtraStartSpanSignatures) > 0 {
24+
cfg.StartSpanMatchersSlice = append(cfg.StartSpanMatchersSlice, settings.ExtraStartSpanSignatures...)
2525
}
2626
}
2727

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//golangcitest:args -Espancheck
2+
//golangcitest:config_path testdata/spancheck_keep_default.yml
3+
package spancheck
4+
5+
import (
6+
"context"
7+
8+
"go.opentelemetry.io/otel"
9+
"go.opentelemetry.io/otel/trace"
10+
)
11+
12+
func StartTrace() (context.Context, trace.Span) {
13+
return otel.Tracer("example.com/main").Start(context.Background(), "span name") // want "span is unassigned, probable memory leak"
14+
}
15+
16+
func _() {
17+
_, _ = StartTrace()
18+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
linters-settings:
2+
spancheck:
3+
extra-start-span-signatures:
4+
- dummy:opentelemetry

0 commit comments

Comments
 (0)