From 57c606263b58b1ea2186bfc3d3d0f8f4d6b6b6d5 Mon Sep 17 00:00:00 2001 From: "octo-sts[bot]" <157150467+octo-sts[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:51:15 +0100 Subject: [PATCH] tempo/2.6.0 package update (#27460)

--------- Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Signed-off-by: Mark McCormick Signed-off-by: Dentrax Co-authored-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Co-authored-by: Mark McCormick Co-authored-by: Dentrax --- tempo.yaml | 16 ++--- tempo/opentelemetry.patch | 123 -------------------------------------- 2 files changed, 4 insertions(+), 135 deletions(-) delete mode 100644 tempo/opentelemetry.patch diff --git a/tempo.yaml b/tempo.yaml index 4ea89455b69..6bd98308418 100644 --- a/tempo.yaml +++ b/tempo.yaml @@ -1,7 +1,7 @@ package: name: tempo - version: 2.5.0 - epoch: 5 + version: 2.6.0 + epoch: 0 description: Grafana Tempo is a high volume, minimal dependency distributed tracing backend. copyright: - license: AGPL-3.0-or-later @@ -12,23 +12,15 @@ environment: - build-base - busybox - ca-certificates-bundle - - go + - go-1.22 # TODO: Back to latest `go` once a new version is released (> 2.6.0) pipeline: - uses: git-checkout with: - expected-commit: 46dad34116020a57b16410e020b56111ff357864 + expected-commit: e85bbc57de52cc9044bc0911de0d1afe5d1fbe07 repository: https://github.com/grafana/tempo tag: v${{package.version}} - - uses: go/bump - with: - deps: go.opentelemetry.io/collector/config/configgrpc@v0.102.1 go.opentelemetry.io/collector/config/confighttp@v0.102.0 go.opentelemetry.io/collector/receiver/otlpreceiver@v0.102.1 go.opentelemetry.io/collector/processor@v0.102.1 go.opentelemetry.io/collector/otelcol@v0.102.1 go.opentelemetry.io/collector/exporter/otlpexporter@v0.102.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver@v0.102.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver@v0.102.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver@v0.102.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver@v0.102.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter@v0.102.0 github.com/mostynb/go-grpc-compression@v1.2.3 github.com/Azure/azure-sdk-for-go/sdk/azidentity@v1.6.0 google.golang.org/grpc@v1.64.1 - - - uses: patch - with: - patches: opentelemetry.patch - - runs: | go mod vendor make ${{package.name}} diff --git a/tempo/opentelemetry.patch b/tempo/opentelemetry.patch deleted file mode 100644 index be0486c7688..00000000000 --- a/tempo/opentelemetry.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff --git a/cmd/tempo/main.go b/cmd/tempo/main.go -index f0e99d679..b968bff2f 100644 ---- a/cmd/tempo/main.go -+++ b/cmd/tempo/main.go -@@ -4,12 +4,6 @@ import ( - "context" - "flag" - "fmt" -- "io" -- "os" -- "reflect" -- "runtime" -- "time" -- - "github.com/drone/envsubst" - "github.com/go-kit/log/level" - "github.com/grafana/dskit/flagext" -@@ -18,6 +12,7 @@ import ( - "github.com/grafana/dskit/tracing" - ot "github.com/opentracing/opentracing-go" - "github.com/prometheus/client_golang/prometheus" -+ ver "github.com/prometheus/client_golang/prometheus/collectors/version" - "github.com/prometheus/common/version" - "go.opentelemetry.io/otel" - oc_bridge "go.opentelemetry.io/otel/bridge/opencensus" -@@ -29,6 +24,11 @@ import ( - semconv "go.opentelemetry.io/otel/semconv/v1.25.0" - "google.golang.org/grpc/encoding" - "gopkg.in/yaml.v2" -+ "io" -+ "os" -+ "reflect" -+ "runtime" -+ "time" - - "github.com/grafana/tempo/cmd/tempo/app" - "github.com/grafana/tempo/cmd/tempo/build" -@@ -49,7 +49,7 @@ func init() { - version.Version = Version - version.Branch = Branch - version.Revision = Revision -- prometheus.MustRegister(version.NewCollector(appName)) -+ prometheus.MustRegister(ver.NewCollector(appName)) - - // Register the gogocodec as early as possible. - encoding.RegisterCodec(gogocodec.NewCodec()) -diff --git a/integration/e2e/receivers_test.go b/integration/e2e/receivers_test.go -index 712cc7346..9cb809268 100644 ---- a/integration/e2e/receivers_test.go -+++ b/integration/e2e/receivers_test.go -@@ -55,7 +55,7 @@ func TestReceivers(t *testing.T) { - otlpCfg := exporterCfg.(*otlpexporter.Config) - otlpCfg.ClientConfig = configgrpc.ClientConfig{ - Endpoint: endpoint, -- TLSSetting: configtls.TLSClientSetting{ -+ TLSSetting: configtls.ClientConfig{ - Insecure: true, - }, - } -@@ -71,7 +71,7 @@ func TestReceivers(t *testing.T) { - zipkinCfg := exporterCfg.(*zipkinexporter.Config) - zipkinCfg.ClientConfig = confighttp.ClientConfig{ - Endpoint: endpoint, -- TLSSetting: configtls.TLSClientSetting{ -+ TLSSetting: configtls.ClientConfig{ - Insecure: true, - }, - } -diff --git a/integration/util.go b/integration/util.go -index a8b988584..1f01d729e 100644 ---- a/integration/util.go -+++ b/integration/util.go -@@ -287,7 +287,7 @@ func NewOtelGRPCExporter(endpoint string) (exporter.Traces, error) { - otlpCfg := exporterCfg.(*otlpexporter.Config) - otlpCfg.ClientConfig = configgrpc.ClientConfig{ - Endpoint: endpoint, -- TLSSetting: configtls.TLSClientSetting{ -+ TLSSetting: configtls.ClientConfig{ - Insecure: true, - }, - } -diff --git a/modules/distributor/receiver/shim.go b/modules/distributor/receiver/shim.go -index fe3c3ae02..632422067 100644 ---- a/modules/distributor/receiver/shim.go -+++ b/modules/distributor/receiver/shim.go -@@ -191,12 +191,10 @@ func New(receiverCfg map[string]interface{}, pusher TracesPusher, middleware Mid - receivers = append(receivers, k) - } - -- // Creates a config provider with the given config map. -- // The provider will be used to retrieve the actual config for the pipeline (although we only need the receivers). -- pro, err := otelcol.NewConfigProvider(otelcol.ConfigProviderSettings{ -- ResolverSettings: confmap.ResolverSettings{ -- URIs: []string{"mock:/"}, -- Providers: map[string]confmap.Provider{"mock": &mapProvider{raw: map[string]interface{}{ -+ // Define a factory function to create the mock provider -+ mockProviderFactory := confmap.NewProviderFactory(func(settings confmap.ProviderSettings) confmap.Provider { -+ return &mapProvider{ -+ raw: map[string]interface{}{ - "receivers": receiverCfg, - "exporters": map[string]interface{}{ - "nop": map[string]interface{}{}, -@@ -209,7 +207,19 @@ func New(receiverCfg map[string]interface{}, pusher TracesPusher, middleware Mid - }, - }, - }, -- }}}, -+ }, -+ } -+ }) -+ -+ // Creates a config provider with the given config map. -+ // The provider will be used to retrieve the actual config for the pipeline (although we only need the receivers). -+ pro, err := otelcol.NewConfigProvider(otelcol.ConfigProviderSettings{ -+ ResolverSettings: confmap.ResolverSettings{ -+ URIs: []string{"mock:/"}, -+ ProviderFactories: []confmap.ProviderFactory{ -+ mockProviderFactory, -+ }, -+ DefaultScheme: "mock", - }, - }) - if err != nil {