From 987167d7bdf99073b5469901e24348f59b8e83ad Mon Sep 17 00:00:00 2001 From: Parampreet Singh <50599809+Paramadon@users.noreply.github.com> Date: Wed, 22 May 2024 12:46:45 -0400 Subject: [PATCH 1/3] Update operator-integration-test.yml --- .github/workflows/operator-integration-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/operator-integration-test.yml b/.github/workflows/operator-integration-test.yml index 3db79ee35..8b0f7f2f2 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 From 3734b89e60a2a1bba0d56edd6393742a757b1e86 Mon Sep 17 00:00:00 2001 From: Paramadon Date: Wed, 22 May 2024 13:39:43 -0400 Subject: [PATCH 2/3] fixing pr issue --- .github/workflows/operator-integration-test.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/operator-integration-test.yml b/.github/workflows/operator-integration-test.yml index 8b0f7f2f2..b81886a06 100644 --- a/.github/workflows/operator-integration-test.yml +++ b/.github/workflows/operator-integration-test.yml @@ -81,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 @@ -93,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 @@ -103,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 @@ -114,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 @@ -126,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 From bd11ef650ef5425d5122c88e582f8b9d6e5a337b Mon Sep 17 00:00:00 2001 From: Paramadon Date: Wed, 22 May 2024 14:00:15 -0400 Subject: [PATCH 3/3] updating default instrumentation values --- .../default_instrumentation_python-java_env_variables.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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