Hide addresses in telemetry

Signed-off-by: Caleb Schoepp <[email protected]>

Author: calebschoepp

Cargo.lock

@@ -5,7 +5,9 @@ use spin_world::v1::mysql as v1;
 use spin_world::v2::mysql::{self as v2, Connection};
 use spin_world::v2::rdbms_types as v2_types;
 use spin_world::v2::rdbms_types::ParameterValue;
+use tracing::field::Empty;
 use tracing::{instrument, Level};
+use url::Url;
 
 use crate::client::Client;
 use crate::InstanceState;
@@ -38,8 +40,15 @@ impl<C: Client> v2::Host for InstanceState<C> {}
 
 #[async_trait]
 impl<C: Client> v2::HostConnection for InstanceState<C> {
-    #[instrument(name = "spin_outbound_mysql.open_connection", skip(self), err(level = Level::INFO), fields(otel.kind = "client", db.system = "mysql"))]
+    #[instrument(name = "spin_outbound_mysql.open", skip(self, address), err(level = Level::INFO), fields(otel.kind = "client", db.system = "mysql", db.address = Empty, server.port = Empty, db.namespace = Empty))]
     async fn open(&mut self, address: String) -> Result<Resource<Connection>, v2::Error> {
+        if let Ok(url) = Url::parse(&address) {
+            let span = tracing::Span::current();
+            span.record("db.address", url.host_str().unwrap_or_default());
+            span.record("server.port", url.port().unwrap_or_default());
+            span.record("db.namespace", url.path().trim_start_matches('/'));
+        }
+
         if !self
             .is_address_allowed(&address)
             .await

crates/factor-outbound-mysql/src/host.rs

@@ -16,6 +16,7 @@ table = { path = "../table" }
 tokio = { version = "1", features = ["rt-multi-thread"] }
 tokio-postgres = "0.7"
 tracing = { workspace = true }
+url = { workspace = true }
 
 [dev-dependencies]
 spin-factor-variables = { path = "../factor-variables" }

crates/factor-outbound-pg/Cargo.toml

@@ -5,8 +5,10 @@ use spin_world::v1::rdbms_types as v1_types;
 use spin_world::v2::postgres::{self as v2, Connection};
 use spin_world::v2::rdbms_types;
 use spin_world::v2::rdbms_types::{ParameterValue, RowSet};
+use tracing::field::Empty;
 use tracing::instrument;
 use tracing::Level;
+use url::Url;
 
 use crate::client::Client;
 use crate::InstanceState;
@@ -63,8 +65,15 @@ impl<C: Send + Sync + Client> v2::Host for InstanceState<C> {}
 
 #[async_trait]
 impl<C: Send + Sync + Client> v2::HostConnection for InstanceState<C> {
-    #[instrument(name = "spin_outbound_pg.open_connection", skip(self), err(level = Level::INFO), fields(otel.kind = "client", db.system = "postgresql"))]
+    #[instrument(name = "spin_outbound_pg.open", skip(self, address), err(level = Level::INFO), fields(otel.kind = "client", db.system = "postgresql", db.address = Empty, server.port = Empty, db.namespace = Empty))]
     async fn open(&mut self, address: String) -> Result<Resource<Connection>, v2::Error> {
+        if let Ok(url) = Url::parse(&address) {
+            let span = tracing::Span::current();
+            span.record("db.address", url.host_str().unwrap_or_default());
+            span.record("server.port", url.port().unwrap_or_default());
+            span.record("db.namespace", url.path().trim_start_matches('/'));
+        }
+
         if !self
             .is_address_allowed(&address)
             .await

crates/factor-outbound-pg/src/host.rs

@@ -13,6 +13,7 @@ spin-factors = { path = "../factors" }
 spin-world = { path = "../world" }
 table = { path = "../table" }
 tracing = { workspace = true }
+url = { workspace = true }
 
 [dev-dependencies]
 spin-factor-variables = { path = "../factor-variables" }

crates/factor-outbound-redis/Cargo.toml

@@ -6,7 +6,9 @@ use spin_world::v1::{redis as v1, redis_types};
 use spin_world::v2::redis::{
     self as v2, Connection as RedisConnection, Error, RedisParameter, RedisResult,
 };
+use tracing::field::Empty;
 use tracing::{instrument, Level};
+use url::Url;
 
 pub struct InstanceState {
     pub allowed_hosts: OutboundAllowedHosts,
@@ -53,8 +55,15 @@ impl v2::Host for crate::InstanceState {
 
 #[async_trait]
 impl v2::HostConnection for crate::InstanceState {
-    #[instrument(name = "spin_outbound_redis.open_connection", skip(self), err(level = Level::INFO), fields(otel.kind = "client", db.system = "redis"))]
+    #[instrument(name = "spin_outbound_redis.open_connection", skip(self, address), err(level = Level::INFO), fields(otel.kind = "client", db.system = "redis", db.address = Empty, server.port = Empty, db.namespace = Empty))]
     async fn open(&mut self, address: String) -> Result<Resource<RedisConnection>, Error> {
+        if let Ok(url) = Url::parse(&address) {
+            let span = tracing::Span::current();
+            span.record("db.address", url.host_str().unwrap_or_default());
+            span.record("server.port", url.port().unwrap_or_default());
+            span.record("db.namespace", url.path().trim_start_matches('/'));
+        }
+
         if !self
             .is_address_allowed(&address)
             .await