review: clean

pkg/golinters/spancheck.go

@@ -10,14 +10,19 @@ import (
 
 func NewSpancheck(settings *config.SpancheckSettings) *goanalysis.Linter {
  cfg := spancheck.NewDefaultConfig()
- if settings != nil && settings.Checks != nil {
- cfg.EnabledChecks = settings.Checks
- }
- if settings != nil && settings.IgnoreCheckSignatures != nil {
- cfg.IgnoreChecksSignaturesSlice = settings.IgnoreCheckSignatures
+
+ if settings != nil {
+ if settings.Checks != nil {
+ cfg.EnabledChecks = settings.Checks
+ }
+
+ if settings.IgnoreCheckSignatures != nil {
+ cfg.IgnoreChecksSignaturesSlice = settings.IgnoreCheckSignatures
+ }
  }
 
  a := spancheck.NewAnalyzerWithConfig(cfg)
+
  return goanalysis.
  NewLinter(a.Name, a.Doc, []*analysis.Analyzer{a}, nil).
  WithLoadMode(goanalysis.LoadModeTypesInfo)

test/testdata/spancheck/spancheck_default.go

@@ -1,4 +1,3 @@
-//golangcitest:config_path configs/default.yml
 //golangcitest:args -Espancheck
 package spancheck
 
@@ -9,12 +8,11 @@ import (
 
  "go.opentelemetry.io/otel"
  "go.opentelemetry.io/otel/codes"
- "go.opentelemetry.io/otel/trace"
 )
 
-type testError struct{}
+type testDefaultError struct{}
 
-func (e *testError) Error() string {
+func (e *testDefaultError) Error() string {
  return "foo"
 }
 
@@ -90,5 +88,3 @@ func _() {
  _, span = otel.Tracer("foo").Start(context.Background(), "bar")
  defer span.End()
 }
-
-func recordErr(span trace.Span, err error) {}

test/testdata/spancheck/spancheck_enable_all.go

@@ -199,8 +199,8 @@ func _() error {
  defer span.End()
 
  err := errors.New("foo")
- recordErr(span, err)
+ recordError(span, err)
  return err
 }
 
-func recordErr(span trace.Span, err error) {}
+func recordError(span trace.Span, err error) {}