Merge pull request #4 from jennypavlova/fix-otel-error-correlation

[APM][Otel] Errors: Add fallback to span id if the parent id is undefined
jennypavlova · Oct 14, 2024 · 7def09a · 7def09a
2 parents 06ec4ef + 7e4e43e
commit 7def09a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...ervability_solution/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts b/...ervability_solution/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts
@@ -27,6 +27,7 @@ import {
   TRACE_ID,
   TRANSACTION_ID,
   ERROR_STACK_TRACE,
+  SPAN_ID,
 } from '../../../../common/es_fields/apm';
 import { environmentQuery } from '../../../../common/utils/environment_query';
 import { ApmDocumentType } from '../../../../common/document_type';
@@ -79,6 +80,7 @@ export async function getErrorSampleDetails({
 
   const optionalFields = asMutableArray([
     TRANSACTION_ID,
+    SPAN_ID,
     AGENT_VERSION,
     PROCESSOR_NAME,
     ERROR_STACK_TRACE,
@@ -129,7 +131,7 @@ export async function getErrorSampleDetails({
 
   const errorFromFields = unflattenKnownApmEventFields(hit.fields, requiredFields);
 
-  const transactionId = errorFromFields.transaction?.id;
+  const transactionId = errorFromFields.transaction?.id ?? errorFromFields.span?.id;
   const traceId = errorFromFields.trace.id;
 
   let transaction: Transaction | undefined;

diff --git a/x-pack/plugins/observability_solution/apm/server/routes/traces/get_trace_items.ts b/x-pack/plugins/observability_solution/apm/server/routes/traces/get_trace_items.ts
@@ -159,6 +159,10 @@ export async function getTraceItems({
 
     const waterfallErrorEvent: WaterfallError = {
       ...event,
+      parent: {
+        ...event?.parent,
+        id: event?.parent?.id ?? event?.span?.id,
+      },
       error: {
         ...(event.error ?? {}),
         exception: