From 927e61e2af81568872878341d4eed5cc0e65e04d Mon Sep 17 00:00:00 2001
From: Tony Hsu <tonyc.t.hsu@gmail.com>
Date: Tue, 16 Jan 2024 11:41:26 +0100
Subject: [PATCH] Remove  method call on SpanOperation

---
 lib/graphql/tracing/data_dog_trace.rb   | 12 ++++--------
 lib/graphql/tracing/data_dog_tracing.rb |  3 +--
 spec/support/datadog.rb                 |  1 -
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/graphql/tracing/data_dog_trace.rb b/lib/graphql/tracing/data_dog_trace.rb
index 5475a8ad0f..30d13466c0 100644
--- a/lib/graphql/tracing/data_dog_trace.rb
+++ b/lib/graphql/tracing/data_dog_trace.rb
@@ -34,8 +34,7 @@ def initialize(tracer: nil, analytics_enabled: false, analytics_sample_rate: 1.0
       }.each do |trace_method, trace_key|
         module_eval <<-RUBY, __FILE__, __LINE__
           def #{trace_method}(**data)
-            @tracer.trace("#{trace_key}", service: @service_name) do |span|
-              span.span_type = 'custom'
+            @tracer.trace("#{trace_key}", service: @service_name, type: 'custom') do |span|
               if defined?(Datadog::Tracing::Metadata::Ext) # Introduced in ddtrace 1.0
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, 'graphql')
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, '#{trace_method}')
@@ -89,8 +88,7 @@ def execute_field_span(span_key, query, field, ast_node, arguments, object)
           nil
         end
         if platform_key && trace_field
-          @tracer.trace(platform_key, service: @service_name) do |span|
-            span.span_type = 'custom'
+          @tracer.trace(platform_key, service: @service_name, type: 'custom') do |span|
             if defined?(Datadog::Tracing::Metadata::Ext) # Introduced in ddtrace 1.0
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, 'graphql')
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, span_key)
@@ -125,8 +123,7 @@ def authorized(query:, type:, object:)
 
       def authorized_span(span_key, object, type, query)
         platform_key = @platform_key_cache[DataDogTrace].platform_authorized_key_cache[type]
-        @tracer.trace(platform_key, service: @service_name) do |span|
-          span.span_type = 'custom'
+        @tracer.trace(platform_key, service: @service_name, type: 'custom') do |span|
           if defined?(Datadog::Tracing::Metadata::Ext) # Introduced in ddtrace 1.0
             span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, 'graphql')
             span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, span_key)
@@ -158,8 +155,7 @@ def resolve_type_lazy(object:, type:, query:)
 
       def resolve_type_span(span_key, object, type, query)
         platform_key = @platform_key_cache[DataDogTrace].platform_resolve_type_key_cache[type]
-        @tracer.trace(platform_key, service: @service_name) do |span|
-          span.span_type = 'custom'
+        @tracer.trace(platform_key, service: @service_name, type: 'custom') do |span|
           if defined?(Datadog::Tracing::Metadata::Ext) # Introduced in ddtrace 1.0
             span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, 'graphql')
             span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, span_key)
diff --git a/lib/graphql/tracing/data_dog_tracing.rb b/lib/graphql/tracing/data_dog_tracing.rb
index 8e38c79cf1..d295161733 100644
--- a/lib/graphql/tracing/data_dog_tracing.rb
+++ b/lib/graphql/tracing/data_dog_tracing.rb
@@ -15,8 +15,7 @@ class DataDogTracing < PlatformTracing
       }
 
       def platform_trace(platform_key, key, data)
-        tracer.trace(platform_key, service: service_name) do |span|
-          span.span_type = 'custom'
+        tracer.trace(platform_key, service: service_name, type: 'custom') do |span|
           if defined?(Datadog::Tracing::Metadata::Ext) # Introduced in ddtrace 1.0
             span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, 'graphql')
             span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, key)
diff --git a/spec/support/datadog.rb b/spec/support/datadog.rb
index e978bef5a0..b2497bfa60 100644
--- a/spec/support/datadog.rb
+++ b/spec/support/datadog.rb
@@ -41,7 +41,6 @@ def resource=(resource_name)
       SPAN_RESOURCE_NAMES << resource_name
     end
 
-    def span_type=(*args)end
     def set_tag(key, value)
       SPAN_TAGS << [key, value]
     end