Fix types

elastic · Oct 8, 2024 · 832abf1 · 832abf1
1 parent d5d9eb0
commit 832abf1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/packages/kbn-apm-synthtrace/src/cli/scenario.ts b/packages/kbn-apm-synthtrace/src/cli/scenario.ts
@@ -26,7 +26,7 @@ interface EsClients {
   infraEsClient: InfraSynthtraceEsClient;
   assetsEsClient: AssetsSynthtraceEsClient;
   syntheticsEsClient: SyntheticsSynthtraceEsClient;
-  otelSynthtraceEsClient: OtelSynthtraceEsClient;
+  otelEsClient: OtelSynthtraceEsClient;
 }
 
 type Generate<TFields> = (options: {

diff --git a/packages/kbn-apm-synthtrace/src/cli/utils/bootstrap.ts b/packages/kbn-apm-synthtrace/src/cli/utils/bootstrap.ts
@@ -91,6 +91,7 @@ export async function bootstrap(runOptions: RunOptions) {
     infraEsClient,
     assetsEsClient,
     syntheticsEsClient,
+    otelEsClient,
     version,
     kibanaUrl,
     esUrl,

diff --git a/packages/kbn-apm-synthtrace/src/cli/utils/start_live_data_upload.ts b/packages/kbn-apm-synthtrace/src/cli/utils/start_live_data_upload.ts
@@ -26,8 +26,15 @@ export async function startLiveDataUpload({
 }) {
   const file = runOptions.file;
 
-  const { logger, apmEsClient, logsEsClient, infraEsClient, assetsEsClient, syntheticsEsClient } =
-    await bootstrap(runOptions);
+  const {
+    logger,
+    apmEsClient,
+    logsEsClient,
+    infraEsClient,
+    assetsEsClient,
+    syntheticsEsClient,
+    otelEsClient,
+  } = await bootstrap(runOptions);
 
   const scenario = await getScenario({ file, logger });
   const { generate } = await scenario({ ...runOptions, logger });
@@ -65,7 +72,14 @@ export async function startLiveDataUpload({
 
       const generatorsAndClients = generate({
         range: timerange(bucketFrom.getTime(), bucketTo.getTime()),
-        clients: { logsEsClient, apmEsClient, infraEsClient, assetsEsClient, syntheticsEsClient },
+        clients: {
+          logsEsClient,
+          apmEsClient,
+          infraEsClient,
+          assetsEsClient,
+          syntheticsEsClient,
+          otelEsClient,
+        },
       });
 
       const generatorsAndClientsArray = castArray(generatorsAndClients);

diff --git a/packages/kbn-apm-synthtrace/src/cli/utils/synthtrace_worker.ts b/packages/kbn-apm-synthtrace/src/cli/utils/synthtrace_worker.ts
@@ -66,7 +66,7 @@ async function start() {
     logger,
   });
 
-  const otelSynthtraceEsClient = getOtelSynthtraceEsClient({
+  const otelEsClient = getOtelSynthtraceEsClient({
     concurrency: runOptions.concurrency,
     target: esUrl,
     logger,
@@ -87,7 +87,7 @@ async function start() {
       infraEsClient,
       assetsEsClient,
       syntheticsEsClient,
-      otelSynthtraceEsClient,
+      otelEsClient,
     });
   }
 
@@ -102,7 +102,7 @@ async function start() {
         infraEsClient,
         assetsEsClient,
         syntheticsEsClient,
-        otelSynthtraceEsClient,
+        otelEsClient,
       },
     })
   );

diff --git a/packages/kbn-apm-synthtrace/src/scenarios/otel_simple_trace.ts b/packages/kbn-apm-synthtrace/src/scenarios/otel_simple_trace.ts
@@ -14,7 +14,7 @@ import { withClient } from '../lib/utils/with_client';
 
 const scenario: Scenario<OtelDocument> = async (runOptions) => {
   return {
-    generate: ({ range, clients: { otelSynthtraceEsClient } }) => {
+    generate: ({ range, clients: { otelEsClient } }) => {
       const { numOtelTraces = 5 } = runOptions.scenarioOpts || {};
       const { logger } = runOptions;
       const traceId = generateShortId();
@@ -37,7 +37,7 @@ const scenario: Scenario<OtelDocument> = async (runOptions) => {
 
       return [
         withClient(
-          otelSynthtraceEsClient,
+          otelEsClient,
           logger.perf('generating_otel_otelTrace', () => otelWithMetricsAndErrors)
         ),
       ];