Revert "Merge pull request #6 from jennypavlova/196161-apmotel-fix-an…

…-error-with-mobile-services" This reverts commit 40d5fa9, reversing changes made to cba684f.
crespocarlos · Oct 15, 2024 · db19165 · db19165
1 parent 241a62f
commit db19165
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/packages/kbn-apm-types/src/es_schemas/raw/transaction_raw.ts b/packages/kbn-apm-types/src/es_schemas/raw/transaction_raw.ts
@@ -35,7 +35,7 @@ export interface TransactionRaw extends APMBaseDoc {
   trace: { id: string }; // trace is required
   event?: { outcome?: EventOutcome };
   transaction: {
-    duration?: { us?: number };
+    duration: { us: number };
     id: string;
     marks?: {
       // "agent": not defined by APM Server - only sent by RUM agent
@@ -46,12 +46,12 @@ export interface TransactionRaw extends APMBaseDoc {
     name?: string;
     page?: Page; // special property for RUM: shared by error and transaction
     result?: string;
-    sampled?: boolean;
+    sampled: boolean;
     span_count?: {
       started?: number;
       dropped?: number;
     };
-    type?: string;
+    type: string;
     custom?: Record<string, unknown>;
     message?: {
       queue?: { name: string };

diff --git a/packages/kbn-apm-types/src/es_schemas/ui/transaction.ts b/packages/kbn-apm-types/src/es_schemas/ui/transaction.ts
@@ -15,7 +15,7 @@ import { Agent } from './fields/agent';
 // and thus it doesn't make sense to treat it as optional
 type InnerTransaction = TransactionRaw['transaction'];
 interface InnerTransactionWithName extends InnerTransaction {
-  name?: string;
+  name: string;
 }
 
 export interface Transaction extends TransactionRaw {

diff --git a/x-pack/plugins/observability_solution/apm/common/waterfall/typings.ts b/x-pack/plugins/observability_solution/apm/common/waterfall/typings.ts
@@ -22,11 +22,11 @@ export interface WaterfallTransaction {
   event?: { outcome?: EventOutcome };
   parent?: { id?: string };
   processor: { event: 'transaction' };
-  transaction?: {
-    duration?: { us?: number };
+  transaction: {
+    duration: { us: number };
     id: string;
-    name?: string;
-    type?: string;
+    name: string;
+    type: string;
     result?: string;
   };
   faas?: {

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
@@ -274,7 +274,12 @@ async function getTraceDocsPerPage({
     PROCESSOR_EVENT,
   ] as const);
 
-  const requiredTxFields = asMutableArray([TRANSACTION_ID] as const);
+  const requiredTxFields = asMutableArray([
+    TRANSACTION_ID,
+    TRANSACTION_DURATION,
+    TRANSACTION_NAME,
+    TRANSACTION_TYPE,
+  ] as const);
 
   const requiredSpanFields = asMutableArray([
     SPAN_ID,
@@ -296,9 +301,6 @@ async function getTraceDocsPerPage({
     SPAN_COMPOSITE_SUM,
     SPAN_SYNC,
     CHILD_ID,
-    TRANSACTION_NAME,
-    TRANSACTION_TYPE,
-    TRANSACTION_DURATION,
   ] as const);
 
   const body = {

diff --git a/...ck/plugins/observability_solution/apm/server/routes/transactions/get_transaction/index.ts b/...ck/plugins/observability_solution/apm/server/routes/transactions/get_transaction/index.ts
@@ -52,17 +52,14 @@ export async function getTransaction({
     TIMESTAMP_US,
     SERVICE_NAME,
     TRANSACTION_ID,
-  ] as const);
-
-  const optionalFields = asMutableArray([
-    PROCESSOR_NAME,
-    SERVICE_LANGUAGE_NAME,
     TRANSACTION_DURATION,
     TRANSACTION_NAME,
     TRANSACTION_SAMPLED,
     TRANSACTION_TYPE,
   ] as const);
 
+  const optionalFields = asMutableArray([PROCESSOR_NAME, SERVICE_LANGUAGE_NAME] as const);
+
   const resp = await apmEventClient.search('get_transaction', {
     apm: {
       sources: [
@@ -86,7 +83,7 @@ export async function getTransaction({
         },
       },
       fields: [...requiredFields, ...optionalFields],
-      _source: [SPAN_LINKS, TRANSACTION_AGENT_MARKS, TRANSACTION_NAME],
+      _source: [SPAN_LINKS, TRANSACTION_AGENT_MARKS],
     },
   });