Migrate to gopkg.in/yaml.v3

open-telemetry · Jan 28, 2025 · a690841 · a690841
1 parent e0351bf
commit a690841
Show file tree

Hide file tree

Showing 36 changed files with 67 additions and 66 deletions.
diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	go.opentelemetry.io/collector/confmap v1.24.0
 	go.uber.org/goleak v1.3.0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -38,7 +38,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 retract (

diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum
diff --git a/confmap/provider/s3provider/provider.go b/confmap/provider/s3provider/provider.go
@@ -14,7 +14,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"go.opentelemetry.io/collector/confmap"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 const (

diff --git a/exporter/datadogexporter/examples_test.go b/exporter/datadogexporter/examples_test.go
@@ -19,7 +19,7 @@ import (
 	"go.opentelemetry.io/collector/processor/memorylimiterprocessor"
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor"

diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod
@@ -84,7 +84,7 @@ require (
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
 	google.golang.org/protobuf v1.36.3
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/zorkian/go-datadog-api.v2 v2.30.0
 	k8s.io/apimachinery v0.31.3
 	k8s.io/client-go v0.31.3
@@ -99,6 +99,7 @@ require (
 	go.opentelemetry.io/collector/component/componenttest v0.118.0
 	go.opentelemetry.io/collector/consumer/consumererror v0.118.0
 	go.opentelemetry.io/collector/exporter/exportertest v0.118.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -420,7 +421,6 @@ require (
 	google.golang.org/grpc v1.69.4 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.31.3 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect

diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod
@@ -33,7 +33,7 @@ require (
 	go.uber.org/goleak v1.3.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.31.3
 	k8s.io/apimachinery v0.31.3
 	k8s.io/client-go v0.31.3
@@ -178,7 +178,7 @@ require (
 	google.golang.org/protobuf v1.36.3 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

diff --git a/exporter/loadbalancingexporter/metrics_exporter_test.go b/exporter/loadbalancingexporter/metrics_exporter_test.go
@@ -27,7 +27,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	conventions "go.opentelemetry.io/collector/semconv/v1.27.0"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest"

diff --git a/exporter/prometheusexporter/end_to_end_test.go b/exporter/prometheusexporter/end_to_end_test.go
@@ -21,7 +21,7 @@ import (
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/exporter/exportertest"
 	"go.opentelemetry.io/collector/receiver/receivertest"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
 )

diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod
@@ -25,7 +25,7 @@ require (
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
 	google.golang.org/protobuf v1.36.3
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -187,7 +187,7 @@ require (
 	google.golang.org/grpc v1.69.4 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/api v0.29.3 // indirect
 	k8s.io/apimachinery v0.29.3 // indirect
 	k8s.io/client-go v0.29.3 // indirect

diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod
@@ -15,7 +15,7 @@ require (
 	go.uber.org/goleak v1.3.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -46,7 +46,7 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
 	google.golang.org/grpc v1.69.4 // indirect
 	google.golang.org/protobuf v1.36.3 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
 retract (

diff --git a/extension/observer/ecsobserver/target.go b/extension/observer/ecsobserver/target.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 // target.go defines labels and structs in exported target.

diff --git a/pkg/stanza/adapter/receiver_test.go b/pkg/stanza/adapter/receiver_test.go
@@ -22,7 +22,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/plog"
 	"go.opentelemetry.io/collector/receiver/receiverhelper"
 	"go.opentelemetry.io/collector/receiver/receivertest"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/storagetest"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/consumerretry"

diff --git a/pkg/stanza/entry/attribute_field_test.go b/pkg/stanza/entry/attribute_field_test.go
@@ -4,13 +4,15 @@
 package entry
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestAttributeFieldGet(t *testing.T) {
@@ -420,8 +422,10 @@ func TestAttributeFieldUnmarshal(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			decoder := yaml.NewDecoder(strings.NewReader(tc.jsonDot))
+			decoder.KnownFields(true)
 			var fy AttributeField
-			err := yaml.UnmarshalStrict([]byte(tc.jsonDot), &fy)
+			err := decoder.Decode(&fy)
 			require.NoError(t, err)
 			require.Equal(t, tc.keys, fy.Keys)
 
@@ -458,8 +462,10 @@ func TestAttributeFieldUnmarshalFailure(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			decoder := yaml.NewDecoder(bytes.NewReader(tc.invalid))
+			decoder.KnownFields(true)
 			var fy AttributeField
-			err := yaml.UnmarshalStrict(tc.invalid, &fy)
+			err := decoder.Decode(&fy)
 			require.ErrorContains(t, err, tc.expectedErr)
 
 			var fj AttributeField

diff --git a/pkg/stanza/entry/body_field_test.go b/pkg/stanza/entry/body_field_test.go
@@ -4,13 +4,15 @@
 package entry
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func testMap() map[string]any {
@@ -346,8 +348,10 @@ func TestBodyFieldUnmarshal(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			decoder := yaml.NewDecoder(strings.NewReader(tc.jsonDot))
+			decoder.KnownFields(true)
 			var fy BodyField
-			err := yaml.UnmarshalStrict([]byte(tc.jsonDot), &fy)
+			err := decoder.Decode(&fy)
 			require.NoError(t, err)
 			require.Equal(t, tc.keys, fy.Keys)
 
@@ -384,8 +388,10 @@ func TestBodyFieldUnmarshalFailure(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			decoder := yaml.NewDecoder(bytes.NewReader(tc.invalid))
+			decoder.KnownFields(true)
 			var fy BodyField
-			err := yaml.UnmarshalStrict(tc.invalid, &fy)
+			err := decoder.Decode(&fy)
 			require.ErrorContains(t, err, tc.expectedErr)
 
 			var fj BodyField

diff --git a/pkg/stanza/entry/field_test.go b/pkg/stanza/entry/field_test.go
@@ -4,11 +4,12 @@
 package entry
 
 import (
+	"bytes"
 	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestFieldUnmarshalJSON(t *testing.T) {
@@ -190,8 +191,10 @@ func TestFieldUnmarshalYAML(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			decoder := yaml.NewDecoder(bytes.NewReader(tc.input))
+			decoder.KnownFields(true)
 			var f Field
-			err := yaml.UnmarshalStrict(tc.input, &f)
+			err := decoder.Decode(&f)
 			require.NoError(t, err)
 
 			require.Equal(t, tc.expected, f)
@@ -229,8 +232,10 @@ func TestFieldUnmarshalYAMLFailure(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			decoder := yaml.NewDecoder(bytes.NewReader(tc.input))
+			decoder.KnownFields(true)
 			var f Field
-			err := yaml.UnmarshalStrict(tc.input, &f)
+			err := decoder.Decode(&f)
 			require.ErrorContains(t, err, tc.expected)
 		})
 	}

diff --git a/pkg/stanza/entry/resource_field_test.go b/pkg/stanza/entry/resource_field_test.go
@@ -4,13 +4,15 @@
 package entry
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestResourceFieldGet(t *testing.T) {
@@ -420,8 +422,10 @@ func TestResourceFieldUnmarshal(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			decoder := yaml.NewDecoder(strings.NewReader(tc.jsonDot))
+			decoder.KnownFields(true)
 			var fy ResourceField
-			err := yaml.UnmarshalStrict([]byte(tc.jsonDot), &fy)
+			err := decoder.Decode(&fy)
 			require.NoError(t, err)
 			require.Equal(t, tc.keys, fy.Keys)
 
@@ -458,8 +462,10 @@ func TestResourceFieldUnmarshalFailure(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			decoder := yaml.NewDecoder(bytes.NewReader(tc.invalid))
+			decoder.KnownFields(true)
 			var fy ResourceField
-			err := yaml.UnmarshalStrict(tc.invalid, &fy)
+			err := decoder.Decode(&fy)
 			require.ErrorContains(t, err, tc.expectedErr)
 
 			var fj ResourceField

diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod
@@ -41,7 +41,7 @@ require (
 	golang.org/x/sys v0.29.0
 	golang.org/x/text v0.21.0
 	gonum.org/v1/gonum v0.15.1
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -78,7 +78,6 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
 	google.golang.org/grpc v1.69.4 // indirect
 	google.golang.org/protobuf v1.36.3 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace github.com/googleapis/gnostic v0.5.6 => github.com/googleapis/gnostic v0.5.5

diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum
diff --git a/pkg/stanza/operator/config_test.go b/pkg/stanza/operator/config_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 type FakeBuilder struct {

diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum
diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum
diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum
diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum
diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum