From 1bae8f73472d4db652fe5e3df0fc98725e8aa8e9 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 3 Aug 2025 17:24:33 +0200 Subject: [PATCH] chore: enable extra-rules from gofumpt (#7114) #### Description Enable extra rules from [gofumpt](https://golangci-lint.run/usage/formatters/#gofumpt) that also fixes paramTypeCombine from go-critic Also defines `go.opentelemetry.io/otel` as in https://github.com/open-telemetry/opentelemetry-go-contrib/pull/7637 Signed-off-by: Matthieu MOREL Co-authored-by: Tyler Yahn --- .golangci.yml | 5 +++-- .../opencensus/internal/oc2otel/span_context_test.go | 4 +--- .../opencensus/internal/otel2oc/span_context_test.go | 10 +++------- bridge/opencensus/trace_test.go | 1 - bridge/opentracing/bridge.go | 8 ++++---- bridge/opentracing/bridge_test.go | 6 +++--- exporters/otlp/otlplog/otlploggrpc/client.go | 4 ++-- exporters/otlp/otlplog/otlploggrpc/client_test.go | 8 ++++---- exporters/otlp/otlplog/otlploggrpc/exporter.go | 3 ++- exporters/otlp/otlplog/otlploggrpc/exporter_test.go | 4 ++-- exporters/otlp/otlplog/otlploghttp/client.go | 5 ++--- exporters/otlp/otlplog/otlploghttp/client_test.go | 5 ++--- exporters/otlp/otlplog/otlploghttp/exporter_test.go | 2 +- exporters/otlp/otlpmetric/otlpmetricgrpc/client.go | 4 ++-- exporters/otlp/otlpmetric/otlpmetricgrpc/exporter.go | 3 ++- exporters/otlp/otlpmetric/otlpmetrichttp/client.go | 4 ++-- .../otlp/otlpmetric/otlpmetrichttp/client_test.go | 2 +- exporters/otlp/otlpmetric/otlpmetrichttp/exporter.go | 3 ++- exporters/otlp/otlptrace/exporter_test.go | 2 +- .../otlptrace/internal/tracetransform/attribute.go | 3 ++- .../internal/tracetransform/attribute_test.go | 2 +- .../internal/tracetransform/instrumentation.go | 3 ++- .../internal/tracetransform/instrumentation_test.go | 2 +- .../otlp/otlptrace/internal/tracetransform/resource.go | 3 ++- .../otlp/otlptrace/internal/tracetransform/span.go | 3 ++- .../otlptrace/internal/tracetransform/span_test.go | 2 +- exporters/otlp/otlptrace/otlptracegrpc/client.go | 4 ++-- exporters/otlp/otlptrace/otlptracegrpc/client_test.go | 4 ++-- .../otlptrace/otlptracegrpc/mock_collector_test.go | 4 ++-- exporters/otlp/otlptrace/otlptracehttp/client.go | 4 ++-- exporters/otlp/otlptrace/otlptracehttp/client_test.go | 2 +- .../otlptrace/otlptracehttp/mock_collector_test.go | 4 ++-- exporters/stdout/stdoutlog/exporter_test.go | 9 ++++----- internal/global/internal_logging_test.go | 4 +--- internal/global/trace.go | 1 + internal/global/trace_test.go | 2 +- internal/tools/semconvkit/main.go | 1 + internal/tools/verifyreadmes/main.go | 2 -- propagation/propagation.go | 4 ++-- propagation/propagators_test.go | 2 +- sdk/log/bench_test.go | 4 ++-- sdk/log/ring_test.go | 2 +- sdk/metric/meter.go | 1 - sdk/trace/util_test.go | 9 ++++----- semconv/internal/http.go | 2 +- semconv/internal/http_test.go | 3 +-- trace/internal/telemetry/id.go | 2 +- trace/internal/telemetry/test/conversion_test.go | 1 - trace/trace_test.go | 2 +- 49 files changed, 83 insertions(+), 91 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 5a2196d59..2a48f4543 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -94,7 +94,6 @@ linters: - dupArg - hugeParam - importShadow - - paramTypeCombine - ptrToRefParam - preferDecodeRune - rangeValCopy @@ -249,9 +248,11 @@ formatters: - goimports - golines settings: + gofumpt: + extra-rules: true goimports: local-prefixes: - - go.opentelemetry.io + - go.opentelemetry.io/otel golines: max-len: 120 exclusions: diff --git a/bridge/opencensus/internal/oc2otel/span_context_test.go b/bridge/opencensus/internal/oc2otel/span_context_test.go index 2f04c0569..e5e6df754 100644 --- a/bridge/opencensus/internal/oc2otel/span_context_test.go +++ b/bridge/opencensus/internal/oc2otel/span_context_test.go @@ -8,12 +8,10 @@ import ( "github.com/stretchr/testify/assert" "go.opencensus.io/plugin/ochttp/propagation/tracecontext" - - "go.opentelemetry.io/otel/bridge/opencensus/internal/otel2oc" - octrace "go.opencensus.io/trace" "go.opencensus.io/trace/tracestate" + "go.opentelemetry.io/otel/bridge/opencensus/internal/otel2oc" "go.opentelemetry.io/otel/trace" ) diff --git a/bridge/opencensus/internal/otel2oc/span_context_test.go b/bridge/opencensus/internal/otel2oc/span_context_test.go index 51e6945c9..c3c7cf964 100644 --- a/bridge/opencensus/internal/otel2oc/span_context_test.go +++ b/bridge/opencensus/internal/otel2oc/span_context_test.go @@ -6,16 +6,12 @@ package otel2oc import ( "testing" - "go.opencensus.io/plugin/ochttp/propagation/tracecontext" - - "go.opentelemetry.io/otel/bridge/opencensus/internal/oc2otel" - "github.com/stretchr/testify/assert" - + "go.opencensus.io/plugin/ochttp/propagation/tracecontext" + octrace "go.opencensus.io/trace" "go.opencensus.io/trace/tracestate" - octrace "go.opencensus.io/trace" - + "go.opentelemetry.io/otel/bridge/opencensus/internal/oc2otel" "go.opentelemetry.io/otel/trace" ) diff --git a/bridge/opencensus/trace_test.go b/bridge/opencensus/trace_test.go index b8fe722a3..ddadc1ca5 100644 --- a/bridge/opencensus/trace_test.go +++ b/bridge/opencensus/trace_test.go @@ -10,7 +10,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - octrace "go.opencensus.io/trace" "go.opentelemetry.io/otel/sdk/trace" diff --git a/bridge/opentracing/bridge.go b/bridge/opentracing/bridge.go index d4e6a6cd8..08cb49852 100644 --- a/bridge/opentracing/bridge.go +++ b/bridge/opentracing/bridge.go @@ -647,7 +647,7 @@ func (s fakeSpan) SpanContext() trace.SpanContext { // interface. // // Currently only the HTTPHeaders and TextMap formats are supported. -func (t *BridgeTracer) Inject(sm ot.SpanContext, format any, carrier any) error { +func (t *BridgeTracer) Inject(sm ot.SpanContext, format, carrier any) error { bridgeSC, ok := sm.(*bridgeSpanContext) if !ok { return ot.ErrInvalidSpanContext @@ -696,7 +696,7 @@ func (t *BridgeTracer) Inject(sm ot.SpanContext, format any, carrier any) error // interface. // // Currently only the HTTPHeaders and TextMap formats are supported. -func (t *BridgeTracer) Extract(format any, carrier any) (ot.SpanContext, error) { +func (t *BridgeTracer) Extract(format, carrier any) (ot.SpanContext, error) { builtinFormat, ok := format.(ot.BuiltinFormat) if !ok { return nil, ot.ErrUnsupportedFormat @@ -763,7 +763,7 @@ func (t *textMapWrapper) Get(key string) string { return t.readerMap[key] } -func (t *textMapWrapper) Set(key string, value string) { +func (t *textMapWrapper) Set(key, value string) { t.TextMapWriter.Set(key, value) } @@ -832,7 +832,7 @@ func newTextMapWrapperForInject(carrier any) (*textMapWrapper, error) { type textMapWriter struct{} -func (t *textMapWriter) Set(key string, value string) { +func (t *textMapWriter) Set(key, value string) { // maybe print a warning log. } diff --git a/bridge/opentracing/bridge_test.go b/bridge/opentracing/bridge_test.go index e85469194..204644017 100644 --- a/bridge/opentracing/bridge_test.go +++ b/bridge/opentracing/bridge_test.go @@ -30,7 +30,7 @@ func newTestOnlyTextMapReader() *testOnlyTextMapReader { return &testOnlyTextMapReader{} } -func (t *testOnlyTextMapReader) ForeachKey(handler func(key string, val string) error) error { +func (t *testOnlyTextMapReader) ForeachKey(handler func(key, val string) error) error { _ = handler("key1", "val1") _ = handler("key2", "val2") @@ -198,7 +198,7 @@ func (t *textMapCarrier) Get(key string) string { return t.m[key] } -func (t *textMapCarrier) Set(key string, value string) { +func (t *textMapCarrier) Set(key, value string) { t.m[key] = value } @@ -221,7 +221,7 @@ func newTestTextMapReader(m *map[string]string) *testTextMapReader { return &testTextMapReader{m: m} } -func (t *testTextMapReader) ForeachKey(handler func(key string, val string) error) error { +func (t *testTextMapReader) ForeachKey(handler func(key, val string) error) error { for key, val := range *t.m { if err := handler(key, val); err != nil { return err diff --git a/exporters/otlp/otlplog/otlploggrpc/client.go b/exporters/otlp/otlplog/otlploggrpc/client.go index b2987f755..05e2afe8f 100644 --- a/exporters/otlp/otlplog/otlploggrpc/client.go +++ b/exporters/otlp/otlplog/otlploggrpc/client.go @@ -9,6 +9,8 @@ import ( "fmt" "time" + collogpb "go.opentelemetry.io/proto/otlp/collector/logs/v1" + logpb "go.opentelemetry.io/proto/otlp/logs/v1" "google.golang.org/genproto/googleapis/rpc/errdetails" "google.golang.org/grpc" "google.golang.org/grpc/backoff" @@ -21,8 +23,6 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc/internal/retry" - collogpb "go.opentelemetry.io/proto/otlp/collector/logs/v1" - logpb "go.opentelemetry.io/proto/otlp/logs/v1" ) // The methods of this type are not expected to be called concurrently. diff --git a/exporters/otlp/otlplog/otlploggrpc/client_test.go b/exporters/otlp/otlplog/otlploggrpc/client_test.go index 2b5cec5d8..fa47a0f6d 100644 --- a/exporters/otlp/otlplog/otlploggrpc/client_test.go +++ b/exporters/otlp/otlplog/otlploggrpc/client_test.go @@ -14,6 +14,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + collogpb "go.opentelemetry.io/proto/otlp/collector/logs/v1" + cpb "go.opentelemetry.io/proto/otlp/common/v1" + lpb "go.opentelemetry.io/proto/otlp/logs/v1" + rpb "go.opentelemetry.io/proto/otlp/resource/v1" "google.golang.org/genproto/googleapis/rpc/errdetails" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -27,10 +31,6 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/sdk/log" semconv "go.opentelemetry.io/otel/semconv/v1.34.0" - collogpb "go.opentelemetry.io/proto/otlp/collector/logs/v1" - cpb "go.opentelemetry.io/proto/otlp/common/v1" - lpb "go.opentelemetry.io/proto/otlp/logs/v1" - rpb "go.opentelemetry.io/proto/otlp/resource/v1" ) var ( diff --git a/exporters/otlp/otlplog/otlploggrpc/exporter.go b/exporters/otlp/otlplog/otlploggrpc/exporter.go index 66895c3a1..4ced020a0 100644 --- a/exporters/otlp/otlplog/otlploggrpc/exporter.go +++ b/exporters/otlp/otlplog/otlploggrpc/exporter.go @@ -8,9 +8,10 @@ import ( "sync" "sync/atomic" + logpb "go.opentelemetry.io/proto/otlp/logs/v1" + "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc/internal/transform" "go.opentelemetry.io/otel/sdk/log" - logpb "go.opentelemetry.io/proto/otlp/logs/v1" ) type logClient interface { diff --git a/exporters/otlp/otlplog/otlploggrpc/exporter_test.go b/exporters/otlp/otlplog/otlploggrpc/exporter_test.go index 26f88bd29..04414781e 100644 --- a/exporters/otlp/otlplog/otlploggrpc/exporter_test.go +++ b/exporters/otlp/otlplog/otlploggrpc/exporter_test.go @@ -14,12 +14,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + collogpb "go.opentelemetry.io/proto/otlp/collector/logs/v1" + logpb "go.opentelemetry.io/proto/otlp/logs/v1" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/log" sdklog "go.opentelemetry.io/otel/sdk/log" - collogpb "go.opentelemetry.io/proto/otlp/collector/logs/v1" - logpb "go.opentelemetry.io/proto/otlp/logs/v1" ) var records []sdklog.Record diff --git a/exporters/otlp/otlplog/otlploghttp/client.go b/exporters/otlp/otlplog/otlploghttp/client.go index c2611967e..59be105db 100644 --- a/exporters/otlp/otlplog/otlploghttp/client.go +++ b/exporters/otlp/otlplog/otlploghttp/client.go @@ -18,12 +18,11 @@ import ( "sync" "time" + collogpb "go.opentelemetry.io/proto/otlp/collector/logs/v1" + logpb "go.opentelemetry.io/proto/otlp/logs/v1" "google.golang.org/protobuf/proto" "go.opentelemetry.io/otel" - collogpb "go.opentelemetry.io/proto/otlp/collector/logs/v1" - logpb "go.opentelemetry.io/proto/otlp/logs/v1" - "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp/internal/retry" ) diff --git a/exporters/otlp/otlplog/otlploghttp/client_test.go b/exporters/otlp/otlplog/otlploghttp/client_test.go index a7cc316e3..55f91b728 100644 --- a/exporters/otlp/otlplog/otlploghttp/client_test.go +++ b/exporters/otlp/otlplog/otlploghttp/client_test.go @@ -29,14 +29,13 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "google.golang.org/protobuf/proto" - - "go.opentelemetry.io/otel" collogpb "go.opentelemetry.io/proto/otlp/collector/logs/v1" cpb "go.opentelemetry.io/proto/otlp/common/v1" lpb "go.opentelemetry.io/proto/otlp/logs/v1" rpb "go.opentelemetry.io/proto/otlp/resource/v1" + "google.golang.org/protobuf/proto" + "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/sdk/log" semconv "go.opentelemetry.io/otel/semconv/v1.34.0" ) diff --git a/exporters/otlp/otlplog/otlploghttp/exporter_test.go b/exporters/otlp/otlplog/otlploghttp/exporter_test.go index d1dba4753..79fea41d6 100644 --- a/exporters/otlp/otlplog/otlploghttp/exporter_test.go +++ b/exporters/otlp/otlplog/otlploghttp/exporter_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + logpb "go.opentelemetry.io/proto/otlp/logs/v1" "go.opentelemetry.io/otel/sdk/log" - logpb "go.opentelemetry.io/proto/otlp/logs/v1" ) func TestExporterExportErrors(t *testing.T) { diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/client.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/client.go index 82a4c2c2a..492480f8c 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/client.go +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/client.go @@ -8,6 +8,8 @@ import ( "errors" "time" + colmetricpb "go.opentelemetry.io/proto/otlp/collector/metrics/v1" + metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" "google.golang.org/genproto/googleapis/rpc/errdetails" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -18,8 +20,6 @@ import ( "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/retry" - colmetricpb "go.opentelemetry.io/proto/otlp/collector/metrics/v1" - metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) type client struct { diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/exporter.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/exporter.go index 6447867ed..91fc20808 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/exporter.go +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/exporter.go @@ -9,12 +9,13 @@ import ( "fmt" "sync" + metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/transform" "go.opentelemetry.io/otel/internal/global" "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" - metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) // Exporter is a OpenTelemetry metric Exporter using gRPC. diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/client.go b/exporters/otlp/otlpmetric/otlpmetrichttp/client.go index dca587832..26af47e62 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/client.go +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/client.go @@ -18,14 +18,14 @@ import ( "sync" "time" + colmetricpb "go.opentelemetry.io/proto/otlp/collector/metrics/v1" + metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" "google.golang.org/protobuf/proto" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp/internal" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp/internal/retry" - colmetricpb "go.opentelemetry.io/proto/otlp/collector/metrics/v1" - metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) type client struct { diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/client_test.go b/exporters/otlp/otlpmetric/otlpmetrichttp/client_test.go index ef5c6774a..d8384067a 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/client_test.go +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/client_test.go @@ -16,12 +16,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + mpb "go.opentelemetry.io/proto/otlp/metrics/v1" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp/internal/otest" "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" - mpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) type clientShim struct { diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/exporter.go b/exporters/otlp/otlpmetric/otlpmetrichttp/exporter.go index 197814698..994da4264 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/exporter.go +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/exporter.go @@ -9,12 +9,13 @@ import ( "fmt" "sync" + metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp/internal/transform" "go.opentelemetry.io/otel/internal/global" "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" - metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) // Exporter is a OpenTelemetry metric Exporter using protobufs over HTTP. diff --git a/exporters/otlp/otlptrace/exporter_test.go b/exporters/otlp/otlptrace/exporter_test.go index 5bb4ec413..036a7b510 100644 --- a/exporters/otlp/otlptrace/exporter_test.go +++ b/exporters/otlp/otlptrace/exporter_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/stretchr/testify/assert" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" "go.opentelemetry.io/otel/exporters/otlp/otlptrace" "go.opentelemetry.io/otel/sdk/trace/tracetest" - tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) type client struct { diff --git a/exporters/otlp/otlptrace/internal/tracetransform/attribute.go b/exporters/otlp/otlptrace/internal/tracetransform/attribute.go index ca4544f0d..d9bfd6e17 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/attribute.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/attribute.go @@ -6,9 +6,10 @@ package tracetransform // import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform" import ( + commonpb "go.opentelemetry.io/proto/otlp/common/v1" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/resource" - commonpb "go.opentelemetry.io/proto/otlp/common/v1" ) // KeyValues transforms a slice of attribute KeyValues into OTLP key-values. diff --git a/exporters/otlp/otlptrace/internal/tracetransform/attribute_test.go b/exporters/otlp/otlptrace/internal/tracetransform/attribute_test.go index d67e3f0ec..03f26868e 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/attribute_test.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/attribute_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" + commonpb "go.opentelemetry.io/proto/otlp/common/v1" "go.opentelemetry.io/otel/attribute" - commonpb "go.opentelemetry.io/proto/otlp/common/v1" ) type attributeTest struct { diff --git a/exporters/otlp/otlptrace/internal/tracetransform/instrumentation.go b/exporters/otlp/otlptrace/internal/tracetransform/instrumentation.go index 2e7690e43..43359c894 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/instrumentation.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/instrumentation.go @@ -4,8 +4,9 @@ package tracetransform // import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform" import ( - "go.opentelemetry.io/otel/sdk/instrumentation" commonpb "go.opentelemetry.io/proto/otlp/common/v1" + + "go.opentelemetry.io/otel/sdk/instrumentation" ) func InstrumentationScope(il instrumentation.Scope) *commonpb.InstrumentationScope { diff --git a/exporters/otlp/otlptrace/internal/tracetransform/instrumentation_test.go b/exporters/otlp/otlptrace/internal/tracetransform/instrumentation_test.go index 3e5f03b3b..e08abcaf9 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/instrumentation_test.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/instrumentation_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/assert" + commonpb "go.opentelemetry.io/proto/otlp/common/v1" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/instrumentation" - commonpb "go.opentelemetry.io/proto/otlp/common/v1" ) func TestInstrumentationScope(t *testing.T) { diff --git a/exporters/otlp/otlptrace/internal/tracetransform/resource.go b/exporters/otlp/otlptrace/internal/tracetransform/resource.go index db7b698a5..526bb5e07 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/resource.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/resource.go @@ -4,8 +4,9 @@ package tracetransform // import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform" import ( - "go.opentelemetry.io/otel/sdk/resource" resourcepb "go.opentelemetry.io/proto/otlp/resource/v1" + + "go.opentelemetry.io/otel/sdk/resource" ) // Resource transforms a Resource into an OTLP Resource. diff --git a/exporters/otlp/otlptrace/internal/tracetransform/span.go b/exporters/otlp/otlptrace/internal/tracetransform/span.go index c1d090ecc..379bc8170 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/span.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/span.go @@ -6,12 +6,13 @@ package tracetransform // import "go.opentelemetry.io/otel/exporters/otlp/otlptr import ( "math" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/sdk/instrumentation" tracesdk "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/trace" - tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) // Spans transforms a slice of OpenTelemetry spans into a slice of OTLP diff --git a/exporters/otlp/otlptrace/internal/tracetransform/span_test.go b/exporters/otlp/otlptrace/internal/tracetransform/span_test.go index 563e60815..87781c9f4 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/span_test.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/span_test.go @@ -10,6 +10,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" "google.golang.org/protobuf/proto" "go.opentelemetry.io/otel/attribute" @@ -20,7 +21,6 @@ import ( "go.opentelemetry.io/otel/sdk/trace/tracetest" semconv "go.opentelemetry.io/otel/semconv/v1.34.0" "go.opentelemetry.io/otel/trace" - tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) func TestSpanKind(t *testing.T) { diff --git a/exporters/otlp/otlptrace/otlptracegrpc/client.go b/exporters/otlp/otlptrace/otlptracegrpc/client.go index 0ebae07c2..4b4cc76f4 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/client.go +++ b/exporters/otlp/otlptrace/otlptracegrpc/client.go @@ -9,6 +9,8 @@ import ( "sync" "time" + coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" "google.golang.org/genproto/googleapis/rpc/errdetails" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -20,8 +22,6 @@ import ( "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/retry" - coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" - tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) type client struct { diff --git a/exporters/otlp/otlptrace/otlptracegrpc/client_test.go b/exporters/otlp/otlptrace/otlptracegrpc/client_test.go index 1268f725e..1aed9c31d 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/client_test.go +++ b/exporters/otlp/otlptrace/otlptracegrpc/client_test.go @@ -14,6 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" + commonpb "go.opentelemetry.io/proto/otlp/common/v1" "go.uber.org/goleak" "google.golang.org/grpc" "google.golang.org/grpc/backoff" @@ -29,8 +31,6 @@ import ( "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlptracetest" sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" - coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" - commonpb "go.opentelemetry.io/proto/otlp/common/v1" ) func TestMain(m *testing.M) { diff --git a/exporters/otlp/otlptrace/otlptracegrpc/mock_collector_test.go b/exporters/otlp/otlptrace/otlptracegrpc/mock_collector_test.go index 2dda93044..d22f27211 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/mock_collector_test.go +++ b/exporters/otlp/otlptrace/otlptracegrpc/mock_collector_test.go @@ -11,12 +11,12 @@ import ( "testing" "github.com/stretchr/testify/require" + collectortracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" "google.golang.org/grpc" "google.golang.org/grpc/metadata" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlptracetest" - collectortracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" - tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) func makeMockCollector(t *testing.T, mockConfig *mockConfig) *mockCollector { diff --git a/exporters/otlp/otlptrace/otlptracehttp/client.go b/exporters/otlp/otlptrace/otlptracehttp/client.go index 2de0f9dfb..6f277c22f 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/client.go +++ b/exporters/otlp/otlptrace/otlptracehttp/client.go @@ -18,6 +18,8 @@ import ( "sync" "time" + coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" "google.golang.org/protobuf/proto" "go.opentelemetry.io/otel" @@ -25,8 +27,6 @@ import ( "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/retry" - coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" - tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) const contentTypeProto = "application/x-protobuf" diff --git a/exporters/otlp/otlptrace/otlptracehttp/client_test.go b/exporters/otlp/otlptrace/otlptracehttp/client_test.go index 7f7ad55f6..8b33b4791 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/client_test.go +++ b/exporters/otlp/otlptrace/otlptracehttp/client_test.go @@ -15,12 +15,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlptrace" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/otlptracetest" - coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" ) const ( diff --git a/exporters/otlp/otlptrace/otlptracehttp/mock_collector_test.go b/exporters/otlp/otlptrace/otlptracehttp/mock_collector_test.go index bf1140e5d..30454c167 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/mock_collector_test.go +++ b/exporters/otlp/otlptrace/otlptracehttp/mock_collector_test.go @@ -18,12 +18,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + collectortracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" "google.golang.org/protobuf/proto" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/otlptracetest" - collectortracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" - tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) type mockCollector struct { diff --git a/exporters/stdout/stdoutlog/exporter_test.go b/exporters/stdout/stdoutlog/exporter_test.go index 2cec18334..d8f0c09fc 100644 --- a/exporters/stdout/stdoutlog/exporter_test.go +++ b/exporters/stdout/stdoutlog/exporter_test.go @@ -11,16 +11,15 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/sdk/instrumentation" - "go.opentelemetry.io/otel/sdk/log/logtest" - "go.opentelemetry.io/otel/sdk/resource" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/log" + "go.opentelemetry.io/otel/sdk/instrumentation" sdklog "go.opentelemetry.io/otel/sdk/log" + "go.opentelemetry.io/otel/sdk/log/logtest" + "go.opentelemetry.io/otel/sdk/resource" "go.opentelemetry.io/otel/trace" ) diff --git a/internal/global/internal_logging_test.go b/internal/global/internal_logging_test.go index b6af22ac9..c09695bbc 100644 --- a/internal/global/internal_logging_test.go +++ b/internal/global/internal_logging_test.go @@ -12,11 +12,9 @@ import ( "testing" "github.com/go-logr/logr" - - "github.com/stretchr/testify/assert" - "github.com/go-logr/logr/funcr" "github.com/go-logr/stdr" + "github.com/stretchr/testify/assert" ) func TestLoggerConcurrentSafe(t *testing.T) { diff --git a/internal/global/trace.go b/internal/global/trace.go index 49e4ac4fa..bf5cf3119 100644 --- a/internal/global/trace.go +++ b/internal/global/trace.go @@ -26,6 +26,7 @@ import ( "sync/atomic" "go.opentelemetry.io/auto/sdk" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" diff --git a/internal/global/trace_test.go b/internal/global/trace_test.go index d513d32c2..d16a8946d 100644 --- a/internal/global/trace_test.go +++ b/internal/global/trace_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/auto/sdk" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace/embedded" diff --git a/internal/tools/semconvkit/main.go b/internal/tools/semconvkit/main.go index e79c72382..8fa362476 100644 --- a/internal/tools/semconvkit/main.go +++ b/internal/tools/semconvkit/main.go @@ -20,6 +20,7 @@ import ( "text/template" "github.com/Masterminds/semver" + "go.opentelemetry.io/otel/internal/tools/semconvkit/decls" ) diff --git a/internal/tools/verifyreadmes/main.go b/internal/tools/verifyreadmes/main.go index ff0d4f4bc..2f4b3c342 100644 --- a/internal/tools/verifyreadmes/main.go +++ b/internal/tools/verifyreadmes/main.go @@ -31,7 +31,6 @@ func verifyReadme(path string, info os.FileInfo, err error) error { if !info.Mode().IsRegular() || info.Name() != "go.mod" { return nil - } for _, dir := range excludedDirs { @@ -40,7 +39,6 @@ func verifyReadme(path string, info os.FileInfo, err error) error { } } - // Check that a README.md exists in the same directory as the go.mod file. readme := filepath.Join(filepath.Dir(path), readmeFilename) _, err = os.Stat(readme) diff --git a/propagation/propagation.go b/propagation/propagation.go index 5c8c26ea2..0a32c59aa 100644 --- a/propagation/propagation.go +++ b/propagation/propagation.go @@ -20,7 +20,7 @@ type TextMapCarrier interface { // must never be done outside of a new major release. // Set stores the key-value pair. - Set(key string, value string) + Set(key, value string) // DO NOT CHANGE: any modification will not be backwards compatible and // must never be done outside of a new major release. @@ -88,7 +88,7 @@ func (hc HeaderCarrier) Values(key string) []string { } // Set stores the key-value pair. -func (hc HeaderCarrier) Set(key string, value string) { +func (hc HeaderCarrier) Set(key, value string) { http.Header(hc).Set(key, value) } diff --git a/propagation/propagators_test.go b/propagation/propagators_test.go index 15deba326..ee9b7d6fa 100644 --- a/propagation/propagators_test.go +++ b/propagation/propagators_test.go @@ -76,7 +76,7 @@ func (nilCarrier) Get(key string) string { return "" } -func (nilCarrier) Set(key string, value string) {} +func (nilCarrier) Set(key, value string) {} func TestMultiplePropagators(t *testing.T) { ootaProp := outOfThinAirPropagator{t: t} diff --git a/sdk/log/bench_test.go b/sdk/log/bench_test.go index 74689d7f3..fb25c871d 100644 --- a/sdk/log/bench_test.go +++ b/sdk/log/bench_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/log" - "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/otel/log" ) type mockDelayExporter struct{} diff --git a/sdk/log/ring_test.go b/sdk/log/ring_test.go index 5a95aee56..ba55b5770 100644 --- a/sdk/log/ring_test.go +++ b/sdk/log/ring_test.go @@ -15,7 +15,7 @@ import ( "go.opentelemetry.io/otel/log" ) -func verifyRing(t *testing.T, r *ring, num int, sum int) { +func verifyRing(t *testing.T, r *ring, num, sum int) { // Length. assert.Equal(t, num, r.Len(), "r.Len()") diff --git a/sdk/metric/meter.go b/sdk/metric/meter.go index fd66fc034..e0a1e90e7 100644 --- a/sdk/metric/meter.go +++ b/sdk/metric/meter.go @@ -12,7 +12,6 @@ import ( "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/embedded" "go.opentelemetry.io/otel/sdk/instrumentation" - "go.opentelemetry.io/otel/sdk/metric/internal/aggregate" ) diff --git a/sdk/trace/util_test.go b/sdk/trace/util_test.go index 21d102bc1..0b54d985d 100644 --- a/sdk/trace/util_test.go +++ b/sdk/trace/util_test.go @@ -11,13 +11,12 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/codes" - - "go.opentelemetry.io/otel/trace" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/codes" + "go.opentelemetry.io/otel/trace" ) func basicTracerProvider(t *testing.T) *TracerProvider { diff --git a/semconv/internal/http.go b/semconv/internal/http.go index e9eb57734..58b5eddef 100644 --- a/semconv/internal/http.go +++ b/semconv/internal/http.go @@ -104,7 +104,7 @@ func (sc *SemanticConventions) NetAttributesFromHTTPRequest( // It handles both IPv4 and IPv6 addresses. If the host portion is not recognized // as a valid IPv4 or IPv6 address, the `ip` result will be empty and the // host portion will instead be returned in `name`. -func hostIPNamePort(hostWithPort string) (ip string, name string, port int) { +func hostIPNamePort(hostWithPort string) (ip, name string, port int) { var ( hostPart, portPart string parsedPort uint64 diff --git a/semconv/internal/http_test.go b/semconv/internal/http_test.go index b9fcd2019..211f8bc76 100644 --- a/semconv/internal/http_test.go +++ b/semconv/internal/http_test.go @@ -10,13 +10,12 @@ import ( "strings" "testing" - "go.opentelemetry.io/otel/trace" - "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" + "go.opentelemetry.io/otel/trace" ) type tlsOption int diff --git a/trace/internal/telemetry/id.go b/trace/internal/telemetry/id.go index 933548852..bea56f2e7 100644 --- a/trace/internal/telemetry/id.go +++ b/trace/internal/telemetry/id.go @@ -82,7 +82,7 @@ func marshalJSON(id []byte) ([]byte, error) { } // unmarshalJSON inflates trace id from hex string, possibly enclosed in quotes. -func unmarshalJSON(dst []byte, src []byte) error { +func unmarshalJSON(dst, src []byte) error { if l := len(src); l >= 2 && src[0] == '"' && src[l-1] == '"' { src = src[1 : l-1] } diff --git a/trace/internal/telemetry/test/conversion_test.go b/trace/internal/telemetry/test/conversion_test.go index feabc78eb..3d41ac047 100644 --- a/trace/internal/telemetry/test/conversion_test.go +++ b/trace/internal/telemetry/test/conversion_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/trace/trace_test.go b/trace/trace_test.go index 9abea43a0..e11401e71 100644 --- a/trace/trace_test.go +++ b/trace/trace_test.go @@ -457,7 +457,7 @@ func TestStringSpanID(t *testing.T) { } } -func assertSpanContextEqual(got SpanContext, want SpanContext) bool { +func assertSpanContextEqual(got, want SpanContext) bool { return got.spanID == want.spanID && got.traceID == want.traceID && got.traceFlags == want.traceFlags &&