diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index c3d383e050..37056659a8 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -240,7 +240,7 @@ jobs: run: | cd examples/collector TAG=latest docker-compose up -d - ../../scripts/wait-for-port.sh 11633 + docker compose logs -f > /tmp/docker-log & - name: Run tests run: | find ./dist -name 'tracetest' -exec cp {} ./dist \; @@ -249,6 +249,8 @@ jobs: cd ./cli/smoketest chmod +x ./run.bash + ../../scripts/wait-for-port.sh 11633 + TRACETEST_CLI="../../dist/tracetest" \ TAG="pr-${{ github.event.pull_request.number }}" \ TEST_ENV="${{ matrix.test_env }}" \ diff --git a/cli/smoketest/run.bash b/cli/smoketest/run.bash index 799fae43c1..639e5b4ef8 100755 --- a/cli/smoketest/run.bash +++ b/cli/smoketest/run.bash @@ -21,6 +21,7 @@ echo "TAG: $TAG" echo "TEST_ENV: $TEST_ENV" echo "TRACETEST_ENDPOINT: $TRACETEST_ENDPOINT" echo "TRACETEST_CLI_COMMAND: $TRACETEST_CLI_COMMAND" +echo "" echo "Setting up tracetest CLI configuration..." cat << EOF > tests/config.yml diff --git a/docs/docs/examples-tutorials/recipes/running-tracetest-with-datadog.md b/docs/docs/examples-tutorials/recipes/running-tracetest-with-datadog.md index 1a86cd56f8..67d048528b 100644 --- a/docs/docs/examples-tutorials/recipes/running-tracetest-with-datadog.md +++ b/docs/docs/examples-tutorials/recipes/running-tracetest-with-datadog.md @@ -130,17 +130,11 @@ The `tracetest.config.yaml` file contains the basic setup of connecting Tracetes ```yaml # tracetest.config.yaml --- -postgres: - host: postgres - user: postgres - password: postgres - port: 5432 - dbname: postgres - params: sslmode=disable +postgresConnString: "host=tt-postgres user=postgres password=postgres port=5432 sslmode=disable" poolingConfig: - maxWaitTimeForTrace: 30s - retryDelay: 500ms + maxWaitTimeForTrace: 180s + retryDelay: 5s demo: enabled: [otel] diff --git a/docs/sidebars.js b/docs/sidebars.js index aaac0626f9..51f45015df 100644 --- a/docs/sidebars.js +++ b/docs/sidebars.js @@ -102,11 +102,11 @@ const sidebars = { id: "configuration/connecting-to-data-stores/new-relic", label: "New Relic", }, -// { -// type: "doc", -// id: "configuration/connecting-to-data-stores/datadog", -// label: "Datadog", -// }, + { + type: "doc", + id: "configuration/connecting-to-data-stores/datadog", + label: "Datadog", + }, ], }, { diff --git a/examples/tracetest-datadog/README.md b/examples/tracetest-datadog/README.md index a9b63c9b09..3c12e08a63 100644 --- a/examples/tracetest-datadog/README.md +++ b/examples/tracetest-datadog/README.md @@ -1,4 +1,4 @@ -# OpenTelemetry Demo with Tracetest and Lightstep +# OpenTelemetry Demo with Tracetest and Datadog > [Read the detailed recipe for setting up Datadog with Tractest in our documentation.](https://docs.tracetest.io/examples-tutorials/recipes/running-tracetest-with-datadog) diff --git a/examples/tracetest-datadog/tracetest/tracetest.config.yaml b/examples/tracetest-datadog/tracetest/tracetest.config.yaml index 4f38a277c6..ddeb3f8253 100644 --- a/examples/tracetest-datadog/tracetest/tracetest.config.yaml +++ b/examples/tracetest-datadog/tracetest/tracetest.config.yaml @@ -1,16 +1,8 @@ ---- -# postgres: -# host: tt-postgres -# user: postgres -# password: postgres -# port: 5432 -# dbname: postgres -# params: sslmode=disable postgresConnString: "host=tt-postgres user=postgres password=postgres port=5432 sslmode=disable" poolingConfig: - maxWaitTimeForTrace: 30s - retryDelay: 500ms + maxWaitTimeForTrace: 180s + retryDelay: 5s demo: enabled: [otel]