Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ RUN rm -rf \

# CI Visibility paths/integrations
RUN rm -rf \
./python/lib/$runtime/site-packages/ddtrace/contrib/coverage/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/pytest/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/pytest_bdd/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/pytest_benchmark/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/selenium/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/unittest/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/internal/coverage/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/internal/pytest/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/internal/pytest_bdd/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/internal/pytest_benchmark/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/internal/selenium/ \
./python/lib/$runtime/site-packages/ddtrace/contrib/internal/unittest/ \
./python/lib/$runtime/site-packages/ddtrace/ext/ci_visibility \
./python/lib/$runtime/site-packages/ddtrace/ext/test_visibility \
./python/lib/$runtime/site-packages/ddtrace/internal/ci_visibility \
Expand Down
5 changes: 4 additions & 1 deletion datadog_lambda/patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ def patch_all():
_patch_for_integration_tests()

if config.trace_enabled:
patch_all_dd()
# unittest and selenium are CI Visibility integrations. The layer strips
# their code and ddtrace.internal.ci_visibility, so leaving them enabled
# logs an import error whenever the user's code imports those modules.
patch_all_dd(unittest=False, selenium=False)
else:
_patch_http()
_ensure_patch_requests()
Expand Down
12 changes: 12 additions & 0 deletions tests/test_patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,15 @@ def test_patch_requests_with_headers_none(self):
self.assertEqual(r.request.headers[TraceHeader.TRACE_ID], "123")
self.assertEqual(r.request.headers[TraceHeader.PARENT_ID], "321")
self.assertEqual(r.request.headers[TraceHeader.SAMPLING_PRIORITY], "2")


@patch("datadog_lambda.patch.patch_all_dd")
@patch("datadog_lambda.patch.config")
def test_patch_all_disables_ci_visibility_integrations(mock_config, mock_patch_all_dd):
from datadog_lambda.patch import patch_all

mock_config.trace_enabled = True
mock_config.integration_test = False
patch_all()

mock_patch_all_dd.assert_called_once_with(unittest=False, selenium=False)
Loading