Merge branch 'main' into issue-14471/cleanup-duplicate-diff

Author: Arunodoy18

.golangci.yml

@@ -70,6 +70,8 @@ linters:
           deny:
             - pkg: "go.uber.org/atomic"
               desc: "Use 'sync/atomic' instead of go.uber.org/atomic"
+            - pkg: "gopkg.in/yaml.v3"
+              desc: "Use 'go.yaml.in/yaml/v3' instead of gopkg.in/yaml.v3"
             - pkg: "github.com/pkg/errors"
               desc: "Use 'errors' or 'fmt' instead of github.com/pkg/errors"
             - pkg: "github.com/hashicorp/go-multierror"

cmd/mdatagen/go.mod

@@ -32,8 +32,8 @@ require (
 	go.opentelemetry.io/otel/trace v1.39.0
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.1
+	go.yaml.in/yaml/v3 v3.0.4
 	golang.org/x/text v0.33.0
-	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -71,11 +71,11 @@ require (
 	go.opentelemetry.io/collector/service v0.144.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.39.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/sys v0.40.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
 	google.golang.org/grpc v1.78.0 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace go.opentelemetry.io/collector/component => ../../component

cmd/mdatagen/internal/command.go

@@ -19,9 +19,9 @@ import (
 	"text/template"
 
 	"github.com/spf13/cobra"
+	"go.yaml.in/yaml/v3"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
-	"gopkg.in/yaml.v3"
 )
 
 const (

config/configopaque/doc_test.go

@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	yaml "go.yaml.in/yaml/v3"
+	"go.yaml.in/yaml/v3"
 
 	"go.opentelemetry.io/collector/config/configopaque"
 )

confmap/confmaptest/configtest.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"regexp"
 
-	yaml "go.yaml.in/yaml/v3"
+	"go.yaml.in/yaml/v3"
 
 	"go.opentelemetry.io/collector/confmap"
 )

confmap/internal/confmap_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	yaml "go.yaml.in/yaml/v3"
+	"go.yaml.in/yaml/v3"
 )
 
 func TestToStringMapFlatten(t *testing.T) {

confmap/internal/mapstructure/encoder.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/go-viper/mapstructure/v2"
-	yaml "go.yaml.in/yaml/v3"
+	"go.yaml.in/yaml/v3"
 )
 
 const (

confmap/provider.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"go.uber.org/zap"
-	yaml "go.yaml.in/yaml/v3"
+	"go.yaml.in/yaml/v3"
 )
 
 // ProviderSettings are the settings to initialize a Provider.

confmap/resolver_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
-	yaml "go.yaml.in/yaml/v3"
+	"go.yaml.in/yaml/v3"
 
 	"go.opentelemetry.io/collector/confmap/internal"
 	"go.opentelemetry.io/collector/featuregate"

otelcol/collector_test.go

@@ -19,7 +19,7 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
-	yaml "go.yaml.in/yaml/v3"
+	"go.yaml.in/yaml/v3"
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentstatus"