fix e2e test

open-telemetry · Apr 9, 2024 · 8b7609a · 8b7609a
1 parent 0a7d640
commit 8b7609a
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 108 deletions.
diff --git a/tests/e2e-instrumentation/instrumentation-select/01-assert-select-multi.yaml b/tests/e2e-instrumentation/instrumentation-select/01-assert-select-multi.yaml
@@ -8,62 +8,70 @@ metadata:
     app: my-java-multi
 spec:
   containers:
-  - env:
-    - name: OTEL_JAVAAGENT_DEBUG
-      value: "true"
-    - name: OTEL_INSTRUMENTATION_JDBC_ENABLED
-      value: "false"
-    - name: SPLUNK_PROFILER_ENABLED
-      value: "false"
-    - name: JAVA_TOOL_OPTIONS
-      value: ' -javaagent:/otel-auto-instrumentation-java/javaagent.jar'
-    - name: OTEL_TRACES_EXPORTER
-      value: otlp
-    - name: OTEL_EXPORTER_OTLP_ENDPOINT
-      value: http://localhost:4317
-    - name: OTEL_EXPORTER_OTLP_TIMEOUT
-      value: "20"
-    - name: OTEL_TRACES_SAMPLER
-      value: parentbased_traceidratio
-    - name: OTEL_TRACES_SAMPLER_ARG
-      value: "0.85"
-    - name: SPLUNK_TRACE_RESPONSE_HEADER_ENABLED
-      value: "true"
-    - name: OTEL_SERVICE_NAME
-      value: my-java-multi
-    - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: metadata.name
-    - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: spec.nodeName
-    - name: OTEL_PROPAGATORS
-      value: jaeger,b3
-    - name: OTEL_RESOURCE_ATTRIBUTES
-    name: myapp
-    volumeMounts:
-    - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
-      readOnly: true
-    - mountPath: /otel-auto-instrumentation-java
-      name: opentelemetry-auto-instrumentation-java
-  - args:
-    - --config=env:OTEL_CONFIG
-    name: otc-container
+    - env:
+        - name: OTEL_NODE_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
+        - name: OTEL_POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: OTEL_JAVAAGENT_DEBUG
+          value: "true"
+        - name: OTEL_INSTRUMENTATION_JDBC_ENABLED
+          value: "false"
+        - name: SPLUNK_PROFILER_ENABLED
+          value: "false"
+        - name: JAVA_TOOL_OPTIONS
+          value: ' -javaagent:/otel-auto-instrumentation-java/javaagent.jar'
+        - name: OTEL_TRACES_EXPORTER
+          value: otlp
+        - name: OTEL_EXPORTER_OTLP_ENDPOINT
+          value: http://localhost:4317
+        - name: OTEL_EXPORTER_OTLP_TIMEOUT
+          value: "20"
+        - name: OTEL_TRACES_SAMPLER
+          value: parentbased_traceidratio
+        - name: OTEL_TRACES_SAMPLER_ARG
+          value: "0.85"
+        - name: SPLUNK_TRACE_RESPONSE_HEADER_ENABLED
+          value: "true"
+        - name: OTEL_SERVICE_NAME
+          value: my-java-multi
+        - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.name
+        - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: spec.nodeName
+        - name: OTEL_PROPAGATORS
+          value: jaeger,b3
+        - name: OTEL_RESOURCE_ATTRIBUTES
+      name: myapp
+      volumeMounts:
+        - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+          readOnly: true
+        - mountPath: /otel-auto-instrumentation-java
+          name: opentelemetry-auto-instrumentation-java
+    - args:
+        - --config=env:OTEL_CONFIG
+      name: otc-container
   initContainers:
-  - name: opentelemetry-auto-instrumentation-java
+    - name: opentelemetry-auto-instrumentation-java
 status:
   containerStatuses:
-  - name: myapp
-    ready: true
-    started: true
-  - name: otc-container
-    ready: true
-    started: true
+    - name: myapp
+      ready: true
+      started: true
+    - name: otc-container
+      ready: true
+      started: true
   initContainerStatuses:
-  - name: opentelemetry-auto-instrumentation-java
-    ready: true
+    - name: opentelemetry-auto-instrumentation-java
+      ready: true
   phase: Running
diff --git a/tests/e2e-instrumentation/instrumentation-select/01-assert-select.yaml b/tests/e2e-instrumentation/instrumentation-select/01-assert-select.yaml
@@ -8,62 +8,70 @@ metadata:
     app: my-java-select
 spec:
   containers:
-  - env:
-    - name: OTEL_JAVAAGENT_DEBUG
-      value: "true"
-    - name: OTEL_INSTRUMENTATION_JDBC_ENABLED
-      value: "false"
-    - name: SPLUNK_PROFILER_ENABLED
-      value: "false"
-    - name: JAVA_TOOL_OPTIONS
-      value: ' -javaagent:/otel-auto-instrumentation-java/javaagent.jar'
-    - name: OTEL_TRACES_EXPORTER
-      value: otlp
-    - name: OTEL_EXPORTER_OTLP_ENDPOINT
-      value: http://localhost:4317
-    - name: OTEL_EXPORTER_OTLP_TIMEOUT
-      value: "20"
-    - name: OTEL_TRACES_SAMPLER
-      value: parentbased_traceidratio
-    - name: OTEL_TRACES_SAMPLER_ARG
-      value: "0.85"
-    - name: SPLUNK_TRACE_RESPONSE_HEADER_ENABLED
-      value: "true"
-    - name: OTEL_SERVICE_NAME
-      value: my-java-select
-    - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: metadata.name
-    - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: spec.nodeName
-    - name: OTEL_PROPAGATORS
-      value: jaeger,b3
-    - name: OTEL_RESOURCE_ATTRIBUTES
-    name: myapp
-    volumeMounts:
-    - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
-      readOnly: true
-    - mountPath: /otel-auto-instrumentation-java
-      name: opentelemetry-auto-instrumentation-java
-  - args:
-    - --config=env:OTEL_CONFIG
-    name: otc-container
+    - env:
+        - name: OTEL_NODE_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
+        - name: OTEL_POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: OTEL_JAVAAGENT_DEBUG
+          value: "true"
+        - name: OTEL_INSTRUMENTATION_JDBC_ENABLED
+          value: "false"
+        - name: SPLUNK_PROFILER_ENABLED
+          value: "false"
+        - name: JAVA_TOOL_OPTIONS
+          value: ' -javaagent:/otel-auto-instrumentation-java/javaagent.jar'
+        - name: OTEL_TRACES_EXPORTER
+          value: otlp
+        - name: OTEL_EXPORTER_OTLP_ENDPOINT
+          value: http://localhost:4317
+        - name: OTEL_EXPORTER_OTLP_TIMEOUT
+          value: "20"
+        - name: OTEL_TRACES_SAMPLER
+          value: parentbased_traceidratio
+        - name: OTEL_TRACES_SAMPLER_ARG
+          value: "0.85"
+        - name: SPLUNK_TRACE_RESPONSE_HEADER_ENABLED
+          value: "true"
+        - name: OTEL_SERVICE_NAME
+          value: my-java-select
+        - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.name
+        - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: spec.nodeName
+        - name: OTEL_PROPAGATORS
+          value: jaeger,b3
+        - name: OTEL_RESOURCE_ATTRIBUTES
+      name: myapp
+      volumeMounts:
+        - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+          readOnly: true
+        - mountPath: /otel-auto-instrumentation-java
+          name: opentelemetry-auto-instrumentation-java
+    - args:
+        - --config=env:OTEL_CONFIG
+      name: otc-container
   initContainers:
-  - name: opentelemetry-auto-instrumentation-java
+    - name: opentelemetry-auto-instrumentation-java
 status:
   containerStatuses:
-  - name: myapp
-    ready: true
-    started: true
-  - name: otc-container
-    ready: true
-    started: true
+    - name: myapp
+      ready: true
+      started: true
+    - name: otc-container
+      ready: true
+      started: true
   initContainerStatuses:
-  - name: opentelemetry-auto-instrumentation-java
-    ready: true
+    - name: opentelemetry-auto-instrumentation-java
+      ready: true
   phase: Running