chore(telemetry): report tested integration versions

.circleci/config.templ.yml

@@ -16,7 +16,7 @@ mongo_image: &mongo_image mongo:3.6@sha256:19c11a8f1064fd2bb713ef1270f79a742a184
 httpbin_image: &httpbin_image kennethreitz/httpbin@sha256:2c7abc4803080c22928265744410173b6fea3b898872c01c5fd0f0f9df4a59fb
 vertica_image: &vertica_image sumitchawla/vertica:latest
 rabbitmq_image: &rabbitmq_image rabbitmq:3.7-alpine
-testagent_image: &testagent_image ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.11.0
+testagent_image: &testagent_image docker.io/williamconti549/dd-apm-test-agent:aws-version-table
 
 parameters:
   coverage:
@@ -238,6 +238,9 @@ testagent: &testagent
     - DD_POOL_TRACE_CHECK_FAILURES=true
     - DD_DISABLE_ERROR_RESPONSES=true
     - ENABLED_CHECKS=trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service
+    - AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
+    - AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
+    - AWS_DEFAULT_REGION=us-east-1
 
 jobs:
   pre_check:

docker-compose.yml

@@ -129,18 +129,21 @@ services:
         volumes:
           - ddagent:/tmp/ddagent:rw
     testagent:
-        image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.11.0
+        image: docker.io/williamconti549/dd-apm-test-agent:aws-version-table
         ports:
             - "127.0.0.1:9126:8126"
         volumes:
             - ./tests/snapshots:/snapshots
         environment:
-            - LOG_LEVEL=WARNING
+            - LOG_LEVEL=DEBUG
             - SNAPSHOT_DIR=/snapshots
             - SNAPSHOT_CI
             - DD_POOL_TRACE_CHECK_FAILURES=true
             - DD_DISABLE_ERROR_RESPONSES=true
             - ENABLED_CHECKS=trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service
+            - AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
+            - AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
+            - AWS_DEFAULT_REGION=us-east-1
     vertica:
         image: sumitchawla/vertica
         environment:

tests/contrib/cherrypy/test_middleware.py

@@ -60,6 +60,18 @@ def test_get_version(self):
         assert type(version) == str
         assert version != ""
 
+    def emit_integration_and_tested_version_telemetry_event(self):
+        # emits a telemetry event that will be consumed by the Test Agent and sent to metabase describing
+        # the integration and its tested versions
+        from ddtrace._monkey import PATCH_MODULES
+        from ddtrace.contrib.cherrypy import get_version
+        from ddtrace.internal.telemetry import telemetry_writer
+
+        version = get_version()
+        telemetry_writer.add_integration("cherrypy", True, PATCH_MODULES.get("cherrypy") is True, "", version=version)
+        integrations = telemetry_writer._flush_integrations_queue()
+        telemetry_writer._app_integrations_changed_event(integrations)
+
     def test_double_instrumentation(self):
         # ensure CherryPy is never instrumented twice when `ddtrace-run`
         # and `TraceMiddleware` are used together. `traced_app` MUST

tests/contrib/falcon/test_falcon_patch_generated.py

@@ -2,9 +2,10 @@
 # script. If you want to make changes to it, you should make sure that you have
 # removed the ``_generated`` suffix from the file name, to prevent the content
 # from being overwritten by future re-generations.
-
+from ddtrace._monkey import PATCH_MODULES
 from ddtrace.contrib.falcon import get_version
 from ddtrace.contrib.falcon.patch import patch
+from ddtrace.internal.telemetry import telemetry_writer
 
 
 try:
@@ -33,3 +34,12 @@ def assert_module_implements_get_version(self):
         version = get_version()
         assert type(version) == str
         assert version != ""
+
+    def emit_integration_and_tested_version_telemetry_event(self):
+        # emits a telemetry event that will be consumed by the Test Agent and sent to metabase describing
+        # the integration and its tested versions
+
+        version = get_version()
+        telemetry_writer.add_integration("falcon", True, PATCH_MODULES.get("falcon") is True, "", version=version)
+        integrations = telemetry_writer._flush_integrations_queue()
+        telemetry_writer._app_integrations_changed_event(integrations)

tests/contrib/mysqldb/test_mysqldb_patch_generated.py

@@ -3,8 +3,10 @@
 # removed the ``_generated`` suffix from the file name, to prevent the content
 # from being overwritten by future re-generations.
 
+from ddtrace._monkey import PATCH_MODULES
 from ddtrace.contrib.mysqldb import get_version
 from ddtrace.contrib.mysqldb.patch import patch
+from ddtrace.internal.telemetry import telemetry_writer
 
 
 try:
@@ -33,3 +35,12 @@ def assert_module_implements_get_version(self):
         version = get_version()
         assert type(version) == str
         assert version != ""
+
+    def emit_integration_and_tested_version_telemetry_event(self):
+        # emits a telemetry event that will be consumed by the Test Agent and sent to metabase describing
+        # the integration and its tested versions
+
+        version = get_version()
+        telemetry_writer.add_integration("falcon", True, PATCH_MODULES.get("falcon") is True, "", version=version)
+        integrations = telemetry_writer._flush_integrations_queue()
+        telemetry_writer._app_integrations_changed_event(integrations)

tests/contrib/patch.py

@@ -302,6 +302,12 @@ def assert_module_implements_get_version(self):
             """
             raise NotImplementedError(self.assert_module_implements_get_version.__doc__)
 
+        def emit_integration_and_tested_version_telemetry_event(self):
+            """
+            Module patch should implement get_version returning the str version
+            """
+            raise NotImplementedError(self.emit_integration_and_tested_version_telemetry_event.__doc__)
+
         @raise_if_no_attrs
         def test_import_patch(self):
             """
@@ -328,6 +334,12 @@ def test_get_version(self):
             """
             self.assert_module_implements_get_version()
 
+        def test_integration_and_version(self):
+            """
+            Module patch should implement get_version returning the str version
+            """
+            self.emit_integration_and_tested_version_telemetry_event()
+
         @raise_if_no_attrs
         def test_patch_import(self):
             """