@sebspark/otel 0.2.2 → 0.2.4

package/README.md

@@ -61,7 +61,7 @@ Logs inside active spans automatically include:
 ```ts
 import { getTracer } from '@sebspark/otel'
 
-const tracer = getTracer()
+const tracer = getTracer() // async to ensure otel initialization
 
 await tracer.withTrace('trace.name', async (span) => {
   span.setAttribute('user.id', '123')
@@ -111,7 +111,7 @@ span.end()
 ```ts
 import { getMeter } from '@sebspark/otel'
 
-const meter = getMeter()
+const meter = getMeter() // async to ensure otel initialization
 
 const counter = meter.createCounter('http_requests_total', {
   description: 'Total number of HTTP requests',

package/dist/index.d.mts

@@ -13,7 +13,7 @@ declare function getLogger(serviceOverride?: string, extraAttrs?: Attrs): {
     emergency: (msg: string, attrs?: Attrs) => void;
 };
 
-declare function getMeter(componentNameOverride?: string): _opentelemetry_api.Meter;
+declare function getMeter(componentNameOverride?: string): Promise<_opentelemetry_api.Meter>;
 
 type OtelTracer = ReturnType<typeof trace.getTracer>;
 type Span = ReturnType<OtelTracer['startSpan']>;
@@ -45,6 +45,6 @@ interface Tracer extends OtelTracer {
  * @param serviceOverride - Optional override for service name
  * @returns Tracer with helpers
  */
-declare function getTracer(componentNameOverride?: string): Tracer;
+declare function getTracer(componentNameOverride?: string): Promise<Tracer>;
 
 export { getLogger, getMeter, getTracer };

package/dist/index.d.ts

@@ -13,7 +13,7 @@ declare function getLogger(serviceOverride?: string, extraAttrs?: Attrs): {
     emergency: (msg: string, attrs?: Attrs) => void;
 };
 
-declare function getMeter(componentNameOverride?: string): _opentelemetry_api.Meter;
+declare function getMeter(componentNameOverride?: string): Promise<_opentelemetry_api.Meter>;
 
 type OtelTracer = ReturnType<typeof trace.getTracer>;
 type Span = ReturnType<OtelTracer['startSpan']>;
@@ -45,6 +45,6 @@ interface Tracer extends OtelTracer {
  * @param serviceOverride - Optional override for service name
  * @returns Tracer with helpers
  */
-declare function getTracer(componentNameOverride?: string): Tracer;
+declare function getTracer(componentNameOverride?: string): Promise<Tracer>;
 
 export { getLogger, getMeter, getTracer };

package/dist/index.js

@@ -614,17 +614,22 @@ var getResource = async () => {
   const { resourceAttributes } = detectTelemetryContext();
   const customRes = (0, import_resources.resourceFromAttributes)(resourceAttributes);
   const resource = baseRes.merge(customRes);
+  if (resource.waitForAsyncAttributes) {
+    await resource.waitForAsyncAttributes();
+  }
   return resource;
 };
 
 // src/otel.ts
 import_api3.diag.setLogger(new import_api3.DiagConsoleLogger(), import_api3.DiagLogLevel.ERROR);
-var isInitialized = false;
+var initialization;
 async function initialize() {
-  if (isInitialized) {
-    return;
+  if (!initialization) {
+    initialization = _initialize();
   }
-  isInitialized = true;
+  return initialization;
+}
+async function _initialize() {
   try {
     const serviceName = process.env.OTEL_SERVICE_NAME ?? "unknown-service";
     const otlpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
@@ -657,12 +662,20 @@ var import_api4 = require("@opentelemetry/api");
 var import_api_logs2 = require("@opentelemetry/api-logs");
 function getLogger(serviceOverride, extraAttrs = {}) {
   const { systemName, systemVersion, resourceAttributes } = detectTelemetryContext(serviceOverride);
-  const logger = import_api_logs2.logs.getLogger(systemName, systemVersion);
   const defaultAttrs = {
     ...resourceAttributes,
     ...extraAttrs
   };
+  let isInitialized = false;
   function emit(severityText, body, attrs = {}) {
+    if (!isInitialized) {
+      initialize().then(() => {
+        isInitialized = true;
+        emit(severityText, body, attrs);
+      });
+      return;
+    }
+    const logger = import_api_logs2.logs.getLogger(systemName, systemVersion);
     const span = import_api4.trace.getSpan(import_api4.context.active());
     const spanContext = span?.spanContext();
     logger.emit({
@@ -696,7 +709,8 @@ function getLogger(serviceOverride, extraAttrs = {}) {
 
 // src/metrics.ts
 var import_api5 = require("@opentelemetry/api");
-function getMeter(componentNameOverride) {
+async function getMeter(componentNameOverride) {
+  await initialize();
   const { componentName, systemName, systemVersion } = detectTelemetryContext(
     componentNameOverride
   );
@@ -705,7 +719,8 @@ function getMeter(componentNameOverride) {
 
 // src/tracer.ts
 var import_api6 = require("@opentelemetry/api");
-function getTracer(componentNameOverride) {
+async function getTracer(componentNameOverride) {
+  await initialize();
   const { componentName, systemName, systemVersion } = detectTelemetryContext(
     componentNameOverride
   );
@@ -767,11 +782,11 @@ function extractArgs(spanOptionsSpanOrFunc, spanOrFunc, func) {
   let options = {};
   let parent;
   let fn;
-  if (typeof spanOptionsSpanOrFunc === "function") {
+  if (isFunction(spanOptionsSpanOrFunc)) {
     fn = spanOptionsSpanOrFunc;
-  } else if (typeof spanOrFunc === "function") {
+  } else if (isFunction(spanOrFunc)) {
     const spanOrSpanOptions = spanOptionsSpanOrFunc;
-    if ("startTime" in spanOrSpanOptions || "attributes" in spanOrSpanOptions || "kind" in spanOrSpanOptions) {
+    if (isSpanOptions(spanOrSpanOptions)) {
       options = spanOrSpanOptions;
     } else {
       parent = spanOrSpanOptions;
@@ -784,6 +799,9 @@ function extractArgs(spanOptionsSpanOrFunc, spanOrFunc, func) {
   }
   return { options, parent, fn };
 }
+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();

package/dist/index.mjs

@@ -1,9 +1,5 @@
 // src/otel.ts
-import {
-  DiagConsoleLogger,
-  DiagLogLevel,
-  diag
-} from "@opentelemetry/api";
+import { DiagConsoleLogger, DiagLogLevel, diag } from "@opentelemetry/api";
 import { logs } from "@opentelemetry/api-logs";
 import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
 import { NodeSDK } from "@opentelemetry/sdk-node";
@@ -595,17 +591,22 @@ var getResource = async () => {
   const { resourceAttributes } = detectTelemetryContext();
   const customRes = resourceFromAttributes(resourceAttributes);
   const resource = baseRes.merge(customRes);
+  if (resource.waitForAsyncAttributes) {
+    await resource.waitForAsyncAttributes();
+  }
   return resource;
 };
 
 // src/otel.ts
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ERROR);
-var isInitialized = false;
+var initialization;
 async function initialize() {
-  if (isInitialized) {
-    return;
+  if (!initialization) {
+    initialization = _initialize();
   }
-  isInitialized = true;
+  return initialization;
+}
+async function _initialize() {
   try {
     const serviceName = process.env.OTEL_SERVICE_NAME ?? "unknown-service";
     const otlpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
@@ -634,17 +635,25 @@ async function initialize() {
 }
 
 // src/logger.ts
-import { context as context2, trace } from "@opentelemetry/api";
+import { context, trace } from "@opentelemetry/api";
 import { logs as logs2 } from "@opentelemetry/api-logs";
 function getLogger(serviceOverride, extraAttrs = {}) {
   const { systemName, systemVersion, resourceAttributes } = detectTelemetryContext(serviceOverride);
-  const logger = logs2.getLogger(systemName, systemVersion);
   const defaultAttrs = {
     ...resourceAttributes,
     ...extraAttrs
   };
+  let isInitialized = false;
   function emit(severityText, body, attrs = {}) {
-    const span = trace.getSpan(context2.active());
+    if (!isInitialized) {
+      initialize().then(() => {
+        isInitialized = true;
+        emit(severityText, body, attrs);
+      });
+      return;
+    }
+    const logger = logs2.getLogger(systemName, systemVersion);
+    const span = trace.getSpan(context.active());
     const spanContext = span?.spanContext();
     logger.emit({
       severityText,
@@ -677,7 +686,8 @@ function getLogger(serviceOverride, extraAttrs = {}) {
 
 // src/metrics.ts
 import { metrics } from "@opentelemetry/api";
-function getMeter(componentNameOverride) {
+async function getMeter(componentNameOverride) {
+  await initialize();
   const { componentName, systemName, systemVersion } = detectTelemetryContext(
     componentNameOverride
   );
@@ -686,11 +696,12 @@ function getMeter(componentNameOverride) {
 
 // src/tracer.ts
 import {
-  context as context3,
+  context as context2,
   SpanStatusCode as SpanStatusCode3,
   trace as trace2
 } from "@opentelemetry/api";
-function getTracer(componentNameOverride) {
+async function getTracer(componentNameOverride) {
+  await initialize();
   const { componentName, systemName, systemVersion } = detectTelemetryContext(
     componentNameOverride
   );
@@ -704,9 +715,9 @@ function getTracer(componentNameOverride) {
       spanOrFunc,
       func
     );
-    const parentContext = parent ? trace2.setSpan(context3.active(), parent) : context3.active();
+    const parentContext = parent ? trace2.setSpan(context2.active(), parent) : context2.active();
     const span = tracer.startSpan(name, options, parentContext);
-    return await context3.with(trace2.setSpan(parentContext, span), async () => {
+    return await context2.with(trace2.setSpan(parentContext, span), async () => {
       try {
         const result = await fn(span);
         span.setStatus({ code: SpanStatusCode3.OK });
@@ -727,9 +738,9 @@ function getTracer(componentNameOverride) {
       spanOrFunc,
       func
     );
-    const parentContext = parent ? trace2.setSpan(context3.active(), parent) : context3.active();
+    const parentContext = parent ? trace2.setSpan(context2.active(), parent) : context2.active();
     const span = tracer.startSpan(name, options, parentContext);
-    return context3.with(trace2.setSpan(parentContext, span), () => {
+    return context2.with(trace2.setSpan(parentContext, span), () => {
       try {
         const result = fn(span);
         span.setStatus({ code: SpanStatusCode3.OK });
@@ -752,11 +763,11 @@ function extractArgs(spanOptionsSpanOrFunc, spanOrFunc, func) {
   let options = {};
   let parent;
   let fn;
-  if (typeof spanOptionsSpanOrFunc === "function") {
+  if (isFunction(spanOptionsSpanOrFunc)) {
     fn = spanOptionsSpanOrFunc;
-  } else if (typeof spanOrFunc === "function") {
+  } else if (isFunction(spanOrFunc)) {
     const spanOrSpanOptions = spanOptionsSpanOrFunc;
-    if ("startTime" in spanOrSpanOptions || "attributes" in spanOrSpanOptions || "kind" in spanOrSpanOptions) {
+    if (isSpanOptions(spanOrSpanOptions)) {
       options = spanOrSpanOptions;
     } else {
       parent = spanOrSpanOptions;
@@ -769,6 +780,9 @@ function extractArgs(spanOptionsSpanOrFunc, spanOrFunc, func) {
   }
   return { options, parent, fn };
 }
+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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/otel",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",