Add unparam linter (#5531)

This adds the [unparam](https://github.com/mvdan/unparam) linter. Co-authored-by: Sam Xie <[email protected]> Co-authored-by: Tyler Yahn <[email protected]>
open-telemetry · Jun 21, 2024 · f6a5aa2 · f6a5aa2
1 parent 3e91436
commit f6a5aa2
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 29 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,6 +25,7 @@ linters:
  - typecheck
  - unconvert
  - unused
+ - unparam
 
 issues:
  # Maximum issues count per one linter.

diff --git a/exporters/stdout/stdouttrace/config.go b/exporters/stdout/stdouttrace/config.go
@@ -29,7 +29,7 @@ type config struct {
 }
 
 // newConfig creates a validated Config configured with options.
-func newConfig(options ...Option) (config, error) {
+func newConfig(options ...Option) config {
  cfg := config{
  Writer: defaultWriter,
  PrettyPrint: defaultPrettyPrint,
@@ -38,7 +38,7 @@ func newConfig(options ...Option) (config, error) {
  for _, opt := range options {
  cfg = opt.apply(cfg)
  }
- return cfg, nil
+ return cfg
 }
 
 // Option sets the value of an option for a Config.

diff --git a/exporters/stdout/stdouttrace/trace.go b/exporters/stdout/stdouttrace/trace.go
@@ -19,10 +19,7 @@ var _ trace.SpanExporter = &Exporter{}
 
 // New creates an Exporter with the passed options.
 func New(options ...Option) (*Exporter, error) {
- cfg, err := newConfig(options...)
- if err != nil {
- return nil, err
- }
+ cfg := newConfig(options...)
 
  enc := json.NewEncoder(cfg.Writer)
  if cfg.PrettyPrint {

diff --git a/log/keyvalue_test.go b/log/keyvalue_test.go
@@ -131,9 +131,9 @@ func TestEmptyGroupsPreserved(t *testing.T) {
 }
 
 func TestBool(t *testing.T) {
- const key, val = "key", true
+ const key, val = "boolKey", true
  kv := log.Bool(key, val)
- testKV(t, key, val, kv)
+ testKV(t, key, kv)
 
  v, k := kv.Value, log.KindBool
  t.Run("AsBool", func(t *testing.T) {
@@ -148,9 +148,9 @@ func TestBool(t *testing.T) {
 }
 
 func TestFloat64(t *testing.T) {
- const key, val = "key", 3.0
+ const key, val = "float64Key", 3.0
  kv := log.Float64(key, val)
- testKV(t, key, val, kv)
+ testKV(t, key, kv)
 
  v, k := kv.Value, log.KindFloat64
  t.Run("AsBool", testErrKind(v.AsBool, "AsBool", k))
@@ -165,9 +165,9 @@ func TestFloat64(t *testing.T) {
 }
 
 func TestInt(t *testing.T) {
- const key, val = "key", 1
+ const key, val = "intKey", 1
  kv := log.Int(key, val)
- testKV[int64](t, key, val, kv)
+ testKV(t, key, kv)
 
  v, k := kv.Value, log.KindInt64
  t.Run("AsBool", testErrKind(v.AsBool, "AsBool", k))
@@ -182,9 +182,9 @@ func TestInt(t *testing.T) {
 }
 
 func TestInt64(t *testing.T) {
- const key, val = "key", 1
+ const key, val = "int64Key", 1
  kv := log.Int64(key, val)
- testKV[int64](t, key, val, kv)
+ testKV(t, key, kv)
 
  v, k := kv.Value, log.KindInt64
  t.Run("AsBool", testErrKind(v.AsBool, "AsBool", k))
@@ -199,9 +199,9 @@ func TestInt64(t *testing.T) {
 }
 
 func TestString(t *testing.T) {
- const key, val = "key", "test string value"
+ const key, val = "stringKey", "test string value"
  kv := log.String(key, val)
- testKV(t, key, val, kv)
+ testKV(t, key, kv)
 
  v, k := kv.Value, log.KindString
  t.Run("AsBool", testErrKind(v.AsBool, "AsBool", k))
@@ -216,10 +216,10 @@ func TestString(t *testing.T) {
 }
 
 func TestBytes(t *testing.T) {
- const key = "key"
+ const key = "bytesKey"
  val := []byte{3, 2, 1}
  kv := log.Bytes(key, val)
- testKV(t, key, val, kv)
+ testKV(t, key, kv)
 
  v, k := kv.Value, log.KindBytes
  t.Run("AsBool", testErrKind(v.AsBool, "AsBool", k))
@@ -234,10 +234,10 @@ func TestBytes(t *testing.T) {
 }
 
 func TestSlice(t *testing.T) {
- const key = "key"
+ const key = "sliceKey"
  val := []log.Value{log.IntValue(3), log.StringValue("foo")}
  kv := log.Slice(key, val...)
- testKV(t, key, val, kv)
+ testKV(t, key, kv)
 
  v, k := kv.Value, log.KindSlice
  t.Run("AsBool", testErrKind(v.AsBool, "AsBool", k))
@@ -252,13 +252,13 @@ func TestSlice(t *testing.T) {
 }
 
 func TestMap(t *testing.T) {
- const key = "key"
+ const key = "mapKey"
  val := []log.KeyValue{
  log.Slice("l", log.IntValue(3), log.StringValue("foo")),
  log.Bytes("b", []byte{3, 5, 7}),
  }
  kv := log.Map(key, val...)
- testKV(t, key, val, kv)
+ testKV(t, key, kv)
 
  v, k := kv.Value, log.KindMap
  t.Run("AsBool", testErrKind(v.AsBool, "AsBool", k))
@@ -339,7 +339,7 @@ func testErrKind[T any](f func() T, msg string, k log.Kind) func(*testing.T) {
  }
 }
 
-func testKV[T any](t *testing.T, key string, val T, kv log.KeyValue) {
+func testKV(t *testing.T, key string, kv log.KeyValue) {
  t.Helper()
 
  assert.Equal(t, key, kv.Key, "incorrect key")

diff --git a/sdk/internal/x/x_test.go b/sdk/internal/x/x_test.go
@@ -31,7 +31,7 @@ func run(steps ...func(*testing.T)) func(*testing.T) {
  }
 }
 
-func setenv(k, v string) func(t *testing.T) {
+func setenv(k, v string) func(t *testing.T) { //nolint:unparam
  return func(t *testing.T) { t.Setenv(k, v) }
 }
 

diff --git a/sdk/trace/batch_span_processor.go b/sdk/trace/batch_span_processor.go
@@ -381,7 +381,7 @@ func (bsp *batchSpanProcessor) enqueueBlockOnQueueFull(ctx context.Context, sd R
  }
 }
 
-func (bsp *batchSpanProcessor) enqueueDrop(ctx context.Context, sd ReadOnlySpan) bool {
+func (bsp *batchSpanProcessor) enqueueDrop(_ context.Context, sd ReadOnlySpan) bool {
  if !sd.SpanContext().IsSampled() {
  return false
  }

diff --git a/sdk/trace/batch_span_processor_test.go b/sdk/trace/batch_span_processor_test.go
@@ -340,7 +340,7 @@ func createAndRegisterBatchSP(option testOption, te *testBatchExporter) sdktrace
  return sdktrace.NewBatchSpanProcessor(te, options...)
 }
 
-func generateSpan(t *testing.T, tr trace.Tracer, option testOption) {
+func generateSpan(_ *testing.T, tr trace.Tracer, option testOption) {
  sc := getSpanContext()
 
  for i := 0; i < option.genNumSpans; i++ {
@@ -353,7 +353,7 @@ func generateSpan(t *testing.T, tr trace.Tracer, option testOption) {
  }
 }
 
-func generateSpanParallel(t *testing.T, tr trace.Tracer, option testOption) {
+func generateSpanParallel(_ *testing.T, tr trace.Tracer, option testOption) {
  sc := getSpanContext()
 
  wg := &sync.WaitGroup{}

diff --git a/sdk/trace/benchmark_test.go b/sdk/trace/benchmark_test.go
@@ -321,7 +321,7 @@ func traceBenchmark(b *testing.B, name string, fn func(*testing.B, trace.Tracer)
  })
 }
 
-func tracer(b *testing.B, name string, sampler sdktrace.Sampler) trace.Tracer {
+func tracer(_ *testing.B, name string, sampler sdktrace.Sampler) trace.Tracer {
  tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sampler))
  return tp.Tracer(name)
 }
diff --git a/sdk/trace/util_test.go b/sdk/trace/util_test.go
@@ -9,7 +9,7 @@ import (
  sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
-func basicTracerProvider(t *testing.T) *sdktrace.TracerProvider {
+func basicTracerProvider(_ *testing.T) *sdktrace.TracerProvider {
  tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample()))
  return tp
 }