[APM] Critical path for a single trace

packages/kbn-apm-synthtrace/index.ts

@@ -8,6 +8,7 @@
 
 export { timerange } from './src/lib/timerange';
 export { apm } from './src/lib/apm';
+export { dedot } from './src/lib/utils/dedot';
 export { stackMonitoring } from './src/lib/stack_monitoring';
 export { observer } from './src/lib/agent_config';
 export { cleanWriteTargets } from './src/lib/utils/clean_write_targets';

packages/kbn-apm-synthtrace/src/lib/apm/base_span.ts

@@ -88,4 +88,10 @@ export class BaseSpan extends Serializable<ApmFields> {
     });
     return this;
   }
+
+  override timestamp(timestamp: number) {
+    const ret = super.timestamp(timestamp);
+    this.fields['timestamp.us'] = timestamp * 1000;
+    return ret;
+  }
 }

packages/kbn-apm-synthtrace/src/lib/apm/instance.ts

@@ -20,24 +20,49 @@ export type SpanParams = {
 } & ApmFields;
 
 export class Instance extends Entity<ApmFields> {
-  transaction({
-    transactionName,
-    transactionType = 'request',
-  }: {
-    transactionName: string;
-    transactionType?: string;
-  }) {
+  transaction(
+    ...options:
+      | [{ transactionName: string; transactionType?: string }]
+      | [string]
+      | [string, string]
+  ) {
+    let transactionName: string;
+    let transactionType: string | undefined;
+    if (options.length === 2) {
+      transactionName = options[0];
+      transactionType = options[1];
+    } else if (typeof options[0] === 'string') {
+      transactionName = options[0];
+    } else {
+      transactionName = options[0].transactionName;
+      transactionType = options[0].transactionType;
+    }
+
     return new Transaction({
       ...this.fields,
       'transaction.name': transactionName,
-      'transaction.type': transactionType,
+      'transaction.type': transactionType || 'request',
     });
   }
 
-  span({ spanName, spanType, spanSubtype, ...apmFields }: SpanParams) {
+  span(...options: [string, string] | [string, string, string] | [SpanParams]) {
+    let spanName: string;
+    let spanType: string;
+    let spanSubtype: string;
+    let fields: ApmFields;
+
+    if (options.length === 3 || options.length === 2) {
+      spanName = options[0];
+      spanType = options[1];
+      spanSubtype = options[2] || 'unknown';
+      fields = {};
+    } else {
+      ({ spanName, spanType, spanSubtype = 'unknown', ...fields } = options[0]);
+    }
+
     return new Span({
       ...this.fields,
-      ...apmFields,
+      ...fields,
       'span.name': spanName,
       'span.type': spanType,
       'span.subtype': spanSubtype,

packages/kbn-apm-synthtrace/src/lib/apm/service.ts

@@ -20,17 +20,18 @@ export class Service extends Entity<ApmFields> {
   }
 }
 
-export function service({
-  name,
-  environment,
-  agentName,
-}: {
-  name: string;
-  environment: string;
-  agentName: string;
-}) {
+export function service(name: string, environment: string, agentName: string): Service;
+
+export function service(options: { name: string; environment: string; agentName: string }): Service;
+
+export function service(
+  ...args: [{ name: string; environment: string; agentName: string }] | [string, string, string]
+) {
+  const [serviceName, environment, agentName] =
+    args.length === 1 ? [args[0].name, args[0].environment, args[0].agentName] : args;
+
   return new Service({
-    'service.name': name,
+    'service.name': serviceName,
     'service.environment': environment,
     'agent.name': agentName,
   });

packages/kbn-apm-synthtrace/src/lib/stream_processor.ts

@@ -187,10 +187,7 @@ export class StreamProcessor<TFields extends Fields = ApmFields> {
     document['service.node.name'] =
       document['service.node.name'] || document['container.id'] || document['host.name'];
     document['ecs.version'] = '1.4';
-    // TODO this non standard field should not be enriched here
-    if (document['processor.event'] !== 'metric') {
-      document['timestamp.us'] = document['@timestamp']! * 1000;
-    }
+
     return document;
   }
 

packages/kbn-apm-synthtrace/src/lib/utils/dedot.ts

@@ -13,4 +13,5 @@ export function dedot(source: Record<string, any>, target: Record<string, any>)
     const val = source[key as keyof typeof source];
     set(target, key, val);
   }
+  return target;
 }

packages/kbn-apm-synthtrace/src/test/apm_events_to_elasticsearch_output.test.ts

@@ -59,9 +59,6 @@ describe('output apm events to elasticsearch', () => {
             "name": "instance-a",
           },
         },
-        "timestamp": Object {
-          "us": 1609455600000000,
-        },
       }
     `);
   });

packages/kbn-apm-synthtrace/src/test/scenarios/01_simple_trace.test.ts

@@ -84,6 +84,7 @@ describe('simple trace', () => {
       'service.environment': 'production',
       'service.name': 'opbeans-java',
       'service.node.name': 'instance-1',
+      'timestamp.us': 1609459200000000,
       'trace.id': '00000000000000000000000000000241',
       'transaction.duration.us': 1000000,
       'transaction.id': '0000000000000240',
@@ -113,6 +114,7 @@ describe('simple trace', () => {
       'span.name': 'GET apm-*/_search',
       'span.subtype': 'elasticsearch',
       'span.type': 'db',
+      'timestamp.us': 1609459200050000,
       'trace.id': '00000000000000000000000000000301',
       'transaction.id': '0000000000000300',
     });