Merge branch 'main' into cutting_release_branch/main_cleanup_5580891258

dbt-labs · Jul 18, 2023 · d8f3979 · d8f3979
2 parents 56a6441 + ea258bb
commit d8f3979
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -132,6 +132,11 @@ jobs:
       TOXENV: integration-${{ matrix.adapter }}
       PYTEST_ADDOPTS: "-v --color=yes -n4 --csv integration_results.csv"
       DBT_INVOCATION_ENV: github-actions
+      DD_CIVISIBILITY_AGENTLESS_ENABLED: true
+      DD_API_KEY: ${{ secrets.DATADOG_API_KEY }}
+      DD_SITE: datadoghq.com
+      DD_ENV: ci
+      DD_SERVICE: ${{ github.event.repository.name }}
 
     steps:
       - name: Check out the repository
@@ -179,7 +184,7 @@ jobs:
           DATAPROC_REGION: us-central1
           DATAPROC_CLUSTER_NAME: dbt-test-1
           GCS_BUCKET: dbt-ci
-        run: tox
+        run: tox -- --ddtrace
 
       - uses: actions/upload-artifact@v3
         if: always()

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -8,6 +8,7 @@ git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-tests-adapter&subdirectory=
 black~=23.3
 bumpversion~=0.6.0
 click~=8.1
+ddtrace~=1.16
 flake8~=6.0
 flaky~=3.7
 freezegun~=1.2

diff --git a/tox.ini b/tox.ini
@@ -22,6 +22,8 @@ passenv =
     PYTEST_ADDOPTS
     DATAPROC_*
     GCS_BUCKET
+    DD_SERVICE
+    DD_ENV
 commands =
   bigquery: {envpython} -m pytest {posargs} -vv tests/functional -k "not TestPython" --profile service_account
 deps =
@@ -37,6 +39,8 @@ passenv =
     PYTEST_ADDOPTS
     DATAPROC_*
     GCS_BUCKET
+    DD_SERVICE
+    DD_ENV
 commands =
   {envpython} -m pytest {posargs} -vv tests/functional -k "TestPython" --profile service_account
 deps =