Fix span_type usage in test

spec/datadog/tracing/contrib/action_cable/patcher_spec.rb

@@ -59,7 +59,7 @@
 
         expect(span.service).to eq(tracer.default_service)
         expect(span.name).to eq('action_cable.broadcast')
-        expect(span.span_type).to eq('web')
+        expect(span.type).to eq('web')
         expect(span.resource).to eq('action_cable.broadcast')
         expect(span.get_tag('action_cable.channel')).to eq(channel)
         expect(span.get_tag('action_cable.broadcast.coder')).to eq('ActiveSupport::JSON')
@@ -119,7 +119,7 @@ def foo(_data); end
 
         expect(span.service).to eq(tracer.default_service)
         expect(span.name).to eq('action_cable.subscribe')
-        expect(span.span_type).to eq('web')
+        expect(span.type).to eq('web')
         expect(span.resource).to eq('ChatChannel#subscribe')
         expect(span.get_tag('action_cable.channel_class')).to eq('ChatChannel')
         expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('action_cable')
@@ -140,7 +140,7 @@ def foo(_data); end
 
         expect(span.service).to eq(tracer.default_service)
         expect(span.name).to eq('action_cable.unsubscribe')
-        expect(span.span_type).to eq('web')
+        expect(span.type).to eq('web')
         expect(span.resource).to eq('ChatChannel#unsubscribe')
         expect(span.get_tag('action_cable.channel_class')).to eq('ChatChannel')
         expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('action_cable')
@@ -159,7 +159,7 @@ def foo(_data); end
 
         expect(span.service).to eq(tracer.default_service)
         expect(span.name).to eq('action_cable.action')
-        expect(span.span_type).to eq('web')
+        expect(span.type).to eq('web')
         expect(span.resource).to eq('ChatChannel#foo')
         expect(span.get_tag('action_cable.channel_class')).to eq('ChatChannel')
         expect(span.get_tag('action_cable.action')).to eq('foo')
@@ -221,7 +221,7 @@ def foo(_data)
         expect(spans).to have(2).items
         expect(span.service).to eq(tracer.default_service)
         expect(span.name).to eq('action_cable.transmit')
-        expect(span.span_type).to eq('web')
+        expect(span.type).to eq('web')
         expect(span.resource).to eq('ChatChannel')
         expect(span.get_tag('action_cable.channel_class')).to eq('ChatChannel')
         expect(span.get_tag('action_cable.transmit.via')).to eq('streamed from chat_channel')

spec/datadog/tracing/contrib/action_mailer/patcher_spec.rb

@@ -61,7 +61,7 @@
         expect(span.resource).to eq(mailer)
         expect(span.get_tag('action_mailer.action')).to eq(action)
         expect(span.get_tag('action_mailer.mailer')).to eq(mailer)
-        expect(span.span_type).to eq('template')
+        expect(span.type).to eq('template')
         expect(span.status).to_not eq(Datadog::Tracing::Metadata::Ext::Errors::STATUS)
         expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('action_mailer')
         expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION))
@@ -74,7 +74,7 @@
         expect(deliver_span.name).to eq('action_mailer.deliver')
         expect(deliver_span.resource).to eq(mailer)
         expect(deliver_span.get_tag('action_mailer.mailer')).to eq(mailer)
-        expect(deliver_span.span_type).to eq('worker')
+        expect(deliver_span.type).to eq('worker')
         expect(deliver_span.get_tag('action_mailer.message_id')).to_not be nil
         expect(deliver_span.status).to_not eq(Datadog::Tracing::Metadata::Ext::Errors::STATUS)
         expect(deliver_span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('action_mailer')
@@ -100,7 +100,7 @@
         expect(deliver_span.name).to eq('action_mailer.deliver')
         expect(deliver_span.resource).to eq(mailer)
         expect(deliver_span.get_tag('action_mailer.mailer')).to eq(mailer)
-        expect(deliver_span.span_type).to eq('worker')
+        expect(deliver_span.type).to eq('worker')
         expect(deliver_span.get_tag('action_mailer.message_id')).to_not be nil
         expect(deliver_span.status).to_not eq(Datadog::Tracing::Metadata::Ext::Errors::STATUS)
         expect(deliver_span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('action_mailer')

spec/datadog/tracing/contrib/active_model_serializers/patcher_spec.rb

@@ -92,7 +92,7 @@
             expect(span.name).to eq(name)
             expect(span.resource).to eq(serializer)
             expect(span.service).to eq(tracer.default_service)
-            expect(span.span_type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE)
+            expect(span.type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE)
             expect(span.get_tag('active_model_serializers.serializer')).to eq(serializer)
             expect(span.get_tag('active_model_serializers.adapter')).to eq(adapter)
             expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('active_model_serializers')
@@ -115,7 +115,7 @@
             expect(span.name).to eq(name)
             expect(span.resource).to eq(serializer)
             expect(span.service).to eq(tracer.default_service)
-            expect(span.span_type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE)
+            expect(span.type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE)
             expect(span.get_tag('active_model_serializers.serializer')).to eq(serializer)
             expect(span.get_tag('active_model_serializers.adapter')).to eq(test_obj.class.to_s)
             expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('active_model_serializers')
@@ -134,7 +134,7 @@
             expect(span.name).to eq(name)
             expect(span.resource).to eq(serializer)
             expect(span.service).to eq(tracer.default_service)
-            expect(span.span_type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE)
+            expect(span.type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE)
             expect(span.get_tag('active_model_serializers.serializer')).to eq(serializer)
             expect(span.get_tag('active_model_serializers.adapter')).to be_nil
             expect(span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('active_model_serializers')

spec/datadog/tracing/contrib/active_record/tracer_spec.rb

@@ -45,7 +45,7 @@
     it 'calls the instrumentation when is used standalone' do
       expect(span.service).to eq('mysql2')
       expect(span.name).to eq('mysql2.query')
-      expect(span.span_type).to eq('sql')
+      expect(span.type).to eq('sql')
       expect(span.resource.strip).to eq('SELECT COUNT(*) FROM `articles`')
       expect(span.get_tag('active_record.db.vendor')).to eq('mysql2')
       expect(span.get_tag('active_record.db.name')).to eq('mysql')

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

@@ -54,7 +54,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('sts.get_access_key_info')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -107,7 +107,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('s3.list_buckets')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -151,7 +151,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('s3.list_objects')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -231,7 +231,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('sqs.send_message')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -308,7 +308,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('sqs.send_message_batch')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -358,7 +358,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('sqs.get_queue_url')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -412,7 +412,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('sns.publish')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -468,7 +468,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('sns.create_topic')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -518,7 +518,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('dynamodb.get_item')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -572,7 +572,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('kinesis.put_record')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -626,7 +626,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('kinesis.describe_stream_consumer')
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
         expect(span.get_tag('aws.operation')).to eq('describe_stream_consumer')
@@ -678,7 +678,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('kinesis.describe_stream_consumer')
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
         expect(span.get_tag('aws.operation')).to eq('describe_stream_consumer')
@@ -734,7 +734,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('eventbridge.put_rule')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -782,7 +782,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('eventbridge.list_targets_by_rule')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -835,7 +835,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('states.start_execution')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -887,7 +887,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('states.create_state_machine')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -945,7 +945,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('states.describe_state_machine')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -993,7 +993,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('states.update_state_machine')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -1039,7 +1039,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('states.delete_state_machine')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -1101,7 +1101,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('states.describe_execution')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')
@@ -1149,7 +1149,7 @@
       it 'generates a span' do
         expect(span.name).to eq('aws.command')
         expect(span.service).to eq('aws')
-        expect(span.span_type).to eq('http')
+        expect(span.type).to eq('http')
         expect(span.resource).to eq('states.stop_execution')
 
         expect(span.get_tag('aws.agent')).to eq('aws-sdk-ruby')

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

@@ -68,7 +68,7 @@
       expect(spans.size).to eq(1)
       expect(span.service).to eq('memcached')
       expect(span.name).to eq('memcached.command')
-      expect(span.span_type).to eq('memcached')
+      expect(span.type).to eq('memcached')
       expect(span.resource).to eq('SET')
       expect(span).to_not have_tag('memcached.command')
       expect(span.get_tag('out.host')).to eq(test_host)
@@ -104,7 +104,7 @@
         expect(spans.size).to eq(1)
         expect(span.service).to eq(service_name)
         expect(span.name).to eq('memcached.command')
-        expect(span.span_type).to eq('memcached')
+        expect(span.type).to eq('memcached')
         expect(span.resource).to eq('SET')
         expect(span).to_not have_tag('memcached.command')
         expect(span.get_tag('out.host')).to eq(test_host)

spec/datadog/tracing/contrib/elasticsearch/patcher_spec.rb

@@ -72,7 +72,7 @@
       it { expect(span.name).to eq('elasticsearch.query') }
       it { expect(span.service).to eq('elasticsearch') }
       it { expect(span.resource).to eq('GET _cluster/health') }
-      it { expect(span.span_type).to eq('elasticsearch') }
+      it { expect(span.type).to eq('elasticsearch') }
       it { expect(span.parent_id).not_to be_nil }
       it { expect(span.trace_id).not_to be_nil }
 
@@ -138,7 +138,7 @@
       end
       it { expect(span.name).to eq('elasticsearch.query') }
       it { expect(span.service).to eq('elasticsearch') }
-      it { expect(span.span_type).to eq('elasticsearch') }
+      it { expect(span.type).to eq('elasticsearch') }
       it { expect(span.resource).to eq('PUT some_index/_doc/?') }
 
       it { expect(span.parent_id).not_to be_nil }

spec/datadog/tracing/contrib/ethon/shared_examples.rb

@@ -37,7 +37,7 @@
   end
 
   it 'is http type' do
-    expect(span.span_type).to eq('http')
+    expect(span.type).to eq('http')
   end
 
   it 'is named correctly' do

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

@@ -109,7 +109,7 @@
       expect(request_span.get_tag(Datadog::Tracing::Metadata::Ext::HTTP::TAG_URL)).to eq('/success')
       expect(request_span.get_tag(Datadog::Tracing::Metadata::Ext::NET::TAG_TARGET_HOST)).to eq('example.com')
       expect(request_span.get_tag(Datadog::Tracing::Metadata::Ext::NET::TAG_TARGET_PORT)).to eq(80)
-      expect(request_span.span_type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND)
+      expect(request_span.type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND)
       expect(request_span).to_not have_error
 
       expect(request_span.get_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT)).to eq('excon')
@@ -156,7 +156,7 @@
       expect(request_span.get_tag(Datadog::Tracing::Metadata::Ext::NET::TAG_TARGET_HOST)).to eq('example.com')
       expect(request_span.get_tag(Datadog::Tracing::Metadata::Ext::NET::TAG_TARGET_PORT)).to eq(80)
       expect(request_span.get_tag('span.kind')).to eq('client')
-      expect(request_span.span_type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND)
+      expect(request_span.type).to eq(Datadog::Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND)
       expect(request_span).to have_error
       expect(request_span).to have_error_type('Error 500')
       expect(request_span).to have_error_message('Boom!')