Skip to content

Refactor e2e instrumentation tests to use step templates #4765

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

Draft
swiatekm wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Refactor e2e instrumentation tests to use step templates #4765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b64b14b
Refactor e2e instrumentation tests to use step templates
claude Nov 11, 2025
be49bf3
Fix template validation issues in instrumentation tests
claude Nov 12, 2025
980cf4a
Fix timeout binding in wait-for-telemetry template
claude Nov 12, 2025
d6adad6
Fix step template issues: assertion threshold, script path, and dead …
claude Feb 13, 2026
f229e9d
fix(e2e): fix step template issues causing instrumentation test failures
claude Feb 20, 2026
359fda3
fix(e2e): use ${} binding syntax in command args instead of ($)
claude Feb 20, 2026
9097eb6
fix(e2e): use test-level bindings instead of template defaults
claude Feb 20, 2026
9074d6a
fix(e2e): use correct Chainsaw expression syntax in step templates
claude Feb 21, 2026
65d7086
ci: trigger re-run for flaky unit test failure
claude Feb 21, 2026
9725b57
refactor(e2e): DRY up instrumentation tests with shared step templates
claude Feb 21, 2026
0f67dba
Merge branch 'main' into claude/fix-e2e-tests-CQP0x
swiatekm Mar 13, 2026
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
105 changes: 31 additions & 74 deletions tests/e2e-instrumentation/instrumentation-apache-httpd/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,31 @@ kind: Test
metadata:
name: instrumentation-apache-httpd
spec:
bindings:
- name: podLabelSelector
value: app=my-apache
- name: appPort
value: "8080"
- name: appPath
value: /
- name: collectorLabelSelector
value: app.kubernetes.io/name=deployment-collector
- name: collectorMetricsPort
value: "8888"
- name: containerName
value: otc-container
- name: retryTimeout
value: "120"
- name: retrySleep
value: "5"
- name: searchStrings
value: |
k8s.container.name: Str(myapp)
k8s.deployment.name: Str(my-apache)
- name: catchPodLabelSelector
value: app=my-apache
- name: catchContainer
value: otc-container
steps:
- name: Add OpenShift namespace annotations
use:
Expand All @@ -24,79 +49,11 @@ spec:
- podLogs:
selector: app=my-apache
- name: Make a request to the app
try:
- command:
entrypoint: kubectl
args:
- get
- pod
- -n
- ${NAMESPACE}
- -l
- app=my-apache
- -o
- jsonpath={.items[0].metadata.name}
outputs:
- name: podName
value: ($stdout)
- proxy:
apiVersion: v1
kind: Pod
name: ($podName)
namespace: ${NAMESPACE}
port: "8080"
use:
template: ../../step-templates/app-http-request.yaml
- name: Wait for telemetry data
try:
- script:
env:
- name: LABEL_SELECTOR
value: "app.kubernetes.io/name=deployment-collector"
- name: CONTAINER_NAME
value: "otc-container"
- name: RETRY_TIMEOUT
value: "120"
- name: RETRY_SLEEP
value: "5"
- name: SEARCH_STRINGS_ENV
value: |
k8s.container.name: Str(myapp)
k8s.deployment.name: Str(my-apache)
timeout: 2m
content: ../../test-e2e-apps/scripts/check_pod_logs.sh
use:
template: ../../step-templates/wait-for-telemetry.yaml
- name: Check the instrumented app has sent the telemetry data successfully
try:
- command:
entrypoint: kubectl
args:
- get
- pod
- -n
- ${NAMESPACE}
- -l
- app.kubernetes.io/name=deployment-collector
- -o
- jsonpath={.items[0].metadata.name}
outputs:
- name: podName
value: ($stdout)
- script:
env:
- name: podName
value: ($podName)
content: |
#!/bin/bash
# set -ex
kubectl get --raw /api/v1/namespaces/$NAMESPACE/pods/${podName}:8888/proxy/metrics
outputs:
- name: metrics
value: (x_metrics_decode($stdout))
check:
($error == null): true
- assert:
resource:
($metrics[?as_string(metric."__name__") == 'otelcol_exporter_sent_spans_total'].value | [0] > `0`): true
($metrics[?as_string(metric."__name__") == 'otelcol_receiver_accepted_spans_total'].value | [0] > `0`): true
catch:
- podLogs:
selector: app=my-apache
container: otc-container
use:
template: ../../step-templates/validate-collector-spans.yaml
191 changes: 40 additions & 151 deletions tests/e2e-instrumentation/instrumentation-apache-multicontainer/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,31 @@ metadata:
creationTimestamp: null
name: instrumentation-apache-multicontainer
spec:
bindings:
- name: podLabelSelector
value: app=my-apache-multi
- name: appPort
value: "8080"
- name: appPath
value: /
- name: collectorLabelSelector
value: app.kubernetes.io/name=deployment-collector
- name: collectorMetricsPort
value: "8888"
- name: containerName
value: otc-container
- name: retryTimeout
value: "120"
- name: retrySleep
value: "5"
- name: searchStrings
value: |
k8s.container.name: Str(myapp)
k8s.deployment.name: Str(my-apache-multi)
- name: catchPodLabelSelector
value: app=my-apache-multi
- name: catchContainer
value: otc-container
steps:
- name: Add OpenShift namespace annotations
use:
Expand All @@ -25,82 +50,14 @@ spec:
- podLogs:
selector: app=my-apache-multi
- name: Make a request to the app
try:
- command:
entrypoint: kubectl
args:
- get
- pod
- -n
- ${NAMESPACE}
- -l
- app=my-apache-multi
- -o
- jsonpath={.items[0].metadata.name}
outputs:
- name: podName
value: ($stdout)
- proxy:
apiVersion: v1
kind: Pod
name: ($podName)
namespace: ${NAMESPACE}
port: "8080"
use:
template: ../../step-templates/app-http-request.yaml
- name: Wait for telemetry data
try:
- script:
env:
- name: LABEL_SELECTOR
value: "app.kubernetes.io/name=deployment-collector"
- name: CONTAINER_NAME
value: "otc-container"
- name: RETRY_TIMEOUT
value: "120"
- name: RETRY_SLEEP
value: "5"
- name: SEARCH_STRINGS_ENV
value: |
k8s.container.name: Str(myapp)
k8s.deployment.name: Str(my-apache-multi)
timeout: 2m
content: ../../test-e2e-apps/scripts/check_pod_logs.sh
use:
template: ../../step-templates/wait-for-telemetry.yaml
- name: Check the instrumented app has sent the telemetry data successfully
try:
- command:
entrypoint: kubectl
args:
- get
- pod
- -n
- ${NAMESPACE}
- -l
- app.kubernetes.io/name=deployment-collector
- -o
- jsonpath={.items[0].metadata.name}
outputs:
- name: podName
value: ($stdout)
- script:
env:
- name: podName
value: ($podName)
content: |
#!/bin/bash
# set -ex
kubectl get --raw /api/v1/namespaces/$NAMESPACE/pods/${podName}:8888/proxy/metrics
outputs:
- name: metrics
value: (x_metrics_decode($stdout))
check:
($error == null): true
- assert:
resource:
($metrics[?as_string(metric."__name__") == 'otelcol_exporter_sent_spans_total'].value | [0] > `0`): true
($metrics[?as_string(metric."__name__") == 'otelcol_receiver_accepted_spans_total'].value | [0] > `0`): true
catch:
- podLogs:
selector: app=my-apache-multi
container: otc-container
use:
template: ../../step-templates/validate-collector-spans.yaml
- name: step-03
try:
- command:
Expand Down Expand Up @@ -132,80 +89,12 @@ spec:
catch:
- podLogs:
selector: app=my-apache-multi
- name: Make a request to the app
try:
- command:
entrypoint: kubectl
args:
- get
- pod
- -n
- ${NAMESPACE}
- -l
- app=my-apache-multi
- -o
- jsonpath={.items[0].metadata.name}
outputs:
- name: podName
value: ($stdout)
- proxy:
apiVersion: v1
kind: Pod
name: ($podName)
namespace: ${NAMESPACE}
port: "8080"
- name: Wait for telemetry data
try:
- script:
env:
- name: LABEL_SELECTOR
value: "app.kubernetes.io/name=deployment-collector"
- name: CONTAINER_NAME
value: "otc-container"
- name: RETRY_TIMEOUT
value: "120"
- name: RETRY_SLEEP
value: "5"
- name: SEARCH_STRINGS_ENV
value: |
k8s.container.name: Str(myapp)
k8s.deployment.name: Str(my-apache-multi)
timeout: 2m
content: ../../test-e2e-apps/scripts/check_pod_logs.sh
- name: Check the instrumented app has sent the telemetry data successfully
try:
- command:
entrypoint: kubectl
args:
- get
- pod
- -n
- ${NAMESPACE}
- -l
- app.kubernetes.io/name=deployment-collector
- -o
- jsonpath={.items[0].metadata.name}
outputs:
- name: podName
value: ($stdout)
- script:
env:
- name: podName
value: ($podName)
content: |
#!/bin/bash
# set -ex
kubectl get --raw /api/v1/namespaces/$NAMESPACE/pods/${podName}:8888/proxy/metrics
outputs:
- name: metrics
value: (x_metrics_decode($stdout))
check:
($error == null): true
- assert:
resource:
($metrics[?as_string(metric."__name__") == 'otelcol_exporter_sent_spans_total'].value | [0] > `0`): true
($metrics[?as_string(metric."__name__") == 'otelcol_receiver_accepted_spans_total'].value | [0] > `0`): true
catch:
- podLogs:
selector: app=my-apache-multi
container: otc-container
- name: Make a request to the app after update
use:
template: ../../step-templates/app-http-request.yaml
- name: Wait for telemetry data after update
use:
template: ../../step-templates/wait-for-telemetry.yaml
- name: Check telemetry data after update
use:
template: ../../step-templates/validate-collector-spans.yaml
Loading
Loading