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
smartcontractkit · Dec 23, 2024 · 963f8c3 · 963f8c3
1 parent 2bb5c5c
commit 963f8c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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,