Remove all usages of legacy global logger

Signed-off-by: Sebastian Malton <sebastian@malton.name>
2025-05-20 05:10:56 +00:00 · 2023-01-05 13:27:53 -05:00
1 parent 1456e1e597
commit ade0775061
@@ -4,8 +4,9 @@
 */
 import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
+import loggerInjectable from "../../common/logger.injectable";
 import hostedClusterIdInjectable from "../cluster-frame-context/hosted-cluster-id.injectable";
-import type { TerminalApiQuery } from "./terminal-api";
+import type { TerminalApiDependencies, TerminalApiQuery } from "./terminal-api";
 import { TerminalApi } from "./terminal-api";

 export type CreateTerminalApi = (query: TerminalApiQuery) => TerminalApi;
@@ -14,12 +15,16 @@ const createTerminalApiInjectable = getInjectable({
  id: "create-terminal-api",
  instantiate: (di): CreateTerminalApi => {
    const hostedClusterId = di.inject(hostedClusterIdInjectable);
+    const deps: Omit<TerminalApiDependencies, "hostedClusterId"> = {
+      logger: di.inject(loggerInjectable),
+    };

    return (query) => {
      assert(hostedClusterId, "Can only create terminal APIs within a cluster frame");

      return new TerminalApi({
        hostedClusterId,
+        ...deps,
      }, query);
    };
  },
@@ -9,7 +9,7 @@ import isEqual from "lodash/isEqual";
 import url from "url";
 import { makeObservable, observable } from "mobx";
 import { ipcRenderer } from "electron";
-import logger from "../../common/logger";
+import type { Logger } from "../../common/logger";
 import { once } from "lodash";
 import { type TerminalMessage, TerminalChannels } from "../../common/terminal/channels";

@@ -38,6 +38,7 @@ export interface TerminalEvents extends WebSocketEvents {

 export interface TerminalApiDependencies {
  readonly hostedClusterId: string;
+  readonly logger: Logger;
 }

 export class TerminalApi extends WebSocketApi<TerminalEvents> {
@@ -145,11 +146,11 @@ export class TerminalApi extends WebSocketApi<TerminalEvents> {
          this.emit("connected");
          break;
        default:
-          logger.warn(`[TERMINAL-API]: unknown or unhandleable message type`, message);
+          this.dependencies.logger.warn(`[TERMINAL-API]: unknown or unhandleable message type`, message);
          break;
      }
    } catch (error) {
-      logger.error(`[TERMINAL-API]: failed to handle message`, error);
+      this.dependencies.logger.error(`[TERMINAL-API]: failed to handle message`, error);
    }
  }

@@ -12,6 +12,7 @@ import { KubeObject } from "../../../common/k8s-api/kube-object";
 import { beforeClusterFrameStartsSecondInjectionToken } from "../tokens";
 import type { KubeObjectStoreDependencies } from "../../../common/k8s-api/kube-object.store";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 const setupAutoRegistrationInjectable = getInjectable({
  id: "setup-auto-registration",
@@ -23,6 +24,7 @@ const setupAutoRegistrationInjectable = getInjectable({
      const beforeApiManagerInitializationApis: KubeApi[] = [];
      const deps: KubeObjectStoreDependencies = {
        context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+        logger: di.inject(loggerInjectable),
      };
      let initialized = false;

@@ -13,7 +13,7 @@ import type { DiContainer } from "@ogre-tools/injectable";
 import extensionLoaderInjectable from "../extensions/extension-loader/extension-loader.injectable";
 import extensionDiscoveryInjectable from "../extensions/extension-discovery/extension-discovery.injectable";
 import extensionInstallationStateStoreInjectable from "../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
-import initRootFrameInjectable from "./frames/root-frame/init-root-frame/init-root-frame.injectable";
+import initRootFrameInjectable from "./frames/root-frame/init-root-frame.injectable";
 import initClusterFrameInjectable from "./frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable";
 import { Router } from "react-router";
 import historyInjectable from "./navigation/history.injectable";
@@ -14,6 +14,7 @@ import assert from "assert";
 import nodeStoreInjectable from "../../+nodes/store.injectable";
 import requestClusterMetricsByNodeNamesInjectable from "../../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";

 const clusterOverviewStoreInjectable = getInjectable({
  id: "cluster-overview-store",
@@ -34,6 +35,7 @@ const clusterOverviewStoreInjectable = getInjectable({
      nodeStore: di.inject(nodeStoreInjectable),
      requestClusterMetricsByNodeNames: di.inject(requestClusterMetricsByNodeNamesInjectable),
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, clusterApi);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -16,17 +16,19 @@ import type { HorizontalPodAutoscalerMetricSpec, HorizontalPodAutoscalerMetricTa
 import { HorizontalPodAutoscaler, HpaMetricType } from "../../../common/k8s-api/endpoints/horizontal-pod-autoscaler.api";
 import { Table, TableCell, TableHead, TableRow } from "../table";
 import type { ApiManager } from "../../../common/k8s-api/api-manager";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
 import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface HpaDetailsProps extends KubeObjectDetailsProps<HorizontalPodAutoscaler> {
 }

 interface Dependencies {
  apiManager: ApiManager;
+  logger: Logger;
  getDetailsUrl: GetDetailsUrl;
 }

@@ -104,7 +106,7 @@ class NonInjectedHpaDetails extends React.Component<HpaDetailsProps & Dependenci
  }

  render() {
-    const { object: hpa, apiManager, getDetailsUrl } = this.props;
+    const { object: hpa, apiManager, getDetailsUrl, logger } = this.props;

    if (!hpa) {
      return null;
@@ -172,5 +174,6 @@ export const HpaDetails = withInjectables<Dependencies, HpaDetailsProps>(NonInje
    ...props,
    apiManager: di.inject(apiManagerInjectable),
    getDetailsUrl: di.inject(getDetailsUrlInjectable),
+    logger: di.inject(loggerInjectable),
  }),
 });
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import horizontalPodAutoscalerApiInjectable from "../../../common/k8s-api/endpoints/horizontal-pod-autoscaler.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { HorizontalPodAutoscalerStore } from "./store";
@@ -19,6 +20,7 @@ const horizontalPodAutoscalerStoreInjectable = getInjectable({

    return new HorizontalPodAutoscalerStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import leaseApiInjectable from "../../../common/k8s-api/endpoints/lease.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { LeaseStore } from "./store";
@@ -19,6 +20,7 @@ const leaseStoreInjectable = getInjectable({

    return new LeaseStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -12,7 +12,9 @@ import type { LimitRangeItem } from "../../../common/k8s-api/endpoints/limit-ran
 import { LimitPart, LimitRange, Resource } from "../../../common/k8s-api/endpoints/limit-range.api";
 import { DrawerItem } from "../drawer/drawer-item";
 import { Badge } from "../badge";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface LimitRangeDetailsProps extends KubeObjectDetailsProps<LimitRange> {
 }
@@ -51,10 +53,14 @@ function renderLimitDetails(limits: LimitRangeItem[], resources: Resource[]) {
  ));
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class LimitRangeDetails extends React.Component<LimitRangeDetailsProps> {
+class NonInjectedLimitRangeDetails extends React.Component<LimitRangeDetailsProps & Dependencies> {
  render() {
-    const { object: limitRange } = this.props;
+    const { object: limitRange, logger } = this.props;

    if (!limitRange) {
      return null;
@@ -97,3 +103,10 @@ export class LimitRangeDetails extends React.Component<LimitRangeDetailsProps> {
    );
  }
 }
+
+export const LimitRangeDetails = withInjectables<Dependencies, LimitRangeDetailsProps>(NonInjectedLimitRangeDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import limitRangeApiInjectable from "../../../common/k8s-api/endpoints/limit-range.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { LimitRangeStore } from "./store";
@@ -19,6 +20,7 @@ const limitRangeStoreInjectable = getInjectable({

    return new LimitRangeStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import configMapApiInjectable from "../../../common/k8s-api/endpoints/config-map.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { ConfigMapStore } from "./store";
@@ -19,6 +20,7 @@ const configMapStoreInjectable = getInjectable({

    return new ConfigMapStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -11,13 +11,19 @@ import { DrawerItem } from "../drawer";
 import { Badge } from "../badge";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { PodDisruptionBudget } from "../../../common/k8s-api/endpoints";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface PodDisruptionBudgetDetailsProps extends KubeObjectDetailsProps<PodDisruptionBudget> {
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class PodDisruptionBudgetDetails extends React.Component<PodDisruptionBudgetDetailsProps> {
+class NonInjectedPodDisruptionBudgetDetails extends React.Component<PodDisruptionBudgetDetailsProps & Dependencies> {

  render() {
    const { object: pdb } = this.props;
@@ -27,7 +33,7 @@ export class PodDisruptionBudgetDetails extends React.Component<PodDisruptionBud
    }

    if (!(pdb instanceof PodDisruptionBudget)) {
-      logger.error("[PodDisruptionBudgetDetails]: passed object that is not an instanceof PodDisruptionBudget", pdb);
+      this.props.logger.error("[PodDisruptionBudgetDetails]: passed object that is not an instanceof PodDisruptionBudget", pdb);

      return null;
    }
@@ -64,3 +70,10 @@ export class PodDisruptionBudgetDetails extends React.Component<PodDisruptionBud
    );
  }
 }
+
+export const PodDisruptionBudgetDetails = withInjectables<Dependencies, PodDisruptionBudgetDetailsProps>(NonInjectedPodDisruptionBudgetDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import podDisruptionBudgetApiInjectable from "../../../common/k8s-api/endpoints/pod-disruption-budget.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { PodDisruptionBudgetStore } from "./store";
@@ -19,6 +20,7 @@ const podDisruptionBudgetStoreInjectable = getInjectable({

    return new PodDisruptionBudgetStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import priorityClassApiInjectable from "../../../common/k8s-api/endpoints/priority-class.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { PriorityClassStore } from "./store";
@@ -19,6 +20,7 @@ const priorityClassStoreInjectable = getInjectable({

    return new PriorityClassStore({
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -13,7 +13,9 @@ import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { ResourceQuota } from "../../../common/k8s-api/endpoints/resource-quota.api";
 import { LineProgress } from "../line-progress";
 import { Table, TableCell, TableHead, TableRow } from "../table";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface ResourceQuotaDetailsProps extends KubeObjectDetailsProps<ResourceQuota> {
 }
@@ -75,8 +77,12 @@ function renderQuotas(quota: ResourceQuota): JSX.Element[] {
    });
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class ResourceQuotaDetails extends React.Component<ResourceQuotaDetailsProps> {
+class NonInjectedResourceQuotaDetails extends React.Component<ResourceQuotaDetailsProps & Dependencies> {
  render() {
    const { object: quota } = this.props;

@@ -85,7 +91,7 @@ export class ResourceQuotaDetails extends React.Component<ResourceQuotaDetailsPr
    }

    if (!(quota instanceof ResourceQuota)) {
-      logger.error("[ResourceQuotaDetails]: passed object that is not an instanceof ResourceQuota", quota);
+      this.props.logger.error("[ResourceQuotaDetails]: passed object that is not an instanceof ResourceQuota", quota);

      return null;
    }
@@ -125,3 +131,10 @@ export class ResourceQuotaDetails extends React.Component<ResourceQuotaDetailsPr
    );
  }
 }
+
+export const ResourceQuotaDetails = withInjectables<Dependencies, ResourceQuotaDetailsProps>(NonInjectedResourceQuotaDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import resourceQuotaApiInjectable from "../../../common/k8s-api/endpoints/resource-quota.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { ResourceQuotaStore } from "./store";
@@ -19,6 +20,7 @@ const resourceQuotaStoreInjectable = getInjectable({

    return new ResourceQuotaStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import runtimeClassApiInjectable from "../../../common/k8s-api/endpoints/runtime-class.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { RuntimeClassStore } from "./store";
@@ -19,6 +20,7 @@ const runtimeClassStoreInjectable = getInjectable({

    return new RuntimeClassStore({
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import secretApiInjectable from "../../../common/k8s-api/endpoints/secret.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { SecretStore } from "./store";
@@ -19,6 +20,7 @@ const secretStoreInjectable = getInjectable({

    return new SecretStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -15,13 +15,19 @@ import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { Table, TableCell, TableHead, TableRow } from "../table";
 import { Input } from "../input";
 import { MonacoEditor } from "../monaco-editor";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface CRDDetailsProps extends KubeObjectDetailsProps<CustomResourceDefinition> {
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class CRDDetails extends React.Component<CRDDetailsProps> {
+class NonInjectedCRDDetails extends React.Component<CRDDetailsProps & Dependencies> {
  render() {
    const { object: crd } = this.props;

@@ -30,7 +36,7 @@ export class CRDDetails extends React.Component<CRDDetailsProps> {
    }

    if (!(crd instanceof CustomResourceDefinition)) {
-      logger.error("[CRDDetails]: passed object that is not an instanceof CustomResourceDefinition", crd);
+      this.props.logger.error("[CRDDetails]: passed object that is not an instanceof CustomResourceDefinition", crd);

      return null;
    }
@@ -152,3 +158,10 @@ export class CRDDetails extends React.Component<CRDDetailsProps> {
    );
  }
 }
+
+export const CRDDetails = withInjectables<Dependencies, CRDDetailsProps>(NonInjectedCRDDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -17,7 +17,9 @@ import { CustomResourceDefinition } from "../../../common/k8s-api/endpoints/cust
 import { safeJSONPathValue } from "../../utils/jsonPath";
 import type { KubeObjectMetadata, KubeObjectStatus } from "../../../common/k8s-api/kube-object";
 import { KubeObject } from "../../../common/k8s-api/kube-object";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface CustomResourceDetailsProps extends KubeObjectDetailsProps<KubeObject> {
  crd?: CustomResourceDefinition;
@@ -59,8 +61,12 @@ function convertSpecValue(value: unknown): React.ReactNode {
  return null;
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class CustomResourceDetails extends React.Component<CustomResourceDetailsProps> {
+class NonInjectedCustomResourceDetails extends React.Component<CustomResourceDetailsProps & Dependencies> {
  renderAdditionalColumns(resource: KubeObject, columns: AdditionalPrinterColumnsV1[]) {
    return columns.map(({ name, jsonPath }) => (
      <DrawerItem key={name} name={name}>
@@ -106,7 +112,7 @@ export class CustomResourceDetails extends React.Component<CustomResourceDetails
  }

  render() {
-    const { props: { object, crd }} = this;
+    const { props: { object, crd, logger }} = this;

    if (!object || !crd) {
      return null;
@@ -134,3 +140,10 @@ export class CustomResourceDetails extends React.Component<CustomResourceDetails
    );
  }
 }
+
+export const CustomResourceDetails = withInjectables<Dependencies, CustomResourceDetailsProps>(NonInjectedCustomResourceDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -7,6 +7,7 @@ import assert from "assert";
 import autoRegistrationEmitterInjectable from "../../../common/k8s-api/api-manager/auto-registration-emitter.injectable";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import customResourceDefinitionApiInjectable from "../../../common/k8s-api/endpoints/custom-resource-definition.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { CustomResourceDefinitionStore } from "./definition.store";
@@ -21,6 +22,7 @@ const customResourceDefinitionStoreInjectable = getInjectable({
    return new CustomResourceDefinitionStore({
      autoRegistration: di.inject(autoRegistrationEmitterInjectable),
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -14,13 +14,14 @@ import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { KubeEvent } from "../../../common/k8s-api/endpoints/events.api";
 import { Table, TableCell, TableHead, TableRow } from "../table";
 import type { ApiManager } from "../../../common/k8s-api/api-manager";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import { DurationAbsoluteTimestamp } from "./duration-absolute";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable";
 import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
 import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
 import { cssNames } from "../../utils";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface EventDetailsProps extends KubeObjectDetailsProps<KubeEvent> {
 }
@@ -28,6 +29,7 @@ export interface EventDetailsProps extends KubeObjectDetailsProps<KubeEvent> {
 interface Dependencies {
  getDetailsUrl: GetDetailsUrl;
  apiManager: ApiManager;
+  logger: Logger;
 }

 const NonInjectedEventDetails = observer(({
@@ -35,6 +37,7 @@ const NonInjectedEventDetails = observer(({
  getDetailsUrl,
  object: event,
  className,
+  logger,
 }: Dependencies & EventDetailsProps) => {
  if (!event) {
    return null;
@@ -101,5 +104,6 @@ export const EventDetails = withInjectables<Dependencies, EventDetailsProps>(Non
    ...props,
    apiManager: di.inject(apiManagerInjectable),
    getDetailsUrl: di.inject(getDetailsUrlInjectable),
+    logger: di.inject(loggerInjectable),
  }),
 });
@@ -12,12 +12,13 @@ import { DrawerItem, DrawerTitle } from "../drawer";
 import { cssNames } from "../../utils";
 import { LocaleDate } from "../locale-date";
 import type { EventStore } from "./store";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import { withInjectables } from "@ogre-tools/injectable-react";

 import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
 import eventStoreInjectable from "./store.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface KubeEventDetailsProps {
  object: KubeObject;
@@ -26,6 +27,7 @@ export interface KubeEventDetailsProps {
 interface Dependencies {
  subscribeStores: SubscribeStores;
  eventStore: EventStore;
+  logger: Logger;
 }

@observer
@@ -46,7 +48,7 @@ class NonInjectedKubeEventDetails extends React.Component<KubeEventDetailsProps
    }

    if (!(object instanceof KubeObject)) {
-      logger.error("[KubeEventDetails]: passed object that is not an instanceof KubeObject", object);
+      this.props.logger.error("[KubeEventDetails]: passed object that is not an instanceof KubeObject", object);

      return null;
    }
@@ -93,6 +95,7 @@ export const KubeEventDetails = withInjectables<Dependencies, KubeEventDetailsPr
    ...props,
    subscribeStores: di.inject(subscribeStoresInjectable),
    eventStore: di.inject(eventStoreInjectable),
+    logger: di.inject(loggerInjectable),
  }),
 });

@@ -7,6 +7,7 @@ import assert from "assert";
 import getPodByIdInjectable from "../+workloads-pods/get-pod-by-id.injectable";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import kubeEventApiInjectable from "../../../common/k8s-api/endpoints/events.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { EventStore } from "./store";
@@ -21,6 +22,7 @@ const eventStoreInjectable = getInjectable({
    return new EventStore({
      getPodById: di.inject(getPodByIdInjectable),
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -4,7 +4,7 @@
 */
 import { getInjectable } from "@ogre-tools/injectable";
 import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
-import uninstallExtensionInjectable from "../uninstall-extension/uninstall-extension.injectable";
+import uninstallExtensionInjectable from "../uninstall-extension.injectable";
 import type { UnpackExtension } from "./unpack-extension.injectable";
 import unpackExtensionInjectable from "./unpack-extension.injectable";
 import type { GetExtensionDestFolder } from "./get-extension-dest-folder.injectable";
@@ -9,7 +9,7 @@ import type { LensExtensionId } from "../../../extensions/lens-extension";
 import { extensionDisplayName } from "../../../extensions/lens-extension";
 import type { Confirm } from "../confirm-dialog/confirm.injectable";
 import confirmInjectable from "../confirm-dialog/confirm.injectable";
-import uninstallExtensionInjectable from "./uninstall-extension/uninstall-extension.injectable";
+import uninstallExtensionInjectable from "./uninstall-extension.injectable";

 interface Dependencies {
  uninstallExtension: (id: LensExtensionId) => Promise<boolean>;
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable";
+import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
+import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import type { LensExtensionId } from "../../../extensions/lens-extension";
+import { extensionDisplayName } from "../../../extensions/lens-extension";
+import { Notifications } from "../notifications";
+import React from "react";
+import { when } from "mobx";
+import { getMessageFromError } from "./get-message-from-error/get-message-from-error";
+
+const uninstallExtensionInjectable = getInjectable({
+  id: "uninstall-extension",
+
+  instantiate: (di) => {
+    const extensionLoader = di.inject(extensionLoaderInjectable);
+    const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
+    const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return async (extensionId: LensExtensionId): Promise<boolean> => {
+      const ext = extensionLoader.getExtension(extensionId);
+
+      if (!ext) {
+        logger.debug(`[EXTENSIONS]: cannot uninstall ${extensionId}, was not installed`);
+
+        return true;
+      }
+
+      const { manifest } = ext;
+      const displayName = extensionDisplayName(manifest.name, manifest.version);
+
+      try {
+        logger.debug(`[EXTENSIONS]: trying to uninstall ${extensionId}`);
+        extensionInstallationStateStore.setUninstalling(extensionId);
+
+        await extensionDiscovery.uninstallExtension(extensionId);
+
+        // wait for the ExtensionLoader to actually uninstall the extension
+        await when(() => !extensionLoader.userExtensions.has(extensionId));
+
+        Notifications.ok(
+          <p>
+            {"Extension "}
+            <b>{displayName}</b>
+            {" successfully uninstalled!"}
+          </p>,
+        );
+
+        return true;
+      } catch (error) {
+        const message = getMessageFromError(error);
+
+        logger.info(
+          `[EXTENSION-UNINSTALL]: uninstalling ${displayName} has failed: ${error}`,
+          { error },
+        );
+        Notifications.error(
+          <p>
+            {"Uninstalling extension "}
+            <b>{displayName}</b>
+            {" has failed: "}
+            <em>{message}</em>
+          </p>,
+        );
+
+        return false;
+      } finally {
+      // Remove uninstall state on uninstall failure
+        extensionInstallationStateStore.clearUninstalling(extensionId);
+      }
+    };
+  },
+});
+
+export default uninstallExtensionInjectable;
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
-import { uninstallExtension } from "./uninstall-extension";
-import extensionInstallationStateStoreInjectable
-  from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
-import extensionDiscoveryInjectable
-  from "../../../../extensions/extension-discovery/extension-discovery.injectable";
-
-const uninstallExtensionInjectable = getInjectable({
-  id: "uninstall-extension",
-
-  instantiate: (di) =>
-    uninstallExtension({
-      extensionLoader: di.inject(extensionLoaderInjectable),
-      extensionDiscovery: di.inject(extensionDiscoveryInjectable),
-      extensionInstallationStateStore: di.inject(extensionInstallationStateStoreInjectable),
-    }),
-});
-
-export default uninstallExtensionInjectable;
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { ExtensionLoader } from "../../../../extensions/extension-loader";
-import type { LensExtensionId } from "../../../../extensions/lens-extension";
-import { extensionDisplayName } from "../../../../extensions/lens-extension";
-import logger from "../../../../main/logger";
-import type { ExtensionDiscovery } from "../../../../extensions/extension-discovery/extension-discovery";
-import { Notifications } from "../../notifications";
-import React from "react";
-import { when } from "mobx";
-import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
-import type { ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
-
-interface Dependencies {
-  extensionLoader: ExtensionLoader;
-  extensionDiscovery: ExtensionDiscovery;
-  extensionInstallationStateStore: ExtensionInstallationStateStore;
-}
-
-export const uninstallExtension = ({
-  extensionLoader,
-  extensionDiscovery,
-  extensionInstallationStateStore,
-}: Dependencies) => (
-  async (extensionId: LensExtensionId): Promise<boolean> => {
-    const ext = extensionLoader.getExtension(extensionId);
-
-    if (!ext) {
-      logger.debug(`[EXTENSIONS]: cannot uninstall ${extensionId}, was not installed`);
-
-      return true;
-    }
-
-    const { manifest } = ext;
-    const displayName = extensionDisplayName(manifest.name, manifest.version);
-
-    try {
-      logger.debug(`[EXTENSIONS]: trying to uninstall ${extensionId}`);
-      extensionInstallationStateStore.setUninstalling(extensionId);
-
-      await extensionDiscovery.uninstallExtension(extensionId);
-
-      // wait for the ExtensionLoader to actually uninstall the extension
-      await when(() => !extensionLoader.userExtensions.has(extensionId));
-
-      Notifications.ok(
-        <p>
-          {"Extension "}
-          <b>{displayName}</b>
-          {" successfully uninstalled!"}
-        </p>,
-      );
-
-      return true;
-    } catch (error) {
-      const message = getMessageFromError(error);
-
-      logger.info(
-        `[EXTENSION-UNINSTALL]: uninstalling ${displayName} has failed: ${error}`,
-        { error },
-      );
-      Notifications.error(
-        <p>
-          {"Uninstalling extension "}
-          <b>{displayName}</b>
-          {" has failed: "}
-          <em>{message}</em>
-        </p>,
-      );
-
-      return false;
-    } finally {
-      // Remove uninstall state on uninstall failure
-      extensionInstallationStateStore.clearUninstalling(extensionId);
-    }
-  }
-);
@@ -11,6 +11,7 @@ import assert from "assert";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable";
 import clusterConfiguredAccessibleNamespacesInjectable from "../../cluster/accessible-namespaces.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 const namespaceStoreInjectable = getInjectable({
  id: "namespace-store",
@@ -25,6 +26,7 @@ const namespaceStoreInjectable = getInjectable({
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
      storage: createStorage<string[] | undefined>("selected_namespaces", undefined),
      clusterConfiguredAccessibleNamespaces: di.inject(clusterConfiguredAccessibleNamespacesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -11,13 +11,19 @@ import { DrawerTitle } from "../drawer";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { Endpoints } from "../../../common/k8s-api/endpoints";
 import { EndpointSubsetList } from "./endpoint-subset-list";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface EndpointsDetailsProps extends KubeObjectDetailsProps<Endpoints> {
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class EndpointsDetails extends React.Component<EndpointsDetailsProps> {
+class NonInjectedEndpointsDetails extends React.Component<EndpointsDetailsProps & Dependencies> {
  render() {
    const { object: endpoint } = this.props;

@@ -26,7 +32,7 @@ export class EndpointsDetails extends React.Component<EndpointsDetailsProps> {
    }

    if (!(endpoint instanceof Endpoints)) {
-      logger.error("[EndpointDetails]: passed object that is not an instanceof Endpoint", endpoint);
+      this.props.logger.error("[EndpointDetails]: passed object that is not an instanceof Endpoint", endpoint);

      return null;
    }
@@ -47,3 +53,10 @@ export class EndpointsDetails extends React.Component<EndpointsDetailsProps> {
    );
  }
 }
+
+export const EndpointsDetails = withInjectables<Dependencies, EndpointsDetailsProps>(NonInjectedEndpointsDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import endpointsApiInjectable from "../../../common/k8s-api/endpoints/endpoint.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { EndpointsStore } from "./store";
@@ -19,6 +20,7 @@ const endpointsStoreInjectable = getInjectable({

    return new EndpointsStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import ingressApiInjectable from "../../../common/k8s-api/endpoints/ingress.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { IngressStore } from "./ingress-store";
@@ -19,6 +20,7 @@ const ingressStoreInjectable = getInjectable({

    return new IngressStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -13,15 +13,21 @@ import { Badge } from "../badge";
 import { SubTitle } from "../layout/sub-title";
 import { observer } from "mobx-react";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import type { LabelMatchExpression, LabelSelector } from "../../../common/k8s-api/kube-object";
 import { isEmpty } from "lodash";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface NetworkPolicyDetailsProps extends KubeObjectDetailsProps<NetworkPolicy> {
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class NetworkPolicyDetails extends React.Component<NetworkPolicyDetailsProps> {
+class NonInjectedNetworkPolicyDetails extends React.Component<NetworkPolicyDetailsProps & Dependencies> {
  renderIPolicyIpBlock(ipBlock: IPolicyIpBlock | undefined) {
    if (!ipBlock) {
      return null;
@@ -159,7 +165,7 @@ export class NetworkPolicyDetails extends React.Component<NetworkPolicyDetailsPr
    }

    if (!(policy instanceof NetworkPolicy)) {
-      logger.error("[NetworkPolicyDetails]: passed object that is not an instanceof NetworkPolicy", policy);
+      this.props.logger.error("[NetworkPolicyDetails]: passed object that is not an instanceof NetworkPolicy", policy);

      return null;
    }
@@ -204,3 +210,10 @@ export class NetworkPolicyDetails extends React.Component<NetworkPolicyDetailsPr
    );
  }
 }
+
+export const NetworkPolicyDetails = withInjectables<Dependencies, NetworkPolicyDetailsProps>(NonInjectedNetworkPolicyDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import networkPolicyApiInjectable from "../../../common/k8s-api/endpoints/network-policy.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { NetworkPolicyStore } from "./store";
@@ -19,6 +20,7 @@ const networkPolicyStoreInjectable = getInjectable({

    return new NetworkPolicyStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -15,12 +15,13 @@ import { ServicePortComponent } from "./service-port-component";
 import type { EndpointsStore } from "../+network-endpoints/store";
 import { ServiceDetailsEndpoint } from "./service-details-endpoint";
 import type { PortForwardStore } from "../../port-forward";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import portForwardStoreInjectable from "../../port-forward/port-forward-store/port-forward-store.injectable";
 import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
 import endpointsStoreInjectable from "../+network-endpoints/store.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface ServiceDetailsProps extends KubeObjectDetailsProps<Service> {
 }
@@ -29,6 +30,7 @@ interface Dependencies {
  subscribeStores: SubscribeStores;
  portForwardStore: PortForwardStore;
  endpointsStore: EndpointsStore;
+  logger: Logger;
 }

@observer
@@ -59,7 +61,7 @@ class NonInjectedServiceDetails extends React.Component<ServiceDetailsProps & De
    }

    if (!(service instanceof Service)) {
-      logger.error("[ServiceDetails]: passed object that is not an instanceof Service", service);
+      this.props.logger.error("[ServiceDetails]: passed object that is not an instanceof Service", service);

      return null;
    }
@@ -155,5 +157,6 @@ export const ServiceDetails = withInjectables<Dependencies, ServiceDetailsProps>
    subscribeStores: di.inject(subscribeStoresInjectable),
    portForwardStore: di.inject(portForwardStoreInjectable),
    endpointsStore: di.inject(endpointsStoreInjectable),
+    logger: di.inject(loggerInjectable),
  }),
 });
@@ -18,11 +18,12 @@ import { Spinner } from "../spinner";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import portForwardStoreInjectable from "../../port-forward/port-forward-store/port-forward-store.injectable";
 import portForwardDialogModelInjectable from "../../port-forward/port-forward-dialog-model/port-forward-dialog-model.injectable";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import aboutPortForwardingInjectable from "../../port-forward/about-port-forwarding.injectable";
 import notifyErrorPortForwardingInjectable from "../../port-forward/notify-error-port-forwarding.injectable";
 import type { OpenPortForward } from "../../port-forward/open-port-forward.injectable";
 import openPortForwardInjectable from "../../port-forward/open-port-forward.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface ServicePortComponentProps {
  service: Service;
@@ -31,6 +32,7 @@ export interface ServicePortComponentProps {

 interface Dependencies {
  portForwardStore: PortForwardStore;
+  logger: Logger;
  openPortForwardDialog: (item: ForwardedPort, options: { openInBrowser: boolean; onClose: () => void }) => void;
  aboutPortForwarding: () => void;
  notifyErrorPortForwarding: (message: string) => void;
@@ -127,7 +129,7 @@ class NonInjectedServicePortComponent extends React.Component<ServicePortCompone
        this.props.notifyErrorPortForwarding(`Error occurred starting port-forward, the local port may not be available or the ${portForward.kind} ${portForward.name} may not be reachable`);
      }
    } catch (error) {
-      logger.error("[SERVICE-PORT-COMPONENT]:", error, portForward);
+      this.props.logger.error("[SERVICE-PORT-COMPONENT]:", error, portForward);
    } finally {
      this.checkExistingPortForwarding();
      this.waiting = false;
@@ -196,18 +198,15 @@ class NonInjectedServicePortComponent extends React.Component<ServicePortCompone
  }
 }

-export const ServicePortComponent = withInjectables<Dependencies, ServicePortComponentProps>(
-  NonInjectedServicePortComponent,
-
-  {
-    getProps: (di, props) => ({
-      portForwardStore: di.inject(portForwardStoreInjectable),
-      openPortForwardDialog: di.inject(portForwardDialogModelInjectable).open,
-      aboutPortForwarding: di.inject(aboutPortForwardingInjectable),
-      notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
-      openPortForward: di.inject(openPortForwardInjectable),
-      ...props,
-    }),
-  },
-);
+export const ServicePortComponent = withInjectables<Dependencies, ServicePortComponentProps>(NonInjectedServicePortComponent, {
+  getProps: (di, props) => ({
+    ...props,
+    portForwardStore: di.inject(portForwardStoreInjectable),
+    openPortForwardDialog: di.inject(portForwardDialogModelInjectable).open,
+    aboutPortForwarding: di.inject(aboutPortForwardingInjectable),
+    notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
+    openPortForward: di.inject(openPortForwardInjectable),
+    logger: di.inject(loggerInjectable),
+  }),
+});

@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import serviceApiInjectable from "../../../common/k8s-api/endpoints/service.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { ServiceStore } from "./store";
@@ -19,6 +20,7 @@ const serviceStoreInjectable = getInjectable({

    return new ServiceStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { NodeStore } from "./store";
@@ -19,6 +20,7 @@ const nodeStoreInjectable = getInjectable({

    return new NodeStore({
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -12,7 +12,9 @@ import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { PodSecurityPolicy } from "../../../common/k8s-api/endpoints";
 import { Badge } from "../badge";
 import { Table, TableCell, TableHead, TableRow } from "../table";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface PodSecurityPolicyDetailsProps extends KubeObjectDetailsProps<PodSecurityPolicy> {
 }
@@ -25,8 +27,12 @@ interface RuleGroup {
  }[];
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class PodSecurityPolicyDetails extends React.Component<PodSecurityPolicyDetailsProps> {
+class NonInjectedPodSecurityPolicyDetails extends React.Component<PodSecurityPolicyDetailsProps & Dependencies> {
  renderRuleGroup(title: React.ReactNode, group: RuleGroup | undefined) {
    if (!group) return null;
    const { rule, ranges } = group;
@@ -59,7 +65,7 @@ export class PodSecurityPolicyDetails extends React.Component<PodSecurityPolicyD
    }

    if (!(psp instanceof PodSecurityPolicy)) {
-      logger.error("[PodSecurityPolicyDetails]: passed object that is not an instanceof PodSecurityPolicy", psp);
+      this.props.logger.error("[PodSecurityPolicyDetails]: passed object that is not an instanceof PodSecurityPolicy", psp);

      return null;
    }
@@ -225,3 +231,10 @@ export class PodSecurityPolicyDetails extends React.Component<PodSecurityPolicyD
    );
  }
 }
+
+export const PodSecurityPolicyDetails = withInjectables<Dependencies, PodSecurityPolicyDetailsProps>(NonInjectedPodSecurityPolicyDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import podSecurityPolicyApiInjectable from "../../../common/k8s-api/endpoints/pod-security-policy.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { PodSecurityPolicyStore } from "./store";
@@ -19,6 +20,7 @@ const podSecurityPolicyStoreInjectable = getInjectable({

    return new PodSecurityPolicyStore({
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -15,12 +15,13 @@ import { StorageClass } from "../../../common/k8s-api/endpoints";
 import type { StorageClassStore } from "./store";
 import { VolumeDetailsList } from "../+storage-volumes/volume-details-list";
 import type { PersistentVolumeStore } from "../+storage-volumes/store";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
 import storageClassStoreInjectable from "./store.injectable";
 import persistentVolumeStoreInjectable from "../+storage-volumes/store.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface StorageClassDetailsProps extends KubeObjectDetailsProps<StorageClass> {
 }
@@ -29,6 +30,7 @@ interface Dependencies {
  subscribeStores: SubscribeStores;
  storageClassStore: StorageClassStore;
  persistentVolumeStore: PersistentVolumeStore;
+  logger: Logger;
 }

@observer
@@ -49,7 +51,7 @@ class NonInjectedStorageClassDetails extends React.Component<StorageClassDetails
    }

    if (!(storageClass instanceof StorageClass)) {
-      logger.error("[StorageClassDetails]: passed object that is not an instanceof StorageClass", storageClass);
+      this.props.logger.error("[StorageClassDetails]: passed object that is not an instanceof StorageClass", storageClass);

      return null;
    }
@@ -100,6 +102,7 @@ export const StorageClassDetails = withInjectables<Dependencies, StorageClassDet
    subscribeStores: di.inject(subscribeStoresInjectable),
    storageClassStore: di.inject(storageClassStoreInjectable),
    persistentVolumeStore: di.inject(persistentVolumeStoreInjectable),
+    logger: di.inject(loggerInjectable),
  }),
 });

@@ -7,6 +7,7 @@ import assert from "assert";
 import getPersistentVolumesByStorageClassInjectable from "../+storage-volumes/get-persisten-volumes-by-storage-class.injectable";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import storageClassApiInjectable from "../../../common/k8s-api/endpoints/storage-class.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { StorageClassStore } from "./store";
@@ -21,6 +22,7 @@ const storageClassStoreInjectable = getInjectable({
    return new StorageClassStore({
      getPersistentVolumesByStorageClass: di.inject(getPersistentVolumesByStorageClassInjectable),
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import persistentVolumeClaimApiInjectable from "../../../common/k8s-api/endpoints/persistent-volume-claim.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { PersistentVolumeClaimStore } from "./store";
@@ -19,6 +20,7 @@ const persistentVolumeClaimStoreInjectable = getInjectable({

    return new PersistentVolumeClaimStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import persistentVolumeApiInjectable from "../../../common/k8s-api/endpoints/persistent-volume.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { PersistentVolumeStore } from "./store";
@@ -19,6 +20,7 @@ const persistentVolumeStoreInjectable = getInjectable({

    return new PersistentVolumeStore({
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -14,14 +14,20 @@ import { Badge } from "../badge";
 import { PersistentVolume, persistentVolumeClaimApi, storageClassApi } from "../../../common/k8s-api/endpoints";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { getDetailsUrl } from "../kube-detail-params";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import { stopPropagation } from "../../../renderer/utils";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface PersistentVolumeDetailsProps extends KubeObjectDetailsProps<PersistentVolume> {
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class PersistentVolumeDetails extends React.Component<PersistentVolumeDetailsProps> {
+class NonInjectedPersistentVolumeDetails extends React.Component<PersistentVolumeDetailsProps & Dependencies> {
  render() {
    const { object: volume } = this.props;

@@ -30,7 +36,7 @@ export class PersistentVolumeDetails extends React.Component<PersistentVolumeDet
    }

    if (!(volume instanceof PersistentVolume)) {
-      logger.error("[PersistentVolumeDetails]: passed object that is not an instanceof PersistentVolume", volume);
+      this.props.logger.error("[PersistentVolumeDetails]: passed object that is not an instanceof PersistentVolume", volume);

      return null;
    }
@@ -121,3 +127,10 @@ export class PersistentVolumeDetails extends React.Component<PersistentVolumeDet
    );
  }
 }
+
+export const PersistentVolumeDetails = withInjectables<Dependencies, PersistentVolumeDetailsProps>(NonInjectedPersistentVolumeDetails, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -9,6 +9,7 @@ import clusterRoleBindingApiInjectable from "../../../../common/k8s-api/endpoint
 import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/manager.injectable";
 import { ClusterRoleBindingStore } from "./store";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../../cluster-frame-context/for-cluster-scoped-resources.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";

 const clusterRoleBindingStoreInjectable = getInjectable({
  id: "cluster-role-binding-store",
@@ -19,6 +20,7 @@ const clusterRoleBindingStoreInjectable = getInjectable({

    return new ClusterRoleBindingStore({
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -9,6 +9,7 @@ import clusterRoleApiInjectable from "../../../../common/k8s-api/endpoints/clust
 import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/manager.injectable";
 import { ClusterRoleStore } from "./store";
 import clusterFrameContextForClusterScopedResourcesInjectable from "../../../cluster-frame-context/for-cluster-scoped-resources.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";

 const clusterRoleStoreInjectable = getInjectable({
  id: "cluster-role-store",
@@ -19,6 +20,7 @@ const clusterRoleStoreInjectable = getInjectable({

    return new ClusterRoleStore({
      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/manager.injectable";
 import roleBindingApiInjectable from "../../../../common/k8s-api/endpoints/role-binding.api.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable";
 import { RoleBindingStore } from "./store";
@@ -19,6 +20,7 @@ const roleBindingStoreInjectable = getInjectable({

    return new RoleBindingStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -9,6 +9,7 @@ import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-cre
 import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/manager.injectable";
 import { RoleStore } from "./store";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";

 const roleStoreInjectable = getInjectable({
  id: "role-store",
@@ -19,6 +20,7 @@ const roleStoreInjectable = getInjectable({

    return new RoleStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -9,6 +9,7 @@ import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-cre
 import { kubeObjectStoreInjectionToken } from "../../../../common/k8s-api/api-manager/manager.injectable";
 import { ServiceAccountStore } from "./store";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../../cluster-frame-context/for-namespaced-resources.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";

 const serviceAccountStoreInjectable = getInjectable({
  id: "service-account-store",
@@ -19,6 +20,7 @@ const serviceAccountStoreInjectable = getInjectable({

    return new ServiceAccountStore({
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -17,12 +17,13 @@ import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { getDetailsUrl } from "../kube-detail-params";
 import type { Job } from "../../../common/k8s-api/endpoints";
 import { CronJob } from "../../../common/k8s-api/endpoints";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
 import cronJobStoreInjectable from "./store.injectable";
 import jobStoreInjectable from "../+workloads-jobs/store.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface CronJobDetailsProps extends KubeObjectDetailsProps<CronJob> {
 }
@@ -31,6 +32,7 @@ interface Dependencies {
  subscribeStores: SubscribeStores;
  jobStore: JobStore;
  cronJobStore: CronJobStore;
+  logger: Logger;
 }

@observer
@@ -51,7 +53,7 @@ class NonInjectedCronJobDetails extends React.Component<CronJobDetailsProps & De
    }

    if (!(cronJob instanceof CronJob)) {
-      logger.error("[CronJobDetails]: passed object that is not an instanceof CronJob", cronJob);
+      this.props.logger.error("[CronJobDetails]: passed object that is not an instanceof CronJob", cronJob);

      return null;
    }
@@ -123,5 +125,6 @@ export const CronJobDetails = withInjectables<Dependencies, CronJobDetailsProps>
    subscribeStores: di.inject(subscribeStoresInjectable),
    cronJobStore: di.inject(cronJobStoreInjectable),
    jobStore: di.inject(jobStoreInjectable),
+    logger: di.inject(loggerInjectable),
  }),
 });
@@ -7,6 +7,7 @@ import assert from "assert";
 import getJobsByOwnerInjectable from "../+workloads-jobs/get-jobs-by-owner.injectable";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import cronJobApiInjectable from "../../../common/k8s-api/endpoints/cron-job.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { CronJobStore } from "./store";
@@ -21,6 +22,7 @@ const cronJobStoreInjectable = getInjectable({
    return new CronJobStore({
      getJobsByOwner: di.inject(getJobsByOwnerInjectable),
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -10,6 +10,7 @@ import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-create
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import { DaemonSetStore } from "./store";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 const daemonSetStoreInjectable = getInjectable({
  id: "daemon-set-store",
@@ -21,6 +22,7 @@ const daemonSetStoreInjectable = getInjectable({
    return new DaemonSetStore({
      getPodsByOwnerId: di.inject(getPodsByOwnerIdInjectable),
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -10,6 +10,7 @@ import { storesAndApisCanBeCreatedInjectionToken } from "../../../common/k8s-api
 import deploymentApiInjectable from "../../../common/k8s-api/endpoints/deployment.api.injectable";
 import { DeploymentStore } from "./store";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 const deploymentStoreInjectable = getInjectable({
  id: "deployment-store",
@@ -21,6 +22,7 @@ const deploymentStoreInjectable = getInjectable({
    return new DeploymentStore({
      podStore: di.inject(podStoreInjectable),
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -7,6 +7,7 @@ import assert from "assert";
 import getPodsByOwnerIdInjectable from "../+workloads-pods/get-pods-by-owner-id.injectable";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import jobApiInjectable from "../../../common/k8s-api/endpoints/job.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { JobStore } from "./store";
@@ -21,6 +22,7 @@ const jobStoreInjectable = getInjectable({
    return new JobStore({
      getPodsByOwnerId: di.inject(getPodsByOwnerIdInjectable),
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -18,11 +18,12 @@ import { Spinner } from "../spinner";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import portForwardStoreInjectable from "../../port-forward/port-forward-store/port-forward-store.injectable";
 import portForwardDialogModelInjectable from "../../port-forward/port-forward-dialog-model/port-forward-dialog-model.injectable";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import aboutPortForwardingInjectable from "../../port-forward/about-port-forwarding.injectable";
 import notifyErrorPortForwardingInjectable from "../../port-forward/notify-error-port-forwarding.injectable";
 import type { OpenPortForward } from "../../port-forward/open-port-forward.injectable";
 import openPortForwardInjectable from "../../port-forward/open-port-forward.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface PodContainerPortProps {
  pod: Pod;
@@ -31,6 +32,7 @@ export interface PodContainerPortProps {

 interface Dependencies {
  portForwardStore: PortForwardStore;
+  logger: Logger;
  openPortForwardDialog: (item: ForwardedPort, options: { openInBrowser: boolean; onClose: () => void }) => void;
  aboutPortForwarding: () => void;
  notifyErrorPortForwarding: (message: string) => void;
@@ -123,7 +125,7 @@ class NonInjectedPodContainerPort extends React.Component<PodContainerPortProps
        this.props.notifyErrorPortForwarding(`Error occurred starting port-forward, the local port may not be available or the ${portForward.kind} ${portForward.name} may not be reachable`);
      }
    } catch (error) {
-      logger.error("[POD-CONTAINER-PORT]:", error, portForward);
+      this.props.logger.error("[POD-CONTAINER-PORT]:", error, portForward);
    } finally {
      this.checkExistingPortForwarding();
      this.waiting = false;
@@ -194,17 +196,14 @@ class NonInjectedPodContainerPort extends React.Component<PodContainerPortProps
  }
 }

-export const PodContainerPort = withInjectables<Dependencies, PodContainerPortProps>(
-  NonInjectedPodContainerPort,
-
-  {
-    getProps: (di, props) => ({
-      portForwardStore: di.inject(portForwardStoreInjectable),
-      openPortForwardDialog: di.inject(portForwardDialogModelInjectable).open,
-      aboutPortForwarding: di.inject(aboutPortForwardingInjectable),
-      notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
-      openPortForward: di.inject(openPortForwardInjectable),
-      ...props,
-    }),
-  },
-);
+export const PodContainerPort = withInjectables<Dependencies, PodContainerPortProps>(NonInjectedPodContainerPort, {
+  getProps: (di, props) => ({
+    ...props,
+    portForwardStore: di.inject(portForwardStoreInjectable),
+    openPortForwardDialog: di.inject(portForwardDialogModelInjectable).open,
+    aboutPortForwarding: di.inject(aboutPortForwardingInjectable),
+    notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
+    openPortForward: di.inject(openPortForwardInjectable),
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -10,6 +10,7 @@ import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manag
 import { PodStore } from "./store";
 import podMetricsApiInjectable from "../../../common/k8s-api/endpoints/pod-metrics.api.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 const podStoreInjectable = getInjectable({
  id: "pod-store",
@@ -21,6 +22,7 @@ const podStoreInjectable = getInjectable({
    return new PodStore({
      podMetricsApi: di.inject(podMetricsApiInjectable),
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -10,6 +10,7 @@ import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-create
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import { ReplicaSetStore } from "./store";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 const replicaSetStoreInjectable = getInjectable({
  id: "replica-set-store",
@@ -21,6 +22,7 @@ const replicaSetStoreInjectable = getInjectable({
    return new ReplicaSetStore({
      getPodsByOwnerId: di.inject(getPodsByOwnerIdInjectable),
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -7,6 +7,7 @@ import assert from "assert";
 import getPodsByOwnerIdInjectable from "../+workloads-pods/get-pods-by-owner-id.injectable";
 import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
 import statefulSetApiInjectable from "../../../common/k8s-api/endpoints/stateful-set.api.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
 import { StatefulSetStore } from "./store";
@@ -21,6 +22,7 @@ const statefulSetStoreInjectable = getInjectable({
    return new StatefulSetStore({
      getPodsByOwnerId: di.inject(getPodsByOwnerIdInjectable),
      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
    }, api);
  },
  injectionToken: kubeObjectStoreInjectionToken,
@@ -13,6 +13,7 @@ import terminalCopyOnSelectInjectable from "../../../../common/user-store/termin
 import isMacInjectable from "../../../../common/vars/is-mac.injectable";
 import openLinkInBrowserInjectable from "../../../../common/utils/open-link-in-browser.injectable";
 import xtermColorThemeInjectable from "../../../themes/terminal-colors.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";

 export type CreateTerminal = (tabId: TabId, api: TerminalApi) => Terminal;

@@ -26,6 +27,7 @@ const createTerminalInjectable = getInjectable({
      isMac: di.inject(isMacInjectable),
      openLinkInBrowser: di.inject(openLinkInBrowserInjectable),
      xtermColorTheme: di.inject(xtermColorThemeInjectable),
+      logger: di.inject(loggerInjectable),
    };

    return (tabId, api) => new Terminal(dependencies, { tabId, api });
@@ -13,7 +13,7 @@ import type { TerminalApi } from "../../../api/terminal-api";
 import { disposer } from "../../../utils";
 import { once } from "lodash";
 import { clipboard } from "electron";
-import logger from "../../../../common/logger";
+import type { Logger } from "../../../../common/logger";
 import type { TerminalConfig } from "../../../../common/user-store/preferences-helpers";
 import assert from "assert";
 import { TerminalChannels } from "../../../../common/terminal/channels";
@@ -26,6 +26,7 @@ export interface TerminalDependencies {
  readonly terminalCopyOnSelect: IComputedValue<boolean>;
  readonly isMac: boolean;
  readonly xtermColorTheme: IComputedValue<Record<string, string>>;
+  readonly logger: Logger;
  openLinkInBrowser: OpenLinkInBrowser;
 }

@@ -199,14 +200,14 @@ export class Terminal {
  };

  setFontSize = (fontSize: number) => {
-    logger.info(`[TERMINAL]: set fontSize to ${fontSize}`);
+    this.dependencies.logger.info(`[TERMINAL]: set fontSize to ${fontSize}`);

    this.xterm.options.fontSize = fontSize;
    this.fit();
  };

  setFontFamily = (fontFamily: string) => {
-    logger.info(`[TERMINAL]: set fontFamily to ${fontFamily}`);
+    this.dependencies.logger.info(`[TERMINAL]: set fontFamily to ${fontFamily}`);

    this.xterm.options.fontFamily = fontFamily;
    this.fit();
@@ -9,7 +9,9 @@ import type { IClassName } from "../../utils";
 import { autoBind, cssNames } from "../../utils";
 import { observable, makeObservable } from "mobx";
 import { observer } from "mobx-react";
-import logger from "../../../main/logger";
+import type { Logger } from "../../../common/logger";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface DropFileInputProps<T extends HTMLElement> extends React.DOMAttributes<T> {
  className?: IClassName;
@@ -21,12 +23,16 @@ export interface DropFileMeta<T extends HTMLElement> {
  evt: React.DragEvent<T>;
 }

+interface Dependencies {
+  logger: Logger;
+}
+
@observer
-export class DropFileInput<T extends HTMLElement> extends React.Component<DropFileInputProps<T>> {
+class NonInjectedDropFileInput<T extends HTMLElement> extends React.Component<DropFileInputProps<T> & Dependencies> {
  @observable dropAreaActive = false;
  dragCounter = 0; // Counter preventing firing onDragLeave() too early (https://stackoverflow.com/questions/7110353/html5-dragleave-fired-when-hovering-a-child-element)

-  constructor(props: DropFileInputProps<T>) {
+  constructor(props: DropFileInputProps<T> & Dependencies) {
    super(props);
    makeObservable(this);
    autoBind(this);
@@ -92,9 +98,18 @@ export class DropFileInput<T extends HTMLElement> extends React.Component<DropFi

      return null;
    } catch (err) {
-      logger.error(`Error: <DropFileInput/> must contain only single child element`);
+      this.props.logger.error(`Error: <DropFileInput/> must contain only single child element`);

      return this.props.children;
    }
  }
 }
+
+const InjectedDropFileInput = withInjectables<Dependencies, DropFileInputProps<HTMLElement>>(NonInjectedDropFileInput, {
+  getProps: (di, props) => ({
+    ...props,
+    logger: di.inject(loggerInjectable),
+  }),
+});
+
+export const DropFileInput = <T extends HTMLElement>(props: DropFileInputProps<T>) => <InjectedDropFileInput {...props} />;
@@ -11,13 +11,14 @@ import type { ApiManager } from "../../../common/k8s-api/api-manager";
 import { Link } from "react-router-dom";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { LocaleDate } from "../locale-date";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import { KubeObjectAge } from "../kube-object/age";
 import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable";
 import { observer } from "mobx-react";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
 import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 export interface KubeObjectMetaProps {
  object: KubeObject;
@@ -27,6 +28,7 @@ export interface KubeObjectMetaProps {
 interface Dependencies {
  getDetailsUrl: GetDetailsUrl;
  apiManager: ApiManager;
+  logger: Logger;
 }

 const NonInjectedKubeObjectMeta = observer(({
@@ -38,6 +40,7 @@ const NonInjectedKubeObjectMeta = observer(({
    "resourceVersion",
    "selfLink",
  ],
+  logger,
 }: Dependencies & KubeObjectMetaProps) => {
  if (!object) {
    return null;
@@ -118,5 +121,6 @@ export const KubeObjectMeta = withInjectables<Dependencies, KubeObjectMetaProps>
    ...props,
    getDetailsUrl: di.inject(getDetailsUrlInjectable),
    apiManager: di.inject(apiManagerInjectable),
+    logger: di.inject(loggerInjectable),
  }),
 });
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import ipcRendererInjectable from "../../utils/channel/ipc-renderer.injectable";
+import bindProtocolAddRouteHandlersInjectable from "../../protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable";
+import lensProtocolRouterRendererInjectable from "../../protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable";
+import catalogEntityRegistryInjectable from "../../api/catalog/entity/registry.injectable";
+import registerIpcListenersInjectable from "../../ipc/register-ipc-listeners.injectable";
+import loadExtensionsInjectable from "../load-extensions.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import { delay } from "../../../common/utils";
+import { broadcastMessage } from "../../../common/ipc";
+import { bundledExtensionsLoaded } from "../../../common/ipc/extension-handling";
+
+const initRootFrameInjectable = getInjectable({
+  id: "init-root-frame",
+  instantiate: (di) => {
+    const loadExtensions = di.inject(loadExtensionsInjectable);
+    const registerIpcListeners = di.inject(registerIpcListenersInjectable);
+    const ipcRenderer = di.inject(ipcRendererInjectable);
+    const bindProtocolAddRouteHandlers = di.inject(bindProtocolAddRouteHandlersInjectable);
+    const lensProtocolRouterRenderer = di.inject(lensProtocolRouterRendererInjectable);
+    const catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return async (unmountRoot: () => void) => {
+      catalogEntityRegistry.init();
+
+      try {
+        // maximum time to let bundled extensions finish loading
+        const timeout = delay(10000);
+
+        const loadingExtensions = await loadExtensions();
+
+        const loadingBundledExtensions = loadingExtensions
+          .filter((e) => e.isBundled)
+          .map((e) => e.loaded);
+
+        const bundledExtensionsFinished = Promise.all(loadingBundledExtensions);
+
+        await Promise.race([bundledExtensionsFinished, timeout]);
+      } finally {
+        ipcRenderer.send(bundledExtensionsLoaded);
+      }
+
+      lensProtocolRouterRenderer.init();
+
+      bindProtocolAddRouteHandlers();
+
+      window.addEventListener("offline", () =>
+        broadcastMessage("network:offline"),
+      );
+
+      window.addEventListener("online", () => broadcastMessage("network:online"));
+
+      registerIpcListeners();
+
+      window.addEventListener("beforeunload", () => {
+        logger.info("[ROOT-FRAME]: Unload app");
+
+        unmountRoot();
+      });
+    };
+  },
+});
+
+export default initRootFrameInjectable;
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { initRootFrame } from "./init-root-frame";
-import ipcRendererInjectable from "../../../utils/channel/ipc-renderer.injectable";
-import bindProtocolAddRouteHandlersInjectable from "../../../protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable";
-import lensProtocolRouterRendererInjectable from "../../../protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable";
-import catalogEntityRegistryInjectable from "../../../api/catalog/entity/registry.injectable";
-import registerIpcListenersInjectable from "../../../ipc/register-ipc-listeners.injectable";
-import loadExtensionsInjectable from "../../load-extensions.injectable";
-
-const initRootFrameInjectable = getInjectable({
-  id: "init-root-frame",
-  instantiate: (di) => initRootFrame({
-    loadExtensions: di.inject(loadExtensionsInjectable),
-    registerIpcListeners: di.inject(registerIpcListenersInjectable),
-    ipcRenderer: di.inject(ipcRendererInjectable),
-    bindProtocolAddRouteHandlers: di.inject(bindProtocolAddRouteHandlersInjectable),
-    lensProtocolRouterRenderer: di.inject(lensProtocolRouterRendererInjectable),
-    catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
-  }),
-});
-
-export default initRootFrameInjectable;
@@ -1,75 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { delay } from "../../../../common/utils";
-import { broadcastMessage } from "../../../../common/ipc";
-import logger from "../../../../common/logger";
-import type { ExtensionLoading } from "../../../../extensions/extension-loader";
-import type { CatalogEntityRegistry } from "../../../api/catalog/entity/registry";
-import { bundledExtensionsLoaded } from "../../../../common/ipc/extension-handling";
-
-
-interface Dependencies {
-  loadExtensions: () => Promise<ExtensionLoading[]>;
-
-  registerIpcListeners: () => void;
-
-  // TODO: Move usages of third party library behind abstraction
-  ipcRenderer: { send: (name: string) => void };
-
-  // TODO: Remove dependencies being here only for correct timing of initialization
-  bindProtocolAddRouteHandlers: () => void;
-  lensProtocolRouterRenderer: { init: () => void };
-  catalogEntityRegistry: CatalogEntityRegistry;
-}
-
-const logPrefix = "[ROOT-FRAME]:";
-
-export const initRootFrame =
-  ({
-    loadExtensions,
-    bindProtocolAddRouteHandlers,
-    lensProtocolRouterRenderer,
-    ipcRenderer,
-    registerIpcListeners,
-    catalogEntityRegistry,
-  }: Dependencies) =>
-    async (unmountRoot: () => void) => {
-      catalogEntityRegistry.init();
-
-      try {
-      // maximum time to let bundled extensions finish loading
-        const timeout = delay(10000);
-
-        const loadingExtensions = await loadExtensions();
-
-        const loadingBundledExtensions = loadingExtensions
-          .filter((e) => e.isBundled)
-          .map((e) => e.loaded);
-
-        const bundledExtensionsFinished = Promise.all(loadingBundledExtensions);
-
-        await Promise.race([bundledExtensionsFinished, timeout]);
-      } finally {
-        ipcRenderer.send(bundledExtensionsLoaded);
-      }
-
-      lensProtocolRouterRenderer.init();
-
-      bindProtocolAddRouteHandlers();
-
-      window.addEventListener("offline", () =>
-        broadcastMessage("network:offline"),
-      );
-
-      window.addEventListener("online", () => broadcastMessage("network:online"));
-
-      registerIpcListeners();
-
-      window.addEventListener("beforeunload", () => {
-        logger.info(`${logPrefix} Unload app`);
-
-        unmountRoot();
-      });
-    };
@@ -3,6 +3,7 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { getInjectable } from "@ogre-tools/injectable";
+import loggerInjectable from "../../common/logger.injectable";
 import clusterFrameContextForNamespacedResourcesInjectable from "../cluster-frame-context/for-namespaced-resources.injectable";
 import { KubeWatchApi } from "./kube-watch-api";

@@ -11,6 +12,7 @@ const kubeWatchApiInjectable = getInjectable({

  instantiate: (di) => new KubeWatchApi({
    clusterContext: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+    logger: di.inject(loggerInjectable),
  }),
 });

@@ -6,7 +6,7 @@ import { comparer, reaction } from "mobx";
 import type { Disposer } from "../../common/utils";
 import { disposer, getOrInsert, noop, WrappedAbortController } from "../../common/utils";
 import { once } from "lodash";
-import logger from "../../common/logger";
+import type { Logger } from "../../common/logger";
 import type { KubeObjectStoreLoadAllParams, KubeObjectStoreSubscribeParams } from "../../common/k8s-api/kube-object.store";
 import AbortController from "abort-controller";
 import type { ClusterContext } from "../cluster-frame-context/cluster-frame-context";
@@ -21,13 +21,19 @@ interface SubscribeStoreParams {
  onLoadFailure?: (err: any) => void;
 }

+interface WatchCountDependencies {
+  readonly logger: Logger;
+}
+
 class WatchCount {
  readonly #data = new Map<SubscribableStore, number>();

+  constructor(private readonly dependencies: WatchCountDependencies) {}
+
  public inc(store: SubscribableStore): number {
    const newCount = getOrInsert(this.#data, store, 0) + 1;

-    logger.info(`[KUBE-WATCH-API]: inc() count for ${store.api.apiBase} is now ${newCount}`);
+    this.dependencies.logger.info(`[KUBE-WATCH-API]: inc() count for ${store.api.apiBase} is now ${newCount}`);
    this.#data.set(store, newCount);

    return newCount;
@@ -46,7 +52,7 @@ class WatchCount {
      throw new Error(`Cannot dec count more times than it has been inc: ${store.api.kind}`);
    }

-    logger.info(`[KUBE-WATCH-API]: dec() count for ${store.api.apiBase} is now ${newCount}`);
+    this.dependencies.logger.info(`[KUBE-WATCH-API]: dec() count for ${store.api.apiBase} is now ${newCount}`);
    this.#data.set(store, newCount);

    return newCount;
@@ -69,6 +75,7 @@ export interface KubeWatchSubscribeStoreOptions {

 interface Dependencies {
  readonly clusterContext: ClusterContext;
+  readonly logger: Logger;
 }

 export interface SubscribableStore {
@@ -84,7 +91,7 @@ export interface SubscribableStore {
 export type SubscribeStores = (stores: SubscribableStore[], opts?: KubeWatchSubscribeStoreOptions) => Disposer;

 export class KubeWatchApi {
-  readonly #watch = new WatchCount();
+  readonly #watch = new WatchCount(this.dependencies);

  constructor(private readonly dependencies: Dependencies) {}

@@ -173,8 +180,8 @@ export class KubeWatchApi {

  protected log(message: any, meta: any) {
    const log = message instanceof Error
-      ? console.error
-      : console.debug;
+      ? this.dependencies.logger.error
+      : this.dependencies.logger.debug;

    log("[KUBE-WATCH-API]:", message, {
      time: new Date().toLocaleString(),
@@ -18,18 +18,20 @@ import { Checkbox } from "../components/checkbox";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import type { PortForwardDialogData, PortForwardDialogModel } from "./port-forward-dialog-model/port-forward-dialog-model";
 import portForwardDialogModelInjectable from "./port-forward-dialog-model/port-forward-dialog-model.injectable";
-import logger from "../../common/logger";
+import type { Logger } from "../../common/logger";
 import portForwardStoreInjectable from "./port-forward-store/port-forward-store.injectable";
 import aboutPortForwardingInjectable from "./about-port-forwarding.injectable";
 import notifyErrorPortForwardingInjectable from "./notify-error-port-forwarding.injectable";
 import type { OpenPortForward } from "./open-port-forward.injectable";
 import openPortForwardInjectable from "./open-port-forward.injectable";
+import loggerInjectable from "../../common/logger.injectable";

 export interface PortForwardDialogProps extends Partial<DialogProps> {}

 interface Dependencies {
  portForwardStore: PortForwardStore;
  model: PortForwardDialogModel;
+  logger: Logger;
  aboutPortForwarding: () => void;
  notifyErrorPortForwarding: (message: string) => void;
  openPortForward: OpenPortForward;
@@ -94,7 +96,7 @@ class NonInjectedPortForwardDialog extends Component<PortForwardDialogProps & De
        this.props.openPortForward(portForward);
      }
    } catch (error) {
-      logger.error(`[PORT-FORWARD-DIALOG]: ${error}`, portForward);
+      this.props.logger.error(`[PORT-FORWARD-DIALOG]: ${error}`, portForward);
    } finally {
      this.props.model.close();
    }
@@ -170,17 +172,14 @@ class NonInjectedPortForwardDialog extends Component<PortForwardDialogProps & De
  }
 }

-export const PortForwardDialog = withInjectables<Dependencies, PortForwardDialogProps>(
-  NonInjectedPortForwardDialog,
-
-  {
-    getProps: (di, props) => ({
-      portForwardStore: di.inject(portForwardStoreInjectable),
-      model: di.inject(portForwardDialogModelInjectable),
-      aboutPortForwarding: di.inject(aboutPortForwardingInjectable),
-      notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
-      openPortForward: di.inject(openPortForwardInjectable),
-      ...props,
-    }),
-  },
-);
+export const PortForwardDialog = withInjectables<Dependencies, PortForwardDialogProps>(NonInjectedPortForwardDialog, {
+  getProps: (di, props) => ({
+    ...props,
+    portForwardStore: di.inject(portForwardStoreInjectable),
+    model: di.inject(portForwardDialogModelInjectable),
+    aboutPortForwarding: di.inject(aboutPortForwardingInjectable),
+    notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
+    openPortForward: di.inject(openPortForwardInjectable),
+    logger: di.inject(loggerInjectable),
+  }),
+});
@@ -9,6 +9,7 @@ import createStorageInjectable from "../../utils/create-storage/create-storage.i
 import notifyErrorPortForwardingInjectable from "../notify-error-port-forwarding.injectable";
 import requestActivePortForwardInjectable from "./request-active-port-forward.injectable";
 import apiBaseInjectable from "../../../common/k8s-api/api-base.injectable";
+import loggerInjectable from "../../../common/logger.injectable";

 const portForwardStoreInjectable = getInjectable({
  id: "port-forward-store",
@@ -24,6 +25,7 @@ const portForwardStoreInjectable = getInjectable({
      notifyErrorPortForwarding: di.inject(notifyErrorPortForwardingInjectable),
      apiBase: di.inject(apiBaseInjectable),
      requestActivePortForward: di.inject(requestActivePortForwardInjectable),
+      logger: di.inject(loggerInjectable),
    });
  },
 });
@@ -10,14 +10,15 @@ import { autoBind, disposer } from "../../utils";
 import type { ForwardedPort } from "../port-forward-item";
 import { PortForwardItem } from "../port-forward-item";
 import { waitUntilFree } from "tcp-port-used";
-import logger from "../../../common/logger";
+import type { Logger } from "../../../common/logger";
 import type { JsonApi } from "../../../common/k8s-api/json-api";
 import type { RequestActivePortForward } from "./request-active-port-forward.injectable";

 interface Dependencies {
  readonly storage: StorageLayer<ForwardedPort[] | undefined>;
-  notifyErrorPortForwarding: (message: string) => void;
  readonly apiBase: JsonApi; // TODO: replace with individual dependencies
+  readonly logger: Logger;
+  notifyErrorPortForwarding: (message: string) => void;
  requestActivePortForward: RequestActivePortForward;
 }

@@ -38,7 +39,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
    const savedPortForwards = this.dependencies.storage.get(); // undefined on first load

    if (Array.isArray(savedPortForwards) && savedPortForwards.length > 0) {
-      logger.info("[PORT-FORWARD-STORE] starting saved port-forwards");
+      this.dependencies.logger.info("[PORT-FORWARD-STORE] starting saved port-forwards");

      // add the disabled ones
      await Promise.all(savedPortForwards.filter(pf => pf.status === "Disabled").map(this.add));
@@ -169,7 +170,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
    if (!pf) {
      const error = new Error("port-forward not found");

-      logger.warn(
+      this.dependencies.logger.warn(
        `[PORT-FORWARD-STORE] Error getting port-forward: ${error}`,
        portForward,
      );
@@ -181,7 +182,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
      await this.stop(portForward);
    } catch (error) {
      if (pf.status === "Active") {
-        logger.warn(
+        this.dependencies.logger.warn(
          `[PORT-FORWARD-STORE] Error removing port-forward: ${error}`,
          portForward,
        );
@@ -214,7 +215,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
    const pf = this.findPortForward(portForward);

    if (!pf) {
-      logger.warn(
+      this.dependencies.logger.warn(
        "[PORT-FORWARD-STORE] Error getting port-forward: port-forward not found",
        portForward,
      );
@@ -231,7 +232,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
      );
      await waitUntilFree(+forwardPort, 200, 1000);
    } catch (error) {
-      logger.warn(
+      this.dependencies.logger.warn(
        `[PORT-FORWARD-STORE] Error stopping active port-forward: ${error}`,
        portForward,
      );
@@ -289,7 +290,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
        response?.port &&
        response.port != +pf.forwardPort
      ) {
-        logger.warn(
+        this.dependencies.logger.warn(
          `[PORT-FORWARD-STORE] specified ${pf.forwardPort}, got ${response.port}`,
        );
      }
@@ -297,7 +298,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
      pf.forwardPort = response.port;
      pf.status = "Active";
    } catch (error) {
-      logger.warn(
+      this.dependencies.logger.warn(
        `[PORT-FORWARD-STORE] Error starting port-forward: ${error}`,
        pf,
      );
@@ -328,7 +329,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
      const pf = await this.dependencies.requestActivePortForward(portForward);

      if (pf?.forwardPort && pf.forwardPort !== portForward.forwardPort) {
-        logger.warn(
+        this.dependencies.logger.warn(
          `[PORT-FORWARD-STORE] local port, expected ${pf.forwardPort}, got ${portForward.forwardPort}`,
        );
      }