Skip to content

Fixing operator integration test #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 22, 2024
Merged

Fixing operator integration test #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
987167d
Update operator-integration-test.yml
Paramadon May 22, 2024
3734b89
fixing pr issue
Paramadon May 22, 2024
bd11ef6
updating default instrumentation values
Paramadon May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/operator-integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/python-java/default_instrumentation_python-java_env_variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"

}
Loading