Consolidate redis span data

getsentry · Sep 5, 2023 · 4ab0076 · 4ab0076
1 parent 3be7f22
commit 4ab0076
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/sentry-rails/lib/sentry/rails/tracing/active_record_subscriber.rb b/sentry-rails/lib/sentry/rails/tracing/active_record_subscriber.rb
@@ -33,8 +33,8 @@ def self.subscribe!
                             connection.pool.spec.config
                           end
 
-              span.set_data(Span::DataConventions::DB_NAME, db_config[:database]) if db_config[:database]
               span.set_data(Span::DataConventions::DB_SYSTEM, db_config[:adapter]) if db_config[:adapter]
+              span.set_data(Span::DataConventions::DB_NAME, db_config[:database]) if db_config[:database]
               span.set_data(Span::DataConventions::SERVER_ADDRESS, db_config[:host]) if db_config[:host]
               span.set_data(Span::DataConventions::SERVER_PORT, db_config[:port]) if db_config[:port]
               span.set_data(Span::DataConventions::SERVER_SOCKET_ADDRESS, db_config[:socket]) if db_config[:socket]

diff --git a/sentry-ruby/lib/sentry/redis.rb b/sentry-ruby/lib/sentry/redis.rb
@@ -19,7 +19,10 @@ def instrument
 
           if span
             span.set_description(commands_description)
-            span.set_data(:server, server_description)
+            span.set_data(Span::DataConventions::DB_SYSTEM, "redis")
+            span.set_data(Span::DataConventions::DB_NAME, db)
+            span.set_data(Span::DataConventions::SERVER_ADDRESS, host)
+            span.set_data(Span::DataConventions::SERVER_PORT, port)
           end
         end
       end

diff --git a/sentry-ruby/spec/sentry/redis_spec.rb b/sentry-ruby/spec/sentry/redis_spec.rb
@@ -27,7 +27,12 @@
           expect(request_span.timestamp).not_to be_nil
           expect(request_span.start_timestamp).not_to eq(request_span.timestamp)
           expect(request_span.description).to eq("SET key value")
-          expect(request_span.data).to eq({ server: "127.0.0.1:6379/0" })
+          expect(request_span.data).to eq({
+            "db.name" => 0,
+            "db.system" => "redis",
+            "server.address" => "127.0.0.1",
+            "server.port" => 6379
+          })
         end
 
         it "removes bad encoding keys and arguments gracefully" do