From 23f30938297f4f5304e5e5541b2cfb00241e6c42 Mon Sep 17 00:00:00 2001 From: "renovate-sh-app[bot]" <219655108+renovate-sh-app[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2026 17:14:59 +0000 Subject: [PATCH] fix(deps): update module go.yaml.in/yaml/v2 to v3 | datasource | package | from | to | | ---------- | ------------------ | ------ | ------ | | go | go.yaml.in/yaml/v2 | v2.4.3 | v3.0.4 | Signed-off-by: renovate-sh-app[bot] <219655108+renovate-sh-app[bot]@users.noreply.github.com> --- cmd/tempo-cli/cmd-migrate-overrides-config.go | 2 +- cmd/tempo-cli/main.go | 2 +- cmd/tempo/main.go | 2 +- go.mod | 4 ++-- integration/util/harness.go | 2 +- integration/util/harness_config_overlay.go | 2 +- modules/generator/storage/config_test.go | 2 +- modules/overrides/config_test.go | 2 +- modules/overrides/overrides_tenant_status_http.go | 2 +- modules/overrides/runtime_config_overrides.go | 2 +- modules/overrides/runtime_config_overrides_test.go | 2 +- modules/overrides/user_configurable_overrides.go | 2 +- modules/overrides/user_configurable_overrides_test.go | 2 +- pkg/traceql/ast_stringer_test.go | 2 +- pkg/traceql/engine_test.go | 2 +- pkg/util/http.go | 2 +- pkg/util/listtomap/list_to_map.go | 2 +- pkg/util/listtomap/list_to_map_test.go | 2 +- pkg/util/yaml.go | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cmd/tempo-cli/cmd-migrate-overrides-config.go b/cmd/tempo-cli/cmd-migrate-overrides-config.go index 28c97fa44ef..6c22a1e3b4b 100644 --- a/cmd/tempo-cli/cmd-migrate-overrides-config.go +++ b/cmd/tempo-cli/cmd-migrate-overrides-config.go @@ -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" diff --git a/cmd/tempo-cli/main.go b/cmd/tempo-cli/main.go index 4f7e48b33e5..c41839dad61 100644 --- a/cmd/tempo-cli/main.go +++ b/cmd/tempo-cli/main.go @@ -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" diff --git a/cmd/tempo/main.go b/cmd/tempo/main.go index 3ea64dde70b..104a1b69438 100644 --- a/cmd/tempo/main.go +++ b/cmd/tempo/main.go @@ -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" diff --git a/go.mod b/go.mod index 74505cdce40..e1e7a17b4bc 100644 --- a/go.mod +++ b/go.mod @@ -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 ) @@ -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 diff --git a/integration/util/harness.go b/integration/util/harness.go index 18ed4145d74..61cb307e6d9 100644 --- a/integration/util/harness.go +++ b/integration/util/harness.go @@ -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 ( diff --git a/integration/util/harness_config_overlay.go b/integration/util/harness_config_overlay.go index 6354c40bf93..4151ddbf374 100644 --- a/integration/util/harness_config_overlay.go +++ b/integration/util/harness_config_overlay.go @@ -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 ( diff --git a/modules/generator/storage/config_test.go b/modules/generator/storage/config_test.go index 840a0692a6a..734c5ed4c6e 100644 --- a/modules/generator/storage/config_test.go +++ b/modules/generator/storage/config_test.go @@ -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) { diff --git a/modules/overrides/config_test.go b/modules/overrides/config_test.go index 9fd1676c048..65aa73fcf73 100644 --- a/modules/overrides/config_test.go +++ b/modules/overrides/config_test.go @@ -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" diff --git a/modules/overrides/overrides_tenant_status_http.go b/modules/overrides/overrides_tenant_status_http.go index 1ca2c1e57af..fc39adff5fa 100644 --- a/modules/overrides/overrides_tenant_status_http.go +++ b/modules/overrides/overrides_tenant_status_http.go @@ -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" ) diff --git a/modules/overrides/runtime_config_overrides.go b/modules/overrides/runtime_config_overrides.go index 6f29b365954..fa7f3d87a6e 100644 --- a/modules/overrides/runtime_config_overrides.go +++ b/modules/overrides/runtime_config_overrides.go @@ -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" diff --git a/modules/overrides/runtime_config_overrides_test.go b/modules/overrides/runtime_config_overrides_test.go index 7071392474b..de5c478d8d3 100644 --- a/modules/overrides/runtime_config_overrides_test.go +++ b/modules/overrides/runtime_config_overrides_test.go @@ -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" diff --git a/modules/overrides/user_configurable_overrides.go b/modules/overrides/user_configurable_overrides.go index 2f4db84c839..1d94a3360d7 100644 --- a/modules/overrides/user_configurable_overrides.go +++ b/modules/overrides/user_configurable_overrides.go @@ -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" diff --git a/modules/overrides/user_configurable_overrides_test.go b/modules/overrides/user_configurable_overrides_test.go index 56824bc68c9..f003d3bef12 100644 --- a/modules/overrides/user_configurable_overrides_test.go +++ b/modules/overrides/user_configurable_overrides_test.go @@ -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" diff --git a/pkg/traceql/ast_stringer_test.go b/pkg/traceql/ast_stringer_test.go index b398d0fc596..51b056de200 100644 --- a/pkg/traceql/ast_stringer_test.go +++ b/pkg/traceql/ast_stringer_test.go @@ -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" diff --git a/pkg/traceql/engine_test.go b/pkg/traceql/engine_test.go index 3ada21d130c..d540ce8a0b0 100644 --- a/pkg/traceql/engine_test.go +++ b/pkg/traceql/engine_test.go @@ -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" diff --git a/pkg/util/http.go b/pkg/util/http.go index 3822d6b5d00..d3489a36eca 100644 --- a/pkg/util/http.go +++ b/pkg/util/http.go @@ -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)" diff --git a/pkg/util/listtomap/list_to_map.go b/pkg/util/listtomap/list_to_map.go index ed4839d2d9b..74ce531a65d 100644 --- a/pkg/util/listtomap/list_to_map.go +++ b/pkg/util/listtomap/list_to_map.go @@ -3,7 +3,7 @@ package listtomap import ( "encoding/json" - "go.yaml.in/yaml/v2" + "go.yaml.in/yaml/v3" ) type ListToMap map[string]struct{} diff --git a/pkg/util/listtomap/list_to_map_test.go b/pkg/util/listtomap/list_to_map_test.go index b575af29ec9..1a9c12c7438 100644 --- a/pkg/util/listtomap/list_to_map_test.go +++ b/pkg/util/listtomap/list_to_map_test.go @@ -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) { diff --git a/pkg/util/yaml.go b/pkg/util/yaml.go index 1afacfb012f..5a387131b88 100644 --- a/pkg/util/yaml.go +++ b/pkg/util/yaml.go @@ -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