feat: add support for OTLP headers and protocol in telemetry configuration

Signed-off-by: André Silva <[email protected]>

Author: askpt

core/pkg/telemetry/builder.go

@@ -38,6 +38,8 @@ type CollectorConfig struct {
 	KeyPath        string
 	ReloadInterval time.Duration
 	CAPath         string
+	Headers        string
+	Protocol       string
 }
 
 // Config of the telemetry runtime. These are expected to be mapped to start-up arguments

flagd/cmd/start.go

@@ -146,6 +146,14 @@ func overrideOtelUri() string {
 	return collectorUri
 }
 
+func getOtelHeaders() string {
+	return os.Getenv("OTEL_EXPORTER_OTLP_HEADERS")
+}
+
+func getOtelProtocol() string {
+	return os.Getenv("OTEL_EXPORTER_OTLP_PROTOCOL")
+}
+
 // startCmd represents the start command
 var startCmd = &cobra.Command{
 	Use:   "start",
@@ -200,6 +208,8 @@ var startCmd = &cobra.Command{
 
 		var metricsExporter = overrideMetricsExporter()
 		var collectorUri = overrideOtelUri()
+		var otelHeaders = getOtelHeaders()
+		var otelProtocol = getOtelProtocol()
 
 		// Build Runtime -----------------------------------------------------------
 		rt, err := runtime.FromConfig(logger, Version, runtime.Config{
@@ -211,6 +221,8 @@ var startCmd = &cobra.Command{
 			OtelCertPath:               viper.GetString(otelCertPathFlagName),
 			OtelKeyPath:                viper.GetString(otelKeyPathFlagName),
 			OtelReloadInterval:         viper.GetDuration(otelReloadIntervalFlagName),
+			OtelHeaders:                otelHeaders,
+			OtelProtocol:               otelProtocol,
 			OtelCAPath:                 viper.GetString(otelCAPathFlagName),
 			ServiceCertPath:            viper.GetString(serverCertPathFlagName),
 			ServiceKeyPath:             viper.GetString(serverKeyPathFlagName),

flagd/pkg/runtime/from_config.go

@@ -31,6 +31,8 @@ type Config struct {
 	OtelCertPath          string
 	OtelKeyPath           string
 	OtelCAPath            string
+	OtelHeaders           string
+	OtelProtocol          string
 	OtelReloadInterval    time.Duration
 	ServiceCertPath       string
 	ServiceKeyPath        string
@@ -59,6 +61,8 @@ func FromConfig(logger *logger.Logger, version string, config Config) (*Runtime,
 			KeyPath:        config.OtelKeyPath,
 			CAPath:         config.OtelCAPath,
 			ReloadInterval: config.OtelReloadInterval,
+			Headers:        config.OtelHeaders,
+			Protocol:       config.OtelProtocol,
 		},
 	}
 
@@ -105,9 +109,9 @@ func FromConfig(logger *logger.Logger, version string, config Config) (*Runtime,
 
 	// ofrep service
 	ofrepService, err := ofrep.NewOfrepService(jsonEvaluator, config.CORS, ofrep.SvcConfiguration{
-		Logger: logger.WithFields(zap.String("component", "OFREPService")),
-		Port:   config.OfrepServicePort,
-		ServiceName: svcName,
+		Logger:          logger.WithFields(zap.String("component", "OFREPService")),
+		Port:            config.OfrepServicePort,
+		ServiceName:     svcName,
 		MetricsRecorder: recorder,
 	},
 		config.ContextValues,