feat(tracing): add OTLP headers config

flipt-io · Sep 19, 2023 · f44b815 · f44b815
1 parent dc15e40
commit f44b815
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 1 deletion.
diff --git a/config/flipt.schema.cue b/config/flipt.schema.cue
@@ -213,6 +213,7 @@ import "strings"
 
 		otlp?: {
 			endpoint?: string | *"localhost:4317"
+			headers?: [string]: string
 		}
 	}
 

diff --git a/config/flipt.schema.json b/config/flipt.schema.json
@@ -619,6 +619,10 @@
             "endpoint": {
               "type": "string",
               "default": "localhost:4317"
+            },
+            "headers": {
+              "type": "object",
+              "additionalProperties": { "type": "string" }
             }
           },
           "title": "OTLP"

diff --git a/internal/cmd/grpc.go b/internal/cmd/grpc.go
@@ -218,6 +218,7 @@ func NewGRPCServer(
 			// TODO: support additional configuration options
 			client := otlptracegrpc.NewClient(
 				otlptracegrpc.WithEndpoint(cfg.Tracing.OTLP.Endpoint),
+				otlptracegrpc.WithHeaders(cfg.Tracing.OTLP.Headers),
 				// TODO: support TLS
 				otlptracegrpc.WithInsecure())
 			exp, err = otlptrace.New(ctx, client)

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -333,6 +333,18 @@ func TestLoad(t *testing.T) {
 				return cfg
 			},
 		},
+		{
+			name: "tracing otlp",
+			path: "./testdata/tracing/otlp.yml",
+			expected: func() *Config {
+				cfg := Default()
+				cfg.Tracing.Enabled = true
+				cfg.Tracing.Exporter = TracingOTLP
+				cfg.Tracing.OTLP.Endpoint = "http://localhost:9999"
+				cfg.Tracing.OTLP.Headers = map[string]string{"api-key": "test-key"}
+				return cfg
+			},
+		},
 		{
 			name: "database key/value",
 			path: "./testdata/database.yml",

diff --git a/internal/config/testdata/tracing/otlp.yml b/internal/config/testdata/tracing/otlp.yml
@@ -0,0 +1,7 @@
+tracing:
+  enabled: true
+  exporter: otlp
+  otlp:
+    endpoint: http://localhost:9999
+    headers:
+      api-key: test-key
diff --git a/internal/config/tracing.go b/internal/config/tracing.go
@@ -106,5 +106,6 @@ type ZipkinTracingConfig struct {
 // OTLPTracingConfig contains fields, which configure
 // OTLP span and tracing output destination.
 type OTLPTracingConfig struct {
-	Endpoint string `json:"endpoint,omitempty" mapstructure:"endpoint"`
+	Endpoint string            `json:"endpoint,omitempty" mapstructure:"endpoint"`
+	Headers  map[string]string `json:"headers,omitempty" mapstructure:"headers"`
 }