Wire up ChipIngressInsecureConnection config option

.changeset/empty-bees-fly.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#updated chip-ingress client

core/cmd/shell.go

@@ -113,7 +113,7 @@ func initGlobals(cfgProm config.Prometheus, cfgTracing config.Tracing, cfgTeleme
 				AuthHeaders:                    beholderAuthHeaders,
 				ChipIngressEmitterEnabled:      cfgTelemetry.ChipIngressEndpoint() != "",
 				ChipIngressEmitterGRPCEndpoint: cfgTelemetry.ChipIngressEndpoint(),
-				ChipIngressInsecureConnection:  cfgTelemetry.InsecureConnection(),
+				ChipIngressInsecureConnection:  cfgTelemetry.ChipIngressInsecureConnection(),
 				LogStreamingEnabled:            cfgTelemetry.LogStreamingEnabled(),
 			}
 			// note: due to the OTEL specification, all histogram buckets

core/config/docs/core.toml

@@ -815,6 +815,9 @@ EmitterBatchProcessor = true # Default
 EmitterExportTimeout = '1s' # Default
 # ChipIngressEndpoint enables sending custom messages to CHIP Ingress.
 ChipIngressEndpoint = '' # Default
+# ChipIngressInsecureConnection disables TLS when connecting to CHIP Ingress.
+ChipIngressInsecureConnection = false # Default
+
 # HeartbeatInterval is the interval at which a the application heartbeat is sent to telemetry backends.
 HeartbeatInterval = '1s' # Default
 # LogStreamingEnabled enables log streaming to the OTel log exporter

core/config/telemetry_config.go

@@ -12,6 +12,7 @@ type Telemetry interface {
 	EmitterBatchProcessor() bool
 	EmitterExportTimeout() time.Duration
 	ChipIngressEndpoint() string
+	ChipIngressInsecureConnection() bool
 	HeartbeatInterval() time.Duration
 	LogStreamingEnabled() bool
 }

core/config/toml/types.go

@@ -2269,17 +2269,18 @@ func (t *Tracing) ValidateConfig() (err error) {
 }
 
 type Telemetry struct {
-	Enabled               *bool
-	CACertFile            *string
-	Endpoint              *string
-	InsecureConnection    *bool
-	ResourceAttributes    map[string]string `toml:",omitempty"`
-	TraceSampleRatio      *float64
-	EmitterBatchProcessor *bool
-	EmitterExportTimeout  *commonconfig.Duration
-	ChipIngressEndpoint   *string
-	HeartbeatInterval     *commonconfig.Duration
-	LogStreamingEnabled   *bool
+	Enabled                       *bool
+	CACertFile                    *string
+	Endpoint                      *string
+	InsecureConnection            *bool
+	ResourceAttributes            map[string]string `toml:",omitempty"`
+	TraceSampleRatio              *float64
+	EmitterBatchProcessor         *bool
+	EmitterExportTimeout          *commonconfig.Duration
+	ChipIngressEndpoint           *string
+	ChipIngressInsecureConnection *bool
+	HeartbeatInterval             *commonconfig.Duration
+	LogStreamingEnabled           *bool
 }
 
 func (b *Telemetry) setFrom(f *Telemetry) {
@@ -2310,6 +2311,9 @@ func (b *Telemetry) setFrom(f *Telemetry) {
 	if v := f.ChipIngressEndpoint; v != nil {
 		b.ChipIngressEndpoint = v
 	}
+	if v := f.ChipIngressInsecureConnection; v != nil {
+		b.ChipIngressInsecureConnection = v
+	}
 	if v := f.HeartbeatInterval; v != nil {
 		b.HeartbeatInterval = v
 	}

core/scripts/cre/environment/configs/workflow-don.toml

@@ -76,6 +76,7 @@
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
       InsecureConnection = true
+      ChipIngressInsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'
 
@@ -98,6 +99,7 @@
       Enabled = true
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
+      ChipIngressInsecureConnection = true
       InsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'
@@ -121,6 +123,7 @@
       Enabled = true
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
+      ChipIngressInsecureConnection = true
       InsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'
@@ -144,6 +147,7 @@
       Enabled = true
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
+      ChipIngressInsecureConnection = true
       InsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'
@@ -167,6 +171,7 @@
       Enabled = true
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
+      ChipIngressInsecureConnection = true
       InsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'

core/scripts/cre/environment/configs/workflow-gateway-capabilities-don.toml

@@ -72,6 +72,7 @@
       Enabled = true
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
+      ChipIngressInsecureConnection = true
       InsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'
@@ -117,6 +118,7 @@
       Enabled = true
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
+      ChipIngressInsecureConnection = true
       InsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'
@@ -160,6 +162,7 @@
       Enabled = true
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
+      ChipIngressInsecureConnection = true
       InsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'

core/scripts/cre/environment/configs/workflow-gateway-don.toml

@@ -71,6 +71,7 @@
       Enabled = true
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
+      ChipIngressInsecureConnection = true
       InsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'
@@ -114,6 +115,7 @@
       Enabled = true
       Endpoint = 'host.docker.internal:4317'
       ChipIngressEndpoint = 'chip-ingress:50051'
+      ChipIngressInsecureConnection = true
       InsecureConnection = true
       TraceSampleRatio = 1
       HeartbeatInterval = '30s'

core/services/chainlink/config_telemetry.go

@@ -89,6 +89,13 @@ func (b *telemetryConfig) ChipIngressEndpoint() string {
 	return *b.s.ChipIngressEndpoint
 }
 
+func (b *telemetryConfig) ChipIngressInsecureConnection() bool {
+	if b.s.ChipIngressInsecureConnection == nil {
+		return false
+	}
+	return *b.s.ChipIngressInsecureConnection
+}
+
 func (b *telemetryConfig) HeartbeatInterval() time.Duration {
 	if b.s.HeartbeatInterval == nil || b.s.HeartbeatInterval.Duration() <= 0 {
 		return defaultHeartbeatInterval

core/services/chainlink/config_telemetry_test.go

@@ -199,6 +199,24 @@ func TestTelemetryConfig_ChipIngressEndpoint(t *testing.T) {
 	}
 }
 
+func TestTelemetryConfig_ChipIngressInsecureConnection(t *testing.T) {
+	tests := []struct {
+		name      string
+		telemetry toml.Telemetry
+		expected  bool
+	}{
+		{"ChipIngressInsecureConnectionTrue", toml.Telemetry{ChipIngressInsecureConnection: ptr(true)}, true},
+		{"ChipIngressInsecureConnectionFalse", toml.Telemetry{ChipIngressInsecureConnection: ptr(false)}, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tc := telemetryConfig{s: tt.telemetry}
+			assert.Equal(t, tt.expected, tc.ChipIngressInsecureConnection())
+		})
+	}
+}
+
 func ptrDuration(d time.Duration) *config.Duration {
 	return config.MustNewDuration(d)
 }

core/services/chainlink/config_test.go

@@ -582,17 +582,18 @@ func TestConfig_Marshal(t *testing.T) {
 		Release:     ptr("v1.2.3"),
 	}
 	full.Telemetry = toml.Telemetry{
-		Enabled:               ptr(true),
-		CACertFile:            ptr("cert-file"),
-		Endpoint:              ptr("example.com/collector"),
-		InsecureConnection:    ptr(true),
-		ResourceAttributes:    map[string]string{"Baz": "test", "Foo": "bar"},
-		TraceSampleRatio:      ptr(0.01),
-		EmitterBatchProcessor: ptr(true),
-		EmitterExportTimeout:  commoncfg.MustNewDuration(1 * time.Second),
-		ChipIngressEndpoint:   ptr("example.com/chip-ingress"),
-		HeartbeatInterval:     commoncfg.MustNewDuration(1 * time.Second),
-		LogStreamingEnabled:   ptr(false),
+		Enabled:                       ptr(true),
+		CACertFile:                    ptr("cert-file"),
+		Endpoint:                      ptr("example.com/collector"),
+		InsecureConnection:            ptr(true),
+		ResourceAttributes:            map[string]string{"Baz": "test", "Foo": "bar"},
+		TraceSampleRatio:              ptr(0.01),
+		EmitterBatchProcessor:         ptr(true),
+		EmitterExportTimeout:          commoncfg.MustNewDuration(1 * time.Second),
+		ChipIngressEndpoint:           ptr("example.com/chip-ingress"),
+		ChipIngressInsecureConnection: ptr(false),
+		HeartbeatInterval:             commoncfg.MustNewDuration(1 * time.Second),
+		LogStreamingEnabled:           ptr(false),
 	}
 	full.CRE = toml.CreConfig{
 		Streams: &toml.StreamsConfig{

core/services/chainlink/testdata/config-empty-effective.toml

@@ -335,6 +335,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

core/services/chainlink/testdata/config-full.toml

@@ -345,6 +345,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = 'example.com/chip-ingress'
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

core/services/chainlink/testdata/config-multi-chain-effective.toml

@@ -335,6 +335,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

core/web/resolver/testdata/config-empty-effective.toml

@@ -335,6 +335,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

core/web/resolver/testdata/config-full.toml

@@ -345,6 +345,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = 'example.com/chip-ingress'
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

core/web/resolver/testdata/config-multi-chain-effective.toml

@@ -335,6 +335,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

docs/CONFIG.md

@@ -2228,6 +2228,7 @@ TraceSampleRatio = 0.01 # Default
 EmitterBatchProcessor = true # Default
 EmitterExportTimeout = '1s' # Default
 ChipIngressEndpoint = '' # Default
+ChipIngressInsecureConnection = false # Default
 HeartbeatInterval = '1s' # Default
 LogStreamingEnabled = false # Default
 ```
@@ -2285,6 +2286,12 @@ ChipIngressEndpoint = '' # Default
 ```
 ChipIngressEndpoint enables sending custom messages to CHIP Ingress.
 
+### ChipIngressInsecureConnection
+```toml
+ChipIngressInsecureConnection = false # Default
+```
+ChipIngressInsecureConnection disables TLS when connecting to CHIP Ingress.
+
 ### HeartbeatInterval
 ```toml
 HeartbeatInterval = '1s' # Default

plugins/loop_registry.go

@@ -127,6 +127,7 @@ func (m *LoopRegistry) Register(id string) (*RegisteredLoop, error) {
 		envCfg.TelemetryEmitterExportTimeout = m.cfgTelemetry.EmitterExportTimeout()
 		envCfg.TelemetryAuthPubKeyHex = m.telemetryAuthPubKeyHex
 		envCfg.ChipIngressEndpoint = m.cfgTelemetry.ChipIngressEndpoint()
+		envCfg.ChipIngressInsecureConnection = m.cfgTelemetry.ChipIngressInsecureConnection()
 		envCfg.TelemetryLogStreamingEnabled = m.cfgTelemetry.LogStreamingEnabled()
 	}
 	m.lggr.Debugf("Registered loopp %q with port %d", id, envCfg.PrometheusPort)

plugins/loop_registry_test.go

@@ -66,6 +66,8 @@ func (m mockCfgTelemetry) EmitterExportTimeout() time.Duration { return 1 * time
 
 func (m mockCfgTelemetry) ChipIngressEndpoint() string { return "example.com/chip-ingress" }
 
+func (m mockCfgTelemetry) ChipIngressInsecureConnection() bool { return false }
+
 func (m mockCfgTelemetry) HeartbeatInterval() time.Duration {
 	return 5 * time.Second
 }

testdata/scripts/config/merge_raw_configs.txtar

@@ -482,6 +482,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/default.txtar

@@ -347,6 +347,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/defaults-override.txtar

@@ -408,6 +408,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/disk-based-logging-disabled.txtar

@@ -391,6 +391,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/disk-based-logging-no-dir.txtar

@@ -391,6 +391,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/disk-based-logging.txtar

@@ -391,6 +391,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/fallback-override.txtar

@@ -489,6 +489,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/invalid-ocr-p2p.txtar

@@ -376,6 +376,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/invalid.txtar

@@ -387,6 +387,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/valid.txtar

@@ -388,6 +388,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false
 

testdata/scripts/node/validate/warnings.txtar

@@ -370,6 +370,7 @@ TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
 EmitterExportTimeout = '1s'
 ChipIngressEndpoint = ''
+ChipIngressInsecureConnection = false
 HeartbeatInterval = '1s'
 LogStreamingEnabled = false