add support for propagating telemetry in configmap

Author: taskbot

cmd/thv-operator/controllers/mcpserver_runconfig.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 	"sort"
+	"strconv"
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
@@ -289,6 +290,9 @@ func (r *MCPServerReconciler) createRunConfigFromMCPServer(m *mcpv1alpha1.MCPSer
 		}
 	}
 
+	// Add telemetry configuration if specified
+	addTelemetryConfigOptions(&options, m.Spec.Telemetry, m.Name)
+
 	// Use the RunConfigBuilder for operator context with full builder pattern
 	return runner.NewOperatorRunConfigBuilder(
 		context.Background(),
@@ -534,3 +538,75 @@ func convertSecretsFromMCPServer(secs []mcpv1alpha1.SecretRef) []string {
 	}
 	return secrets
 }
+
+// addTelemetryConfigOptions adds telemetry configuration options to the builder options
+func addTelemetryConfigOptions(
+	options *[]runner.RunConfigBuilderOption,
+	telemetryConfig *mcpv1alpha1.TelemetryConfig,
+	mcpServerName string,
+) {
+	if telemetryConfig == nil {
+		return
+	}
+
+	// Default values
+	var otelEndpoint string
+	var otelEnablePrometheusMetricsPath bool
+	var otelTracingEnabled bool
+	var otelMetricsEnabled bool
+	var otelServiceName string
+	var otelSamplingRate = 0.05 // Default sampling rate
+	var otelHeaders []string
+	var otelInsecure bool
+	var otelEnvironmentVariables []string
+
+	// Process OpenTelemetry configuration
+	if telemetryConfig.OpenTelemetry != nil && telemetryConfig.OpenTelemetry.Enabled {
+		otel := telemetryConfig.OpenTelemetry
+
+		otelEndpoint = otel.Endpoint
+		otelInsecure = otel.Insecure
+		otelHeaders = otel.Headers
+
+		// Use MCPServer name as service name if not specified
+		if otel.ServiceName != "" {
+			otelServiceName = otel.ServiceName
+		} else {
+			otelServiceName = mcpServerName
+		}
+
+		// Handle tracing configuration
+		if otel.Tracing != nil {
+			otelTracingEnabled = otel.Tracing.Enabled
+			if otel.Tracing.SamplingRate != "" {
+				// Parse sampling rate string to float64
+				if rate, err := strconv.ParseFloat(otel.Tracing.SamplingRate, 64); err == nil {
+					otelSamplingRate = rate
+				}
+			}
+		}
+
+		// Handle metrics configuration
+		if otel.Metrics != nil {
+			otelMetricsEnabled = otel.Metrics.Enabled
+		}
+	}
+
+	// Process Prometheus configuration
+	if telemetryConfig.Prometheus != nil {
+		otelEnablePrometheusMetricsPath = telemetryConfig.Prometheus.Enabled
+	}
+
+	// Add telemetry config to options
+	*options = append(*options, runner.WithTelemetryConfig(
+		otelEndpoint,
+		otelEnablePrometheusMetricsPath,
+		otelTracingEnabled,
+		otelMetricsEnabled,
+		otelServiceName,
+		otelSamplingRate,
+		otelHeaders,
+		otelInsecure,
+		otelEnvironmentVariables,
+	))
+}

cmd/thv-operator/controllers/mcpserver_runconfig_test.go

@@ -282,6 +282,124 @@ func TestCreateRunConfigFromMCPServer(t *testing.T) {
 				assert.Len(t, config.Secrets, 0)
 			},
 		},
+		{
+			name: "with telemetry configuration",
+			mcpServer: &mcpv1alpha1.MCPServer{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "telemetry-server",
+					Namespace: "test-ns",
+				},
+				Spec: mcpv1alpha1.MCPServerSpec{
+					Image:     testImage,
+					Transport: stdioTransport,
+					Port:      8080,
+					Telemetry: &mcpv1alpha1.TelemetryConfig{
+						OpenTelemetry: &mcpv1alpha1.OpenTelemetryConfig{
+							Enabled:     true,
+							Endpoint:    "http://otel-collector:4317",
+							ServiceName: "custom-service-name",
+							Insecure:    true,
+							Headers:     []string{"Authorization=Bearer token123", "X-API-Key=abc"},
+							Tracing: &mcpv1alpha1.OpenTelemetryTracingConfig{
+								Enabled:      true,
+								SamplingRate: "0.25",
+							},
+							Metrics: &mcpv1alpha1.OpenTelemetryMetricsConfig{
+								Enabled: true,
+							},
+						},
+						Prometheus: &mcpv1alpha1.PrometheusConfig{
+							Enabled: true,
+						},
+					},
+				},
+			},
+			//nolint:thelper // We want to see the error at the specific line
+			expected: func(t *testing.T, config *runner.RunConfig) {
+				assert.Equal(t, "telemetry-server", config.Name)
+
+				// Verify telemetry config is set
+				assert.NotNil(t, config.TelemetryConfig)
+
+				// Check OpenTelemetry settings
+				assert.Equal(t, "http://otel-collector:4317", config.TelemetryConfig.Endpoint)
+				assert.Equal(t, "custom-service-name", config.TelemetryConfig.ServiceName)
+				assert.True(t, config.TelemetryConfig.Insecure)
+				assert.True(t, config.TelemetryConfig.TracingEnabled)
+				assert.True(t, config.TelemetryConfig.MetricsEnabled)
+				assert.Equal(t, 0.25, config.TelemetryConfig.SamplingRate)
+				assert.Equal(t, map[string]string{"Authorization": "Bearer token123", "X-API-Key": "abc"}, config.TelemetryConfig.Headers)
+
+				// Check Prometheus settings
+				assert.True(t, config.TelemetryConfig.EnablePrometheusMetricsPath)
+			},
+		},
+		{
+			name: "with minimal telemetry configuration",
+			mcpServer: &mcpv1alpha1.MCPServer{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "minimal-telemetry-server",
+					Namespace: "test-ns",
+				},
+				Spec: mcpv1alpha1.MCPServerSpec{
+					Image:     testImage,
+					Transport: stdioTransport,
+					Port:      8080,
+					Telemetry: &mcpv1alpha1.TelemetryConfig{
+						OpenTelemetry: &mcpv1alpha1.OpenTelemetryConfig{
+							Enabled:  true,
+							Endpoint: "https://secure-otel:4318",
+							// ServiceName not specified - should default to MCPServer name
+						},
+					},
+				},
+			},
+			//nolint:thelper // We want to see the error at the specific line
+			expected: func(t *testing.T, config *runner.RunConfig) {
+				assert.Equal(t, "minimal-telemetry-server", config.Name)
+
+				// Verify telemetry config is set
+				assert.NotNil(t, config.TelemetryConfig)
+
+				// Check that service name defaults to MCPServer name
+				assert.Equal(t, "minimal-telemetry-server", config.TelemetryConfig.ServiceName)
+				assert.Equal(t, "https://secure-otel:4318", config.TelemetryConfig.Endpoint)
+				assert.False(t, config.TelemetryConfig.Insecure)           // Default should be false
+				assert.Equal(t, 0.05, config.TelemetryConfig.SamplingRate) // Default sampling rate
+			},
+		},
+		{
+			name: "with prometheus only telemetry",
+			mcpServer: &mcpv1alpha1.MCPServer{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "prometheus-only-server",
+					Namespace: "test-ns",
+				},
+				Spec: mcpv1alpha1.MCPServerSpec{
+					Image:     testImage,
+					Transport: stdioTransport,
+					Port:      8080,
+					Telemetry: &mcpv1alpha1.TelemetryConfig{
+						Prometheus: &mcpv1alpha1.PrometheusConfig{
+							Enabled: true,
+						},
+					},
+				},
+			},
+			//nolint:thelper // We want to see the error at the specific line
+			expected: func(t *testing.T, config *runner.RunConfig) {
+				assert.Equal(t, "prometheus-only-server", config.Name)
+
+				// Verify telemetry config is set
+				assert.NotNil(t, config.TelemetryConfig)
+
+				// Only Prometheus should be enabled
+				assert.True(t, config.TelemetryConfig.EnablePrometheusMetricsPath)
+				assert.False(t, config.TelemetryConfig.TracingEnabled)
+				assert.False(t, config.TelemetryConfig.MetricsEnabled)
+				assert.Equal(t, "", config.TelemetryConfig.Endpoint)
+			},
+		},
 	}
 
 	for _, tt := range tests {