Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions internal/config/config_stdin.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ type StdinOpenTelemetryConfig struct {
// Endpoint is the OTLP/HTTP collector URL. MUST be HTTPS. Supports ${VAR} expansion.
Endpoint string `json:"endpoint"`

// Headers is a comma-separated list of key=value HTTP headers for export requests
// (e.g. "Authorization=Bearer ${OTEL_TOKEN},X-Custom=value"). Supports ${VAR} expansion.
Headers string `json:"headers,omitempty"`

// TraceID is the parent trace ID (32-char lowercase hex, W3C format). Supports ${VAR}.
TraceID string `json:"traceId,omitempty"`

Expand Down
1 change: 0 additions & 1 deletion internal/config/config_tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ func init() {
}
cfg.Gateway.Tracing = &TracingConfig{
Endpoint: otel.Endpoint,
Headers: otel.Headers,
TraceID: otel.TraceID,
SpanID: otel.SpanID,
ServiceName: otel.ServiceName,
Expand Down
2 changes: 0 additions & 2 deletions internal/config/config_tracing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,6 @@ func TestStdinConverter_OTelConfig(t *testing.T) {
Gateway: &StdinGatewayConfig{
OpenTelemetry: &StdinOpenTelemetryConfig{
Endpoint: "https://otel.example.com",
Headers: "Authorization=Bearer tok",
TraceID: "4bf92f3577b34da6a3ce929d0e0e4736",
SpanID: "00f067aa0ba902b7",
ServiceName: "my-service",
Expand All @@ -376,7 +375,6 @@ func TestStdinConverter_OTelConfig(t *testing.T) {

require.NotNil(t, cfg.Gateway.Tracing, "TracingConfig must be populated by the stdin converter")
assert.Equal(t, "https://otel.example.com", cfg.Gateway.Tracing.Endpoint)
assert.Equal(t, "Authorization=Bearer tok", cfg.Gateway.Tracing.Headers)
assert.Equal(t, "4bf92f3577b34da6a3ce929d0e0e4736", cfg.Gateway.Tracing.TraceID)
assert.Equal(t, "00f067aa0ba902b7", cfg.Gateway.Tracing.SpanID)
assert.Equal(t, "my-service", cfg.Gateway.Tracing.ServiceName)
Expand Down
17 changes: 6 additions & 11 deletions internal/config/load_from_stdin_coverage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ func TestLoadFromStdin_ValidateGatewayConfigError_AllZeroTraceId(t *testing.T) {
}

// TestLoadFromStdin_OpenTelemetryHeaders verifies that gateway.opentelemetry.headers
// passes schema validation and is converted into the runtime tracing config.
// is rejected by schema validation (spec §4.1.3.7 v1.14.0 Breaking Change).
// Authentication headers must be provided via OTEL_EXPORTER_OTLP_HEADERS env var.
func TestLoadFromStdin_OpenTelemetryHeaders(t *testing.T) {
jsonConfig := `{
"mcpServers": {
Expand All @@ -201,19 +202,13 @@ func TestLoadFromStdin_OpenTelemetryHeaders(t *testing.T) {
}
}`

var (
cfg *Config
loadErr error
)
var loadErr error
stdinFromString(t, jsonConfig, func() {
cfg, loadErr = LoadFromStdin()
_, loadErr = LoadFromStdin()
})

require.NoError(t, loadErr)
require.NotNil(t, cfg)
require.NotNil(t, cfg.Gateway)
require.NotNil(t, cfg.Gateway.Tracing)
assert.Equal(t, "X-Test=value", cfg.Gateway.Tracing.Headers)
require.Error(t, loadErr, "headers field in opentelemetry config must be rejected")
assert.ErrorContains(t, loadErr, "headers")
}

// TestNormalizeLocalType_NonObjectServerValue covers the continue branch (line 616-617)
Expand Down
5 changes: 0 additions & 5 deletions internal/config/schema/mcp-gateway-config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -456,11 +456,6 @@
"description": "Logical service name reported in the 'service.name' resource attribute of all emitted spans. Identifies the gateway in the tracing backend. Defaults to 'mcp-gateway' when not specified.",
"minLength": 1,
"default": "mcp-gateway"
},
"headers": {
"type": "string",
"description": "Comma-separated key=value HTTP headers for OTLP export requests. Supports ${VAR} expansion.",
"minLength": 1
}
},
"required": [
Expand Down
1 change: 0 additions & 1 deletion internal/config/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@ func validateGatewayConfig(gateway *StdinGatewayConfig) error {
if gateway.OpenTelemetry != nil {
tracingCfg := &TracingConfig{
Endpoint: gateway.OpenTelemetry.Endpoint,
Headers: gateway.OpenTelemetry.Headers,
TraceID: gateway.OpenTelemetry.TraceID,
SpanID: gateway.OpenTelemetry.SpanID,
ServiceName: gateway.OpenTelemetry.ServiceName,
Expand Down
Loading