config,crds: unify/simplify OpenTelemetry tracing config.

Simplify OpenTelemetry tracing exporter configuration and unify
it with metrics. We only accept "otlp-http" and "otlp-grpc" as
exporters. All other configuration of the stock otel exporters
can be done using their documented environment variables.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>

Author: klihub

config/crd/bases/config.nri_balloonspolicies.yaml

@@ -784,9 +784,12 @@ spec:
                       Endpoints are specified as full URLs, or as plain URL schemes which then
                       imply scheme-specific defaults. The supported schemes and their default
                       URLs are:
-                        - otlp-http, http: localhost:4318
-                        - otlp-grpc, grpc: localhost:4317
-                    example: otlp-http://localhost:4318
+                        - otlp-http: use OpenTelemetry HTTP[S] tracing exporter/collector
+                        - otlp-grpc: use OpenTelemetry gRPC tracing exported/collector
+                    enum:
+                    - otlp-http
+                    - otlp-grpc
+                    example: otlp-http
                     type: string
                 type: object
               loadClasses:

config/crd/bases/config.nri_templatepolicies.yaml

@@ -508,9 +508,12 @@ spec:
                       Endpoints are specified as full URLs, or as plain URL schemes which then
                       imply scheme-specific defaults. The supported schemes and their default
                       URLs are:
-                        - otlp-http, http: localhost:4318
-                        - otlp-grpc, grpc: localhost:4317
-                    example: otlp-http://localhost:4318
+                        - otlp-http: use OpenTelemetry HTTP[S] tracing exporter/collector
+                        - otlp-grpc: use OpenTelemetry gRPC tracing exported/collector
+                    enum:
+                    - otlp-http
+                    - otlp-grpc
+                    example: otlp-http
                     type: string
                 type: object
               log:

config/crd/bases/config.nri_topologyawarepolicies.yaml

@@ -535,9 +535,12 @@ spec:
                       Endpoints are specified as full URLs, or as plain URL schemes which then
                       imply scheme-specific defaults. The supported schemes and their default
                       URLs are:
-                        - otlp-http, http: localhost:4318
-                        - otlp-grpc, grpc: localhost:4317
-                    example: otlp-http://localhost:4318
+                        - otlp-http: use OpenTelemetry HTTP[S] tracing exporter/collector
+                        - otlp-grpc: use OpenTelemetry gRPC tracing exported/collector
+                    enum:
+                    - otlp-http
+                    - otlp-grpc
+                    example: otlp-http
                     type: string
                 type: object
               log:

deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml

@@ -784,9 +784,12 @@ spec:
                       Endpoints are specified as full URLs, or as plain URL schemes which then
                       imply scheme-specific defaults. The supported schemes and their default
                       URLs are:
-                        - otlp-http, http: localhost:4318
-                        - otlp-grpc, grpc: localhost:4317
-                    example: otlp-http://localhost:4318
+                        - otlp-http: use OpenTelemetry HTTP[S] tracing exporter/collector
+                        - otlp-grpc: use OpenTelemetry gRPC tracing exported/collector
+                    enum:
+                    - otlp-http
+                    - otlp-grpc
+                    example: otlp-http
                     type: string
                 type: object
               loadClasses:

deployment/helm/template/crds/config.nri_templatepolicies.yaml

@@ -508,9 +508,12 @@ spec:
                       Endpoints are specified as full URLs, or as plain URL schemes which then
                       imply scheme-specific defaults. The supported schemes and their default
                       URLs are:
-                        - otlp-http, http: localhost:4318
-                        - otlp-grpc, grpc: localhost:4317
-                    example: otlp-http://localhost:4318
+                        - otlp-http: use OpenTelemetry HTTP[S] tracing exporter/collector
+                        - otlp-grpc: use OpenTelemetry gRPC tracing exported/collector
+                    enum:
+                    - otlp-http
+                    - otlp-grpc
+                    example: otlp-http
                     type: string
                 type: object
               log:

deployment/helm/topology-aware/crds/config.nri_topologyawarepolicies.yaml

@@ -535,9 +535,12 @@ spec:
                       Endpoints are specified as full URLs, or as plain URL schemes which then
                       imply scheme-specific defaults. The supported schemes and their default
                       URLs are:
-                        - otlp-http, http: localhost:4318
-                        - otlp-grpc, grpc: localhost:4317
-                    example: otlp-http://localhost:4318
+                        - otlp-http: use OpenTelemetry HTTP[S] tracing exporter/collector
+                        - otlp-grpc: use OpenTelemetry gRPC tracing exported/collector
+                    enum:
+                    - otlp-http
+                    - otlp-grpc
+                    example: otlp-http
                     type: string
                 type: object
               log:

docs/resource-policy/policy/balloons.md

@@ -340,7 +340,7 @@ Balloons policy parameters:
   - `samplingRatePerMillion`: the number of samples to collect per million spans.
     Example: `100000`
   - `tracingCollector`: defines the external endpoint for tracing data collection.
-    Example: `otlp-http://localhost:4318`.
+    Example: `otlp-http`.
 - `agent`: controls communicating with the Kubernetes node agent and
   the API server.
   - `nodeResourceTopology`: if `true`, expose balloons as node

pkg/apis/config/v1alpha1/instrumentation/config.go

@@ -30,10 +30,11 @@ type Config struct {
 	// Endpoints are specified as full URLs, or as plain URL schemes which then
 	// imply scheme-specific defaults. The supported schemes and their default
 	// URLs are:
-	//   - otlp-http, http: localhost:4318
-	//   - otlp-grpc, grpc: localhost:4317
+	//   - otlp-http: use OpenTelemetry HTTP[S] tracing exporter/collector
+	//   - otlp-grpc: use OpenTelemetry gRPC tracing exported/collector
 	// +optional
-	// +kubebuilder:example="otlp-http://localhost:4318"
+	// +kubebuilder:validation:Enum=otlp-http;otlp-grpc
+	// +kubebuilder:example="otlp-http"
 	TracingCollector string `json:"tracingCollector,omitempty"`
 	// MetricsExporter defines which exporter is used to export metrics.
 	// The supported exporters are:

pkg/instrumentation/tracing/exporter.go

@@ -17,14 +17,18 @@ package tracing
 import (
 	"context"
 	"fmt"
-	"net/url"
 	"sync"
 
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
+const (
+	httpExporter = "otlp-http"
+	grpcExporter = "otlp-grpc"
+)
+
 var (
 	_ sdktrace.SpanExporter = (*spanExporter)(nil)
 )
@@ -71,44 +75,17 @@ func (e *spanExporter) setEndpoint(endpoint string) error {
 	defer e.Unlock()
 
 	var (
-		u   *url.URL
 		exp sdktrace.SpanExporter
 		err error
 	)
 
-	// Notes:
-	//   We allow collector endpoint URLs to be given as a plain scheme-prefix,
-	//   IOW, without a host, port, and path. If only a prefix is given, the
-	//   exporters use defaults defined by the OTLP library. These are:
-	//     - otlp-http, http: localhost:4318
-	//     - otlp-grpc, grpc: localhost:4317
-	//
-
 	switch endpoint {
-	case "otlp-http", "http", "otlp-grpc", "grpc":
-		u = &url.URL{Scheme: endpoint}
-	default:
-		u, err = url.Parse(endpoint)
-		if err != nil {
-			return fmt.Errorf("invalid tracing endpoint %q: %w", endpoint, err)
-		}
-	}
-
-	switch u.Scheme {
-	case "otlp-http", "http":
-		opts := []otlptracehttp.Option{otlptracehttp.WithInsecure()}
-		if u.Host != "" {
-			opts = append(opts, otlptracehttp.WithEndpoint(u.Host))
-		}
-		exp, err = otlptracehttp.New(context.Background(), opts...)
+	case httpExporter:
+		exp, err = otlptracehttp.New(context.Background())
 		e.exporter = exp
 		return err
-	case "otlp-grpc", "grpc":
-		opts := []otlptracegrpc.Option{otlptracegrpc.WithInsecure()}
-		if u.Host != "" {
-			opts = append(opts, otlptracegrpc.WithEndpoint(u.Host))
-		}
-		exp, err = otlptracegrpc.New(context.Background(), opts...)
+	case grpcExporter:
+		exp, err = otlptracegrpc.New(context.Background())
 		e.exporter = exp
 		return err
 	}