Merge branch 'main' into auto-instrumentation

xuan-cao-swi · web-flow · commit d867dcd663e1 · 2025-10-28T13:05:48.000-04:00
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
 
       - name: Install Ruby 3.4
-        uses: ruby/setup-ruby@v1.265.0
+        uses: ruby/setup-ruby@v1.267.0
         with:
           ruby-version: 3.4
       - name: Generate Gemfile.lock
diff --git a/.github/workflows/installation-tests.yml b/.github/workflows/installation-tests.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v5
         # ATTENTION: Dependabot does not know how to update shared actions file.
         # If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
-      - uses: ruby/setup-ruby@v1.265.0
+      - uses: ruby/setup-ruby@v1.267.0
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -34,7 +34,7 @@ jobs:
       # uploads of run results in SARIF format to the repository Actions tab.
       # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
       - name: "Upload artifact"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: SARIF file
           path: results.sarif
@@ -43,6 +43,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.RUBY_VERSION }}
-        uses: ruby/setup-ruby@v1.265.0
+        uses: ruby/setup-ruby@v1.267.0
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
       - name: Checkout repo
diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.RUBY_VERSION }}
-        uses: ruby/setup-ruby@v1.265.0
+        uses: ruby/setup-ruby@v1.267.0
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
       - name: Checkout repo
diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.RUBY_VERSION }}
-        uses: ruby/setup-ruby@v1.265.0
+        uses: ruby/setup-ruby@v1.267.0
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
       - name: Checkout repo
diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           app-id: ${{ vars.OTELBOT_APP_ID }}
           private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
-      - uses: googleapis/release-please-action@v4.3.0
+      - uses: googleapis/release-please-action@v4.4.0
         id: prepare
         # with:
         #   token: ${{ steps.otelbot-token.outputs.token }}
@@ -57,7 +57,7 @@ jobs:
           chmod 0600 $HOME/.gem/credentials
           printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
 
-      - uses: ruby/setup-ruby@v1.265.0
+      - uses: ruby/setup-ruby@v1.267.0
         with:
           ruby-version: "3.2"
           bundler: latest
diff --git a/.github/workflows/release-request-weekly.yml b/.github/workflows/release-request-weekly.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.RUBY_VERSION }}
-        uses: ruby/setup-ruby@v1.265.0
+        uses: ruby/setup-ruby@v1.267.0
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
 
diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.RUBY_VERSION }}
-        uses: ruby/setup-ruby@v1.265.0
+        uses: ruby/setup-ruby@v1.267.0
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
 
diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.RUBY_VERSION }}
-        uses: ruby/setup-ruby@v1.265.0
+        uses: ruby/setup-ruby@v1.267.0
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
 
diff --git a/instrumentation/graphql/CHANGELOG.md b/instrumentation/graphql/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release History: opentelemetry-instrumentation-graphql
 
+### v0.31.2 / 2025-10-28
+
+* FIXED: Patch dataloader to propagate context to new fiber
+* FIXED: Does not trace resolve type unless enable
+
 ### v0.31.1 / 2025-10-22
 
 * FIXED: Update opentelemetry-instrumentation-base dependency
diff --git 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
@@ -41,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,
@@ -96,6 +102,13 @@ def install_new_tracer(config = {})
             end
           end
         end
+
+        def patch
+          return unless dataloader_has_spawn_fiber?
+
+          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
@@ -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
diff --git a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/tracers/graphql_trace.rb b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/tracers/graphql_trace.rb
@@ -148,12 +148,16 @@ def authorized_lazy(query:, type:, object:, &)
 
           def resolve_type(query:, type:, object:, &)
             platform_key = @_otel_resolve_type_key_cache[type]
+            return super unless platform_key
+
             attributes = @_otel_type_attrs_cache[type]
             tracer.in_span(platform_key, attributes: attributes) { super }
           end
 
           def resolve_type_lazy(query:, type:, object:, &)
             platform_key = @_otel_resolve_type_key_cache[type]
+            return super unless platform_key
+
             attributes = @_otel_lazy_type_attrs_cache[type]
             tracer.in_span(platform_key, attributes: attributes) { super }
           end
diff --git a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/version.rb b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module GraphQL
-      VERSION = '0.31.1'
+      VERSION = '0.31.2'
     end
   end
 end
diff --git a/instrumentation/graphql/test/instrumentation/graphql/patches/dataloader_test.rb 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
diff --git a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb
@@ -221,6 +221,28 @@
         end
       end
 
+      describe 'when platform_resolve_type is disabled' do
+        let(:config) { { enable_platform_resolve_type: false } }
+
+        it 'does not trace .resolve_type' do
+          skip unless supports_authorized_and_resolved_types?
+          SomeGraphQLAppSchema.execute('{ vehicle { __typename } }')
+
+          parent = spans.find { |s| s.name == 'graphql.execute_query' }
+          span = spans.find { |s| s.parent_span_id == parent.span_id }
+          _(span).must_be_nil
+        end
+
+        it 'does not traces .resolve_type_lazy' do
+          skip unless supports_authorized_and_resolved_types?
+          SomeGraphQLAppSchema.execute('{ vehicle { __typename } }', context: { lazy_type_resolve: true })
+
+          parent = spans.find { |s| s.name == 'graphql.execute_query_lazy' }
+          span = spans.find { |s| s.parent_span_id == parent.span_id }
+          _(span).must_be_nil
+        end
+      end
+
       describe 'when platform_resolve_type is enabled with legacy naming' do
         let(:config) { { enable_platform_resolve_type: true, legacy_platform_span_names: true } }
 
