diff --git a/tests/contrib/mariadb/test_mariadb.py b/tests/contrib/mariadb/test_mariadb.py
index 569ee5c42e3..5e8a62f941a 100644
--- a/tests/contrib/mariadb/test_mariadb.py
+++ b/tests/contrib/mariadb/test_mariadb.py
@@ -1,3 +1,5 @@
+from typing import Tuple
+
 import mariadb
 import pytest
 
@@ -13,6 +15,17 @@
 from tests.utils import snapshot
 
 
+MARIADB_VERSION = mariadb.__version_info__  # type: Tuple[int, int, int, str, int]
+SNAPSHOT_VARIANTS = {
+    "pre_1_1": MARIADB_VERSION < (1, 1, 0),
+    "post_1_1": MARIADB_VERSION
+    >= (
+        1,
+        1,
+    ),
+}
+
+
 @pytest.fixture
 def tracer():
     tracer = DummyTracer()
@@ -71,6 +84,7 @@ def test_query_executemany(connection, tracer):
             dummy_key VARCHAR(32) PRIMARY KEY,
             dummy_value TEXT NOT NULL)"""
     )
+    cursor.execute("DELETE FROM dummy")
     tracer.enabled = True
 
     stmt = "INSERT INTO dummy (dummy_key, dummy_value) VALUES (%s, %s)"
@@ -116,7 +130,7 @@ def test_analytics_default(connection, tracer):
 
 
 @pytest.mark.subprocess(env=dict(DD_SERVICE="mysvc"))
-@snapshot(async_mode=False)
+@snapshot(async_mode=False, variants=SNAPSHOT_VARIANTS)
 def test_user_specified_dd_service_snapshot():
     """
     When a user specifies a service for the app
@@ -140,7 +154,7 @@ def test_user_specified_dd_service_snapshot():
 
 
 @pytest.mark.subprocess(env=dict(DD_MARIADB_SERVICE="mysvc"))
-@snapshot(async_mode=False)
+@snapshot(async_mode=False, variants=SNAPSHOT_VARIANTS)
 def test_user_specified_dd_mariadb_service_snapshot():
     """
     When a user specifies a service for the app
@@ -163,7 +177,7 @@ def test_user_specified_dd_mariadb_service_snapshot():
     tracer.shutdown()
 
 
-@snapshot(include_tracer=True)
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS)
 def test_simple_query_snapshot(tracer):
     with get_connection(tracer) as connection:
         cursor = connection.cursor()
@@ -172,7 +186,7 @@ def test_simple_query_snapshot(tracer):
         assert len(rows) == 1
 
 
-@snapshot(include_tracer=True, ignores=["meta.error.stack"])
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS, ignores=["meta.error.stack"])
 def test_simple_malformed_query_snapshot(tracer):
     with get_connection(tracer) as connection:
         cursor = connection.cursor()
@@ -180,7 +194,7 @@ def test_simple_malformed_query_snapshot(tracer):
             cursor.execute("SELEC 1")
 
 
-@snapshot(include_tracer=True)
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS)
 def test_simple_query_fetchall_snapshot(tracer):
     with override_config("mariadb", dict(trace_fetch_methods=True)):
         with get_connection(tracer) as connection:
@@ -190,7 +204,7 @@ def test_simple_query_fetchall_snapshot(tracer):
             assert len(rows) == 1
 
 
-@snapshot(include_tracer=True)
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS)
 def test_query_with_several_rows_snapshot(tracer):
     with get_connection(tracer) as connection:
         cursor = connection.cursor()
@@ -200,7 +214,7 @@ def test_query_with_several_rows_snapshot(tracer):
         assert len(rows) == 3
 
 
-@snapshot(include_tracer=True)
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS)
 def test_query_with_several_rows_fetchall_snapshot(tracer):
     with override_config("mariadb", dict(trace_fetch_methods=True)):
         with get_connection(tracer) as connection:
@@ -211,7 +225,7 @@ def test_query_with_several_rows_fetchall_snapshot(tracer):
             assert len(rows) == 3
 
 
-@snapshot(include_tracer=True)
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS)
 def test_query_many_fetchall_snapshot(tracer):
     with override_config("mariadb", dict(trace_fetch_methods=True)):
         with get_connection(tracer) as connection:
@@ -226,6 +240,7 @@ def test_query_many_fetchall_snapshot(tracer):
                     dummy_key VARCHAR(32) PRIMARY KEY,
                     dummy_value TEXT NOT NULL)"""
             )
+            cursor.execute("DELETE FROM dummy")
             tracer.enabled = True
 
             stmt = "INSERT INTO dummy (dummy_key, dummy_value) VALUES (%s, %s)"
@@ -240,13 +255,13 @@ def test_query_many_fetchall_snapshot(tracer):
             assert len(rows) == 2
 
 
-@snapshot(include_tracer=True)
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS)
 def test_commit_snapshot(tracer):
     with get_connection(tracer) as connection:
         connection.commit()
 
 
-@snapshot(include_tracer=True)
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS)
 def test_query_proc_snapshot(tracer):
     with get_connection(tracer) as connection:
         # create a procedure
@@ -267,7 +282,7 @@ def test_query_proc_snapshot(tracer):
         cursor.callproc(proc, data)
 
 
-@snapshot(include_tracer=True)
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS)
 def test_analytics_with_rate_snapshot(tracer):
     with override_config("mariadb", dict(analytics_enabled=True, analytics_sample_rate=0.5)):
         with get_connection(tracer) as connection:
@@ -277,7 +292,7 @@ def test_analytics_with_rate_snapshot(tracer):
             assert len(rows) == 1
 
 
-@snapshot(include_tracer=True)
+@snapshot(include_tracer=True, variants=SNAPSHOT_VARIANTS)
 def test_analytics_without_rate_snapshot(tracer):
     with override_config("mariadb", dict(analytics_enabled=True)):
         with get_connection(tracer) as connection:
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_with_rate_snapshot_post_1_1.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_with_rate_snapshot_post_1_1.json
new file mode 100644
index 00000000000..d5dedbfe25b
--- /dev/null
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_with_rate_snapshot_post_1_1.json
@@ -0,0 +1,30 @@
+[[
+  {
+    "name": "mariadb.query",
+    "service": "mariadb",
+    "resource": "SELECT 1",
+    "trace_id": 0,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.measured": 1,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_dd1.sr.eausr": 0.5,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 1,
+      "out.port": 3306,
+      "sql.rows": 1,
+      "system.pid": 9677
+    },
+    "duration": 1412500,
+    "start": 1656521264659140100
+  }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_with_rate_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_with_rate_snapshot_pre_1_1.json
similarity index 79%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_with_rate_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_with_rate_snapshot_pre_1_1.json
index 29d92e64368..86519913244 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_with_rate_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_with_rate_snapshot_pre_1_1.json
@@ -11,7 +11,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -23,8 +23,8 @@
       "db.rowcount": 0,
       "out.port": 3306,
       "sql.rows": 0,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 1238000,
-    "start": 1633039295271632000
+    "duration": 650000,
+    "start": 1656521180778211000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_without_rate_snapshot_post_1_1.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_without_rate_snapshot_post_1_1.json
new file mode 100644
index 00000000000..5e8502232f9
--- /dev/null
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_without_rate_snapshot_post_1_1.json
@@ -0,0 +1,30 @@
+[[
+  {
+    "name": "mariadb.query",
+    "service": "mariadb",
+    "resource": "SELECT 1",
+    "trace_id": 0,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.measured": 1,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_dd1.sr.eausr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 1,
+      "out.port": 3306,
+      "sql.rows": 1,
+      "system.pid": 9677
+    },
+    "duration": 580200,
+    "start": 1656521264692636300
+  }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_without_rate_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_without_rate_snapshot_pre_1_1.json
similarity index 79%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_without_rate_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_without_rate_snapshot_pre_1_1.json
index e4498b1a497..9a919f14bf2 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_without_rate_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_analytics_without_rate_snapshot_pre_1_1.json
@@ -11,7 +11,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -23,8 +23,8 @@
       "db.rowcount": 0,
       "out.port": 3306,
       "sql.rows": 0,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 976000,
-    "start": 1633039295305654000
+    "duration": 616000,
+    "start": 1656521180800547000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_commit_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_commit_snapshot_post_1_1.json
similarity index 76%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_commit_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_commit_snapshot_post_1_1.json
index d3aa32bdc37..45ef87ba403 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_commit_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_commit_snapshot_post_1_1.json
@@ -10,7 +10,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -18,8 +18,8 @@
       "_dd.tracer_kr": 1.0,
       "_sampling_priority_v1": 1,
       "out.port": 3306,
-      "system.pid": 5857
+      "system.pid": 9677
     },
-    "duration": 784000,
-    "start": 1633039295184325000
+    "duration": 420500,
+    "start": 1656521264458364000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_commit_snapshot_pre_1_1.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_commit_snapshot_pre_1_1.json
new file mode 100644
index 00000000000..029e71a1f36
--- /dev/null
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_commit_snapshot_pre_1_1.json
@@ -0,0 +1,25 @@
+[[
+  {
+    "name": "mariadb.connection.commit",
+    "service": "mariadb",
+    "resource": "mariadb.connection.commit",
+    "trace_id": 0,
+    "span_id": 1,
+    "parent_id": 0,
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "out.port": 3306,
+      "system.pid": 9600
+    },
+    "duration": 395000,
+    "start": 1656521180729828000
+  }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_many_fetchall_snapshot_post_1_1.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_many_fetchall_snapshot_post_1_1.json
new file mode 100644
index 00000000000..2de95c26662
--- /dev/null
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_many_fetchall_snapshot_post_1_1.json
@@ -0,0 +1,87 @@
+[[
+  {
+    "name": "mariadb.query",
+    "service": "mariadb",
+    "resource": "INSERT INTO dummy (dummy_key, dummy_value) VALUES (%s, %s)",
+    "trace_id": 0,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86",
+      "sql.executemany": "true"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.measured": 1,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 2,
+      "out.port": 3306,
+      "sql.rows": 2,
+      "system.pid": 9677
+    },
+    "duration": 1468400,
+    "start": 1656521264429166700
+  }],
+[
+  {
+    "name": "mariadb.query",
+    "service": "mariadb",
+    "resource": "SELECT dummy_key, dummy_value FROM dummy ORDER BY dummy_key",
+    "trace_id": 1,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.measured": 1,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 2,
+      "out.port": 3306,
+      "sql.rows": 2,
+      "system.pid": 9677
+    },
+    "duration": 698300,
+    "start": 1656521264432090500
+  }],
+[
+  {
+    "name": "mariadb.query.fetchall",
+    "service": "mariadb",
+    "resource": "SELECT dummy_key, dummy_value FROM dummy ORDER BY dummy_key",
+    "trace_id": 2,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 2,
+      "out.port": 3306,
+      "sql.rows": 2,
+      "system.pid": 9677
+    },
+    "duration": 94000,
+    "start": 1656521264433020400
+  }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_many_fetchall_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_many_fetchall_snapshot_pre_1_1.json
similarity index 80%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_many_fetchall_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_many_fetchall_snapshot_pre_1_1.json
index 3d715c88a34..52e0d6fe277 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_many_fetchall_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_many_fetchall_snapshot_pre_1_1.json
@@ -11,7 +11,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "f547bbe17ce54cc79cb10a965abd9740",
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01",
       "sql.executemany": "true"
     },
     "metrics": {
@@ -23,10 +23,10 @@
       "db.rowcount": 2,
       "out.port": 3306,
       "sql.rows": 2,
-      "system.pid": 6754
+      "system.pid": 9600
     },
-    "duration": 9144000,
-    "start": 1633040960213865000
+    "duration": 4039000,
+    "start": 1656521180702582000
   }],
 [
   {
@@ -41,7 +41,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "f547bbe17ce54cc79cb10a965abd9740"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -52,10 +52,10 @@
       "db.rowcount": 0,
       "out.port": 3306,
       "sql.rows": 0,
-      "system.pid": 6754
+      "system.pid": 9600
     },
-    "duration": 1214000,
-    "start": 1633040960223609000
+    "duration": 909000,
+    "start": 1656521180707416000
   }],
 [
   {
@@ -70,7 +70,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "f547bbe17ce54cc79cb10a965abd9740"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -80,8 +80,8 @@
       "db.rowcount": 2,
       "out.port": 3306,
       "sql.rows": 2,
-      "system.pid": 6754
+      "system.pid": 9600
     },
-    "duration": 102000,
-    "start": 1633040960225024000
+    "duration": 175000,
+    "start": 1656521180708509000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_proc_snapshot_post_1_1.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_proc_snapshot_post_1_1.json
new file mode 100644
index 00000000000..4ee84c303f9
--- /dev/null
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_proc_snapshot_post_1_1.json
@@ -0,0 +1,29 @@
+[[
+  {
+    "name": "mariadb.query",
+    "service": "mariadb",
+    "resource": "sp_sum",
+    "trace_id": 0,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.measured": 1,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 1,
+      "out.port": 3306,
+      "sql.rows": 1,
+      "system.pid": 9677
+    },
+    "duration": 1428400,
+    "start": 1656521264606348600
+  }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_proc_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_proc_snapshot_pre_1_1.json
similarity index 78%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_proc_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_proc_snapshot_pre_1_1.json
index 7eb48f90014..e79dd8999c0 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_proc_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_proc_snapshot_pre_1_1.json
@@ -11,7 +11,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -22,8 +22,8 @@
       "db.rowcount": 0,
       "out.port": 3306,
       "sql.rows": 0,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 1895000,
-    "start": 1633039295234024000
+    "duration": 996000,
+    "start": 1656521180755302000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_fetchall_snapshot_post_1_1.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_fetchall_snapshot_post_1_1.json
new file mode 100644
index 00000000000..a6ac742d040
--- /dev/null
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_fetchall_snapshot_post_1_1.json
@@ -0,0 +1,57 @@
+[[
+  {
+    "name": "mariadb.query",
+    "service": "mariadb",
+    "resource": "SELECT n FROM (SELECT 42 n UNION SELECT 421 UNION SELECT 4210) m",
+    "trace_id": 0,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.measured": 1,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 3,
+      "out.port": 3306,
+      "sql.rows": 3,
+      "system.pid": 9677
+    },
+    "duration": 956800,
+    "start": 1656521264386625100
+  }],
+[
+  {
+    "name": "mariadb.query.fetchall",
+    "service": "mariadb",
+    "resource": "SELECT n FROM (SELECT 42 n UNION SELECT 421 UNION SELECT 4210) m",
+    "trace_id": 1,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 3,
+      "out.port": 3306,
+      "sql.rows": 3,
+      "system.pid": 9677
+    },
+    "duration": 132500,
+    "start": 1656521264388572600
+  }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_fetchall_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_fetchall_snapshot_pre_1_1.json
similarity index 80%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_fetchall_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_fetchall_snapshot_pre_1_1.json
index 5689c141acf..89efdae2aa4 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_fetchall_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_fetchall_snapshot_pre_1_1.json
@@ -11,7 +11,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -22,10 +22,10 @@
       "db.rowcount": 0,
       "out.port": 3306,
       "sql.rows": 0,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 760000,
-    "start": 1633039294966448000
+    "duration": 535000,
+    "start": 1656521180668394000
   }],
 [
   {
@@ -40,7 +40,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -50,8 +50,8 @@
       "db.rowcount": 3,
       "out.port": 3306,
       "sql.rows": 3,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 98000,
-    "start": 1633039294967644000
+    "duration": 102000,
+    "start": 1656521180669617000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_snapshot_post_1_1.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_snapshot_post_1_1.json
new file mode 100644
index 00000000000..23200130d01
--- /dev/null
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_snapshot_post_1_1.json
@@ -0,0 +1,29 @@
+[[
+  {
+    "name": "mariadb.query",
+    "service": "mariadb",
+    "resource": "SELECT n FROM (SELECT 42 n UNION SELECT 421 UNION SELECT 4210) m",
+    "trace_id": 0,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.measured": 1,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 3,
+      "out.port": 3306,
+      "sql.rows": 3,
+      "system.pid": 9677
+    },
+    "duration": 569600,
+    "start": 1656521264363662100
+  }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_snapshot_pre_1_1.json
similarity index 80%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_snapshot_pre_1_1.json
index 826fab716af..460dea2d12b 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_query_with_several_rows_snapshot_pre_1_1.json
@@ -11,7 +11,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -22,8 +22,8 @@
       "db.rowcount": 0,
       "out.port": 3306,
       "sql.rows": 0,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 833000,
-    "start": 1633039294936111000
+    "duration": 560000,
+    "start": 1656521180646895000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_malformed_query_snapshot_post_1_1.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_malformed_query_snapshot_post_1_1.json
new file mode 100644
index 00000000000..8b735a8b174
--- /dev/null
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_malformed_query_snapshot_post_1_1.json
@@ -0,0 +1,32 @@
+[[
+  {
+    "name": "mariadb.query",
+    "service": "mariadb",
+    "resource": "SELEC 1",
+    "trace_id": 0,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "error": 1,
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "error.msg": "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELEC 1' at line 1",
+      "error.stack": "Traceback (most recent call last):\n  File \"/root/project/ddtrace/contrib/dbapi/__init__.py\", line 81, in _trace_method\n    return method(*args, **kwargs)\n  File \"/root/project/.riot/venv_py3713_mariadb~10/lib/python3.7/site-packages/mariadb/cursors.py\", line 293, in execute\n    self._readresponse()\nmariadb.ProgrammingError: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELEC 1' at line 1\n",
+      "error.type": "mariadb.ProgrammingError",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.measured": 1,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": -1,
+      "out.port": 3306,
+      "system.pid": 9677
+    },
+    "duration": 4552500,
+    "start": 1656521264312730600
+  }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_malformed_query_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_malformed_query_snapshot_pre_1_1.json
similarity index 83%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_malformed_query_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_malformed_query_snapshot_pre_1_1.json
index e6ab1654d7d..af9b04febb0 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_malformed_query_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_malformed_query_snapshot_pre_1_1.json
@@ -12,10 +12,10 @@
       "db.name": "test",
       "db.user": "test",
       "error.msg": "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELEC 1' at line 1",
-      "error.stack": "Traceback (most recent call last):\n  File \"/root/project/ddtrace/contrib/dbapi/__init__.py\", line 75, in _trace_method\n    return method(*args, **kwargs)\nmariadb.ProgrammingError: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELEC 1' at line 1\n",
+      "error.stack": "Traceback (most recent call last):\n  File \"/root/project/ddtrace/contrib/dbapi/__init__.py\", line 81, in _trace_method\n    return method(*args, **kwargs)\nmariadb.ProgrammingError: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELEC 1' at line 1\n",
       "error.type": "mariadb.ProgrammingError",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -25,8 +25,8 @@
       "_sampling_priority_v1": 1,
       "db.rowcount": -1,
       "out.port": 3306,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 1061000,
-    "start": 1633039294872805000
+    "duration": 2360000,
+    "start": 1656521180598042000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_fetchall_snapshot_post_1_1.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_fetchall_snapshot_post_1_1.json
new file mode 100644
index 00000000000..ad40aa63197
--- /dev/null
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_fetchall_snapshot_post_1_1.json
@@ -0,0 +1,57 @@
+[[
+  {
+    "name": "mariadb.query",
+    "service": "mariadb",
+    "resource": "SELECT 1",
+    "trace_id": 0,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.measured": 1,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 1,
+      "out.port": 3306,
+      "sql.rows": 1,
+      "system.pid": 9677
+    },
+    "duration": 617000,
+    "start": 1656521264338568300
+  }],
+[
+  {
+    "name": "mariadb.query.fetchall",
+    "service": "mariadb",
+    "resource": "SELECT 1",
+    "trace_id": 1,
+    "span_id": 1,
+    "parent_id": 0,
+    "type": "sql",
+    "meta": {
+      "db.name": "test",
+      "db.user": "test",
+      "out.host": "127.0.0.1",
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
+    },
+    "metrics": {
+      "_dd.agent_psr": 1.0,
+      "_dd.top_level": 1,
+      "_dd.tracer_kr": 1.0,
+      "_sampling_priority_v1": 1,
+      "db.rowcount": 1,
+      "out.port": 3306,
+      "sql.rows": 1,
+      "system.pid": 9677
+    },
+    "duration": 271200,
+    "start": 1656521264339927400
+  }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_fetchall_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_fetchall_snapshot_pre_1_1.json
similarity index 78%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_fetchall_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_fetchall_snapshot_pre_1_1.json
index 0d12f511fd6..b1c92445586 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_fetchall_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_fetchall_snapshot_pre_1_1.json
@@ -11,7 +11,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -22,10 +22,10 @@
       "db.rowcount": 0,
       "out.port": 3306,
       "sql.rows": 0,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 711000,
-    "start": 1633039294906899000
+    "duration": 1075000,
+    "start": 1656521180623369000
   }],
 [
   {
@@ -40,7 +40,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -50,8 +50,8 @@
       "db.rowcount": 1,
       "out.port": 3306,
       "sql.rows": 1,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 102000,
-    "start": 1633039294908120000
+    "duration": 188000,
+    "start": 1656521180625496000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_user_specified_dd_service_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_snapshot_post_1_1.json
similarity index 71%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_user_specified_dd_service_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_snapshot_post_1_1.json
index e23b6195702..ace537ba3b9 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_user_specified_dd_service_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_snapshot_post_1_1.json
@@ -11,7 +11,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "0e9890fbb9d544048b5861934675132d"
+      "runtime-id": "778c778962a54eeea3ae401d2417ef86"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -19,11 +19,11 @@
       "_dd.top_level": 1,
       "_dd.tracer_kr": 1.0,
       "_sampling_priority_v1": 1,
-      "db.rowcount": 0,
+      "db.rowcount": 1,
       "out.port": 3306,
-      "sql.rows": 0,
-      "system.pid": 5863
+      "sql.rows": 1,
+      "system.pid": 9677
     },
-    "duration": 868000,
-    "start": 1633039294322557000
+    "duration": 430200,
+    "start": 1656521264285207600
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_snapshot_pre_1_1.json
similarity index 78%
rename from tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_snapshot.json
rename to tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_snapshot_pre_1_1.json
index 3c97c891228..3dd0c2c8552 100644
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_snapshot.json
+++ b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple_query_snapshot_pre_1_1.json
@@ -11,7 +11,7 @@
       "db.name": "test",
       "db.user": "test",
       "out.host": "127.0.0.1",
-      "runtime-id": "afb83c6e2adf41f9a723786fdb1b223b"
+      "runtime-id": "93f76aae38d74161926ccd64013f5d01"
     },
     "metrics": {
       "_dd.agent_psr": 1.0,
@@ -22,8 +22,8 @@
       "db.rowcount": 0,
       "out.port": 3306,
       "sql.rows": 0,
-      "system.pid": 5857
+      "system.pid": 9600
     },
-    "duration": 909000,
-    "start": 1633039294840902000
+    "duration": 496000,
+    "start": 1656521180575354000
   }]]
diff --git a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_user_specified_dd_mariadb_service_snapshot.json b/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_user_specified_dd_mariadb_service_snapshot.json
deleted file mode 100644
index 1533fb8db3b..00000000000
--- a/tests/snapshots/tests.contrib.mariadb.test_mariadb.test_user_specified_dd_mariadb_service_snapshot.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[[
-  {
-    "name": "mariadb.query",
-    "service": "mysvc",
-    "resource": "SELECT 1",
-    "trace_id": 0,
-    "span_id": 1,
-    "parent_id": 0,
-    "type": "sql",
-    "meta": {
-      "db.name": "test",
-      "db.user": "test",
-      "out.host": "127.0.0.1",
-      "runtime-id": "d2ec231cf6b849fd80d6372675a86ccc"
-    },
-    "metrics": {
-      "_dd.agent_psr": 1.0,
-      "_dd.measured": 1,
-      "_dd.top_level": 1,
-      "_dd.tracer_kr": 1.0,
-      "_sampling_priority_v1": 1,
-      "db.rowcount": 0,
-      "out.port": 3306,
-      "sql.rows": 0,
-      "system.pid": 5866
-    },
-    "duration": 483000,
-    "start": 1633039294782938000
-  }]]