remove unused config map keys

Signed-off-by: Haywood Shannon <[email protected]>

Author: haywoodsh

internal/configs/config_params.go

@@ -38,7 +38,6 @@ type ConfigParams struct {
 	MainOpenTracingLoadModule              bool
 	MainOpenTracingTracer                  string
 	MainOpenTracingTracerConfig            string
-	MainOtelEnabled                        bool
 	MainOtelLoadModule                     bool
 	MainOtelGlobalTraceEnabled             bool
 	MainOtelExporterEndpoint               string

internal/configs/configmaps.go

@@ -615,23 +615,6 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has
 		cfgParams.MainOtelLoadModule = true
 	}
 
-	if otelEnabled, exists, err := GetMapKeyAsBool(cfgm.Data, "otel-enabled", cfgm); exists {
-		if err != nil {
-			nl.Error(l, err)
-			eventLog.Event(cfgm, v1.EventTypeWarning, nl.EventReasonInvalidValue, err.Error())
-			configOk = false
-		} else {
-			if cfgParams.MainOtelLoadModule {
-				cfgParams.MainOtelEnabled = otelEnabled
-			} else {
-				errorText := fmt.Sprintf("ConfigMap %s/%s: 'otel-enabled' is ignored because 'otel-exporter-endpoint' is not set, ignoring", cfgm.GetNamespace(), cfgm.GetName())
-				nl.Error(l, errorText)
-				eventLog.Event(cfgm, v1.EventTypeWarning, nl.EventReasonInvalidValue, errorText)
-				configOk = false
-			}
-		}
-	}
-
 	if hasAppProtect {
 		if appProtectFailureModeAction, exists := cfgm.Data["app-protect-failure-mode-action"]; exists {
 			if appProtectFailureModeAction == "pass" || appProtectFailureModeAction == "drop" {
@@ -1026,7 +1009,6 @@ func GenerateNginxMainConfig(staticCfgParams *StaticConfigParams, config *Config
 		OpenTracingLoadModule:              config.MainOpenTracingLoadModule,
 		OpenTracingTracer:                  config.MainOpenTracingTracer,
 		OpenTracingTracerConfig:            config.MainOpenTracingTracerConfig,
-		MainOtelEnabled:                    config.MainOtelEnabled,
 		MainOtelLoadModule:                 config.MainOtelLoadModule,
 		MainOtelGlobalTraceEnabled:         config.MainOtelGlobalTraceEnabled,
 		MainOtelExporterEndpoint:           config.MainOtelExporterEndpoint,

internal/configs/version1/nginx-plus.tmpl

@@ -13,7 +13,7 @@ error_log  stderr {{.ErrorLogLevel}};
 pid        /var/lib/nginx/nginx.pid;
 
 {{- if .MainOtelLoadModule}}
-#load_module modules/ngx_otel_module.so;
+load_module modules/ngx_otel_module.so;
 {{- end}}
 {{- if .AppProtectLoadModule}}
 load_module modules/ngx_http_app_protect_module.so;
@@ -145,20 +145,23 @@ http {
     {{- if .SSLDHParam}}
     ssl_dhparam {{.SSLDHParam}};
     {{- end}}
-    
-    {{- if .MainOtelEnabled}}
-    # otel_exporter {
-    #    endpoint {{ .MainOtelExporterEndpoint}};
-    #   header {{ .MainOtelExporterHeaderName }} {{ .MainOtelExporterHeaderValue }};
+
+    {{- if .MainOtelLoadModule}}
+    otel_exporter {
+        endpoint {{ .MainOtelExporterEndpoint}};
+        {{ if and .MainOtelExporterHeaderName .MainOtelExporterHeaderValue }}
+        header {{ .MainOtelExporterHeaderName }} "{{ .MainOtelExporterHeaderValue }}";
+        {{- end }}
         {{ if .MainOtelExporterTrustedCA}}
     #   trusted_certificate <path>;
         {{- end }}
+    }
+
     {{ if .MainOtelServiceName}}
-     # otel_service_name {{ .MainOtelServiceName }};
-    # }
+    otel_service_name {{ .MainOtelServiceName }};
     {{- end }}
     {{ if .MainOtelGlobalTraceEnabled }}
-     # otel_trace on;
+    otel_trace on;
     {{- end}}
     {{- end}}