Skip to content

Commit

Permalink
Update trace based tests run script (open-telemetry#1018)
Browse files Browse the repository at this point in the history
* chore(tests): allow partial runs on trace-based test scripts

* Adding option to run trace-based tests for selected services

* Updating testing README

* Fixing sanity checks

* Fixing lint issues

* Apply suggestions from code review

Co-authored-by: Adnan Rahić <ado.raha198@gmail.com>

* Update README.md with suggestions

* Updating Changelog

* Fixing linter issue

* Fixed changelog

---------

Co-authored-by: Adnan Rahić <ado.raha198@gmail.com>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
Co-authored-by: Austin Parker <austin@ap2.io>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
  • Loading branch information
5 people committed Aug 7, 2023
1 parent 2671bfb commit d999501
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 17 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ release.

## Unreleased

* [tests] Update trace-based tests run script
([#1018](https://github.com/open-telemetry/opentelemetry-demo/pull/1018))
* Add cartServiceFailure feature flag triggering Cart Service errors
([#824](https://github.com/open-telemetry/opentelemetry-demo/pull/824))
* [paymentservice] update JS SDKs to 1.12.0/0.38.0
Expand Down Expand Up @@ -45,6 +47,8 @@ release.
([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/935))
* [cartservice] update service to .NET 7
([#942](https://github.com/open-telemetry/opentelemetry-demo/pull/942))
* [tests] Add trace-based testing examples
([#877](https://github.com/open-telemetry/opentelemetry-demo/pull/877))
* Introduce minimal mode to run demo
([#872](https://github.com/open-telemetry/opentelemetry-demo/pull/872))
* [frontendproxy]Envoy expose a route for the collector to route frontend spans
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ run-tests:
docker compose run traceBasedTests

run-tracetesting:
docker compose run traceBasedTests
docker compose run traceBasedTests ${SERVICES_TO_TEST}

.PHONY: generate-protobuf
generate-protobuf:
Expand Down
48 changes: 45 additions & 3 deletions test/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,49 @@
# Service Testing

Testing gRPC services as black boxes.
There are two ways to test the service APIs in the OpenTelemetry Demo:

1. Using black box-testing, calling gRPC services
and validating their direct response
2. Using Trace-based tests, calling both HTTP and
gRPC services and validating their direct response as well as
the distributed traces they generate

## Testing gRPC services as black boxes

To run the entire test suite as a black box, run the command:

```sh
docker compose run integrationTests
```

If you want to run tests for a specific service, run:

1. Start the services you want to test with `docker compose up --build <service>`
1. Run `npm install`
1. Run `npm test` or `npx ava --match='<pattern>'` to match test names
2. Run `npm install`
3. Run `npm test` or `npx ava --match='<pattern>'` to match test names

## Testing services with Trace-based tests

To run the entire test suite of trace-based tests, run the command:

```sh
make run-tracetesting
#or
docker compose run traceBasedTests
```

To run tests for specific services, pass the name of the service as a
parameter (using the folder names located [here](./tracetesting/)):

```sh
make run-tracetesting SERVICES_TO_TEST="service-1 service-2 ..."
#or
docker compose run traceBasedTests "service-1 service-2 ..."
```

For instance, if you need to run the tests for `ad-service` and
`payment-service`, you can run them with:

```sh
make run-tracetesting SERVICES_TO_TEST="ad-service payment-service"
```
2 changes: 1 addition & 1 deletion test/tracetesting/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ COPY ./pb ./pb

WORKDIR /app/test/tracetesting

CMD ["/bin/sh", "/app/test/tracetesting/run.bash"]
ENTRYPOINT ["/bin/bash", "/app/test/tracetesting/run.bash"]
32 changes: 20 additions & 12 deletions test/tracetesting/run.bash
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,26 @@ EOF

run_tracetest() {
service_name=$1
test_file=./$service_name/all.yaml
transaction_file=./$service_name/all.yaml

tracetest --config ./cli-config.yml test run --definition $test_file --environment ./tracetesting-env.yaml --wait-for-result
tracetest --config ./cli-config.yml run transaction --file $transaction_file --environment ./tracetesting-env.yaml
return $?
}

ALL_SERVICES=("ad-service" "cart-service" "currency-service" "checkout-service" "frontend-service" "email-service" "payment-service" "product-catalog-service" "recommendation-service" "shipping-service")
CHOSEN_SERVICES=()

while [[ $# -gt 0 ]]; do
CHOSEN_SERVICES+=("$1")
shift
done

if [ ${#CHOSEN_SERVICES[@]} -eq 0 ]; then
for service in "${ALL_SERVICES[@]}"; do
CHOSEN_SERVICES+=("$service")
done
fi

check_if_tracetest_is_installed
create_env_file

Expand All @@ -62,17 +76,11 @@ EXIT_STATUS=0

echo ""
echo "Running trace-based tests..."
echo ""

run_tracetest ad-service || EXIT_STATUS=$?
run_tracetest cart-service || EXIT_STATUS=$?
run_tracetest currency-service || EXIT_STATUS=$?
run_tracetest checkout-service || EXIT_STATUS=$?
run_tracetest frontend-service || EXIT_STATUS=$?
run_tracetest email-service || EXIT_STATUS=$?
run_tracetest payment-service || EXIT_STATUS=$?
run_tracetest product-catalog-service || EXIT_STATUS=$?
run_tracetest recommendation-service || EXIT_STATUS=$?
run_tracetest shipping-service || EXIT_STATUS=$?
for service in "${CHOSEN_SERVICES[@]}"; do
run_tracetest $service || EXIT_STATUS=$?
done

echo ""
echo "Tests done! Exit code: $EXIT_STATUS"
Expand Down

0 comments on commit d999501

Please sign in to comment.