From 963f8c3f073fe5f08d86f097a5add45e06582532 Mon Sep 17 00:00:00 2001 From: hendoxc Date: Mon, 23 Dec 2024 10:53:45 -0700 Subject: [PATCH] INFOPLAT1-1562 Reconfigures loops to use AuthHeaderProvider keeps old struct fields, to not break build. Will circle back to removing them one, this PR has been integrated into chainlink node --- pkg/loop/config.go | 9 ++------- pkg/loop/server.go | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/loop/config.go b/pkg/loop/config.go index ea68cfa4aa..747b432ef9 100644 --- a/pkg/loop/config.go +++ b/pkg/loop/config.go @@ -9,6 +9,7 @@ import ( "time" "github.com/hashicorp/go-plugin" + "github.com/smartcontractkit/chainlink-common/pkg/beholder" ) const ( @@ -57,6 +58,7 @@ type EnvConfig struct { TelemetryTraceSampleRatio float64 TelemetryAuthHeaders map[string]string TelemetryAuthPubKeyHex string + TelemetryAuthHeaderProvider beholder.AuthHeaderProvider TelemetryEmitterBatchProcessor bool TelemetryEmitterExportTimeout time.Duration TelemetryEmitterExportInterval time.Duration @@ -92,11 +94,6 @@ func (e *EnvConfig) AsCmdEnv() (env []string) { for k, v := range e.TelemetryAttributes { add(envTelemetryAttribute+k, v) } - - for k, v := range e.TelemetryAuthHeaders { - add(envTelemetryAuthHeader+k, v) - } - add(envTelemetryAuthPubKeyHex, e.TelemetryAuthPubKeyHex) add(envTelemetryEmitterBatchProcessor, strconv.FormatBool(e.TelemetryEmitterBatchProcessor)) add(envTelemetryEmitterExportTimeout, e.TelemetryEmitterExportTimeout.String()) add(envTelemetryEmitterExportInterval, e.TelemetryEmitterExportInterval.String()) @@ -148,8 +145,6 @@ func (e *EnvConfig) parse() error { e.TelemetryCACertFile = os.Getenv(envTelemetryCACertFile) e.TelemetryAttributes = getMap(envTelemetryAttribute) e.TelemetryTraceSampleRatio = getFloat64OrZero(envTelemetryTraceSampleRatio) - e.TelemetryAuthHeaders = getMap(envTelemetryAuthHeader) - e.TelemetryAuthPubKeyHex = os.Getenv(envTelemetryAuthPubKeyHex) e.TelemetryEmitterBatchProcessor, err = getBool(envTelemetryEmitterBatchProcessor) if err != nil { return fmt.Errorf("failed to parse %s: %w", envTelemetryEmitterBatchProcessor, err) diff --git a/pkg/loop/server.go b/pkg/loop/server.go index 6cf4f0c5bf..61bf415394 100644 --- a/pkg/loop/server.go +++ b/pkg/loop/server.go @@ -99,6 +99,7 @@ func (s *Server) start() error { TraceSampleRatio: envCfg.TelemetryTraceSampleRatio, AuthHeaders: envCfg.TelemetryAuthHeaders, AuthPublicKeyHex: envCfg.TelemetryAuthPubKeyHex, + AuthHeaderProvider: envCfg.TelemetryAuthHeaderProvider, EmitterBatchProcessor: envCfg.TelemetryEmitterBatchProcessor, EmitterExportTimeout: envCfg.TelemetryEmitterExportTimeout, EmitterExportInterval: envCfg.TelemetryEmitterExportInterval,