Merge branch 'odigos-io:main' into bigfix/odigos-instrumentor-leader-…

…election-error
odigos-io · Mar 10, 2025 · 46b4491 · 46b4491
2 parents b46642d + 69a515a
commit 46b4491
Show file tree

Hide file tree

Showing 6 changed files with 307 additions and 55 deletions.
diff --git a/tests/common/assert/simple-demo-instrumented-full.yaml b/tests/common/assert/simple-demo-instrumented-full.yaml
@@ -0,0 +1,294 @@
+### Simple-demo Pods ### 
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: default
+  labels:
+    app: frontend
+spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: odigos.io/odiglet-oss-installed
+                operator: In
+                values:
+                  - "true"
+  containers:
+    - name: frontend
+      resources:
+        limits:
+          instrumentation.odigos.io/generic: "1"
+        requests:
+          instrumentation.odigos.io/generic: "1"
+status:
+  containerStatuses:
+    - name: frontend
+      ready: true
+      restartCount: 0
+      started: true
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: default
+  labels:
+    app: coupon
+spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: odigos.io/odiglet-oss-installed
+                operator: In
+                values:
+                  - "true"
+  containers:
+    - name: coupon
+      resources:
+        limits:
+          instrumentation.odigos.io/generic: "1"
+        requests:
+          instrumentation.odigos.io/generic: "1"
+status:
+  containerStatuses:
+    - name: coupon
+      ready: true
+      restartCount: 0
+      started: true
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: default
+  labels:
+    app: inventory
+spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: odigos.io/odiglet-oss-installed
+                operator: In
+                values:
+                  - "true"
+  containers:
+    - name: inventory
+      resources:
+        limits:
+          instrumentation.odigos.io/generic: "1"
+        requests:
+          instrumentation.odigos.io/generic: "1"
+status:
+  containerStatuses:
+    - name: inventory
+      ready: true
+      restartCount: 0
+      started: true
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: default
+  labels:
+    app: membership
+spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: odigos.io/odiglet-oss-installed
+                operator: In
+                values:
+                  - "true"
+  containers:
+    - name: membership
+status:
+  containerStatuses:
+    - name: membership
+      ready: true
+      restartCount: 0
+      started: true
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: default
+  labels:
+    app: pricing
+spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: odigos.io/odiglet-oss-installed
+                operator: In
+                values:
+                  - "true"
+  containers:
+    - name: pricing
+      resources:
+        limits:
+          instrumentation.odigos.io/dotnet-native-community: "1"
+        requests:
+          instrumentation.odigos.io/dotnet-native-community: "1"
+status:
+  containerStatuses:
+    - name: pricing
+      ready: true
+      restartCount: 0
+      started: true
+  phase: Running
+---
+#### Instrumentation Configs ####
+apiVersion: odigos.io/v1alpha1
+kind: InstrumentationConfig
+metadata:
+  name: deployment-coupon
+  namespace: default
+  ownerReferences:
+    - apiVersion: apps/v1
+      blockOwnerDeletion: true
+      controller: true
+      kind: Deployment
+      name: coupon
+status:
+  runtimeDetailsByContainer:
+    - containerName: coupon
+      language: javascript
+      runtimeVersion: 18.3.0
+---
+apiVersion: odigos.io/v1alpha1
+kind: InstrumentationConfig
+metadata:
+  name: deployment-frontend
+  namespace: default
+  ownerReferences:
+    - apiVersion: apps/v1
+      blockOwnerDeletion: true
+      controller: true
+      kind: Deployment
+      name: frontend
+status:
+  runtimeDetailsByContainer:
+    - containerName: frontend
+      language: java
+      runtimeVersion: 17.0.14+7
+---
+apiVersion: odigos.io/v1alpha1
+kind: InstrumentationConfig
+metadata:
+  name: deployment-inventory
+  namespace: default
+  ownerReferences:
+    - apiVersion: apps/v1
+      blockOwnerDeletion: true
+      controller: true
+      kind: Deployment
+      name: inventory
+status:
+  runtimeDetailsByContainer:
+    - containerName: inventory
+      language: python
+      runtimeVersion: 3.11.11
+---
+apiVersion: odigos.io/v1alpha1
+kind: InstrumentationConfig
+metadata:
+  name: deployment-membership
+  namespace: default
+  ownerReferences:
+    - apiVersion: apps/v1
+      blockOwnerDeletion: true
+      controller: true
+      kind: Deployment
+      name: membership
+status:
+  runtimeDetailsByContainer:
+    - containerName: membership
+      language: go
+      runtimeVersion: 1.21.4
+---
+apiVersion: odigos.io/v1alpha1
+kind: InstrumentationConfig
+metadata:
+  name: deployment-pricing
+  namespace: default
+  ownerReferences:
+    - apiVersion: apps/v1
+      blockOwnerDeletion: true
+      controller: true
+      kind: Deployment
+      name: pricing
+status:
+  runtimeDetailsByContainer:
+    - containerName: pricing
+      language: dotnet
+---
+### Instrumentation Instances ###
+apiVersion: odigos.io/v1alpha1
+kind: InstrumentationInstance
+metadata:
+  namespace: default
+  labels:
+    instrumented-app: deployment-coupon
+status:
+  healthy: true
+  identifyingAttributes:
+    - key: service.instance.id
+      (value != null): true
+    - key: telemetry.sdk.language
+      value: nodejs
+    - key: process.runtime.version
+      (value != null): true
+    - key: telemetry.distro.version
+      (value != null): true
+    - key: process.vpid
+      (value != null): true
+    - key: k8s.namespace.name
+      (value != null): true
+    - key: k8s.container.name
+      (value != null): true
+    - key: k8s.pod.name
+      (value != null): true      
+---
+apiVersion: odigos.io/v1alpha1
+kind: InstrumentationInstance
+metadata:
+  namespace: default
+  labels:
+    instrumented-app: deployment-inventory
+status:
+  healthy: true
+  identifyingAttributes:
+    - key: service.instance.id
+      (value != null): true
+    - key: process.pid
+      (value != null): true
+    - key: telemetry.sdk.language
+      value: python
+    - key: k8s.namespace.name
+      (value != null): true
+    - key: k8s.container.name
+      (value != null): true
+    - key: k8s.pod.name
+      (value != null): true        
+---
+apiVersion: odigos.io/v1alpha1
+kind: InstrumentationInstance
+metadata:
+  namespace: default
+  labels:
+    instrumented-app: deployment-membership
+status:
+  healthy: true
+  reason: LoadedSuccessfully
diff --git a/tests/common/assert/simple-demo-instrumented.yaml b/tests/common/assert/simple-demo-instrumented.yaml
@@ -164,8 +164,6 @@ metadata:
 status:
   runtimeDetailsByContainer:
     - containerName: coupon
-      language: javascript
-      runtimeVersion: 18.3.0
 ---
 apiVersion: odigos.io/v1alpha1
 kind: InstrumentationConfig
@@ -181,8 +179,6 @@ metadata:
 status:
   runtimeDetailsByContainer:
     - containerName: frontend
-      language: java
-      runtimeVersion: 17.0.14+7
 ---
 apiVersion: odigos.io/v1alpha1
 kind: InstrumentationConfig
@@ -198,8 +194,6 @@ metadata:
 status:
   runtimeDetailsByContainer:
     - containerName: inventory
-      language: python
-      runtimeVersion: 3.11.11
 ---
 apiVersion: odigos.io/v1alpha1
 kind: InstrumentationConfig
@@ -215,8 +209,6 @@ metadata:
 status:
   runtimeDetailsByContainer:
     - containerName: membership
-      language: go
-      runtimeVersion: 1.21.4
 ---
 apiVersion: odigos.io/v1alpha1
 kind: InstrumentationConfig
@@ -232,7 +224,6 @@ metadata:
 status:
   runtimeDetailsByContainer:
     - containerName: pricing
-      language: dotnet
 ---
 ### Instrumentation Instances ###
 apiVersion: odigos.io/v1alpha1
@@ -243,23 +234,6 @@ metadata:
     instrumented-app: deployment-coupon
 status:
   healthy: true
-  identifyingAttributes:
-    - key: service.instance.id
-      (value != null): true
-    - key: telemetry.sdk.language
-      value: nodejs
-    - key: process.runtime.version
-      (value != null): true
-    - key: telemetry.distro.version
-      (value != null): true
-    - key: process.vpid
-      (value != null): true
-    - key: k8s.namespace.name
-      (value != null): true
-    - key: k8s.container.name
-      (value != null): true
-    - key: k8s.pod.name
-      (value != null): true      
 ---
 apiVersion: odigos.io/v1alpha1
 kind: InstrumentationInstance
@@ -269,19 +243,6 @@ metadata:
     instrumented-app: deployment-inventory
 status:
   healthy: true
-  identifyingAttributes:
-    - key: service.instance.id
-      (value != null): true
-    - key: process.pid
-      (value != null): true
-    - key: telemetry.sdk.language
-      value: python
-    - key: k8s.namespace.name
-      (value != null): true
-    - key: k8s.container.name
-      (value != null): true
-    - key: k8s.pod.name
-      (value != null): true        
 ---
 apiVersion: odigos.io/v1alpha1
 kind: InstrumentationInstance
@@ -290,5 +251,4 @@ metadata:
   labels:
     instrumented-app: deployment-membership
 status:
-  healthy: true
-  reason: LoadedSuccessfully
+  healthy: true