diff --git a/CHANGELOG.md b/CHANGELOG.md
index 876c1ced8a..1723363f9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Introduce `trim = "disabled"` type attribute to prevent trimming of spans. ([#3877](https://github.com/getsentry/relay/pull/3877))
 - Make the tcp listen backlog configurable and raise the default to 1024. ([#3899](https://github.com/getsentry/relay/pull/3899))
 - Extract `user.geo.country_code` into span indexed. ([#3911](https://github.com/getsentry/relay/pull/3911))
+- Add `span.system` tag to span metrics ([#3913](https://github.com/getsentry/relay/pull/3913))
 
 ## 24.7.1
 
diff --git a/relay-dynamic-config/src/defaults.rs b/relay-dynamic-config/src/defaults.rs
index 7e5af1eff0..3567c6bad2 100644
--- a/relay-dynamic-config/src/defaults.rs
+++ b/relay-dynamic-config/src/defaults.rs
@@ -905,6 +905,10 @@ pub fn hardcoded_span_metrics() -> Vec<(GroupKey, Vec<MetricSpec>, Vec<TagMappin
                         Tag::with_key("trace.status")
                             .from_field("span.sentry_tags.trace.status")
                             .when(is_queue_op.clone()),
+                        // database module
+                        Tag::with_key("span.system")
+                            .from_field("span.sentry_tags.system")
+                            .when(is_db.clone()),
                     ],
                 },
                 TagMapping {
diff --git a/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__both_feature_flags_enabled.snap b/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__both_feature_flags_enabled.snap
index 7edb1d036a..fa0ebcdf5e 100644
--- a/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__both_feature_flags_enabled.snap
+++ b/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__both_feature_flags_enabled.snap
@@ -1648,6 +1648,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "f4a7fef06db3d88e",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -1679,6 +1680,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "f4a7fef06db3d88e",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -1707,6 +1709,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "f4a7fef06db3d88e",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -1738,6 +1741,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "f4a7fef06db3d88e",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -1918,6 +1922,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -1947,6 +1952,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -1973,6 +1979,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2002,6 +2009,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2048,6 +2056,7 @@ expression: metrics
             "span.domain": ",from_date,",
             "span.group": "e4ea457c8e7e4109",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2079,6 +2088,7 @@ expression: metrics
             "span.domain": ",from_date,",
             "span.group": "e4ea457c8e7e4109",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2107,6 +2117,7 @@ expression: metrics
             "span.domain": ",from_date,",
             "span.group": "e4ea457c8e7e4109",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2138,6 +2149,7 @@ expression: metrics
             "span.domain": ",from_date,",
             "span.group": "e4ea457c8e7e4109",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2312,6 +2324,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "03cb381cee3f1463",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2343,6 +2356,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "03cb381cee3f1463",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2371,6 +2385,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "03cb381cee3f1463",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2402,6 +2417,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "03cb381cee3f1463",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2448,6 +2464,7 @@ expression: metrics
             "span.domain": ",table,",
             "span.group": "e0f7e81a59b030ba",
             "span.op": "db",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2479,6 +2496,7 @@ expression: metrics
             "span.domain": ",table,",
             "span.group": "e0f7e81a59b030ba",
             "span.op": "db",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2507,6 +2525,7 @@ expression: metrics
             "span.domain": ",table,",
             "span.group": "e0f7e81a59b030ba",
             "span.op": "db",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2538,6 +2557,7 @@ expression: metrics
             "span.domain": ",table,",
             "span.group": "e0f7e81a59b030ba",
             "span.op": "db",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2582,6 +2602,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2611,6 +2632,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2637,6 +2659,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2666,6 +2689,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2710,6 +2734,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2739,6 +2764,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2765,6 +2791,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2794,6 +2821,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2839,6 +2867,7 @@ expression: metrics
             "span.description": "SAVEPOINT %s",
             "span.group": "3f955cbde39e04b9",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2869,6 +2898,7 @@ expression: metrics
             "span.description": "SAVEPOINT %s",
             "span.group": "3f955cbde39e04b9",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -2896,6 +2926,7 @@ expression: metrics
             "span.description": "SAVEPOINT %s",
             "span.group": "3f955cbde39e04b9",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -2926,6 +2957,7 @@ expression: metrics
             "span.description": "SAVEPOINT %s",
             "span.group": "3f955cbde39e04b9",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -3674,6 +3706,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -3703,6 +3736,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -3729,6 +3763,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -3758,6 +3793,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -3870,6 +3906,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.activerecord",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -3899,6 +3936,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.activerecord",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -3925,6 +3963,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.activerecord",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -3954,6 +3993,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.activerecord",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6064,6 +6104,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "f4a7fef06db3d88e",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6095,6 +6136,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "f4a7fef06db3d88e",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6123,6 +6165,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "f4a7fef06db3d88e",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6154,6 +6197,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "f4a7fef06db3d88e",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6334,6 +6378,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6363,6 +6408,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6389,6 +6435,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6418,6 +6465,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6464,6 +6512,7 @@ expression: metrics
             "span.domain": ",from_date,",
             "span.group": "e4ea457c8e7e4109",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6495,6 +6544,7 @@ expression: metrics
             "span.domain": ",from_date,",
             "span.group": "e4ea457c8e7e4109",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6523,6 +6573,7 @@ expression: metrics
             "span.domain": ",from_date,",
             "span.group": "e4ea457c8e7e4109",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6554,6 +6605,7 @@ expression: metrics
             "span.domain": ",from_date,",
             "span.group": "e4ea457c8e7e4109",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6728,6 +6780,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "03cb381cee3f1463",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6759,6 +6812,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "03cb381cee3f1463",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6787,6 +6841,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "03cb381cee3f1463",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6818,6 +6873,7 @@ expression: metrics
             "span.domain": "table",
             "span.group": "03cb381cee3f1463",
             "span.op": "db.sql.query",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6864,6 +6920,7 @@ expression: metrics
             "span.domain": ",table,",
             "span.group": "e0f7e81a59b030ba",
             "span.op": "db",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6895,6 +6952,7 @@ expression: metrics
             "span.domain": ",table,",
             "span.group": "e0f7e81a59b030ba",
             "span.op": "db",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6923,6 +6981,7 @@ expression: metrics
             "span.domain": ",table,",
             "span.group": "e0f7e81a59b030ba",
             "span.op": "db",
+            "span.system": "postgresql",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -6954,6 +7013,7 @@ expression: metrics
             "span.domain": ",table,",
             "span.group": "e0f7e81a59b030ba",
             "span.op": "db",
+            "span.system": "postgresql",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -6998,6 +7058,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -7027,6 +7088,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -7053,6 +7115,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -7082,6 +7145,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -7126,6 +7190,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -7155,6 +7220,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -7181,6 +7247,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -7210,6 +7277,7 @@ expression: metrics
             "span.category": "db",
             "span.domain": "table",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -7255,6 +7323,7 @@ expression: metrics
             "span.description": "SAVEPOINT %s",
             "span.group": "3f955cbde39e04b9",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -7285,6 +7354,7 @@ expression: metrics
             "span.description": "SAVEPOINT %s",
             "span.group": "3f955cbde39e04b9",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -7312,6 +7382,7 @@ expression: metrics
             "span.description": "SAVEPOINT %s",
             "span.group": "3f955cbde39e04b9",
             "span.op": "db",
+            "span.system": "mydatabase",
             "transaction": "gEt /api/:version/users/",
             "transaction.method": "POST",
             "transaction.op": "myop",
@@ -7342,6 +7413,7 @@ expression: metrics
             "span.description": "SAVEPOINT %s",
             "span.group": "3f955cbde39e04b9",
             "span.op": "db",
+            "span.system": "mydatabase",
         },
         metadata: BucketMetadata {
             merges: 1,