Skip to content

fix: spancheck default StartSpanMatchersSlice values #5324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 16, 2025
Merged

fix: spancheck default StartSpanMatchersSlice values #5324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28aea6f
fix: spancheck default StartSpanMatchersSlice values
ldez Jan 15, 2025
939c831
tests: keep default
ldez Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/golinters/spancheck/spancheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ func New(settings *config.SpancheckSettings) *goanalysis.Linter {
cfg := spancheck.NewDefaultConfig()

if settings != nil {
if settings.Checks != nil {
if len(settings.Checks) > 0 {
cfg.EnabledChecks = settings.Checks
}

if settings.IgnoreCheckSignatures != nil {
if len(settings.IgnoreCheckSignatures) > 0 {
cfg.IgnoreChecksSignaturesSlice = settings.IgnoreCheckSignatures
}

if settings.ExtraStartSpanSignatures != nil {
cfg.StartSpanMatchersSlice = settings.ExtraStartSpanSignatures
if len(settings.ExtraStartSpanSignatures) > 0 {
cfg.StartSpanMatchersSlice = append(cfg.StartSpanMatchersSlice, settings.ExtraStartSpanSignatures...)
}
}

Expand Down
0 ...s/spancheck/testdata/spancheck_default.go → ...golinters/spancheck/testdata/spancheck.go
View file
Open in desktop
File renamed without changes.
18 changes: 18 additions & 0 deletions pkg/golinters/spancheck/testdata/spancheck_keep_default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//golangcitest:args -Espancheck
//golangcitest:config_path testdata/spancheck_keep_default.yml
package spancheck

import (
"context"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/trace"
)

func StartTrace() (context.Context, trace.Span) {
return otel.Tracer("example.com/main").Start(context.Background(), "span name") // want "span is unassigned, probable memory leak"
}

func _() {
_, _ = StartTrace()
}
4 changes: 4 additions & 0 deletions pkg/golinters/spancheck/testdata/spancheck_keep_default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
linters-settings:
spancheck:
extra-start-span-signatures:
- dummy:opentelemetry
Loading