fix for open-telemetry#1893

chrlic · Jul 11, 2023 · 096f98f · 096f98f
1 parent a0e3852
commit 096f98f
Show file tree

Hide file tree

Showing 4 changed files with 213 additions and 5 deletions.
diff --git a/pkg/instrumentation/apachehttpd.go b/pkg/instrumentation/apachehttpd.go
@@ -20,6 +20,7 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
+	semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
 	corev1 "k8s.io/api/core/v1"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
@@ -219,6 +220,13 @@ LoadModule otel_apache_module %[1]s/WebServerModule/Apache/libmod_apache_otel%[2
 	}
 	serviceName := chooseServiceName(pod, resourceMap, index)
 	serviceNamespace := pod.GetNamespace()
+	if len(serviceNamespace) == 0 {
+		serviceNamespace = resourceMap[string(semconv.K8SNamespaceNameKey)]
+		if len(serviceNamespace) == 0 {
+			serviceNamespace = "apache-httpd"
+		}
+
+	}
 	// Namespace name override TBD
 
 	// There are two versions of the OTEL modules - for Apache HTTPD 2.4 and 2.2.