diff --git a/.github/workflows/operator-integration-test.yml b/.github/workflows/operator-integration-test.yml index 3db79ee35..b81886a06 100644 --- a/.github/workflows/operator-integration-test.yml +++ b/.github/workflows/operator-integration-test.yml @@ -71,7 +71,6 @@ jobs: - name: Test for default instrumentation resources for Java run: | kubectl apply -f integration-tests/java/sample-deployment-java.yaml -# 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 @@ -82,7 +81,7 @@ jobs: 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 + sleep 5 kubectl get pods -A kubectl describe pods -n default cd integration-tests/manifests/cmd @@ -94,7 +93,7 @@ jobs: kubectl apply -f integration-tests/python/sample-deployment-python.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 go run integration-tests/manifests/cmd/validate_instrumentation_vars.go default integration-tests/python/default_instrumentation_python_env_variables.json @@ -104,7 +103,7 @@ jobs: 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 + sleep 5 kubectl describe pods -n default cd integration-tests/manifests/cmd go run validate_instrumentation_vars.go default ns_instrumentation_env_variables.json @@ -115,7 +114,6 @@ jobs: 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 @@ -127,7 +125,7 @@ jobs: 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 + sleep 5 kubectl get pods -A kubectl describe pods -n default cd integration-tests/manifests/cmd diff --git a/integration-tests/python-java/default_instrumentation_python-java_env_variables.json b/integration-tests/python-java/default_instrumentation_python-java_env_variables.json index cb2f787e9..7d0b72cc7 100644 --- a/integration-tests/python-java/default_instrumentation_python-java_env_variables.json +++ b/integration-tests/python-java/default_instrumentation_python-java_env_variables.json @@ -2,6 +2,7 @@ { "PYTHONPATH": "/otel-auto-instrumentation-python/opentelemetry/instrumentation/auto_instrumentation:/otel-auto-instrumentation-python", "OTEL_AWS_APP_SIGNALS_ENABLED": "true", + "OTEL_AWS_APPLICATION_SIGNALS_ENABLED": "true", "OTEL_TRACES_SAMPLER_ARG": "endpoint=http://cloudwatch-agent.amazon-cloudwatch:2000", "OTEL_TRACES_SAMPLER": "xray", "OTEL_EXPORTER_OTLP_PROTOCOL": "http/protobuf", @@ -10,8 +11,7 @@ "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", + "OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics", "JAVA_TOOL_OPTIONS": "-javaagent:/otel-auto-instrumentation-java/javaagent.jar" } \ No newline at end of file