Use Field#owner for platform_field_key, for consistent keys

PlayerData · Feb 20, 2023 · a54d131 · a54d131
1 parent 4a5e131
commit a54d131
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 6 deletions.
diff --git a/lib/graphql/tracing/platform_tracing.rb b/lib/graphql/tracing/platform_tracing.rb
@@ -40,7 +40,7 @@ def trace(key, data)
 
           platform_key = if trace_field
             context = data.fetch(:query).context
-            cached_platform_key(context, field, :field) { platform_field_key(data[:owner], field) }
+            cached_platform_key(context, field, :field) { platform_field_key(field.owner, field) }
           else
             nil
           end

diff --git a/spec/graphql/tracing/platform_trace_spec.rb b/spec/graphql/tracing/platform_trace_spec.rb
@@ -112,7 +112,7 @@ def platform_resolve_type_key(type)
 
     it "traces resolve_type and differentiates field calls on different types" do
       scalar_schema = Class.new(Dummy::Schema) { trace_with(CustomPlatformTrace, trace_scalars: true) }
-      scalar_schema.execute(" { allEdible { __typename origin } }")
+      scalar_schema.execute(" { allEdible { __typename fatContent } }")
       expected_trace = [
           "em",
           "am",
@@ -133,24 +133,24 @@ def platform_resolve_type_key(type)
           "Cheese.authorized",
           "DynamicFields.authorized",
           "D._",
-          "C.o",
+          "C.f",
           "Edible.resolve_type",
           "Cheese.authorized",
           "Cheese.authorized",
           "DynamicFields.authorized",
           "D._",
-          "C.o",
+          "C.f",
           "Edible.resolve_type",
           "Cheese.authorized",
           "Cheese.authorized",
           "DynamicFields.authorized",
           "D._",
-          "C.o",
+          "C.f",
           "Edible.resolve_type",
           "Milk.authorized",
           "DynamicFields.authorized",
           "D._",
-          "M.o",
+          "E.f",
         ]
 
       assert_equal expected_trace, CustomPlatformTrace::TRACE

diff --git a/spec/graphql/tracing/platform_tracing_spec.rb b/spec/graphql/tracing/platform_tracing_spec.rb
@@ -115,6 +115,54 @@ def platform_trace(platform_key, key, data)
 
       assert_equal expected_trace, CustomPlatformTracer::TRACE
     end
+
+    focus
+    it "traces resolve_type and differentiates field calls on different types" do
+      scalar_schema = Class.new(Dummy::Schema) { use(CustomPlatformTracer, trace_scalars: true) }
+
+      scalar_schema.execute(" { allEdible { __typename fatContent } }")
+      expected_trace = [
+        "em",
+        "am",
+        "l",
+        "p",
+        "v",
+        "aq",
+        "eq",
+        "Query.authorized",
+        "Q.a",
+        "Edible.resolve_type",
+        "Edible.resolve_type",
+        "Edible.resolve_type",
+        "Edible.resolve_type",
+        "eql",
+        "Edible.resolve_type",
+        "Cheese.authorized",
+        "Cheese.authorized",
+        "DynamicFields.authorized",
+        "D._",
+        "C.f",
+        "Edible.resolve_type",
+        "Cheese.authorized",
+        "Cheese.authorized",
+        "DynamicFields.authorized",
+        "D._",
+        "C.f",
+        "Edible.resolve_type",
+        "Cheese.authorized",
+        "Cheese.authorized",
+        "DynamicFields.authorized",
+        "D._",
+        "C.f",
+        "Edible.resolve_type",
+        "Milk.authorized",
+        "DynamicFields.authorized",
+        "D._",
+        "E.f",
+      ]
+
+      assert_equal expected_trace, CustomPlatformTracer::TRACE
+    end
   end
 
   describe "by default, scalar fields are not traced" do