From a69084181ad9f20391a6acd385671b6283ec486f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Tue, 28 Jan 2025 17:44:18 +0000 Subject: [PATCH] Migrate to gopkg.in/yaml.v3 --- confmap/provider/s3provider/go.mod | 3 +-- confmap/provider/s3provider/go.sum | 2 -- confmap/provider/s3provider/provider.go | 2 +- exporter/datadogexporter/examples_test.go | 2 +- exporter/datadogexporter/go.mod | 4 ++-- exporter/loadbalancingexporter/go.mod | 4 ++-- .../loadbalancingexporter/metrics_exporter_test.go | 2 +- exporter/prometheusexporter/end_to_end_test.go | 2 +- exporter/prometheusexporter/go.mod | 4 ++-- extension/observer/ecsobserver/go.mod | 4 ++-- extension/observer/ecsobserver/target.go | 2 +- pkg/stanza/adapter/receiver_test.go | 2 +- pkg/stanza/entry/attribute_field_test.go | 12 +++++++++--- pkg/stanza/entry/body_field_test.go | 12 +++++++++--- pkg/stanza/entry/field_test.go | 11 ++++++++--- pkg/stanza/entry/resource_field_test.go | 12 +++++++++--- pkg/stanza/go.mod | 3 +-- pkg/stanza/go.sum | 2 -- pkg/stanza/operator/config_test.go | 2 +- processor/logstransformprocessor/go.sum | 2 -- receiver/azureeventhubreceiver/go.sum | 2 -- receiver/filelogreceiver/go.sum | 2 -- receiver/journaldreceiver/go.sum | 2 -- receiver/mongodbatlasreceiver/go.sum | 2 -- receiver/namedpipereceiver/go.sum | 2 -- receiver/otlpjsonfilereceiver/go.sum | 2 -- receiver/prometheusreceiver/config.go | 7 +++++-- receiver/prometheusreceiver/go.mod | 4 ++-- .../metrics_receiver_helper_test.go | 2 +- .../metrics_receiver_scrape_config_files_test.go | 2 +- .../prometheusreceiver/targetallocator/config.go | 7 +++++-- .../prometheusreceiver/targetallocator/manager.go | 2 +- receiver/syslogreceiver/go.sum | 2 -- receiver/tcplogreceiver/go.sum | 2 -- receiver/udplogreceiver/go.sum | 2 -- receiver/windowseventlogreceiver/go.sum | 2 -- 36 files changed, 67 insertions(+), 66 deletions(-) diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index b46a30e10cb71..6c62585af01bc 100644 --- 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 index 7e7466fff14bd..eddba5e71c571 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -69,7 +69,5 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/confmap/provider/s3provider/provider.go b/confmap/provider/s3provider/provider.go index 437ac438e2ddb..2a4e214d5d5b4 100644 --- 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 index bcfb3ebc7f8be..d7d6a70b68215 100644 --- 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 index 4dd5254c45800..eba0fb96fb9c9 100644 --- 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 index da8543c15a2bb..c6cf4f2c45447 100644 --- 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 index 669f873ec3a94..cb0746f93e9bf 100644 --- 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 index 87a9e1283c848..4bdd880ecb3fe 100644 --- 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 index 109e8b403db9b..3f5d87693a4a7 100644 --- 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 index 1c18238ccbd93..1ee450afe93a5 100644 --- 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 index 710ef631a2f77..be0c30648a3ab 100644 --- 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 index 1e08e9498e24e..593bedad88434 100644 --- 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 index ad55479d4279d..b2f34e6f72518 100644 --- 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 index 48238eda3a250..ca3feae7a92f4 100644 --- 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 index 617b812790dc4..bfbdf686c403d 100644 --- 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 index 75a4f95c2a00d..1f1822366218c 100644 --- 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 index b33dba4cab0c4..152950f8cd907 100644 --- 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 index f517e756677d2..b431bf21b6b95 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -183,7 +183,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkg/stanza/operator/config_test.go b/pkg/stanza/operator/config_test.go index 8d3899634f744..b481428ef59ff 100644 --- 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 index 4b0f80a3699c9..2dd0b8bf79661 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -179,7 +179,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index 63a6e3338946f..3e1bb03011a43 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -393,7 +393,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index a620aa48752ba..d7772612a96a1 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -175,7 +175,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index cd2276e672170..447ece8c938e8 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -171,7 +171,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index 9f17268497bbd..8a070bcc4f642 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -196,7 +196,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/namedpipereceiver/go.sum b/receiver/namedpipereceiver/go.sum index 143bb3f92147c..c8e5aa1e75213 100644 --- a/receiver/namedpipereceiver/go.sum +++ b/receiver/namedpipereceiver/go.sum @@ -173,7 +173,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index a620aa48752ba..d7772612a96a1 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -175,7 +175,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/prometheusreceiver/config.go b/receiver/prometheusreceiver/config.go index 556dd42445187..271e38d1fd7db 100644 --- a/receiver/prometheusreceiver/config.go +++ b/receiver/prometheusreceiver/config.go @@ -4,6 +4,7 @@ package prometheusreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" import ( + "bytes" "errors" "fmt" "os" @@ -14,7 +15,7 @@ import ( promconfig "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery/kubernetes" "go.opentelemetry.io/collector/confmap" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver/targetallocator" ) @@ -126,7 +127,9 @@ func unmarshalYAML(in map[string]any, out any) error { return fmt.Errorf("prometheus receiver: failed to marshal config to yaml: %w", err) } - err = yaml.UnmarshalStrict(yamlOut, out) + decoder := yaml.NewDecoder(bytes.NewReader(yamlOut)) + decoder.KnownFields(true) + err = decoder.Decode(out) if err != nil { return fmt.Errorf("prometheus receiver: failed to unmarshal yaml to prometheus config object: %w", err) } diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 8e231c0cc9183..49ed1a24d3e61 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -36,7 +36,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 ( @@ -237,7 +237,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/receiver/prometheusreceiver/metrics_receiver_helper_test.go b/receiver/prometheusreceiver/metrics_receiver_helper_test.go index 1bda7ac42e905..9cb58672e20a8 100644 --- a/receiver/prometheusreceiver/metrics_receiver_helper_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_helper_test.go @@ -33,7 +33,7 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver/receivertest" semconv "go.opentelemetry.io/collector/semconv/v1.27.0" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver/internal" ) diff --git a/receiver/prometheusreceiver/metrics_receiver_scrape_config_files_test.go b/receiver/prometheusreceiver/metrics_receiver_scrape_config_files_test.go index 7654cd0dad0b3..722ac51afb944 100644 --- a/receiver/prometheusreceiver/metrics_receiver_scrape_config_files_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_scrape_config_files_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/pmetric" semconv "go.opentelemetry.io/collector/semconv/v1.27.0" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) var scrapeFileTargetPage = ` diff --git a/receiver/prometheusreceiver/targetallocator/config.go b/receiver/prometheusreceiver/targetallocator/config.go index f0a1199f64904..00f02bbbd101d 100644 --- a/receiver/prometheusreceiver/targetallocator/config.go +++ b/receiver/prometheusreceiver/targetallocator/config.go @@ -4,6 +4,7 @@ package targetallocator // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver/targetallocator" import ( + "bytes" "encoding/base64" "errors" "fmt" @@ -16,7 +17,7 @@ import ( promHTTP "github.com/prometheus/prometheus/discovery/http" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) type Config struct { @@ -115,7 +116,9 @@ func unmarshalYAML(in map[string]any, out any) error { return fmt.Errorf("prometheus receiver: failed to marshal config to yaml: %w", err) } - err = yaml.UnmarshalStrict(yamlOut, out) + decoder := yaml.NewDecoder(bytes.NewReader(yamlOut)) + decoder.KnownFields(true) + err = decoder.Decode(out) if err != nil { return fmt.Errorf("prometheus receiver: failed to unmarshal yaml to prometheus config object: %w", err) } diff --git a/receiver/prometheusreceiver/targetallocator/manager.go b/receiver/prometheusreceiver/targetallocator/manager.go index d1804bafc6309..387d2fbee5749 100644 --- a/receiver/prometheusreceiver/targetallocator/manager.go +++ b/receiver/prometheusreceiver/targetallocator/manager.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) type Manager struct { diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 7b2066e8380e9..2d00c69f5c455 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -179,7 +179,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 7b2066e8380e9..2d00c69f5c455 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -179,7 +179,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index cd2276e672170..447ece8c938e8 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -171,7 +171,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index cd2276e672170..447ece8c938e8 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -171,7 +171,5 @@ google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=