STAC-25175: Deal with signals that are missing the k8s cluster and/or…

stackpacks/open-telemetry-2/settings/component-mappings/namespaces.sty

@@ -15,8 +15,6 @@ nodes:
         value: "resource.attributes['service.namespace']"
       - name: "clusterName"
         value: "resource.attributes['k8s.cluster.name']"
-      - name: "k8sNamespaceName"
-        value: "resource.attributes['k8s.namespace.name']"
     output:
       identifier: "'urn:opentelemetry:namespace/' + vars.namespace"
       name: "vars.namespace"
@@ -27,14 +25,14 @@ nodes:
             target: "stackpack"
           - source: "vars.clusterName"
             target: "cluster-name"
-          - source: "vars.k8sNamespaceName"
-            target: "namespace"
-          - source: "vars.clusterName + '/' + vars.k8sNamespaceName"
-            target: "k8s-scope"
       optional:
         tags:
           - source: "resource.attributes['deployment.environment']"
             target: "deployment-environment"
+          - source: "vars.clusterName + '/' + resource.attributes['k8s.namespace.name']"
+            target: "k8s-scope"
+          - source: "resource.attributes['k8s.namespace.name']"
+            target: "namespace"
     expireAfter: 900000
     rank:
       specificity: 100

stackpacks/open-telemetry-2/settings/component-mappings/service-instances.sty

@@ -9,13 +9,10 @@ nodes:
         - "METRICS"
       resource:
         action: "'CREATE'"
-        condition: "'service.namespace' in resource.attributes"
+        condition: "'service.instance.id' in resource.attributes"
     vars:
       - name: "namespace"
-        value: >-
-          'service.namespace' in resource.attributes ?
-          resource.attributes['service.namespace'] :
-          'default'
+        value: "resource.attributes['service.namespace']"
       - name: "service"
         value: "resource.attributes['service.name']"
       - name: "version"
@@ -24,19 +21,11 @@ nodes:
           resource.attributes['service.version'] :
           'undefined'
       - name: "instanceId"
-        value: >-
-          'service.instance.id' in resource.attributes ?
-          resource.attributes['service.instance.id'] :
-          resource.attributes['service.name']
+        value: "resource.attributes['service.instance.id']"
       - name: "instanceName"
-        value: >-
-          'service.instance.id' in resource.attributes ?
-          resource.attributes['service.name'] + " - " + resource.attributes['service.instance.id'] :
-          resource.attributes['service.name'] + " - instance"
+        value: "resource.attributes['service.name'] + ' - ' + resource.attributes['service.instance.id']"
       - name: "clusterName"
         value: "resource.attributes['k8s.cluster.name']"
-      - name: "k8sNamespaceName"
-        value: "resource.attributes['k8s.namespace.name']"
     output:
       identifier: >-
         'urn:opentelemetry:namespace/' + vars.namespace + ':service/' + vars.service + ':serviceInstance/' + vars.instanceId
@@ -53,17 +42,17 @@ nodes:
             target: "service.namespace"
           - source: "vars.clusterName"
             target: "cluster-name"
-          - source: "vars.k8sNamespaceName"
-            target: "namespace"
-          - source: "vars.clusterName + '/' + vars.k8sNamespaceName"
-            target: "k8s-scope"
           - source: "resource.attributes"
             pattern: "(.*)"
             target: "${1}"
       optional:
         tags:
           - source: "resource.attributes['deployment.environment']"
             target: "deployment-environment"
+          - source: "vars.clusterName + '/' + resource.attributes['k8s.namespace.name']"
+            target: "k8s-scope"
+          - source: "resource.attributes['k8s.namespace.name']"
+            target: "namespace"
     expireAfter: 900000
     rank:
       specificity: 210

stackpacks/open-telemetry-2/settings/component-mappings/services.sty

@@ -9,7 +9,7 @@ nodes:
         - "METRICS"
       resource:
         action: "'CREATE'"
-        condition: "'service.namespace' in resource.attributes"
+        condition: "'service.name' in resource.attributes"
     vars:
       - name: "namespace"
         value: >-
@@ -25,8 +25,6 @@ nodes:
           'undefined'
       - name: "clusterName"
         value: "resource.attributes['k8s.cluster.name']"
-      - name: "k8sNamespaceName"
-        value: "resource.attributes['k8s.namespace.name']"
     output:
       identifier: >-
         'urn:opentelemetry:namespace/' + vars.namespace + ':service/' + vars.service
@@ -45,17 +43,17 @@ nodes:
             target: "service.version"
           - source: "vars.clusterName"
             target: "cluster-name"
-          - source: "vars.k8sNamespaceName"
-            target: "namespace"
-          - source: "vars.clusterName + '/' + vars.k8sNamespaceName"
-            target: "k8s-scope"
           - source: "resource.attributes"
             pattern: "telemetry.sdk\\.(.*)"
             target: "telemetry.sdk.${1}"
       optional:
         tags:
           - source: "resource.attributes['deployment.environment']"
             target: "deployment-environment"
+          - source: "vars.clusterName + '/' + resource.attributes['k8s.namespace.name']"
+            target: "k8s-scope"
+          - source: "resource.attributes['k8s.namespace.name']"
+            target: "namespace"
     expireAfter: 900000
     rank:
       specificity: 200

stackpacks/open-telemetry-2/stackpack.yaml

@@ -1,5 +1,5 @@
 name: "open-telemetry-2"
-version: "0.0.16"
+version: "0.0.17"
 schemaVersion: "2.0"
 displayName: "Open Telemetry 2.0"
 categories: [ "Open Telemetry" ]