instana 1.209.7 → 1.209.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad727e388d233521b7837cfc0157cd6b5af54f307529ad5e58207894d6863de
-  data.tar.gz: 9fb40e5a5769d996195f076475c2ef5d67182e245e549cf14970dcc0779d6014
+  metadata.gz: 1461b6f3821df0472c4d486c1256069909ed6c833e8016e70e06d14130124704
+  data.tar.gz: 4f6d244e93cd9bdf2b1e3aa895d8824df136123f46a829a02059d4f82c3d0a75
 SHA512:
-  metadata.gz: 0f9e58d31701ffd88af39ff5ac25e7c87a443153122a63b6e319e04c545d3926318d4c5862b8a628a215325f6f873d26852eb426440ceaa19746c4c80e9d19e6
-  data.tar.gz: d83ea081e9721634bcbf0aff97b1fc67f78fdcfabe52bfbeda95f20fc144c017e16d137f74d02a54f9a0adbb028916c5a62596b7af2a7cb51a80880d0fc79f99
+  metadata.gz: 7533b3a686d6f432cfad515c4625b687c4d14d593acc15bde81bae500d1c170582ebaea43a4527807d68f1e70397ede59e0659c3898f1ecaba5c8311095b0110
+  data.tar.gz: 55e6433ff8f6eb247ef63d1b9d8321e4c82aefd94c8838347bdae07fbac6d3d01903a60db6df32b36430bc351b375f5a8e1630a1d34adf15053dcb28152d71de

data/lib/instana/instrumentation/graphql.rb

@@ -63,7 +63,20 @@ module Instana
         return [] unless parent.respond_to?(method)
 
         parent.send(method).map do |field|
-          [{object: parent.name, field: field.name}] + walk_fields(field, method)
+          # Certain types like GraphQL::Language::Nodes::InlineFragment
+          # have no "name" instance variable defined,
+          # in such case we use the class's name
+          parent_name = if parent.instance_variable_defined?(:@name)
+                          parent.name
+                        else
+                          parent.class.name.split('::').last
+                        end
+          field_name = if field.instance_variable_defined?(:@name)
+                         field.name
+                       else
+                         field.class.name.split('::').last
+                       end
+          [{object: parent_name, field: field_name}] + walk_fields(field, method)
         end.flatten
       end
 

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.209.7"
+  VERSION = "1.209.8"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/instrumentation/graphql_test.rb

@@ -8,84 +8,213 @@ class GraphqlTest < Minitest::Test
     field :id, ID, null: false
     field :action, String, null: false
   end
-  
+
+  class JobType < GraphQL::Schema::Object
+    field :id, ID, null: false
+    field :name, String, null: false
+    field :description, String, null: false
+  end
+
+  class TaskJobUnion < GraphQL::Schema::Union
+    description "A union type for Task and Job"
+    possible_types TaskType, JobType
+
+    def self.resolve_type(object, _context)
+      if !object.action.nil?
+        TaskType
+      elsif !object.description?
+        JobType
+      else
+        raise("Unexpected object: #{object}")
+      end
+    end
+  end
+
   class NewTaskType < GraphQL::Schema::Mutation
     argument :action, String, required: true
     field :task, TaskType, null: true
-    
+
     def resolve(action:)
       {
         task: OpenStruct.new(id: '0', action: action)
       }
     end
   end
-  
+
   class QueryType < GraphQL::Schema::Object
     field :tasks, TaskType.connection_type, null: false
-    
+    field :jobs, JobType.connection_type, null: false
+    field :tasksorjobs, TaskJobUnion.connection_type, null: false
+
     def tasks()
       [
-        OpenStruct.new(id: '0', action: 'Sample')
+        OpenStruct.new(id: '0', action: 'Sample 00'),
+        OpenStruct.new(id: '1', action: 'Sample 01'),
+        OpenStruct.new(id: '2', action: 'Sample 02'),
+        OpenStruct.new(id: '3', action: 'Sample 03'),
+        OpenStruct.new(id: '4', action: 'Sample 04')
+      ]
+    end
+
+    def jobs()
+      [
+        OpenStruct.new(id: '0', name: 'Name 00', description: 'Desc 00'),
+        OpenStruct.new(id: '1', name: 'Name 01', description: 'Desc 01'),
+        OpenStruct.new(id: '2', name: 'Name 02', description: 'Desc 02'),
+        OpenStruct.new(id: '3', name: 'Name 03', description: 'Desc 03'),
+        OpenStruct.new(id: '4', name: 'Name 04', description: 'Desc 04')
+      ]
+    end
+
+    def tasksorjobs()
+      [
+        OpenStruct.new(id: '0', action: 'Task 00'),
+        OpenStruct.new(id: '0', name: 'Job 00', description: 'Job Desc 00')
       ]
     end
   end
-  
+
   class MutationType < GraphQL::Schema::Object
     field :create_task, mutation: NewTaskType
   end
-  
+
   class Schema < GraphQL::Schema
     query QueryType
     mutation MutationType
   end
-  
+
   def test_it_works
     assert defined?(GraphQL)
   end
-  
-  def test_config_defaults    
+
+  def test_config_defaults
     assert ::Instana.config[:graphql].is_a?(Hash)
     assert ::Instana.config[:graphql].key?(:enabled)
     assert_equal true, ::Instana.config[:graphql][:enabled]
   end
-  
+
   def test_query
     clear_all!
-    
-    query = "query Sample {
-      tasks(after: \"\", first: 10) {
+
+    query = "query FirstTwoTaskSamples {
+      tasks(after: \"\", first: 2) {
         nodes {
           action
         }
       }
     }"
-    
+
     expected_data = {
-      :operationName => "Sample",
+      :operationName => "FirstTwoTaskSamples",
       :operationType => "query",
       :arguments => { "tasks" => ["after", "first"] },
       :fields => { "tasks" => ["nodes"], "nodes" => ["action"] }
     }
     expected_results = {
       "data" => {
-        "tasks" => { 
-          "nodes" => [{ "action" => "Sample" }]
+        "tasks" => {
+          "nodes" => [{"action" => "Sample 00"}, {"action" => "Sample 01"}]
+        }
+      }
+    }
+
+    results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
+    query_span, root_span = *Instana.processor.queued_spans
+
+    assert_equal expected_results, results.to_h
+    assert_equal :sdk, root_span[:n]
+    assert_equal :'graphql.server', query_span[:n]
+    assert_equal expected_data, query_span[:data][:graphql]
+  end
+
+  def test_query_with_fragment
+    clear_all!
+
+    query = "
+    fragment actionDetails on Task {
+      action
+    }
+
+    query SampleWithFragment {
+      tasks {
+        nodes {
+          ... actionDetails
+        }
+      }
+    }"
+
+    expected_data = {
+      :operationName => "SampleWithFragment",
+      :operationType => "query",
+      :arguments => {},
+      :fields => { "tasks" => ["nodes"], "nodes" => ["actionDetails"] }
+    }
+    expected_results = {
+      "data" => {
+        "tasks" => {
+          "nodes" => [{"action" => "Sample 00"}, {"action" => "Sample 01"},
+                      {"action" => "Sample 02"}, {"action" => "Sample 03"},
+                      {"action" => "Sample 04"}]
         }
       }
     }
-    
+
     results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
     query_span, root_span = *Instana.processor.queued_spans
-    
+
     assert_equal expected_results, results.to_h
     assert_equal :sdk, root_span[:n]
     assert_equal :'graphql.server', query_span[:n]
     assert_equal expected_data, query_span[:data][:graphql]
   end
-  
+
+  def test_query_union_with_fragment
+    clear_all!
+
+    query = "
+    query QueryUnionWithFragment {
+      tasksorjobs {
+        nodes {
+          ... on Task {
+            action
+          }
+          ... on Job {
+            name
+            description
+          }
+        }
+      }
+    }"
+
+    expected_data = {
+      :operationName => "QueryUnionWithFragment",
+      :operationType => "query",
+      :arguments => {},
+      :fields => { "tasksorjobs" => ["nodes"],
+                   "nodes" => ["InlineFragment", "InlineFragment"],
+                   "InlineFragment" => %w[action name description]}
+    }
+    expected_results = {
+      "data" => {
+        "tasksorjobs" => {
+          "nodes" => [{"action" => "Task 00"},
+                      {"name" => "Job 00", "description" => "Job Desc 00"}]
+        }
+      }
+    }
+
+    results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
+    query_span, root_span = *Instana.processor.queued_spans
+
+    assert_equal expected_results, results.to_h
+    assert_equal :sdk, root_span[:n]
+    assert_equal :'graphql.server', query_span[:n]
+    assert_equal expected_data, query_span[:data][:graphql]
+  end
+
   def test_mutation
     clear_all!
-    
+
     query = "mutation Sample {
       createTask(action: \"Sample\") {
         task {
@@ -93,7 +222,7 @@ class GraphqlTest < Minitest::Test
         }
       }
     }"
-    
+
     expected_data = {
       :operationName => "Sample",
       :operationType => "mutation",
@@ -102,15 +231,15 @@ class GraphqlTest < Minitest::Test
     }
     expected_results = {
       "data" => {
-        "createTask" => { 
+        "createTask" => {
           "task" => { "action" => "Sample" }
         }
       }
     }
-    
+
     results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
     query_span, root_span = *Instana.processor.queued_spans
-        
+
     assert_equal expected_results, results.to_h
     assert_equal :sdk, root_span[:n]
     assert_equal :'graphql.server', query_span[:n]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.209.7
+  version: 1.209.8
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler