From ac73d198997aeb25eb46a9c77a29a56e194e0332 Mon Sep 17 00:00:00 2001 From: Calin Martinconi Date: Wed, 27 May 2026 18:20:38 +0300 Subject: [PATCH] revert: feat(config): support new bee OTLP tracing flags (#585) This reverts commit 34f33e4071e1a9655121ccd7587825d066229003. PR #585 introduced `tracing-otlp-endpoint`, `tracing-otlp-insecure`, and `tracing-sampling-ratio` config keys in the bee config template, replacing `tracing-endpoint`. Bee master does not yet recognise these keys (the OpenTelemetry migration is on the `feat/opentelemetry-migration` branch and hasn't merged), so bee fails startup with "unknown parameters" and bee PR CI consistently times out at "bootnode-0 is not ready yet". Revert until the bee OpenTelemetry migration lands; #585 will be reopened so the change can re-land alongside it. --- config/config.yaml | 2 +- config/staging.yaml | 2 +- config/testnet-bee-playground.yaml | 2 +- pkg/config/bee.go | 12 +----------- pkg/orchestration/k8s/helpers.go | 4 +--- pkg/orchestration/node.go | 4 +--- 6 files changed, 6 insertions(+), 20 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index c89796d89..6d90d4f23 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -124,7 +124,7 @@ bee-configs: swap-factory-address: "0xdD661f2500bA5831e3d1FEbAc379Ea1bF80773Ac" swap-initial-deposit: 500000000000000000 tracing-enabled: true - tracing-otlp-endpoint: "10.10.11.199:4318" + tracing-endpoint: "10.10.11.199:6831" tracing-service-name: "bee" verbosity: 5 # 1=error, 2=warn, 3=info, 4=debug, 5=trace warmup-time: 0s diff --git a/config/staging.yaml b/config/staging.yaml index ea4ece9e8..9345579ae 100644 --- a/config/staging.yaml +++ b/config/staging.yaml @@ -42,7 +42,7 @@ bee-configs: password: "beekeeper" swap-enable: true tracing-enabled: true - tracing-otlp-endpoint: "10.10.11.199:4318" + tracing-endpoint: "10.10.11.199:6831" tracing-service-name: "bee" verbosity: 4 welcome-message: Welcome to the bee staging environment created by Beekeeper! diff --git a/config/testnet-bee-playground.yaml b/config/testnet-bee-playground.yaml index 6143e5de6..4ef4f645a 100644 --- a/config/testnet-bee-playground.yaml +++ b/config/testnet-bee-playground.yaml @@ -69,7 +69,7 @@ bee-configs: swap-enable: true swap-initial-deposit: 0 tracing-enabled: false - tracing-otlp-endpoint: "10.10.11.199:4318" + tracing-endpoint: "10.10.11.199:6831" tracing-service-name: "bee-playground" verbosity: 5 warmup-time: 5m0s diff --git a/pkg/config/bee.go b/pkg/config/bee.go index bddaa8151..343664794 100644 --- a/pkg/config/bee.go +++ b/pkg/config/bee.go @@ -58,9 +58,7 @@ type BeeConfig struct { SwapFactoryAddress *string `yaml:"swap-factory-address"` SwapInitialDeposit *uint64 `yaml:"swap-initial-deposit"` TracingEnabled *bool `yaml:"tracing-enabled"` - TracingOTLPEndpoint *string `yaml:"tracing-otlp-endpoint"` - TracingOTLPInsecure *bool `yaml:"tracing-otlp-insecure"` - TracingSamplingRatio *float64 `yaml:"tracing-sampling-ratio"` + TracingEndpoint *string `yaml:"tracing-endpoint"` TracingServiceName *string `yaml:"tracing-service-name"` Verbosity *uint64 `yaml:"verbosity"` WarmupTime *time.Duration `yaml:"warmup-time"` @@ -100,13 +98,5 @@ func (b *BeeConfig) Export() (config orchestration.Config) { config.BlockchainRPCEndpoint = *b.SwapEndpoint } - // Bee's tracing-sampling-ratio semantics: 0 disables sampling, 1 samples - // everything. Default to 1 when unset so existing beekeeper configs (which - // never specified the key) keep the prior "sample everything" behavior - // rather than silently turning tracing off. - if b.TracingSamplingRatio == nil { - config.TracingSamplingRatio = 1.0 - } - return config } diff --git a/pkg/orchestration/k8s/helpers.go b/pkg/orchestration/k8s/helpers.go index aff01cef7..e763be697 100644 --- a/pkg/orchestration/k8s/helpers.go +++ b/pkg/orchestration/k8s/helpers.go @@ -56,9 +56,7 @@ swap-enable: {{.SwapEnable}} swap-factory-address: {{.SwapFactoryAddress}} swap-initial-deposit: {{.SwapInitialDeposit}} tracing-enable: {{.TracingEnabled}} -tracing-otlp-endpoint: {{.TracingOTLPEndpoint}} -tracing-otlp-insecure: {{.TracingOTLPInsecure}} -tracing-sampling-ratio: {{.TracingSamplingRatio}} +tracing-endpoint: {{.TracingEndpoint}} tracing-service-name: {{.TracingServiceName}} verbosity: {{.Verbosity}} warmup-time: {{.WarmupTime}} diff --git a/pkg/orchestration/node.go b/pkg/orchestration/node.go index c235d55c3..20bdce748 100644 --- a/pkg/orchestration/node.go +++ b/pkg/orchestration/node.go @@ -116,9 +116,7 @@ type Config struct { SwapFactoryAddress string // swap factory address SwapInitialDeposit uint64 // initial deposit if deploying a new chequebook TracingEnabled bool // enable tracing - TracingOTLPEndpoint string // OTLP/HTTP endpoint for tracing data (host:port) - TracingOTLPInsecure bool // disable TLS for the OTLP exporter - TracingSamplingRatio float64 // head-based sampling ratio in [0,1]; 1 samples everything + TracingEndpoint string // endpoint to send tracing data TracingServiceName string // service name identifier for tracing Verbosity uint64 // log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace WarmupTime time.Duration // warmup time pull/pushsync protocols