@sebspark/otel 0.5.1 → 1.0.0

package/README.md

@@ -21,7 +21,20 @@ pnpm add @sebspark/otel
 **This must be the first import in your application:**
 
 ```ts
-import '@sebspark/otel'
+import { initialize, instrumentation } from '@sebspark/otel'
+
+async function start () {
+  await initialize(
+    instrumentation.undici,
+    instrumentation.http,
+    instrumentation.express,
+    instrumentation.redis,
+  )
+
+  // start your application
+}
+
+start()
 ```
 
 Automatically:
@@ -38,6 +51,7 @@ Automatically:
 ### Logging
 
 ```ts
+// Will throw if OTEL is not yet initialized
 import { getLogger } from '@sebspark/otel'
 
 const logger = getLogger()
@@ -61,7 +75,8 @@ Logs inside active spans automatically include:
 ```ts
 import { getTracer } from '@sebspark/otel'
 
-const tracer = getTracer() // async to ensure otel initialization
+// Will throw if OTEL is not yet initialized
+const tracer = getTracer()
 
 await tracer.withTrace('trace.name', async (span) => {
   span.setAttribute('user.id', '123')
@@ -111,7 +126,8 @@ span.end()
 ```ts
 import { getMeter } from '@sebspark/otel'
 
-const meter = getMeter() // async to ensure otel initialization
+// Will throw if OTEL is not yet initialized
+const meter = getMeter()
 
 const counter = meter.createCounter('http_requests_total', {
   description: 'Total number of HTTP requests',

package/dist/index.d.mts

@@ -1,9 +1,30 @@
-import { LoggerProvider } from '@opentelemetry/api-logs';
+import { Instrumentation } from '@opentelemetry/instrumentation';
+import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns';
+import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
+import { FsInstrumentation } from '@opentelemetry/instrumentation-fs';
+import { GrpcInstrumentation } from '@opentelemetry/instrumentation-grpc';
+import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
+import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis';
+import { SocketIoInstrumentation } from '@opentelemetry/instrumentation-socket.io';
+import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
 import * as _opentelemetry_api from '@opentelemetry/api';
 import { trace, SpanOptions } from '@opentelemetry/api';
 
+declare const instrumentations: {
+    readonly http: Instrumentation;
+    readonly express: ExpressInstrumentation;
+    readonly grpc: GrpcInstrumentation;
+    readonly redis: RedisInstrumentation;
+    readonly dns: DnsInstrumentation;
+    readonly net: NetInstrumentation;
+    readonly fs: FsInstrumentation;
+    readonly undici: UndiciInstrumentation;
+    readonly socketIo: SocketIoInstrumentation;
+};
+
 type Attrs = Record<string, any>;
-declare function getLogger(serviceOverride?: string, extraAttrs?: Attrs, testProvider?: LoggerProvider): {
+type Logger = ReturnType<typeof getLogger>;
+declare function getLogger(serviceOverride?: string, extraAttrs?: Attrs): {
     debug: (msg: string, attrs?: Attrs) => void;
     info: (msg: string, attrs?: Attrs) => void;
     notice: (msg: string, attrs?: Attrs) => void;
@@ -14,7 +35,10 @@ declare function getLogger(serviceOverride?: string, extraAttrs?: Attrs, testPro
     emergency: (msg: string, attrs?: Attrs) => void;
 };
 
-declare function getMeter(componentNameOverride?: string): Promise<_opentelemetry_api.Meter>;
+declare function getMeter(componentNameOverride?: string): _opentelemetry_api.Meter;
+
+declare function initialize(...instrumentations: Instrumentation[]): Promise<void>;
+declare function isInitialized(): boolean;
 
 type OtelTracer = ReturnType<typeof trace.getTracer>;
 type Span = ReturnType<OtelTracer['startSpan']>;
@@ -46,6 +70,6 @@ interface Tracer extends OtelTracer {
  * @param serviceOverride - Optional override for service name
  * @returns Tracer with helpers
  */
-declare function getTracer(componentNameOverride?: string): Promise<Tracer>;
+declare function getTracer(componentNameOverride?: string): Tracer;
 
-export { getLogger, getMeter, getTracer };
+export { type Logger, getLogger, getMeter, getTracer, initialize, instrumentations, isInitialized };

package/dist/index.d.ts

@@ -1,9 +1,30 @@
-import { LoggerProvider } from '@opentelemetry/api-logs';
+import { Instrumentation } from '@opentelemetry/instrumentation';
+import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns';
+import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
+import { FsInstrumentation } from '@opentelemetry/instrumentation-fs';
+import { GrpcInstrumentation } from '@opentelemetry/instrumentation-grpc';
+import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
+import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis';
+import { SocketIoInstrumentation } from '@opentelemetry/instrumentation-socket.io';
+import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
 import * as _opentelemetry_api from '@opentelemetry/api';
 import { trace, SpanOptions } from '@opentelemetry/api';
 
+declare const instrumentations: {
+    readonly http: Instrumentation;
+    readonly express: ExpressInstrumentation;
+    readonly grpc: GrpcInstrumentation;
+    readonly redis: RedisInstrumentation;
+    readonly dns: DnsInstrumentation;
+    readonly net: NetInstrumentation;
+    readonly fs: FsInstrumentation;
+    readonly undici: UndiciInstrumentation;
+    readonly socketIo: SocketIoInstrumentation;
+};
+
 type Attrs = Record<string, any>;
-declare function getLogger(serviceOverride?: string, extraAttrs?: Attrs, testProvider?: LoggerProvider): {
+type Logger = ReturnType<typeof getLogger>;
+declare function getLogger(serviceOverride?: string, extraAttrs?: Attrs): {
     debug: (msg: string, attrs?: Attrs) => void;
     info: (msg: string, attrs?: Attrs) => void;
     notice: (msg: string, attrs?: Attrs) => void;
@@ -14,7 +35,10 @@ declare function getLogger(serviceOverride?: string, extraAttrs?: Attrs, testPro
     emergency: (msg: string, attrs?: Attrs) => void;
 };
 
-declare function getMeter(componentNameOverride?: string): Promise<_opentelemetry_api.Meter>;
+declare function getMeter(componentNameOverride?: string): _opentelemetry_api.Meter;
+
+declare function initialize(...instrumentations: Instrumentation[]): Promise<void>;
+declare function isInitialized(): boolean;
 
 type OtelTracer = ReturnType<typeof trace.getTracer>;
 type Span = ReturnType<OtelTracer['startSpan']>;
@@ -46,6 +70,6 @@ interface Tracer extends OtelTracer {
  * @param serviceOverride - Optional override for service name
  * @returns Tracer with helpers
  */
-declare function getTracer(componentNameOverride?: string): Promise<Tracer>;
+declare function getTracer(componentNameOverride?: string): Tracer;
 
-export { getLogger, getMeter, getTracer };
+export { type Logger, getLogger, getMeter, getTracer, initialize, instrumentations, isInitialized };

package/dist/index.js

@@ -32,26 +32,92 @@ var index_exports = {};
 __export(index_exports, {
   getLogger: () => getLogger,
   getMeter: () => getMeter,
-  getTracer: () => getTracer
+  getTracer: () => getTracer,
+  initialize: () => initialize,
+  instrumentations: () => instrumentations,
+  isInitialized: () => isInitialized
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/otel.ts
-var import_api3 = require("@opentelemetry/api");
-var import_api_logs = require("@opentelemetry/api-logs");
-var import_auto_instrumentations_node = require("@opentelemetry/auto-instrumentations-node");
-var import_sdk_node = require("@opentelemetry/sdk-node");
-
-// src/providers.ts
-var import_exporter_logs_otlp_http = require("@opentelemetry/exporter-logs-otlp-http");
-var import_exporter_metrics_otlp_http = require("@opentelemetry/exporter-metrics-otlp-http");
-var import_exporter_trace_otlp_http = require("@opentelemetry/exporter-trace-otlp-http");
-var import_sdk_logs = require("@opentelemetry/sdk-logs");
-var import_sdk_metrics = require("@opentelemetry/sdk-metrics");
-var import_sdk_trace_node = require("@opentelemetry/sdk-trace-node");
+// src/instrumentations.ts
+var import_instrumentation_dns = require("@opentelemetry/instrumentation-dns");
+var import_instrumentation_express = require("@opentelemetry/instrumentation-express");
+var import_instrumentation_fs = require("@opentelemetry/instrumentation-fs");
+var import_instrumentation_grpc = require("@opentelemetry/instrumentation-grpc");
+var import_instrumentation_http = require("@opentelemetry/instrumentation-http");
+var import_instrumentation_net = require("@opentelemetry/instrumentation-net");
+var import_instrumentation_redis = require("@opentelemetry/instrumentation-redis");
+var import_instrumentation_socket = require("@opentelemetry/instrumentation-socket.io");
+var import_instrumentation_undici = require("@opentelemetry/instrumentation-undici");
+var _http;
+var _express;
+var _grpc;
+var _redis;
+var _dns;
+var _net;
+var _fs;
+var _undici;
+var _socketIo;
+var instrumentations = {
+  get http() {
+    if (!_http) {
+      _http = new import_instrumentation_http.HttpInstrumentation();
+    }
+    return _http;
+  },
+  get express() {
+    if (!_express) {
+      _express = new import_instrumentation_express.ExpressInstrumentation();
+    }
+    return _express;
+  },
+  get grpc() {
+    if (!_grpc) {
+      _grpc = new import_instrumentation_grpc.GrpcInstrumentation();
+    }
+    return _grpc;
+  },
+  get redis() {
+    if (!_redis) {
+      _redis = new import_instrumentation_redis.RedisInstrumentation();
+    }
+    return _redis;
+  },
+  get dns() {
+    if (!_dns) {
+      _dns = new import_instrumentation_dns.DnsInstrumentation();
+    }
+    return _dns;
+  },
+  get net() {
+    if (!_net) {
+      _net = new import_instrumentation_net.NetInstrumentation();
+    }
+    return _net;
+  },
+  get fs() {
+    if (!_fs) {
+      _fs = new import_instrumentation_fs.FsInstrumentation();
+    }
+    return _fs;
+  },
+  get undici() {
+    if (!_undici) {
+      _undici = new import_instrumentation_undici.UndiciInstrumentation();
+    }
+    return _undici;
+  },
+  get socketIo() {
+    if (!_socketIo) {
+      _socketIo = new import_instrumentation_socket.SocketIoInstrumentation();
+    }
+    return _socketIo;
+  }
+};
 
-// src/loggers/console-log-pretty-exporter.ts
-var import_core = require("@opentelemetry/core");
+// src/logger.ts
+var import_api4 = require("@opentelemetry/api");
+var import_api_logs3 = require("@opentelemetry/api-logs");
 
 // src/consts.ts
 var LOG_SEVERITY_MAP = {
@@ -68,6 +134,23 @@ var LOG_SEVERITY_MAP = {
   EMERGENCY: 23
 };
 
+// src/otel.ts
+var import_api3 = require("@opentelemetry/api");
+var import_api_logs2 = require("@opentelemetry/api-logs");
+var import_sdk_node = require("@opentelemetry/sdk-node");
+
+// src/providers.ts
+var import_exporter_logs_otlp_http = require("@opentelemetry/exporter-logs-otlp-http");
+var import_exporter_metrics_otlp_http = require("@opentelemetry/exporter-metrics-otlp-http");
+var import_exporter_trace_otlp_http = require("@opentelemetry/exporter-trace-otlp-http");
+var import_sdk_logs = require("@opentelemetry/sdk-logs");
+var import_sdk_metrics = require("@opentelemetry/sdk-metrics");
+var import_sdk_trace_node = require("@opentelemetry/sdk-trace-node");
+
+// src/loggers/console-log-pretty-exporter.ts
+var import_api_logs = require("@opentelemetry/api-logs");
+var import_core = require("@opentelemetry/core");
+
 // src/loggers/formatters/shared.ts
 var import_semantic_conventions = require("@opentelemetry/semantic-conventions");
 var import_fast_safe_stringify = __toESM(require("fast-safe-stringify"));
@@ -398,7 +481,19 @@ var ConsoleLogPrettyExporter = class {
   _sendLogRecords(logRecords, done) {
     for (const record of logRecords) {
       if ((record.severityNumber ?? 0) >= this.logThreshold) {
-        console.log(formatLogRecord(record));
+        const formatted = formatLogRecord(record);
+        const severity = record.severityNumber || import_api_logs.SeverityNumber.UNSPECIFIED;
+        if (severity >= import_api_logs.SeverityNumber.ERROR) {
+          console.error(formatted);
+        } else if (severity >= import_api_logs.SeverityNumber.WARN) {
+          console.warn(formatted);
+        } else if (severity >= import_api_logs.SeverityNumber.INFO) {
+          console.info(formatted);
+        } else if (severity >= import_api_logs.SeverityNumber.DEBUG) {
+          console.debug(formatted);
+        } else {
+          console.trace(formatted);
+        }
       }
     }
     done?.({ code: import_core.ExportResultCode.SUCCESS });
@@ -473,8 +568,8 @@ var ConsoleMetricPrettyExporter = class {
       scopeMetrics: filteredScopes
     };
   }
-  export(metrics2, resultCallback) {
-    const filtered = this.filterMetrics(metrics2);
+  export(metrics3, resultCallback) {
+    const filtered = this.filterMetrics(metrics3);
     if (filtered) {
       console.log(formatMetrics(filtered));
     }
@@ -579,6 +674,8 @@ var getMetricReader = (otlpEndpoint) => {
 };
 
 // src/resource.ts
+var import_resource_detector_container = require("@opentelemetry/resource-detector-container");
+var import_resource_detector_gcp = require("@opentelemetry/resource-detector-gcp");
 var import_resources = require("@opentelemetry/resources");
 
 // src/otel-context.ts
@@ -626,7 +723,19 @@ function detectTelemetryContext(componentNameOverride) {
 
 // src/resource.ts
 var getResource = async () => {
-  const baseRes = await (0, import_resources.detectResources)();
+  const baseRes = await (0, import_resources.detectResources)({
+    detectors: [
+      import_resource_detector_container.containerDetector,
+      import_resources.envDetector,
+      import_resource_detector_gcp.gcpDetector,
+      import_resources.osDetector,
+      import_resources.processDetector,
+      import_resources.serviceInstanceIdDetector
+    ]
+  });
+  if (baseRes.waitForAsyncAttributes) {
+    await baseRes.waitForAsyncAttributes();
+  }
   const { resourceAttributes } = detectTelemetryContext();
   const customRes = (0, import_resources.resourceFromAttributes)(resourceAttributes);
   const resource = baseRes.merge(customRes);
@@ -637,66 +746,53 @@ var getResource = async () => {
 };
 
 // src/otel.ts
+import_api3.diag.disable();
+import_api3.diag.setLogger(new import_api3.DiagConsoleLogger(), import_api3.DiagLogLevel.ERROR);
 var initialization;
-async function initialize() {
+async function initialize(...instrumentations2) {
   if (!initialization) {
-    import_api3.diag.setLogger(new import_api3.DiagConsoleLogger(), import_api3.DiagLogLevel.ERROR);
-    initialization = initializeOtel();
+    initialization = _initialize(instrumentations2);
   }
   return initialization;
 }
 function isInitialized() {
-  return initialization !== void 0;
+  return !!initialization;
 }
-async function initializeOtel() {
+async function _initialize(instrumentations2) {
   try {
     const serviceName = process.env.OTEL_SERVICE_NAME ?? "unknown-service";
     const otlpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
-    const isTestMode = process.env.NODE_ENV === "test" || process.env.VITEST === "true";
     const resource = await getResource();
-    let logProvider;
-    const shouldSetupLogProvider = !isTestMode || !!process.env.LOG_LEVEL;
-    if (shouldSetupLogProvider) {
-      logProvider = getLogProvider(resource, otlpEndpoint);
-      import_api_logs.logs.setGlobalLoggerProvider(logProvider);
-    }
+    import_api_logs2.logs.disable();
+    import_api3.trace.disable();
+    import_api3.metrics.disable();
+    const logProvider = getLogProvider(resource, otlpEndpoint);
+    import_api_logs2.logs.setGlobalLoggerProvider(logProvider);
     const spanProcessor = getSpanProcessor(otlpEndpoint);
     const metricReader = getMetricReader(otlpEndpoint);
     const sdk = new import_sdk_node.NodeSDK({
       spanProcessor,
       metricReader,
-      instrumentations: [(0, import_auto_instrumentations_node.getNodeAutoInstrumentations)()],
+      instrumentations: instrumentations2,
       resource
     });
     await sdk.start();
     console.log(`[otel] Telemetry initialized for "${serviceName}"`);
     process.on("SIGTERM", async () => {
       console.log("[otel] Shutting down...");
-      const shutdownPromises = [sdk.shutdown()];
-      if (logProvider) {
-        shutdownPromises.push(logProvider.shutdown());
-      }
-      await Promise.all(shutdownPromises);
+      await Promise.all([sdk.shutdown(), logProvider.shutdown()]);
       console.log("[otel] Shutdown complete.");
       process.exit(0);
     });
   } catch (err) {
-    if (err instanceof Error && err.message.includes("duplicate registration")) {
-      console.warn("[otel] Warning - API already registered, continuing...");
-    } else {
-      console.error("[otel] Startup error:", err);
-    }
+    console.error("[otel] Startup error:", err);
   }
 }
 
 // src/logger.ts
-var import_api4 = require("@opentelemetry/api");
-var import_api_logs2 = require("@opentelemetry/api-logs");
-function getLogger(serviceOverride, extraAttrs = {}, testProvider) {
+function getLogger(serviceOverride, extraAttrs = {}) {
   if (!isInitialized()) {
-    throw new Error(
-      "OpenTelemetry is not initialized. Please call initialize() before getting a logger."
-    );
+    throw new Error("OTEL must be initialized before calling getLogger()");
   }
   const { systemName, systemVersion, resourceAttributes } = detectTelemetryContext(serviceOverride);
   const defaultAttrs = {
@@ -704,7 +800,7 @@ function getLogger(serviceOverride, extraAttrs = {}, testProvider) {
     ...extraAttrs
   };
   function emit(severityText, body, attrs = {}) {
-    const logger = testProvider ? testProvider.getLogger(systemName, systemVersion) : import_api_logs2.logs.getLogger(systemName, systemVersion);
+    const logger = import_api_logs3.logs.getLogger(systemName, systemVersion);
     const span = import_api4.trace.getSpan(import_api4.context.active());
     const spanContext = span?.spanContext();
     logger.emit({
@@ -746,8 +842,10 @@ function getLogger(serviceOverride, extraAttrs = {}, testProvider) {
 
 // src/metrics.ts
 var import_api5 = require("@opentelemetry/api");
-async function getMeter(componentNameOverride) {
-  await initialize();
+function getMeter(componentNameOverride) {
+  if (!isInitialized()) {
+    throw new Error("OTEL must be initialized before calling getMeter()");
+  }
   const { componentName, systemName, systemVersion } = detectTelemetryContext(
     componentNameOverride
   );
@@ -756,8 +854,10 @@ async function getMeter(componentNameOverride) {
 
 // src/tracer.ts
 var import_api6 = require("@opentelemetry/api");
-async function getTracer(componentNameOverride) {
-  await initialize();
+function getTracer(componentNameOverride) {
+  if (!isInitialized()) {
+    throw new Error("OTEL must be initialized before calling getMeter()");
+  }
   const { componentName, systemName, systemVersion } = detectTelemetryContext(
     componentNameOverride
   );
@@ -839,12 +939,12 @@ function extractArgs(spanOptionsSpanOrFunc, spanOrFunc, func) {
 var isFunction = (value) => typeof value === "function";
 var isSpan = (value) => value !== null && value !== void 0 && isFunction(value.spanContext) && isFunction(value.end);
 var isSpanOptions = (value) => value !== null && value !== void 0 && (!!value.startTime || !!value.attributes || !!value.kind) && !isSpan(value);
-
-// src/index.ts
-initialize();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getLogger,
   getMeter,
-  getTracer
+  getTracer,
+  initialize,
+  instrumentations,
+  isInitialized
 });

package/dist/index.mjs

@@ -1,7 +1,107 @@
+// src/instrumentations.ts
+import { DnsInstrumentation } from "@opentelemetry/instrumentation-dns";
+import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
+import { FsInstrumentation } from "@opentelemetry/instrumentation-fs";
+import { GrpcInstrumentation } from "@opentelemetry/instrumentation-grpc";
+import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
+import { NetInstrumentation } from "@opentelemetry/instrumentation-net";
+import { RedisInstrumentation } from "@opentelemetry/instrumentation-redis";
+import { SocketIoInstrumentation } from "@opentelemetry/instrumentation-socket.io";
+import { UndiciInstrumentation } from "@opentelemetry/instrumentation-undici";
+var _http;
+var _express;
+var _grpc;
+var _redis;
+var _dns;
+var _net;
+var _fs;
+var _undici;
+var _socketIo;
+var instrumentations = {
+  get http() {
+    if (!_http) {
+      _http = new HttpInstrumentation();
+    }
+    return _http;
+  },
+  get express() {
+    if (!_express) {
+      _express = new ExpressInstrumentation();
+    }
+    return _express;
+  },
+  get grpc() {
+    if (!_grpc) {
+      _grpc = new GrpcInstrumentation();
+    }
+    return _grpc;
+  },
+  get redis() {
+    if (!_redis) {
+      _redis = new RedisInstrumentation();
+    }
+    return _redis;
+  },
+  get dns() {
+    if (!_dns) {
+      _dns = new DnsInstrumentation();
+    }
+    return _dns;
+  },
+  get net() {
+    if (!_net) {
+      _net = new NetInstrumentation();
+    }
+    return _net;
+  },
+  get fs() {
+    if (!_fs) {
+      _fs = new FsInstrumentation();
+    }
+    return _fs;
+  },
+  get undici() {
+    if (!_undici) {
+      _undici = new UndiciInstrumentation();
+    }
+    return _undici;
+  },
+  get socketIo() {
+    if (!_socketIo) {
+      _socketIo = new SocketIoInstrumentation();
+    }
+    return _socketIo;
+  }
+};
+
+// src/logger.ts
+import { context, trace as trace2 } from "@opentelemetry/api";
+import { logs as logs2 } from "@opentelemetry/api-logs";
+
+// src/consts.ts
+var LOG_SEVERITY_MAP = {
+  TRACE: 1,
+  DEBUG: 5,
+  INFO: 9,
+  NOTICE: 10,
+  WARNING: 13,
+  WARN: 13,
+  ERROR: 17,
+  FATAL: 21,
+  CRITICAL: 21,
+  ALERT: 22,
+  EMERGENCY: 23
+};
+
 // src/otel.ts
-import { DiagConsoleLogger, DiagLogLevel, diag } from "@opentelemetry/api";
+import {
+  DiagConsoleLogger,
+  DiagLogLevel,
+  diag,
+  metrics,
+  trace
+} from "@opentelemetry/api";
 import { logs } from "@opentelemetry/api-logs";
-import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
 import { NodeSDK } from "@opentelemetry/sdk-node";
 
 // src/providers.ts
@@ -19,23 +119,9 @@ import {
 } from "@opentelemetry/sdk-trace-node";
 
 // src/loggers/console-log-pretty-exporter.ts
+import { SeverityNumber } from "@opentelemetry/api-logs";
 import { ExportResultCode } from "@opentelemetry/core";
 
-// src/consts.ts
-var LOG_SEVERITY_MAP = {
-  TRACE: 1,
-  DEBUG: 5,
-  INFO: 9,
-  NOTICE: 10,
-  WARNING: 13,
-  WARN: 13,
-  ERROR: 17,
-  FATAL: 21,
-  CRITICAL: 21,
-  ALERT: 22,
-  EMERGENCY: 23
-};
-
 // src/loggers/formatters/shared.ts
 import {
   ATTR_SERVICE_NAME,
@@ -369,7 +455,19 @@ var ConsoleLogPrettyExporter = class {
   _sendLogRecords(logRecords, done) {
     for (const record of logRecords) {
       if ((record.severityNumber ?? 0) >= this.logThreshold) {
-        console.log(formatLogRecord(record));
+        const formatted = formatLogRecord(record);
+        const severity = record.severityNumber || SeverityNumber.UNSPECIFIED;
+        if (severity >= SeverityNumber.ERROR) {
+          console.error(formatted);
+        } else if (severity >= SeverityNumber.WARN) {
+          console.warn(formatted);
+        } else if (severity >= SeverityNumber.INFO) {
+          console.info(formatted);
+        } else if (severity >= SeverityNumber.DEBUG) {
+          console.debug(formatted);
+        } else {
+          console.trace(formatted);
+        }
       }
     }
     done?.({ code: ExportResultCode.SUCCESS });
@@ -444,8 +542,8 @@ var ConsoleMetricPrettyExporter = class {
       scopeMetrics: filteredScopes
     };
   }
-  export(metrics2, resultCallback) {
-    const filtered = this.filterMetrics(metrics2);
+  export(metrics3, resultCallback) {
+    const filtered = this.filterMetrics(metrics3);
     if (filtered) {
       console.log(formatMetrics(filtered));
     }
@@ -550,9 +648,15 @@ var getMetricReader = (otlpEndpoint) => {
 };
 
 // src/resource.ts
+import { containerDetector } from "@opentelemetry/resource-detector-container";
+import { gcpDetector } from "@opentelemetry/resource-detector-gcp";
 import {
   detectResources,
-  resourceFromAttributes
+  envDetector,
+  osDetector,
+  processDetector,
+  resourceFromAttributes,
+  serviceInstanceIdDetector
 } from "@opentelemetry/resources";
 
 // src/otel-context.ts
@@ -603,7 +707,19 @@ function detectTelemetryContext(componentNameOverride) {
 
 // src/resource.ts
 var getResource = async () => {
-  const baseRes = await detectResources();
+  const baseRes = await detectResources({
+    detectors: [
+      containerDetector,
+      envDetector,
+      gcpDetector,
+      osDetector,
+      processDetector,
+      serviceInstanceIdDetector
+    ]
+  });
+  if (baseRes.waitForAsyncAttributes) {
+    await baseRes.waitForAsyncAttributes();
+  }
   const { resourceAttributes } = detectTelemetryContext();
   const customRes = resourceFromAttributes(resourceAttributes);
   const resource = baseRes.merge(customRes);
@@ -614,66 +730,53 @@ var getResource = async () => {
 };
 
 // src/otel.ts
+diag.disable();
+diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ERROR);
 var initialization;
-async function initialize() {
+async function initialize(...instrumentations2) {
   if (!initialization) {
-    diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ERROR);
-    initialization = initializeOtel();
+    initialization = _initialize(instrumentations2);
   }
   return initialization;
 }
 function isInitialized() {
-  return initialization !== void 0;
+  return !!initialization;
 }
-async function initializeOtel() {
+async function _initialize(instrumentations2) {
   try {
     const serviceName = process.env.OTEL_SERVICE_NAME ?? "unknown-service";
     const otlpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
-    const isTestMode = process.env.NODE_ENV === "test" || process.env.VITEST === "true";
     const resource = await getResource();
-    let logProvider;
-    const shouldSetupLogProvider = !isTestMode || !!process.env.LOG_LEVEL;
-    if (shouldSetupLogProvider) {
-      logProvider = getLogProvider(resource, otlpEndpoint);
-      logs.setGlobalLoggerProvider(logProvider);
-    }
+    logs.disable();
+    trace.disable();
+    metrics.disable();
+    const logProvider = getLogProvider(resource, otlpEndpoint);
+    logs.setGlobalLoggerProvider(logProvider);
     const spanProcessor = getSpanProcessor(otlpEndpoint);
     const metricReader = getMetricReader(otlpEndpoint);
     const sdk = new NodeSDK({
       spanProcessor,
       metricReader,
-      instrumentations: [getNodeAutoInstrumentations()],
+      instrumentations: instrumentations2,
       resource
     });
     await sdk.start();
     console.log(`[otel] Telemetry initialized for "${serviceName}"`);
     process.on("SIGTERM", async () => {
       console.log("[otel] Shutting down...");
-      const shutdownPromises = [sdk.shutdown()];
-      if (logProvider) {
-        shutdownPromises.push(logProvider.shutdown());
-      }
-      await Promise.all(shutdownPromises);
+      await Promise.all([sdk.shutdown(), logProvider.shutdown()]);
       console.log("[otel] Shutdown complete.");
       process.exit(0);
     });
   } catch (err) {
-    if (err instanceof Error && err.message.includes("duplicate registration")) {
-      console.warn("[otel] Warning - API already registered, continuing...");
-    } else {
-      console.error("[otel] Startup error:", err);
-    }
+    console.error("[otel] Startup error:", err);
   }
 }
 
 // src/logger.ts
-import { context, trace } from "@opentelemetry/api";
-import { logs as logs2 } from "@opentelemetry/api-logs";
-function getLogger(serviceOverride, extraAttrs = {}, testProvider) {
+function getLogger(serviceOverride, extraAttrs = {}) {
   if (!isInitialized()) {
-    throw new Error(
-      "OpenTelemetry is not initialized. Please call initialize() before getting a logger."
-    );
+    throw new Error("OTEL must be initialized before calling getLogger()");
   }
   const { systemName, systemVersion, resourceAttributes } = detectTelemetryContext(serviceOverride);
   const defaultAttrs = {
@@ -681,8 +784,8 @@ function getLogger(serviceOverride, extraAttrs = {}, testProvider) {
     ...extraAttrs
   };
   function emit(severityText, body, attrs = {}) {
-    const logger = testProvider ? testProvider.getLogger(systemName, systemVersion) : logs2.getLogger(systemName, systemVersion);
-    const span = trace.getSpan(context.active());
+    const logger = logs2.getLogger(systemName, systemVersion);
+    const span = trace2.getSpan(context.active());
     const spanContext = span?.spanContext();
     logger.emit({
       severityText,
@@ -722,27 +825,31 @@ function getLogger(serviceOverride, extraAttrs = {}, testProvider) {
 }
 
 // src/metrics.ts
-import { metrics } from "@opentelemetry/api";
-async function getMeter(componentNameOverride) {
-  await initialize();
+import { metrics as metrics2 } from "@opentelemetry/api";
+function getMeter(componentNameOverride) {
+  if (!isInitialized()) {
+    throw new Error("OTEL must be initialized before calling getMeter()");
+  }
   const { componentName, systemName, systemVersion } = detectTelemetryContext(
     componentNameOverride
   );
-  return metrics.getMeter(componentName ?? systemName, systemVersion);
+  return metrics2.getMeter(componentName ?? systemName, systemVersion);
 }
 
 // src/tracer.ts
 import {
   context as context2,
   SpanStatusCode as SpanStatusCode3,
-  trace as trace2
+  trace as trace3
 } from "@opentelemetry/api";
-async function getTracer(componentNameOverride) {
-  await initialize();
+function getTracer(componentNameOverride) {
+  if (!isInitialized()) {
+    throw new Error("OTEL must be initialized before calling getMeter()");
+  }
   const { componentName, systemName, systemVersion } = detectTelemetryContext(
     componentNameOverride
   );
-  const tracer = trace2.getTracer(
+  const tracer = trace3.getTracer(
     componentName ?? systemName,
     systemVersion
   );
@@ -752,9 +859,9 @@ async function getTracer(componentNameOverride) {
       spanOrFunc,
       func
     );
-    const parentContext = parent ? trace2.setSpan(context2.active(), parent) : context2.active();
+    const parentContext = parent ? trace3.setSpan(context2.active(), parent) : context2.active();
     const span = tracer.startSpan(name, options, parentContext);
-    return await context2.with(trace2.setSpan(parentContext, span), async () => {
+    return await context2.with(trace3.setSpan(parentContext, span), async () => {
       try {
         const result = await fn(span);
         span.setStatus({ code: SpanStatusCode3.OK });
@@ -775,9 +882,9 @@ async function getTracer(componentNameOverride) {
       spanOrFunc,
       func
     );
-    const parentContext = parent ? trace2.setSpan(context2.active(), parent) : context2.active();
+    const parentContext = parent ? trace3.setSpan(context2.active(), parent) : context2.active();
     const span = tracer.startSpan(name, options, parentContext);
-    return context2.with(trace2.setSpan(parentContext, span), () => {
+    return context2.with(trace3.setSpan(parentContext, span), () => {
       try {
         const result = fn(span);
         span.setStatus({ code: SpanStatusCode3.OK });
@@ -820,11 +927,11 @@ function extractArgs(spanOptionsSpanOrFunc, spanOrFunc, func) {
 var isFunction = (value) => typeof value === "function";
 var isSpan = (value) => value !== null && value !== void 0 && isFunction(value.spanContext) && isFunction(value.end);
 var isSpanOptions = (value) => value !== null && value !== void 0 && (!!value.startTime || !!value.attributes || !!value.kind) && !isSpan(value);
-
-// src/index.ts
-initialize();
 export {
   getLogger,
   getMeter,
-  getTracer
+  getTracer,
+  initialize,
+  instrumentations,
+  isInitialized
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/otel",
-  "version": "0.5.1",
+  "version": "1.0.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -17,16 +17,27 @@
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/api-logs": "0.206.0",
-    "@opentelemetry/auto-instrumentations-node": "0.65.0",
-    "@opentelemetry/exporter-logs-otlp-http": "0.206.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.206.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.206.0",
-    "@opentelemetry/resources": "2.1.0",
-    "@opentelemetry/sdk-logs": "0.206.0",
-    "@opentelemetry/sdk-metrics": "2.1.0",
-    "@opentelemetry/sdk-node": "0.206.0",
-    "@opentelemetry/sdk-trace-node": "2.1.0",
+    "@opentelemetry/api-logs": "0.207.0",
+    "@opentelemetry/exporter-logs-otlp-http": "0.207.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.207.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.207.0",
+    "@opentelemetry/instrumentation": "0.207.0",
+    "@opentelemetry/instrumentation-dns": "0.51.0",
+    "@opentelemetry/instrumentation-express": "0.56.0",
+    "@opentelemetry/instrumentation-fs": "0.27.0",
+    "@opentelemetry/instrumentation-grpc": "0.207.0",
+    "@opentelemetry/instrumentation-http": "0.207.0",
+    "@opentelemetry/instrumentation-net": "0.51.0",
+    "@opentelemetry/instrumentation-redis": "0.56.0",
+    "@opentelemetry/instrumentation-socket.io": "0.54.0",
+    "@opentelemetry/instrumentation-undici": "0.18.0",
+    "@opentelemetry/resource-detector-container": "0.7.10",
+    "@opentelemetry/resource-detector-gcp": "0.42.0",
+    "@opentelemetry/resources": "2.2.0",
+    "@opentelemetry/sdk-logs": "0.207.0",
+    "@opentelemetry/sdk-metrics": "2.2.0",
+    "@opentelemetry/sdk-node": "0.207.0",
+    "@opentelemetry/sdk-trace-node": "2.2.0",
     "@opentelemetry/semantic-conventions": "1.37.0",
     "fast-safe-stringify": "2.1.1",
     "kleur": "4.1.5"