Skip to content

fix(deps): update module go.yaml.in/yaml/v2 to v3 (main) #6323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renovate-sh-app wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(deps): update module go.yaml.in/yaml/v2 to v3 (main) #6323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/tempo-cli/cmd-migrate-overrides-config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/grafana/dskit/services"
"github.com/prometheus/client_golang/prometheus"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"

"github.com/grafana/tempo/cmd/tempo/app"
"github.com/grafana/tempo/modules/overrides"
Expand Down
2 changes: 1 addition & 1 deletion cmd/tempo-cli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/grafana/dskit/flagext"

"github.com/alecthomas/kong"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"

"github.com/grafana/tempo/cmd/tempo/app"
"github.com/grafana/tempo/tempodb/backend"
Expand Down
2 changes: 1 addition & 1 deletion cmd/tempo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
ver "github.com/prometheus/client_golang/prometheus/collectors/version"
"github.com/prometheus/common/version"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"
"google.golang.org/grpc/encoding"

"github.com/grafana/tempo/cmd/tempo/app"
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ require (
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.41.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.41.0
go.opentelemetry.io/proto/otlp v1.9.0
go.yaml.in/yaml/v2 v2.4.3
go.yaml.in/yaml/v3 v3.0.4
golang.org/x/net v0.51.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171
)
Expand Down Expand Up @@ -408,7 +408,7 @@ require (
go.opentelemetry.io/otel/log v0.17.0 // indirect
go.opentelemetry.io/otel/sdk/log v0.17.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.41.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
golang.org/x/crypto v0.48.0 // indirect
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
Expand Down
2 changes: 1 addition & 1 deletion integration/util/harness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/grafana/tempo/tempodb/backend/azure"
"github.com/prometheus/prometheus/model/labels"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion integration/util/harness_config_overlay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/grafana/tempo/cmd/tempo/app"
"github.com/grafana/tempo/tempodb/backend"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion modules/generator/storage/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
prometheus_config "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/util/compression"
"github.com/stretchr/testify/assert"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"
)

func TestConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion modules/overrides/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"

"github.com/grafana/tempo/modules/overrides/histograms"
"github.com/grafana/tempo/modules/overrides/userconfigurable/client"
Expand Down
2 changes: 1 addition & 1 deletion modules/overrides/overrides_tenant_status_http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/gorilla/mux"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"

"github.com/grafana/tempo/pkg/util"
)
Expand Down
2 changes: 1 addition & 1 deletion modules/overrides/runtime_config_overrides.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/grafana/dskit/runtimeconfig"
"github.com/grafana/dskit/services"
"github.com/prometheus/client_golang/prometheus"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"

"github.com/grafana/tempo/modules/overrides/histograms"
"github.com/grafana/tempo/pkg/sharedconfig"
Expand Down
2 changes: 1 addition & 1 deletion modules/overrides/runtime_config_overrides_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"

"github.com/grafana/tempo/pkg/sharedconfig"
"github.com/grafana/tempo/tempodb/backend"
Expand Down
2 changes: 1 addition & 1 deletion modules/overrides/user_configurable_overrides.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/grafana/dskit/services"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"

"github.com/grafana/tempo/modules/overrides/histograms"
userconfigurableoverrides "github.com/grafana/tempo/modules/overrides/userconfigurable/client"
Expand Down
2 changes: 1 addition & 1 deletion modules/overrides/user_configurable_overrides_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"

"github.com/grafana/tempo/modules/overrides/histograms"
userconfigurableoverrides "github.com/grafana/tempo/modules/overrides/userconfigurable/client"
Expand Down
2 changes: 1 addition & 1 deletion pkg/traceql/ast_stringer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"
)

const testExamplesFile = "./test_examples.yaml"
Expand Down
2 changes: 1 addition & 1 deletion pkg/traceql/engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"

"github.com/grafana/tempo/pkg/collector"
"github.com/grafana/tempo/pkg/tempopb"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/golang/snappy"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"
)

const messageSizeLargerErrFmt = "received message larger than max (%d vs %d)"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/listtomap/list_to_map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import (
"encoding/json"

"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"
)

type ListToMap map[string]struct{}

var (
_ yaml.Marshaler = (*ListToMap)(nil)
_ yaml.Unmarshaler = (*ListToMap)(nil)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Lint 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as "go.yaml.in/yaml/v3".Unmarshaler value in variable declaration: *ListToMap does not implement "go.yaml.in/yaml/v3".Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Run Unit Tests (test-with-cover-others) 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as yaml.Unmarshaler value in variable declaration: *ListToMap does not implement yaml.Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Run Unit Tests (test-with-cover-pkg) 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as "go.yaml.in/yaml/v3".Unmarshaler value in variable declaration: *ListToMap does not implement "go.yaml.in/yaml/v3".Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Run Unit Tests (test-with-cover-pkg) 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as yaml.Unmarshaler value in variable declaration: *ListToMap does not implement yaml.Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Build 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as yaml.Unmarshaler value in variable declaration: *ListToMap does not implement yaml.Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Run integration tests (test-e2e-util) 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as yaml.Unmarshaler value in variable declaration: *ListToMap does not implement yaml.Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Run integration tests (test-e2e-limits) 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as yaml.Unmarshaler value in variable declaration: *ListToMap does not implement yaml.Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Run integration tests (test-e2e-storage) 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as yaml.Unmarshaler value in variable declaration: *ListToMap does not implement yaml.Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Run integration tests (test-e2e-operations) 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as yaml.Unmarshaler value in variable declaration: *ListToMap does not implement yaml.Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Run integration tests (test-e2e-metrics-generator) 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as yaml.Unmarshaler value in variable declaration: *ListToMap does not implement yaml.Unmarshaler (wrong type for method UnmarshalYAML)

Check failure on line 13 in pkg/util/listtomap/list_to_map.go

View workflow job for this annotation

GitHub Actions / Run integration tests (test-e2e-api) 

cannot use (*ListToMap)(nil) (value of type *ListToMap) as yaml.Unmarshaler value in variable declaration: *ListToMap does not implement yaml.Unmarshaler (wrong type for method UnmarshalYAML)
_ json.Marshaler = (*ListToMap)(nil)
_ json.Unmarshaler = (*ListToMap)(nil)
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/listtomap/list_to_map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"go.yaml.in/yaml/v2"
"go.yaml.in/yaml/v3"
)

func TestListToMapMarshalOperationsYAML(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package util

import "go.yaml.in/yaml/v2"
import "go.yaml.in/yaml/v3"

// YAMLMarshalUnmarshal utility function that converts a YAML interface in a map
// doing marshal and unmarshal of the parameter
Expand Down
Loading