Merge pull request #2392 from DataDog/zarir/redis_span_kind_client

Adds `span.kind` as `client` for `redis`

lib/datadog/tracing/contrib/redis/instrumentation.rb

@@ -26,6 +26,7 @@ def call(*args, &block)
                 span.span_type = Contrib::Redis::Ext::TYPE
                 span.resource = get_command(args)
                 Contrib::Redis::Tags.set_common_tags(self, span)
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
                 response = super
               end
@@ -43,6 +44,7 @@ def call_pipeline(*args, &block)
                 span.resource = commands.any? ? commands.join("\n") : '(none)'
                 span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, commands.length
                 Contrib::Redis::Tags.set_common_tags(self, span)
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
                 response = super
               end

spec/datadog/tracing/contrib/redis/instrumentation_spec.rb

@@ -99,6 +99,8 @@
           port: test_port,
           db: test_database
         )
+
+        expect(span.get_tag('span.kind')).to eq('client')
       end
     end
   end
@@ -147,6 +149,8 @@
           port: test_port,
           db: test_database
         )
+
+        expect(span.get_tag('span.kind')).to eq('client')
       end
     end
   end

spec/datadog/tracing/contrib/redis/miniapp_spec.rb

@@ -82,12 +82,14 @@
         expect(redis_cmd1_span.parent_id).to eq(process_span.span_id)
         expect(redis_cmd1_span.trace_id).to eq(publish_span.trace_id)
         expect(redis_cmd1_span.get_tag('db.system')).to eq('redis')
+        expect(redis_cmd2_span.get_tag('span.kind')).to eq('client')
 
         expect(redis_cmd2_span.name).to eq('redis.command')
         expect(redis_cmd2_span.service).to eq('test-service')
         expect(redis_cmd2_span.parent_id).to eq(process_span.span_id)
         expect(redis_cmd2_span.trace_id).to eq(publish_span.trace_id)
         expect(redis_cmd2_span.get_tag('db.system')).to eq('redis')
+        expect(redis_cmd2_span.get_tag('span.kind')).to eq('client')
       end
 
       it_behaves_like 'a peer service span' do

spec/datadog/tracing/contrib/redis/redis_spec.rb

@@ -87,6 +87,7 @@
           expect(span.resource).to eq('SET FOO bar')
           expect(span.get_tag('redis.raw_command')).to eq('SET FOO bar')
           expect(span.get_tag('db.system')).to eq('redis')
+          expect(span.get_tag('span.kind')).to eq('client')
         end
 
         it_behaves_like 'a span with common tags'
@@ -104,6 +105,7 @@
           expect(span.resource).to eq('GET FOO')
           expect(span.get_tag('redis.raw_command')).to eq('GET FOO')
           expect(span.get_tag('db.system')).to eq('redis')
+          expect(span.get_tag('span.kind')).to eq('client')
         end
 
         it_behaves_like 'a span with common tags'
@@ -127,6 +129,7 @@
           expect(span.resource).to eq('SET FOO bar')
           expect(span.get_tag('redis.raw_command')).to eq('SET FOO bar')
           expect(span.get_tag('db.system')).to eq('redis')
+          expect(span.get_tag('span.kind')).to eq('client')
         end
       end
     end
@@ -147,6 +150,7 @@
           expect(span.resource).to eq('SET')
           expect(span.get_tag('redis.raw_command')).to be_nil
           expect(span.get_tag('db.system')).to eq('redis')
+          expect(span.get_tag('span.kind')).to eq('client')
         end
       end
     end
@@ -179,6 +183,7 @@
           expect(span.resource).to eq("SET v1 0\nSET v2 0\nINCR v1\nINCR v2\nINCR v2")
           expect(span.get_tag('redis.raw_command')).to eq("SET v1 0\nSET v2 0\nINCR v1\nINCR v2\nINCR v2")
           expect(span.get_tag('db.system')).to eq('redis')
+          expect(span.get_tag('span.kind')).to eq('client')
         end
 
         it_behaves_like 'a span with common tags'
@@ -199,6 +204,7 @@
           expect(span.resource).to eq("SET\nSET\nINCR\nINCR\nINCR")
           expect(span.get_tag('redis.raw_command')).to be_nil
           expect(span.get_tag('db.system')).to eq('redis')
+          expect(span.get_tag('span.kind')).to eq('client')
         end
       end
     end
@@ -225,6 +231,7 @@
           expect(span.resource).to eq('(none)')
           expect(span.get_tag('redis.raw_command')).to eq('(none)')
           expect(span.get_tag('db.system')).to eq('redis')
+          expect(span.get_tag('span.kind')).to eq('client')
         end
 
         it_behaves_like 'a span with common tags'
@@ -257,6 +264,7 @@
           expect(span.get_tag('error.msg')).to match(/ERR unknown command/)
           expect(span.get_tag('error.type')).to eq('Redis::CommandError')
           expect(span.get_tag('error.stack').length).to be >= 3
+          expect(span.get_tag('span.kind')).to eq('client')
         end
 
         it_behaves_like 'a span with common tags'
@@ -276,6 +284,7 @@
           expect(span.resource).to eq("SET K #{'x' * 47}...")
           expect(span.get_tag('db.system')).to eq('redis')
           expect(span.get_tag('redis.raw_command')).to eq("SET K #{'x' * 47}...")
+          expect(span.get_tag('span.kind')).to eq('client')
         end
 
         it_behaves_like 'a span with common tags'
@@ -299,6 +308,7 @@
           expect(span.resource).to eq('GET K')
           expect(span.get_tag('redis.raw_command')).to eq('GET K')
           expect(span.get_tag('db.system')).to eq('redis')
+          expect(span.get_tag('span.kind')).to eq('client')
         end
 
         it_behaves_like 'a span with common tags'
@@ -318,6 +328,7 @@
           expect(span.resource).to eq('AUTH ?')
           expect(span.get_tag('redis.raw_command')).to eq('AUTH ?')
           expect(span.get_tag('db.system')).to eq('redis')
+          expect(span.get_tag('span.kind')).to eq('client')
         end
 
         it_behaves_like 'a peer service span' do