chore: enable extra-rules from gofumpt (#7637)

Signed-off-by: Matthieu MOREL <[email protected]>

Author: mmorel-35

.golangci.yml

@@ -60,7 +60,6 @@ linters:
         - exitAfterDefer
         - exposedSyncMutex
         - hugeParam
-        - paramTypeCombine
         - rangeValCopy
         - typeUnparen
         - unnamedResult
@@ -202,8 +201,10 @@ formatters:
     - gofumpt
     - goimports
   settings:
+    gofumpt:
+      extra-rules: true
     goimports:
       local-prefixes:
-        - go.opentelemetry.io
+        - go.opentelemetry.io/contrib
   exclusions:
     generated: lax

bridges/otellogr/example_test.go

@@ -5,10 +5,10 @@ package otellogr_test
 
 import (
 	"github.com/go-logr/logr"
-
-	"go.opentelemetry.io/contrib/bridges/otellogr"
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/noop"
+
+	"go.opentelemetry.io/contrib/bridges/otellogr"
 )
 
 func Example() {

bridges/otellogr/logsink.go

@@ -58,7 +58,6 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/global"

bridges/otellogr/logsink_test.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/stretchr/testify/assert"
-
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/embedded"

bridges/otellogrus/example_test.go

@@ -5,9 +5,9 @@ package otellogrus_test
 
 import (
 	"github.com/sirupsen/logrus"
+	"go.opentelemetry.io/otel/log/noop"
 
 	"go.opentelemetry.io/contrib/bridges/otellogrus"
-	"go.opentelemetry.io/otel/log/noop"
 )
 
 func Example() {

bridges/otellogrus/hook.go

@@ -33,7 +33,6 @@ package otellogrus // import "go.opentelemetry.io/contrib/bridges/otellogrus"
 
 import (
 	"github.com/sirupsen/logrus"
-
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/global"

bridges/otellogrus/hook_test.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
-
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/embedded"

bridges/otelslog/example_test.go

@@ -4,8 +4,9 @@
 package otelslog_test
 
 import (
-	"go.opentelemetry.io/contrib/bridges/otelslog"
 	"go.opentelemetry.io/otel/log/noop"
+
+	"go.opentelemetry.io/contrib/bridges/otelslog"
 )
 
 func Example() {

bridges/otelslog/handler_test.go

@@ -19,7 +19,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/embedded"

bridges/otelzap/core.go

@@ -37,12 +37,11 @@ import (
 	"context"
 	"slices"
 
-	"go.uber.org/zap/zapcore"
-
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/log/global"
 	semconv "go.opentelemetry.io/otel/semconv/v1.34.0"
+	"go.uber.org/zap/zapcore"
 )
 
 type config struct {