beholder/config: wire up ChipIngressForceIPV4 option

Author: pkcll

pkg/beholder/client.go

@@ -231,7 +231,7 @@ func NewGRPCClient(cfg Config, otlploggrpcNew otlploggrpcFactory) (*Client, erro
 			headerProvider := NewStaticAuthHeaderProvider(cfg.AuthHeaders)
 			chipIngressOpts = append(chipIngressOpts, chipingress.WithTokenAuth(headerProvider))
 		}
-		if !cfg.ChipIngressIPv6Enabled {
+		if cfg.ChipIngressForceIPV4 {
 			// Force the use of IPv4 addresses for the chip ingress connection
 			chipIngressOpts = append(chipIngressOpts, chipingress.WithForceIPV4())
 		}

pkg/beholder/config.go

@@ -38,7 +38,7 @@ type Config struct {
 	ChipIngressEmitterEnabled      bool
 	ChipIngressEmitterGRPCEndpoint string
 	ChipIngressInsecureConnection  bool // Disables TLS for Chip Ingress Emitter
-	ChipIngressIPv6Enabled         bool
+	ChipIngressForceIPV4           bool // Forces IPv4 connections for Chip Ingress Emitter
 
 	// OTel Log
 	LogExportTimeout      time.Duration

pkg/beholder/config_test.go

@@ -57,6 +57,6 @@ func ExampleConfig() {
 	}
 	fmt.Printf("%+v\n", *config.LogRetryConfig)
 	// Output:
-	// {InsecureConnection:true CACertFile: OtelExporterGRPCEndpoint:localhost:4317 OtelExporterHTTPEndpoint:localhost:4318 ResourceAttributes:[{Key:package_name Value:{vtype:4 numeric:0 stringly:beholder slice:<nil>}} {Key:sender Value:{vtype:4 numeric:0 stringly:beholderclient slice:<nil>}}] EmitterExportTimeout:1s EmitterExportInterval:1s EmitterExportMaxBatchSize:512 EmitterMaxQueueSize:2048 EmitterBatchProcessor:true TraceSampleRatio:1 TraceBatchTimeout:1s TraceSpanExporter:<nil> TraceRetryConfig:<nil> MetricReaderInterval:1s MetricRetryConfig:<nil> MetricViews:[] ChipIngressEmitterEnabled:false ChipIngressEmitterGRPCEndpoint: ChipIngressInsecureConnection:false ChipIngressIPv6Enabled:false LogExportTimeout:1s LogExportInterval:1s LogExportMaxBatchSize:512 LogMaxQueueSize:2048 LogBatchProcessor:true LogRetryConfig:<nil> LogStreamingEnabled:false AuthPublicKeyHex: AuthHeaders:map[]}
+	// {InsecureConnection:true CACertFile: OtelExporterGRPCEndpoint:localhost:4317 OtelExporterHTTPEndpoint:localhost:4318 ResourceAttributes:[{Key:package_name Value:{vtype:4 numeric:0 stringly:beholder slice:<nil>}} {Key:sender Value:{vtype:4 numeric:0 stringly:beholderclient slice:<nil>}}] EmitterExportTimeout:1s EmitterExportInterval:1s EmitterExportMaxBatchSize:512 EmitterMaxQueueSize:2048 EmitterBatchProcessor:true TraceSampleRatio:1 TraceBatchTimeout:1s TraceSpanExporter:<nil> TraceRetryConfig:<nil> MetricReaderInterval:1s MetricRetryConfig:<nil> MetricViews:[] ChipIngressEmitterEnabled:false ChipIngressEmitterGRPCEndpoint: ChipIngressInsecureConnection:false ChipIngressForceIPV4:false LogExportTimeout:1s LogExportInterval:1s LogExportMaxBatchSize:512 LogMaxQueueSize:2048 LogBatchProcessor:true LogRetryConfig:<nil> LogStreamingEnabled:false AuthPublicKeyHex: AuthHeaders:map[]}
 	// {InitialInterval:5s MaxInterval:30s MaxElapsedTime:1m0s}
 }

pkg/loop/config.go

@@ -64,6 +64,7 @@ const (
 
 	envChipIngressEndpoint           = "CL_CHIP_INGRESS_ENDPOINT"
 	envChipIngressInsecureConnection = "CL_CHIP_INGRESS_INSECURE_CONNECTION"
+	envChipIngressForceIPV4          = "CL_CHIP_INGRESS_FORCE_IPV4"
 )
 
 // EnvConfig is the configuration between the application and the LOOP executable. The values
@@ -119,6 +120,7 @@ type EnvConfig struct {
 
 	ChipIngressEndpoint           string
 	ChipIngressInsecureConnection bool
+	ChipIngressForceIPV4          bool
 }
 
 // AsCmdEnv returns a slice of environment variable key/value pairs for an exec.Cmd.
@@ -187,6 +189,7 @@ func (e *EnvConfig) AsCmdEnv() (env []string) {
 
 	add(envChipIngressEndpoint, e.ChipIngressEndpoint)
 	add(envChipIngressInsecureConnection, strconv.FormatBool(e.ChipIngressInsecureConnection))
+	add(envChipIngressForceIPV4, strconv.FormatBool(e.ChipIngressForceIPV4))
 
 	return
 }
@@ -350,6 +353,10 @@ func (e *EnvConfig) parse() error {
 		if err != nil {
 			return fmt.Errorf("failed to parse %s: %w", envChipIngressInsecureConnection, err)
 		}
+		e.ChipIngressForceIPV4, err = getBool(envChipIngressForceIPV4)
+		if err != nil {
+			return fmt.Errorf("failed to parse %s: %w", envChipIngressForceIPV4, err)
+		}
 	}
 
 	return nil

pkg/loop/config_test.go

@@ -75,8 +75,9 @@ func TestEnvConfig_parse(t *testing.T) {
 				envTelemetryEmitterExportMaxBatchSize: "100",
 				envTelemetryEmitterMaxQueueSize:       "1000",
 
-				envChipIngressEndpoint:           "http://chip-ingress.example.com",
+				envChipIngressEndpoint:           "chip-ingress.example.com:50051",
 				envChipIngressInsecureConnection: "true",
+				envChipIngressForceIPV4:          "true",
 			},
 			expectError:  false,
 			expectConfig: envCfgFull,
@@ -173,8 +174,9 @@ var envCfgFull = EnvConfig{
 	TelemetryEmitterExportMaxBatchSize: 100,
 	TelemetryEmitterMaxQueueSize:       1000,
 
-	ChipIngressEndpoint:           "http://chip-ingress.example.com",
+	ChipIngressEndpoint:           "chip-ingress.example.com:50051",
 	ChipIngressInsecureConnection: true,
+	ChipIngressForceIPV4:          true,
 }
 
 func TestEnvConfig_AsCmdEnv(t *testing.T) {
@@ -223,8 +225,9 @@ func TestEnvConfig_AsCmdEnv(t *testing.T) {
 	assert.Equal(t, "1000", got[envTelemetryEmitterMaxQueueSize])
 
 	// Assert ChipIngress environment variables
-	assert.Equal(t, "http://chip-ingress.example.com", got[envChipIngressEndpoint])
+	assert.Equal(t, "chip-ingress.example.com:50051", got[envChipIngressEndpoint])
 	assert.Equal(t, "true", got[envChipIngressInsecureConnection])
+	assert.Equal(t, "true", got[envChipIngressForceIPV4])
 }
 
 func TestGetMap(t *testing.T) {