From 42303b3494c8da8e105b0580ac7e71a05a562954 Mon Sep 17 00:00:00 2001
From: Joshua Li <joshuali925@gmail.com>
Date: Wed, 30 Oct 2024 23:10:25 +0000
Subject: [PATCH] pass logger to QueryService to avoid npe

Signed-off-by: Joshua Li <joshuali925@gmail.com>
---
 server/plugin.ts                | 7 ++++++-
 server/routes/index.ts          | 6 ++++--
 server/services/queryService.ts | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/server/plugin.ts b/server/plugin.ts
index 8310902ad..7cb11fc87 100644
--- a/server/plugin.ts
+++ b/server/plugin.ts
@@ -219,7 +219,12 @@ export class ObservabilityPlugin
     core.savedObjects.registerType(integrationTemplateType);
 
     // Register server side APIs
-    setupRoutes({ router, client: openSearchObservabilityClient, dataSourceEnabled });
+    setupRoutes({
+      router,
+      client: openSearchObservabilityClient,
+      dataSourceEnabled,
+      logger: this.logger,
+    });
 
     core.savedObjects.registerType(getVisualizationSavedObject(dataSourceEnabled));
     core.savedObjects.registerType(getSearchSavedObject(dataSourceEnabled));
diff --git a/server/routes/index.ts b/server/routes/index.ts
index 696578ab1..d124941b2 100644
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ILegacyClusterClient, IRouter } from '../../../../src/core/server';
+import { ILegacyClusterClient, IRouter, Logger } from '../../../../src/core/server';
 import { DSLFacet } from '../services/facets/dsl_facet';
 import { PPLFacet } from '../services/facets/ppl_facet';
 import SavedObjectFacet from '../services/facets/saved_objects';
@@ -30,10 +30,12 @@ export function setupRoutes({
   router,
   client,
   dataSourceEnabled,
+  logger,
 }: {
   router: IRouter;
   client: ILegacyClusterClient;
   dataSourceEnabled: boolean;
+  logger: Logger;
 }) {
   PanelsRouter(router);
   VisualizationsRouter(router);
@@ -49,7 +51,7 @@ export function setupRoutes({
   registerParaRoute(router);
   registerNoteRoute(router);
   registerVizRoute(router, dataSourceEnabled);
-  const queryService = new QueryService(client);
+  const queryService = new QueryService(client, logger);
   registerSqlRoute(router, queryService, dataSourceEnabled);
 
   registerMetricsRoute(router, dataSourceEnabled);
diff --git a/server/services/queryService.ts b/server/services/queryService.ts
index d11e66621..2c8a5d004 100644
--- a/server/services/queryService.ts
+++ b/server/services/queryService.ts
@@ -6,10 +6,11 @@
 import 'core-js/stable';
 import _ from 'lodash';
 import 'regenerator-runtime/runtime';
+import { Logger } from '../../../../src/core/server';
 
 export class QueryService {
   private client: any;
-  constructor(client: any) {
+  constructor(client: any, private readonly logger: Logger) {
     this.client = client;
   }