experimental/wip: different exports per namespace

[skip ci]

Author: basti1302

internal/collectors/collector_manager.go

@@ -7,8 +7,6 @@ import (
 	"context"
 	"fmt"
 	"reflect"
-	"slices"
-	"strings"
 	"sync/atomic"
 
 	"github.com/go-logr/logr"
@@ -128,33 +126,14 @@ func (m *CollectorManager) ReconcileOpenTelemetryCollector(
 	if err != nil {
 		return false, err
 	}
-	var export *dash0common.Export
+	hasAtLeastOneExport := false
 	if operatorConfigurationResource != nil && operatorConfigurationResource.Spec.Export != nil {
-		export = operatorConfigurationResource.Spec.Export
+		hasAtLeastOneExport = true
 	}
-	if export == nil && triggeringMonitoringResource != nil &&
-		triggeringMonitoringResource.IsAvailable() &&
-		triggeringMonitoringResource.Spec.Export != nil {
-		export = triggeringMonitoringResource.Spec.Export
-	}
-	if export == nil {
-		// Using the export setting of an arbitrary monitoring resource is a bandaid as long as we do not allow
-		// exporting, telemetry to different backends per namespace.
-		// Additional note: When using the export from an arbitrary monitoring resource, we need to be aware that the
-		// result of we findAllMonitoringResources is not guaranteed to be sorted in the same way for each invocation.
-		// Thus, we need to sort the monitoring resources before we arbitrarily pick the first resource, otherwise we
-		// could get configmap flapping (i.e. the collector configmaps get re-rendered again and again because we
-		// accidentally pick a different monitoring resource each time).
-		slices.SortFunc(
-			allMonitoringResources,
-			func(mr1 dash0v1beta1.Dash0Monitoring, mr2 dash0v1beta1.Dash0Monitoring) int {
-				return strings.Compare(mr1.Namespace, mr2.Namespace)
-			},
-		)
+	if hasAtLeastOneExport == false {
 		for _, monitoringResource := range allMonitoringResources {
 			if monitoringResource.Spec.Export != nil {
-				export = monitoringResource.Spec.Export
-				break
+				hasAtLeastOneExport = true
 			}
 		}
 	}
@@ -172,13 +151,12 @@ func (m *CollectorManager) ReconcileOpenTelemetryCollector(
 		)
 		err = m.removeOpenTelemetryCollector(ctx, *extraConfig, &logger)
 		return err == nil, err
-	} else if export != nil {
+	} else if hasAtLeastOneExport {
 		err = m.createOrUpdateOpenTelemetryCollector(
 			ctx,
 			operatorConfigurationResource,
 			allMonitoringResources,
 			*extraConfig,
-			export,
 			&logger,
 		)
 		return err == nil, err
@@ -202,7 +180,6 @@ func (m *CollectorManager) createOrUpdateOpenTelemetryCollector(
 	operatorConfigurationResource *dash0v1alpha1.Dash0OperatorConfiguration,
 	allMonitoringResources []dash0v1beta1.Dash0Monitoring,
 	extraConfig util.ExtraConfig,
-	export *dash0common.Export,
 	logger *logr.Logger,
 ) error {
 	resourcesHaveBeenCreated, resourcesHaveBeenUpdated, err :=
@@ -211,7 +188,6 @@ func (m *CollectorManager) createOrUpdateOpenTelemetryCollector(
 			extraConfig,
 			operatorConfigurationResource,
 			allMonitoringResources,
-			export,
 			logger,
 		)
 	if err != nil {

internal/collectors/otelcolresources/collector_config_maps.go

@@ -180,7 +180,7 @@ func assembleCollectorConfigMap(
 	if forDeletion {
 		configMapData = map[string]string{}
 	} else {
-		exporterMap, err := ConvertExportSettingsToExporterMap(config.Export)
+		exporterMap, err := ConvertExportSettingsToExporterMap(config.DefaultExport, config.PerNamespaceExports)
 		if err != nil {
 			return nil, fmt.Errorf("%s %w", commonExportErrorPrefix, err)
 		}
@@ -425,14 +425,36 @@ func compareErrorMode(
 	return errorMode1
 }
 
-func ConvertExportSettingsToExporterMap(export dash0common.Export) (map[string][]OtlpExporter, error) {
+// TODO
+// - actually use the exporter settings from the Dash0Monitoring resources
+// - also create different exporters for other export types, e.g. gRPC, HTTP
+// - ...?
+
+func ConvertExportSettingsToExporterMap(
+	defaultExport dash0common.Export,
+	perNamespaceExports map[string]dash0common.Export,
+) (map[string][]OtlpExporter, error) {
 	exporterMap := make(map[string][]OtlpExporter)
-	exporterMap["default"] = []OtlpExporter{}
+	var err error
+	exporterMap["_default"], err = convertExportSettingsToExporterList(defaultExport)
+	if err != nil {
+		return nil, err
+	}
+	for namespace, export := range perNamespaceExports {
+		exporterMap[namespace], err = convertExportSettingsToExporterList(export)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return exporterMap, nil
+}
 
+func convertExportSettingsToExporterList(export dash0common.Export) ([]OtlpExporter, error) {
 	if export.Dash0 == nil && export.Grpc == nil && export.Http == nil {
 		return nil, fmt.Errorf("%s no exporter configuration found", commonExportErrorPrefix)
 	}
 
+	var exporters []OtlpExporter
 	if export.Dash0 != nil {
 		d0 := export.Dash0
 		if d0.Endpoint == "" {
@@ -454,20 +476,20 @@ func ConvertExportSettingsToExporterMap(export dash0common.Export) (map[string][
 			Headers:  headers,
 		}
 		setGrpcTlsFromPrefix(export.Dash0.Endpoint, &dash0ExporterDefault)
-		exporterMap["default"] = append(exporterMap["default"], dash0ExporterDefault)
-
-		headersRouted := headers
-		headersRouted = append(headersRouted, dash0common.Header{
-			Name:  util.Dash0DatasetHeaderName,
-			Value: "routed",
-		})
-		dash0ExporterForRoutedNamespace := OtlpExporter{
-			Name:     "otlp/dash0/routed-namespace",
-			Endpoint: export.Dash0.Endpoint,
-			Headers:  headersRouted,
-		}
-		setGrpcTlsFromPrefix(export.Dash0.Endpoint, &dash0ExporterForRoutedNamespace)
-		exporterMap["routed"] = []OtlpExporter{dash0ExporterForRoutedNamespace}
+		exporters = append(exporters, dash0ExporterDefault)
+
+		//headersRouted := headers
+		//headersRouted = append(headersRouted, dash0common.Header{
+		//	Name:  util.Dash0DatasetHeaderName,
+		//	Value: "routed",
+		//})
+		//dash0ExporterForRoutedNamespace := OtlpExporter{
+		//	Name:     "otlp/dash0/routed-namespace",
+		//	Endpoint: export.Dash0.Endpoint,
+		//	Headers:  headersRouted,
+		//}
+		//setGrpcTlsFromPrefix(export.Dash0.Endpoint, &dash0ExporterForRoutedNamespace)
+		//exporterMap["routed"] = []OtlpExporter{dash0ExporterForRoutedNamespace}
 	}
 
 	if export.Grpc != nil {
@@ -489,7 +511,7 @@ func ConvertExportSettingsToExporterMap(export dash0common.Export) (map[string][
 		if len(grpc.Headers) > 0 {
 			grpcExporter.Headers = grpc.Headers
 		}
-		exporterMap["default"] = append(exporterMap["default"], grpcExporter)
+		exporters = append(exporters, grpcExporter)
 	}
 
 	if export.Http != nil {
@@ -510,10 +532,10 @@ func ConvertExportSettingsToExporterMap(export dash0common.Export) (map[string][
 		if len(http.Headers) > 0 {
 			httpExporter.Headers = http.Headers
 		}
-		exporterMap["default"] = append(exporterMap["default"], httpExporter)
+		exporters = append(exporters, httpExporter)
 	}
 
-	return exporterMap, nil
+	return exporters, nil
 }
 
 func renderCollectorConfiguration(