-
Notifications
You must be signed in to change notification settings - Fork 399
fix(graphql): handle nil value for locations in unified_trace #5025
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
ivoanjo
merged 9 commits into
DataDog:master
from
codella:graphql/set-tag-locations-in-span-only-if-present
Nov 20, 2025
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
169c10f
fix(graphql): handle nil value for locations in unified_trace
codella eefa92d
Merge branch 'master' into graphql/set-tag-locations-in-span-only-if-…
codella 8e2330a
Merge branch 'master' into HEAD
ivoanjo 565ae85
Linting fixes
ivoanjo 1c74992
Directly access helper method
ivoanjo 458285c
Avoid running spec on legacy graphql versions
ivoanjo d2c02c6
Update sig/datadog/tracing/contrib/graphql/unified_trace.rbs
ivoanjo 2fb3ae5
Merge branch 'master' into graphql/set-tag-locations-in-span-only-if-…
ivoanjo 3dee4b2
Merge branch 'master' into graphql/set-tag-locations-in-span-only-if-…
p-datadog File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
spec/datadog/tracing/contrib/graphql/unified_trace_spec.rb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| require 'datadog/tracing/contrib/support/spec_helper' | ||
| require 'graphql' | ||
|
|
||
| RSpec.describe "Datadog::Tracing::Contrib::GraphQL::UnifiedTrace" do | ||
| before do | ||
| skip 'UnifiedTrace is only supported in GraphQL 2.0.19 and above' if Gem::Version.new(::GraphQL::VERSION) < Gem::Version.new('2.0.19') | ||
| require 'datadog/tracing/contrib/graphql/unified_trace' | ||
| end | ||
|
|
||
| let(:described_class) { Datadog::Tracing::Contrib::GraphQL::UnifiedTrace } | ||
|
|
||
| describe '.serialize_error_locations' do | ||
| subject(:result) { described_class.serialize_error_locations(locations) } | ||
|
|
||
| context 'when locations is nil' do | ||
| let(:locations) { nil } | ||
|
|
||
| it 'returns an empty array' do | ||
| expect(result).to eq([]) | ||
| end | ||
| end | ||
|
|
||
| context 'when locations is an array' do | ||
| let(:locations) do | ||
| [ | ||
| {'line' => 3, 'column' => 10}, | ||
| {'line' => 7, 'column' => 8} | ||
| ] | ||
| end | ||
|
|
||
| it 'maps locations to formatted strings' do | ||
| expect(result).to eq(['3:10', '7:8']) | ||
| end | ||
| end | ||
|
|
||
| context 'when locations is an empty array' do | ||
| let(:locations) { [] } | ||
|
|
||
| it 'returns an empty array' do | ||
| expect(result).to eq([]) | ||
| end | ||
| end | ||
| end | ||
| end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.