Skip to content

[9.1] [Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602) #225769

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.

Sign up for GitHub

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
kibanamachine merged 1 commit into from
Jun 30, 2025
Merged

[9.1] [Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602) #225769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions .../components/observability/traces/components/full_screen_waterfall/helpers/is_span.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import { OTEL_SPAN_KIND, PROCESSOR_EVENT_FIELD, DataTableRecord } from '@kbn/discover-utils';
import { PROCESSOR_EVENT_FIELD, DataTableRecord } from '@kbn/discover-utils';
import { isSpanHit } from './is_span';

describe('isSpanHit', () => {
Expand All @@ -19,17 +19,6 @@ describe('isSpanHit', () => {
expect(isSpanHit(hit)).toBe(false);
});

it('returns true for an OTEL span (spanKind is present)', () => {
const hit = {
flattened: {
[OTEL_SPAN_KIND]: 'client',
[PROCESSOR_EVENT_FIELD]: 'span',
},
} as unknown as DataTableRecord;

expect(isSpanHit(hit)).toBe(true);
});

it('returns true when processorEvent is null (OTEL fallback)', () => {
const hit = {
flattened: {
Expand All @@ -50,11 +39,10 @@ describe('isSpanHit', () => {
expect(isSpanHit(hit)).toBe(true);
});

it('returns false when processorEvent is not "span" and spanKind is null', () => {
it('returns false when processorEvent is not "span" ', () => {
const hit = {
flattened: {
[PROCESSOR_EVENT_FIELD]: 'transaction',
[OTEL_SPAN_KIND]: null,
},
} as unknown as DataTableRecord;

Expand Down
10 changes: 6 additions & 4 deletions ...ublic/components/observability/traces/components/full_screen_waterfall/helpers/is_span.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import { DataTableRecord, OTEL_SPAN_KIND, PROCESSOR_EVENT_FIELD } from '@kbn/discover-utils';
import { DataTableRecord, PROCESSOR_EVENT_FIELD } from '@kbn/discover-utils';
import { getFlattenedFields } from '@kbn/discover-utils/src/utils/get_flattened_fields';

export const isSpanHit = (hit: DataTableRecord | null): boolean => {
if (!hit?.flattened) {
return false;
}

const processorEvent = hit.flattened[PROCESSOR_EVENT_FIELD];
const spanKind = hit.flattened[OTEL_SPAN_KIND];
const processorEvent = getFlattenedFields<{ [PROCESSOR_EVENT_FIELD]: string }>(hit, [
PROCESSOR_EVENT_FIELD,
])[PROCESSOR_EVENT_FIELD];

const isOtelSpan = spanKind != null || processorEvent == null;
const isOtelSpan = processorEvent == null;
const isApmSpan = processorEvent === 'span';

return isApmSpan || isOtelSpan;
Expand Down