vMCP CRD uses common spec telemetry type

Signed-off-by: Jeremy Drouillard <jeremy@stacklok.com>

Author: jerm-dro

cmd/thv-operator/api/v1alpha1/virtualmcpserver_types.go

@@ -3,8 +3,6 @@ package v1alpha1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-
-	"github.com/stacklok/toolhive/pkg/telemetry"
 )
 
 // VirtualMCPServerSpec defines the desired state of VirtualMCPServer
@@ -60,7 +58,7 @@ type VirtualMCPServerSpec struct {
 	// Telemetry configures OpenTelemetry-based observability for the Virtual MCP server
 	// including distributed tracing, OTLP metrics export, and Prometheus metrics endpoint
 	// +optional
-	Telemetry *telemetry.Config `json:"telemetry,omitempty"`
+	Telemetry *TelemetryConfig `json:"telemetry,omitempty"`
 }
 
 // GroupRef references an MCPGroup resource

cmd/thv-operator/api/v1alpha1/zz_generated.deepcopy.go

@@ -15,6 +15,7 @@ import (
 
 	mcpv1alpha1 "github.com/stacklok/toolhive/cmd/thv-operator/api/v1alpha1"
 	"github.com/stacklok/toolhive/cmd/thv-operator/pkg/oidc"
+	"github.com/stacklok/toolhive/cmd/thv-operator/pkg/spectoconfig"
 	authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
 	vmcpconfig "github.com/stacklok/toolhive/pkg/vmcp/config"
 )
@@ -110,9 +111,7 @@ func (c *Converter) Convert(
 		config.Operational = c.convertOperational(ctx, vmcp)
 	}
 
-	// Convert Telemetry - pass through directly as it's the same type.
-	// Eventually, we may want to decouple the two, but for now this is fine.
-	config.Telemetry = vmcp.Spec.Telemetry
+	config.Telemetry = spectoconfig.ConvertTelemetryConfig(ctx, vmcp.Spec.Telemetry, vmcp.Name)
 
 	// Apply operational defaults (fills missing values)
 	config.EnsureOperationalDefaults()

cmd/thv-operator/pkg/vmcpconfig/converter.go

@@ -733,6 +733,73 @@ spec:
                 - NodePort
                 - LoadBalancer
                 type: string
+              telemetry:
+                description: |-
+                  Telemetry configures OpenTelemetry-based observability for the Virtual MCP server
+                  including distributed tracing, OTLP metrics export, and Prometheus metrics endpoint
+                properties:
+                  openTelemetry:
+                    description: OpenTelemetry defines OpenTelemetry configuration
+                    properties:
+                      enabled:
+                        default: false
+                        description: Enabled controls whether OpenTelemetry is enabled
+                        type: boolean
+                      endpoint:
+                        description: Endpoint is the OTLP endpoint URL for tracing
+                          and metrics
+                        type: string
+                      headers:
+                        description: |-
+                          Headers contains authentication headers for the OTLP endpoint
+                          Specified as key=value pairs
+                        items:
+                          type: string
+                        type: array
+                      insecure:
+                        default: false
+                        description: Insecure indicates whether to use HTTP instead
+                          of HTTPS for the OTLP endpoint
+                        type: boolean
+                      metrics:
+                        description: Metrics defines OpenTelemetry metrics-specific
+                          configuration
+                        properties:
+                          enabled:
+                            default: false
+                            description: Enabled controls whether OTLP metrics are
+                              sent
+                            type: boolean
+                        type: object
+                      serviceName:
+                        description: |-
+                          ServiceName is the service name for telemetry
+                          If not specified, defaults to the MCPServer name
+                        type: string
+                      tracing:
+                        description: Tracing defines OpenTelemetry tracing configuration
+                        properties:
+                          enabled:
+                            default: false
+                            description: Enabled controls whether OTLP tracing is
+                              sent
+                            type: boolean
+                          samplingRate:
+                            default: "0.05"
+                            description: SamplingRate is the trace sampling rate (0.0-1.0)
+                            type: string
+                        type: object
+                    type: object
+                  prometheus:
+                    description: Prometheus defines Prometheus-specific configuration
+                    properties:
+                      enabled:
+                        default: false
+                        description: Enabled controls whether Prometheus metrics endpoint
+                          is exposed
+                        type: boolean
+                    type: object
+                type: object
             required:
             - groupRef
             - incomingAuth

deploy/charts/operator-crds/crds/toolhive.stacklok.dev_virtualmcpservers.yaml

@@ -292,34 +292,41 @@ spec:
 
 ### `.spec.telemetry` (optional)
 
-Configures OpenTelemetry-based observability for the Virtual MCP server, including distributed tracing, OTLP metrics export, and Prometheus metrics endpoint.
+Configures OpenTelemetry-based observability for the Virtual MCP server, including distributed tracing, OTLP metrics export, and Prometheus metrics endpoint. Uses the same configuration structure as `MCPServer.spec.telemetry`.
 
-**Type**: `telemetry.Config`
+**Type**: `TelemetryConfig`
 
 **Fields**:
-- `endpoint` (string): OTLP collector endpoint (host:port format)
-- `serviceName` (string): Service name for telemetry
-- `serviceVersion` (string): Service version for telemetry
-- `tracingEnabled` (boolean): Enable distributed tracing
-- `metricsEnabled` (boolean): Enable OTLP metrics export
-- `samplingRate` (float64): Trace sampling rate (0.0-1.0)
-- `headers` (map[string]string): Authentication headers for OTLP endpoint
-- `insecure` (boolean): Use HTTP instead of HTTPS
-- `enablePrometheusMetricsPath` (boolean): Expose Prometheus /metrics endpoint
-- `environmentVariables` ([]string): Environment variable names to include as span attributes
-- `customAttributes` (map[string]string): Custom resource attributes for all telemetry signals
+- `openTelemetry` (OpenTelemetryConfig, optional): OpenTelemetry configuration
+  - `enabled` (boolean): Controls whether OpenTelemetry is enabled
+  - `endpoint` (string): OTLP endpoint URL for tracing and metrics
+  - `serviceName` (string): Service name for telemetry (defaults to VirtualMCPServer name)
+  - `headers` ([]string): Authentication headers for OTLP endpoint (key=value format)
+  - `insecure` (boolean): Use HTTP instead of HTTPS for the OTLP endpoint
+  - `metrics` (OpenTelemetryMetricsConfig, optional): Metrics-specific configuration
+    - `enabled` (boolean): Controls whether OTLP metrics are sent
+  - `tracing` (OpenTelemetryTracingConfig, optional): Tracing-specific configuration
+    - `enabled` (boolean): Controls whether OTLP tracing is sent
+    - `samplingRate` (string): Trace sampling rate (0.0-1.0, default: "0.05")
+- `prometheus` (PrometheusConfig, optional): Prometheus-specific configuration
+  - `enabled` (boolean): Controls whether Prometheus metrics endpoint is exposed at /metrics
 
 **Example**:
 ```yaml
 spec:
   telemetry:
-    endpoint: "otel-collector:4317"
-    serviceName: "my-vmcp"
-    tracingEnabled: true
-    metricsEnabled: true
-    samplingRate: 0.1
-    insecure: true
-    enablePrometheusMetricsPath: true
+    openTelemetry:
+      enabled: true
+      endpoint: "otel-collector:4317"
+      serviceName: "my-vmcp"
+      insecure: true
+      tracing:
+        enabled: true
+        samplingRate: "0.1"
+      metrics:
+        enabled: true
+    prometheus:
+      enabled: true
 ```
 
 For details on what metrics and traces are emitted, see the [Virtual MCP Server Observability](./virtualmcpserver-observability.md) documentation.
@@ -487,11 +494,16 @@ spec:
 
   # Observability
   telemetry:
-    endpoint: "otel-collector:4317"
-    tracingEnabled: true
-    metricsEnabled: true
-    samplingRate: 0.1
-    enablePrometheusMetricsPath: true
+    openTelemetry:
+      enabled: true
+      endpoint: "otel-collector:4317"
+      tracing:
+        enabled: true
+        samplingRate: "0.1"
+      metrics:
+        enabled: true
+    prometheus:
+      enabled: true
 
 status:
   phase: Ready

docs/operator/crd-api.md

@@ -45,7 +45,8 @@ The vMCP creates spans for each individual backend operation as well as workflow
 ## Configuration
 
 Configure telemetry in the `VirtualMCPServer` resource using the `spec.telemetry`
-field:
+field. The telemetry configuration uses the same `TelemetryConfig` type as
+`MCPServer`, providing a consistent configuration experience across resources.
 
 ```yaml
 apiVersion: toolhive.stacklok.dev/v1alpha1
@@ -55,14 +56,21 @@ metadata:
 spec:
   groupRef:
     name: my-group
+  incomingAuth:
+    type: anonymous
   telemetry:
-    endpoint: "otel-collector:4317"
-    serviceName: "my-vmcp"
-    tracingEnabled: true
-    metricsEnabled: true
-    samplingRate: 0.1
-    insecure: true
-    enablePrometheusMetricsPath: true
+    openTelemetry:
+      enabled: true
+      endpoint: "otel-collector:4317"
+      serviceName: "my-vmcp"
+      insecure: true
+      tracing:
+        enabled: true
+        samplingRate: "0.1"
+      metrics:
+        enabled: true
+    prometheus:
+      enabled: true
 ```
 
 See the [VirtualMCPServer API reference](./virtualmcpserver-api.md) for complete