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:integration-versions
 
 parameters:
   coverage:
@@ -472,6 +472,9 @@ jobs:
 
   test_logging:
     <<: *contrib_job
+    docker:
+      - image: *ddtrace_dev_image
+      - *testagent
     steps:
       - run_test:
           pattern: 'test_logging'
@@ -584,6 +587,9 @@ jobs:
 
   dogpile_cache:
     <<: *contrib_job
+    docker:
+      - image: *ddtrace_dev_image
+      - *testagent
     steps:
       - run_test:
           pattern: 'dogpile_cache'
@@ -770,6 +776,9 @@ jobs:
 
   pytest:
     <<: *contrib_job
+    docker:
+      - image: *ddtrace_dev_image
+      - *testagent
     steps:
       - run_test:
           pattern: 'pytest'

docker-compose.yml

@@ -129,13 +129,13 @@ 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:integration-versions
         ports:
             - "127.0.0.1:9126:8126"
         volumes:
             - ./tests/snapshots:/snapshots
         environment:
-            - LOG_LEVEL=WARNING
+            - LOG_LEVEL=ERROR
             - SNAPSHOT_DIR=/snapshots
             - SNAPSHOT_CI
             - DD_POOL_TRACE_CHECK_FAILURES=true

scripts/contrib-patch-tests.py

@@ -76,6 +76,7 @@ class Test{contrib.title()}Patch(PatchTestCase.Base):
                 __module_name__ = "{module}"
                 __patch_func__ = patch
                 __unpatch_func__ = unpatch
+                __get_version__ = get_version
 
                 def assert_module_patched(self, {module.replace(".", "_")}):
                     pass
@@ -89,7 +90,7 @@ def assert_not_module_double_patched(self, {module.replace(".", "_")}):
                 def assert_module_implements_get_version(self):
                     version = get_version()
                     assert type(version) == str
-                    assert version != ''
+                    assert version != ""
             """
         ).lstrip()
     )

tests/contrib/aiobotocore/test_aiobotocore_patch_generated.py

@@ -19,6 +19,7 @@ class TestAiobotocorePatch(PatchTestCase.Base):
     __module_name__ = "aiobotocore.client"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, aiobotocore_client):
         pass

tests/contrib/aiohttp/test_aiohttp_patch_generated.py

@@ -19,6 +19,7 @@ class TestAiohttpPatch(PatchTestCase.Base):
     __module_name__ = "aiohttp"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, aiohttp):
         pass

tests/contrib/aiohttp_jinja2/test_aiohttp_jinja2_patch_generated.py

@@ -19,6 +19,7 @@ class TestAiohttp_Jinja2Patch(PatchTestCase.Base):
     __module_name__ = "aiohttp_jinja2"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, aiohttp_jinja2):
         pass

tests/contrib/aiomysql/test_aiomysql_patch_generated.py

@@ -19,6 +19,7 @@ class TestAiomysqlPatch(PatchTestCase.Base):
     __module_name__ = "aiomysql"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, aiomysql):
         pass

tests/contrib/aiopg/test_aiopg_patch_generated.py

@@ -19,6 +19,7 @@ class TestAiopgPatch(PatchTestCase.Base):
     __module_name__ = "aiopg"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, aiopg):
         pass

tests/contrib/aioredis/test_aioredis_patch_generated.py

@@ -19,6 +19,7 @@ class TestAioredisPatch(PatchTestCase.Base):
     __module_name__ = "aioredis"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, aioredis):
         pass

tests/contrib/algoliasearch/test_algoliasearch_patch_generated.py

@@ -19,6 +19,7 @@ class TestAlgoliasearchPatch(PatchTestCase.Base):
     __module_name__ = "algoliasearch"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, algoliasearch):
         pass

tests/contrib/aredis/test_aredis_patch_generated.py

@@ -19,6 +19,7 @@ class TestAredisPatch(PatchTestCase.Base):
     __module_name__ = "aredis"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, aredis):
         pass

tests/contrib/asyncpg/test_asyncpg_patch_generated.py

@@ -19,6 +19,7 @@ class TestAsyncpgPatch(PatchTestCase.Base):
     __module_name__ = "asyncpg"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, asyncpg):
         pass

tests/contrib/boto/test_boto_patch_generated.py

@@ -19,6 +19,7 @@ class TestBotoPatch(PatchTestCase.Base):
     __module_name__ = "boto.connection"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, boto_connection):
         pass

tests/contrib/botocore/test_botocore_patch_generated.py

@@ -19,6 +19,7 @@ class TestBotocorePatch(PatchTestCase.Base):
     __module_name__ = "botocore.client"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, botocore_client):
         pass

tests/contrib/bottle/test_bottle_patch_generated.py

@@ -19,6 +19,7 @@ class TestBottlePatch(PatchTestCase.Base):
     __module_name__ = "bottle"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, bottle):
         pass

tests/contrib/cassandra/test_cassandra_patch_generated.py

@@ -19,6 +19,7 @@ class TestCassandraPatch(PatchTestCase.Base):
     __module_name__ = "cassandra.cluster"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, cassandra_cluster):
         pass

tests/contrib/celery/test_patch.py

@@ -1,6 +1,7 @@
 import unittest
 
 from ddtrace import Pin
+from tests.contrib.patch import emit_integration_and_version_to_test_agent
 
 
 class CeleryPatchTest(unittest.TestCase):
@@ -29,3 +30,5 @@ def test_get_version(self):
         version = get_version()
         assert type(version) == str
         assert version != ""
+
+        emit_integration_and_version_to_test_agent("celery", version)

tests/contrib/cherrypy/test_middleware.py

@@ -17,6 +17,7 @@
 from ddtrace.constants import SAMPLING_PRIORITY_KEY
 from ddtrace.contrib.cherrypy import TraceMiddleware
 from ddtrace.ext import http
+from tests.contrib.patch import emit_integration_and_version_to_test_agent
 from tests.utils import TracerTestCase
 from tests.utils import assert_span_http_status_code
 from tests.utils import snapshot
@@ -60,6 +61,8 @@ def test_get_version(self):
         assert type(version) == str
         assert version != ""
 
+        emit_integration_and_version_to_test_agent("cherrypy", version)
+
     def test_double_instrumentation(self):
         # ensure CherryPy is never instrumented twice when `ddtrace-run`
         # and `TraceMiddleware` are used together. `traced_app` MUST

tests/contrib/consul/test_consul_patch_generated.py

@@ -19,6 +19,7 @@ class TestConsulPatch(PatchTestCase.Base):
     __module_name__ = "consul"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, consul):
         pass

tests/contrib/django/test_django_patch.py

@@ -8,6 +8,7 @@ class TestDjangoPatch(PatchTestCase.Base):
     __module_name__ = "django"
     __patch_func__ = patch
     __unpatch_func__ = None
+    __get_version__ = get_version
 
     def assert_module_patched(self, django):
         import django.apps.registry

tests/contrib/dogpile_cache/test_dogpile_cache_patch_generated.py

@@ -19,6 +19,7 @@ class TestDogpile_CachePatch(PatchTestCase.Base):
     __module_name__ = "dogpile.cache"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, dogpile_cache):
         pass

tests/contrib/elasticsearch/test_elasticsearch.py

@@ -6,10 +6,13 @@
 from ddtrace import Pin
 from ddtrace import config
 from ddtrace.constants import ANALYTICS_SAMPLE_RATE_KEY
+from ddtrace.contrib.elasticsearch.patch import get_version
+from ddtrace.contrib.elasticsearch.patch import get_versions
 from ddtrace.contrib.elasticsearch.patch import patch
 from ddtrace.contrib.elasticsearch.patch import unpatch
 from ddtrace.ext import http
 from ddtrace.internal.schema import DEFAULT_SPAN_SERVICE_NAME
+from tests.contrib.patch import emit_integration_and_version_to_test_agent
 from tests.utils import TracerTestCase
 
 from ..config import ELASTICSEARCH_CONFIG
@@ -331,3 +334,13 @@ def test_large_body(self):
         self.reset()
         assert len(spans) == 1
         assert len(spans[0].get_tag("elasticsearch.body")) < 25000
+
+    def test_and_emit_get_version(self):
+        version = get_version()
+        assert type(version) == str
+        assert version == ""
+
+        versions = get_versions()
+        assert len(versions) > 0
+        for module_name, v in versions.items():
+            emit_integration_and_version_to_test_agent(module_name, v)

tests/contrib/falcon/test_falcon_patch_generated.py

@@ -19,6 +19,7 @@ class TestFalconPatch(PatchTestCase.Base):
     __module_name__ = "falcon"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, falcon):
         pass

tests/contrib/fastapi/test_fastapi_patch.py

@@ -9,6 +9,7 @@ class TestFastapiPatch(PatchTestCase.Base):
     __module_name__ = "fastapi"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, fastapi):
         self.assert_wrapped(fastapi.applications.FastAPI.build_middleware_stack)

tests/contrib/flask/test_flask_patch_generated.py

@@ -19,6 +19,7 @@ class TestFlaskPatch(PatchTestCase.Base):
     __module_name__ = "flask"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, flask):
         pass

tests/contrib/futures/test_futures_patch_generated.py

@@ -2,6 +2,8 @@
 # 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.contrib.futures import get_version
 from ddtrace.contrib.futures.patch import patch
 
 
@@ -17,6 +19,7 @@ class TestFuturesPatch(PatchTestCase.Base):
     __module_name__ = "concurrent.futures.thread"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, concurrent_futures):
         pass
@@ -29,3 +32,6 @@ def assert_not_module_double_patched(self, concurrent_futures):
 
     def assert_module_implements_get_version(self):
         pass
+
+    def test_and_emit_get_version(self):
+        pass

tests/contrib/gevent/test_gevent_patch_generated.py

@@ -19,6 +19,7 @@ class TestGeventPatch(PatchTestCase.Base):
     __module_name__ = "gevent"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, gevent):
         pass
@@ -32,4 +33,4 @@ def assert_not_module_double_patched(self, gevent):
     def assert_module_implements_get_version(self):
         version = get_version()
         assert type(version) == str
-        assert version != ''
+        assert version != ""

tests/contrib/graphql/test_graphql_patch_generated.py

@@ -19,6 +19,7 @@ class TestGraphqlPatch(PatchTestCase.Base):
     __module_name__ = "graphql"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, graphql):
         pass

tests/contrib/grpc/test_grpc_patch.py

@@ -8,6 +8,7 @@ class TestGRPCPatch(PatchTestCase.Base):
     __module_name__ = "grpc"
     __patch_func__ = patch
     __unpatch_func__ = None
+    __get_version__ = get_version
 
     def assert_module_patched(self, grpc):
         # Client Wrapping

tests/contrib/httplib/test_httplib_patch.py

@@ -1,3 +1,4 @@
+from ddtrace.contrib.httplib.patch import get_version
 from ddtrace.contrib.httplib.patch import patch
 from ddtrace.internal.compat import PY2
 
@@ -14,6 +15,7 @@ class TestHttplibPatch(PatchTestCase.Base):
     __module_name__ = "httplib" if PY2 else "http.client"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, http_client):
         pass
@@ -24,5 +26,7 @@ def assert_not_module_patched(self, http_client):
     def assert_not_module_double_patched(self, http_client):
         pass
 
-    def assert_module_implements_get_version(self):
-        pass
+    def test_and_emit_get_version(self):
+        version = get_version()
+        assert type(version) == str
+        assert version == ""

tests/contrib/httpx/test_httpx_patch_generated.py

@@ -19,6 +19,7 @@ class TestHttpxPatch(PatchTestCase.Base):
     __module_name__ = "httpx"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, httpx):
         pass

tests/contrib/jinja2/test_jinja2_patch_generated.py

@@ -19,6 +19,7 @@ class TestJinja2Patch(PatchTestCase.Base):
     __module_name__ = "jinja2"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, jinja2):
         pass

tests/contrib/kafka/test_kafka_patch.py

@@ -9,6 +9,7 @@ class TestKafkaPatch(PatchTestCase.Base):
     __module_name__ = "confluent_kafka"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, confluent_kafka):
         self.assert_wrapped(confluent_kafka.Producer({}).produce)

tests/contrib/kombu/test_kombu_patch_generated.py

@@ -19,6 +19,7 @@ class TestKombuPatch(PatchTestCase.Base):
     __module_name__ = "kombu"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, kombu):
         pass

tests/contrib/langchain/test_langchain_patch.py

@@ -11,6 +11,7 @@ class TestLangchainPatch(PatchTestCase.Base):
     __module_name__ = "langchain"
     __patch_func__ = patch
     __unpatch_func__ = unpatch
+    __get_version__ = get_version
 
     def assert_module_patched(self, langchain):
         self.assert_wrapped(langchain.llms.base.BaseLLM.generate)