Modifying operator test for python and java simultaneous instrumentation

.github/workflows/operator-integration-test.yml

@@ -71,7 +71,8 @@ jobs:
       - name: Test for default instrumentation resources for Java
         run: |
           kubectl apply -f integration-tests/java/sample-deployment-java.yaml
-          sleep 5
+#         sleep is to make sure the app is fully active before restart wait doesn't work as accurately
+          sleep 5 
           kubectl get pods -A 
           kubectl describe pods -n default
           go run integration-tests/manifests/cmd/validate_instrumentation_vars.go default integration-tests/java/default_instrumentation_java_env_variables.json
@@ -81,7 +82,7 @@ jobs:
           kubectl apply -f integration-tests/manifests/sample-instrumentation.yaml
           sleep 5
           kubectl rollout restart deployment nginx
-          sleep 5
+          kubectl wait --for=condition=Available deployment/nginx -n default
           kubectl get pods -A
           kubectl describe pods -n default
           cd integration-tests/manifests/cmd
@@ -93,25 +94,45 @@ jobs:
           kubectl apply -f integration-tests/python/sample-deployment-python.yaml
           sleep 5
           kubectl rollout restart deployment nginx
-          sleep 5
+          kubectl wait --for=condition=Available deployment/nginx -n default
           kubectl get pods -A 
           kubectl describe pods -n default
           go run integration-tests/manifests/cmd/validate_instrumentation_vars.go default integration-tests/python/default_instrumentation_python_env_variables.json
 
-
       - name: Test for defined instrumentation resources for python
         run: |
           kubectl apply -f integration-tests/manifests/sample-instrumentation.yaml
           sleep 5
           kubectl rollout restart deployment nginx
-          sleep 5
-          kubectl get pods -A
+          kubectl wait --for=condition=Available deployment/nginx -n default
           kubectl describe pods -n default
           cd integration-tests/manifests/cmd
           go run validate_instrumentation_vars.go default ns_instrumentation_env_variables.json
           kubectl delete instrumentation sample-instrumentation
 
+      - name: Test for default instrumentation resources for python and java
+        run: |
+          kubectl apply -f integration-tests/python-java/sample-deployment-python-java.yaml
+          sleep 5
+          kubectl rollout restart deployment nginx
+          kubectl wait --for=condition=Available deployment/nginx -n default
+          sleep 5
+          kubectl get pods -A 
+          kubectl describe pods -n default
+          kubectl describe pods -n amazon-cloudwatch
+          go run integration-tests/manifests/cmd/validate_instrumentation_vars.go default integration-tests/python-java/default_instrumentation_python-java_env_variables.json
 
+      - name: Test for defined instrumentation resources for python and java
+        run: |
+          kubectl apply -f integration-tests/manifests/sample-instrumentation.yaml
+          sleep 5
+          kubectl rollout restart deployment nginx
+          kubectl wait --for=condition=Available deployment/nginx -n default
+          kubectl get pods -A
+          kubectl describe pods -n default
+          cd integration-tests/manifests/cmd
+          go run validate_instrumentation_vars.go default ns_instrumentation_env_variables.json
+          kubectl delete instrumentation sample-instrumentation
 
   DeploymentAnnotationsTest:
     name: DeploymentAnnotationsTest
@@ -308,8 +329,5 @@ jobs:
           go test -v -run TestPythonOnlyNamespace ./integration-tests/manifests/annotations -timeout 30m
           sleep 5
           go test -v -run TestAlreadyAutoAnnotatedResourceShouldNotRestart ./integration-tests/manifests/annotations -timeout 30m
-          kubectl get pods -A
-          kubectl describe pods -n default
-
 
 

config/manager/manager.yaml

@@ -28,6 +28,8 @@ spec:
     spec:
       containers:
       - image: controller
+        args:
+          - "--feature-gates=operator.autoinstrumentation.multi-instrumentation,operator.autoinstrumentation.multi-instrumentation.skip-container-validation"
         name: manager
         resources:
           requests:

integration-tests/manifests/cmd/ns_instrumentation_env_variables.json

@@ -2,5 +2,5 @@
   "OTEL_TRACES_SAMPLER":"traceidratio",
   "OTEL_TRACES_SAMPLER_ARG": "0.5",
   "OTEL_EXPORTER_OTLP_ENDPOINT":"http://example.com/collector",
-  "OTEL_PROPAGATORS": "tracecontext,baggage,b3"
+  "OTEL_PROPAGATORS": "tracecontext,baggage,b3,xray"
 }

integration-tests/manifests/cmd/validate_instrumentation_vars.go

@@ -52,7 +52,10 @@ func main() {
 }
 
 func verifyInstrumentationEnvVariables(clientset *kubernetes.Clientset, namespace, jsonPath string) bool {
-	podList, err := clientset.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: "app=nginx"})
+	podList, err := clientset.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{
+		LabelSelector: "app=nginx",
+		FieldSelector: "status.phase!=Terminating",
+	})
 	if err != nil {
 		fmt.Println("Error retrieving pods:", err)
 		return false

integration-tests/manifests/sample-instrumentation.yaml

@@ -16,4 +16,5 @@ spec:
   propagators:
     - tracecontext
     - baggage
-    - b3
+    - b3
+    - xray

integration-tests/python-java/default_instrumentation_python-java_env_variables.json

@@ -0,0 +1,17 @@
+
+{
+  "PYTHONPATH": "/otel-auto-instrumentation-python/opentelemetry/instrumentation/auto_instrumentation:/otel-auto-instrumentation-python",
+  "OTEL_AWS_APP_SIGNALS_ENABLED": "true",
+  "OTEL_TRACES_SAMPLER_ARG": "endpoint=http://cloudwatch-agent.amazon-cloudwatch:2000",
+  "OTEL_TRACES_SAMPLER": "xray",
+  "OTEL_EXPORTER_OTLP_PROTOCOL": "http/protobuf",
+  "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/traces",
+  "OTEL_AWS_APP_SIGNALS_EXPORTER_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics",
+  "OTEL_METRICS_EXPORTER": "none",
+  "OTEL_PYTHON_DISTRO": "aws_distro",
+  "OTEL_PYTHON_CONFIGURATOR": "aws_configurator",
+  "OTEL_SMP_ENABLED": "true",
+  "OTEL_AWS_SMP_EXPORTER_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics",
+  "JAVA_TOOL_OPTIONS": "-javaagent:/otel-auto-instrumentation-java/javaagent.jar"
+
+}

integration-tests/python-java/sample-deployment-python-java.yaml

@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx
+spec:
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+      annotations:
+        instrumentation.opentelemetry.io/inject-python: "true"
+        instrumentation.opentelemetry.io/inject-java: "true"
+    spec:
+      containers:
+        - name: nginx
+          image: nginx:1.14.2
+      restartPolicy: Always
+status: {}