From 243367127fc6d0efe9b250fab707e5578bdbff7a Mon Sep 17 00:00:00 2001
From: Duc Nghiem-Xuan <git@ducnx.com>
Date: Fri, 24 Oct 2025 14:17:55 +0900
Subject: [PATCH 1/2] fix: patch dataloader to propagate context to new fiber

---
 .../graphql/instrumentation.rb                |  9 ++++++++
 .../graphql/patches/dataloader.rb             | 23 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/patches/dataloader.rb

diff --git a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/instrumentation.rb b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/instrumentation.rb
index f34c88d68c..8c25d91056 100644
--- a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/instrumentation.rb
+++ b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/instrumentation.rb
@@ -27,6 +27,8 @@ class Instrumentation < OpenTelemetry::Instrumentation::Base
             require_relative 'tracers/graphql_trace'
             install_new_tracer(config)
           end
+
+          patch
         end
 
         present do
@@ -96,6 +98,13 @@ def install_new_tracer(config = {})
             end
           end
         end
+
+        def patch
+          return if gem_version < Gem::Version.new('2.1.8')
+
+          require_relative 'patches/dataloader'
+          ::GraphQL::Dataloader.prepend(Patches::Dataloader)
+        end
       end
     end
   end
diff --git a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/patches/dataloader.rb b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/patches/dataloader.rb
new file mode 100644
index 0000000000..a2c8325d78
--- /dev/null
+++ b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/patches/dataloader.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module GraphQL
+      module Patches
+        # Patches GraphQL::Dataloader to propagate context to new fiber
+        module Dataloader
+          def spawn_fiber(&block)
+            ctx = OpenTelemetry::Context.current
+            super do
+              OpenTelemetry::Context.with_current(ctx, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

From 9108622c7cd109a1f90fecf2e93a9f44b0f739cc Mon Sep 17 00:00:00 2001
From: Duc Nghiem-Xuan <git@ducnx.com>
Date: Sat, 25 Oct 2025 08:57:25 +0900
Subject: [PATCH 2/2] chore: add test for dataloader patch

---
 .../graphql/instrumentation.rb                |  6 ++-
 .../graphql/patches/dataloader_test.rb        | 49 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 instrumentation/graphql/test/instrumentation/graphql/patches/dataloader_test.rb

diff --git a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/instrumentation.rb b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/instrumentation.rb
index 8c25d91056..0965973d6c 100644
--- a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/instrumentation.rb
+++ b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/instrumentation.rb
@@ -43,6 +43,10 @@ def supports_new_tracer?
           Gem::Requirement.new('>= 2.0.19').satisfied_by?(gem_version)
         end
 
+        def dataloader_has_spawn_fiber?
+          Gem::Requirement.new('>= 2.1.8').satisfied_by?(gem_version)
+        end
+
         ## Supported configuration keys for the install config hash:
         #
         # The enable_platform_field key expects a boolean value,
@@ -100,7 +104,7 @@ def install_new_tracer(config = {})
         end
 
         def patch
-          return if gem_version < Gem::Version.new('2.1.8')
+          return unless dataloader_has_spawn_fiber?
 
           require_relative 'patches/dataloader'
           ::GraphQL::Dataloader.prepend(Patches::Dataloader)
diff --git a/instrumentation/graphql/test/instrumentation/graphql/patches/dataloader_test.rb b/instrumentation/graphql/test/instrumentation/graphql/patches/dataloader_test.rb
new file mode 100644
index 0000000000..17512cf3a8
--- /dev/null
+++ b/instrumentation/graphql/test/instrumentation/graphql/patches/dataloader_test.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'test_helper'
+
+require_relative '../../../../lib/opentelemetry/instrumentation/graphql'
+require_relative '../../../../lib/opentelemetry/instrumentation/graphql/patches/dataloader'
+
+describe OpenTelemetry::Instrumentation::GraphQL::Patches::Dataloader do
+  let(:instrumentation) { OpenTelemetry::Instrumentation::GraphQL::Instrumentation.instance }
+  let(:tracer) { OpenTelemetry.tracer_provider.tracer('test') }
+  let(:exporter) { EXPORTER }
+  let(:spans) { exporter.finished_spans }
+
+  before do
+    instrumentation.instance_variable_set(:@installed, false)
+    instrumentation.install({})
+  end
+
+  if OpenTelemetry::Instrumentation::GraphQL::Instrumentation.instance.dataloader_has_spawn_fiber?
+    describe '#spawn_fiber' do
+      it 'set context in the child fiber' do
+        tracer.in_span('parent') do
+          fiber = GraphQL::Dataloader.new.spawn_fiber do
+            tracer.in_span('child1') do
+              # empty block
+            end
+            Fiber.yield
+            tracer.in_span('child2') do
+              # empty block
+            end
+          end
+          fiber.resume
+          fiber.resume
+        end
+
+        parent_span = spans.find { |s| s.name == 'parent' }
+        child1_span = spans.find { |s| s.name == 'child1' }
+        child2_span = spans.find { |s| s.name == 'child2' }
+
+        _(parent_span.span_id).must_equal(child1_span.parent_span_id)
+        _(parent_span.span_id).must_equal(child2_span.parent_span_id)
+      end
+    end
+  end
+end