File tree Expand file tree Collapse file tree 13 files changed +15
-13
lines changed
Expand file tree Collapse file tree 13 files changed +15
-13
lines changed Original file line number Diff line number Diff line change @@ -70,6 +70,8 @@ linters:
7070 deny :
7171 - pkg : " go.uber.org/atomic"
7272 desc : " Use 'sync/atomic' instead of go.uber.org/atomic"
73+ - pkg : " gopkg.in/yaml.v3"
74+ desc : " Use 'go.yaml.in/yaml/v3' instead of gopkg.in/yaml.v3"
7375 - pkg : " github.com/pkg/errors"
7476 desc : " Use 'errors' or 'fmt' instead of github.com/pkg/errors"
7577 - pkg : " github.com/hashicorp/go-multierror"
Original file line number Diff line number Diff line change @@ -32,8 +32,8 @@ require (
3232 go.opentelemetry.io/otel/trace v1.39.0
3333 go.uber.org/goleak v1.3.0
3434 go.uber.org/zap v1.27.1
35+ go.yaml.in/yaml/v3 v3.0.4
3536 golang.org/x/text v0.33.0
36- gopkg.in/yaml.v3 v3.0.1
3737)
3838
3939require (
@@ -71,11 +71,11 @@ require (
7171 go.opentelemetry.io/collector/service v0.144.0 // indirect
7272 go.opentelemetry.io/otel/sdk v1.39.0 // indirect
7373 go.uber.org/multierr v1.11.0 // indirect
74- go.yaml.in/yaml/v3 v3.0.4 // indirect
7574 golang.org/x/sys v0.40.0 // indirect
7675 google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
7776 google.golang.org/grpc v1.78.0 // indirect
7877 google.golang.org/protobuf v1.36.11 // indirect
78+ gopkg.in/yaml.v3 v3.0.1 // indirect
7979)
8080
8181replace go.opentelemetry.io/collector/component => ../../component
Original file line number Diff line number Diff line change @@ -19,9 +19,9 @@ import (
1919 "text/template"
2020
2121 "github.com/spf13/cobra"
22+ "go.yaml.in/yaml/v3"
2223 "golang.org/x/text/cases"
2324 "golang.org/x/text/language"
24- "gopkg.in/yaml.v3"
2525)
2626
2727const (
Original file line number Diff line number Diff line change 77 "encoding/json"
88 "fmt"
99
10- yaml "go.yaml.in/yaml/v3"
10+ "go.yaml.in/yaml/v3"
1111
1212 "go.opentelemetry.io/collector/config/configopaque"
1313)
Original file line number Diff line number Diff line change 99 "path/filepath"
1010 "regexp"
1111
12- yaml "go.yaml.in/yaml/v3"
12+ "go.yaml.in/yaml/v3"
1313
1414 "go.opentelemetry.io/collector/confmap"
1515)
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ import (
1515
1616 "github.com/stretchr/testify/assert"
1717 "github.com/stretchr/testify/require"
18- yaml "go.yaml.in/yaml/v3"
18+ "go.yaml.in/yaml/v3"
1919)
2020
2121func TestToStringMapFlatten (t * testing.T ) {
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ import (
1212 "strings"
1313
1414 "github.com/go-viper/mapstructure/v2"
15- yaml "go.yaml.in/yaml/v3"
15+ "go.yaml.in/yaml/v3"
1616)
1717
1818const (
Original file line number Diff line number Diff line change 99 "time"
1010
1111 "go.uber.org/zap"
12- yaml "go.yaml.in/yaml/v3"
12+ "go.yaml.in/yaml/v3"
1313)
1414
1515// ProviderSettings are the settings to initialize a Provider.
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ import (
1717 "github.com/stretchr/testify/assert"
1818 "github.com/stretchr/testify/require"
1919 "go.uber.org/zap"
20- yaml "go.yaml.in/yaml/v3"
20+ "go.yaml.in/yaml/v3"
2121
2222 "go.opentelemetry.io/collector/confmap/internal"
2323 "go.opentelemetry.io/collector/featuregate"
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ import (
1919 "go.uber.org/zap"
2020 "go.uber.org/zap/zapcore"
2121 "go.uber.org/zap/zaptest/observer"
22- yaml "go.yaml.in/yaml/v3"
22+ "go.yaml.in/yaml/v3"
2323
2424 "go.opentelemetry.io/collector/component"
2525 "go.opentelemetry.io/collector/component/componentstatus"
You can’t perform that action at this time.
0 commit comments