@devopsplaybook.io/otel-utils 1.0.1-beta6 → 1.0.1-beta7

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./src/models/ConfigOTelInterface";
+export * from "./src/models/StandardLoggerInterface";
 export * from "./src/ModuleLogger";
 export * from "./src/StandardLogger";
 export * from "./src/StandardMeter";

package/dist/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./src/models/ConfigOTelInterface"), exports);
+__exportStar(require("./src/models/StandardLoggerInterface"), exports);
 __exportStar(require("./src/ModuleLogger"), exports);
 __exportStar(require("./src/StandardLogger"), exports);
 __exportStar(require("./src/StandardMeter"), exports);

package/dist/src/ModuleLogger.d.ts

@@ -1,8 +1,8 @@
-import type { Logger } from "@opentelemetry/api-logs";
+import { StandardLoggerInterface } from "./models/StandardLoggerInterface";
 export declare class ModuleLogger {
     private module;
-    private logger?;
-    constructor(module: string, logger?: Logger);
+    private standardLogger?;
+    constructor(module: string, standardLogger: StandardLoggerInterface);
     info(message: Error | string | any): void;
     warn(message: Error | string | any): void;
     error(message: Error | string | any): void;

package/dist/src/ModuleLogger.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleLogger = void 0;
 const api_logs_1 = require("@opentelemetry/api-logs");
 class ModuleLogger {
-    constructor(module, logger) {
+    constructor(module, standardLogger) {
         this.module = module;
-        this.logger = logger;
+        this.standardLogger = standardLogger;
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     info(message) {
@@ -22,6 +22,7 @@ class ModuleLogger {
     display(level, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     message, severityNumber = api_logs_1.SeverityNumber.INFO) {
+        var _a, _b;
         if (typeof message === "string") {
             // eslint:disable-next-line:no-console
             console.log(`[${level}] [${this.module}] ${message}`);
@@ -36,10 +37,10 @@ class ModuleLogger {
             // eslint:disable-next-line:no-console
             console.log(`${level} [${this.module}] ${JSON.stringify(message)}`);
         }
-        if (!this.logger) {
+        if (!((_a = this.standardLogger) === null || _a === void 0 ? void 0 : _a.getLogger())) {
             return;
         }
-        this.logger.emit({
+        (_b = this.standardLogger.getLogger()) === null || _b === void 0 ? void 0 : _b.emit({
             severityNumber,
             severityText: level,
             body: message,

package/dist/src/StandardLogger.d.ts

@@ -1,9 +1,11 @@
+import type { Logger as OTelLogger } from "@opentelemetry/api-logs";
 import { ConfigOTelInterface } from "./models/ConfigOTelInterface";
 import { ModuleLogger } from "./ModuleLogger";
 export declare class StandardLogger {
     private logger?;
-    private serviceVersion;
-    private serviceName;
-    constructor(config: ConfigOTelInterface);
+    private serviceVersion?;
+    private serviceName?;
+    initOTel(config: ConfigOTelInterface): void;
+    getLogger(): OTelLogger | undefined;
     createModuleLogger(moduleName: string): ModuleLogger;
 }

package/dist/src/StandardLogger.js

@@ -41,7 +41,7 @@ const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const os = __importStar(require("os"));
 const ModuleLogger_1 = require("./ModuleLogger");
 class StandardLogger {
-    constructor(config) {
+    initOTel(config) {
         this.serviceName = config.SERVICE_ID;
         this.serviceVersion = config.VERSION;
         if (config.OPENTELEMETRY_COLLECTOR_HTTP_LOGS) {
@@ -70,8 +70,11 @@ class StandardLogger {
             this.logger = loggerProvider.getLogger(`${this.serviceName}:${this.serviceVersion}`);
         }
     }
+    getLogger() {
+        return this.logger;
+    }
     createModuleLogger(moduleName) {
-        return new ModuleLogger_1.ModuleLogger(moduleName, this.logger);
+        return new ModuleLogger_1.ModuleLogger(moduleName, this);
     }
 }
 exports.StandardLogger = StandardLogger;

package/dist/src/models/StandardLoggerInterface.d.ts

@@ -0,0 +1,4 @@
+import type { Logger } from "@opentelemetry/api-logs";
+export interface StandardLoggerInterface {
+    getLogger(): Logger | undefined;
+}

package/dist/src/models/StandardLoggerInterface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/index.ts

@@ -1,4 +1,5 @@
 export * from "./src/models/ConfigOTelInterface";
+export * from "./src/models/StandardLoggerInterface";
 export * from "./src/ModuleLogger";
 export * from "./src/StandardLogger";
 export * from "./src/StandardMeter";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devopsplaybook.io/otel-utils",
-  "version": "1.0.1-beta6",
+  "version": "1.0.1-beta7",
   "description": "Utility to simplify integration with Open Telemetry",
   "keywords": [
     "Open",

package/src/ModuleLogger.ts

@@ -1,13 +1,13 @@
-import type { Logger } from "@opentelemetry/api-logs";
 import { SeverityNumber } from "@opentelemetry/api-logs";
+import { StandardLoggerInterface } from "./models/StandardLoggerInterface";
 
 export class ModuleLogger {
   private module: string;
-  private logger?: Logger;
+  private standardLogger?: StandardLoggerInterface;
 
-  constructor(module: string, logger?: Logger) {
+  constructor(module: string, standardLogger: StandardLoggerInterface) {
     this.module = module;
-    this.logger = logger;
+    this.standardLogger = standardLogger;
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -41,10 +41,10 @@ export class ModuleLogger {
       // eslint:disable-next-line:no-console
       console.log(`${level} [${this.module}] ${JSON.stringify(message)}`);
     }
-    if (!this.logger) {
+    if (!this.standardLogger?.getLogger()) {
       return;
     }
-    this.logger.emit({
+    this.standardLogger.getLogger()?.emit({
       severityNumber,
       severityText: level,
       body: message,

package/src/StandardLogger.ts

@@ -1,12 +1,10 @@
 import type { Logger, Logger as OTelLogger } from "@opentelemetry/api-logs";
-import { SeverityNumber } from "@opentelemetry/api-logs";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 import { resourceFromAttributes } from "@opentelemetry/resources";
 import {
   BatchLogRecordProcessor,
   LoggerProvider,
 } from "@opentelemetry/sdk-logs";
-import { Span } from "@opentelemetry/sdk-trace-base";
 import {
   ATTR_NETWORK_LOCAL_ADDRESS,
   ATTR_SERVICE_NAME,
@@ -18,10 +16,10 @@ import { ModuleLogger } from "./ModuleLogger";
 
 export class StandardLogger {
   private logger?: Logger;
-  private serviceVersion: string;
-  private serviceName: string;
+  private serviceVersion?: string;
+  private serviceName?: string;
 
-  constructor(config: ConfigOTelInterface) {
+  public initOTel(config: ConfigOTelInterface) {
     this.serviceName = config.SERVICE_ID;
     this.serviceVersion = config.VERSION;
 
@@ -59,7 +57,11 @@ export class StandardLogger {
     }
   }
 
+  public getLogger(): OTelLogger | undefined {
+    return this.logger;
+  }
+
   public createModuleLogger(moduleName: string): ModuleLogger {
-    return new ModuleLogger(moduleName, this.logger);
+    return new ModuleLogger(moduleName, this);
   }
 }

package/src/models/StandardLoggerInterface.ts

@@ -0,0 +1,5 @@
+import type { Logger } from "@opentelemetry/api-logs";
+
+export interface StandardLoggerInterface {
+  getLogger(): Logger | undefined;
+}