@sebspark/otel 0.3.0 → 0.4.0

package/dist/index.js

@@ -233,8 +233,8 @@ function formatSpans(spans) {
   const totalDuration = rootEnd - rootStart;
   const service = formatService(rootSpan.resource);
   const timestamp = formatTimestamp(rootSpan.startTime);
-  const spanId = colors.gray(`[${rootSpan.spanContext().spanId}]`);
-  const lines = [`${service} ${timestamp} ${spanId}`];
+  const traceId = colors.gray(`[${rootSpan.spanContext().traceId}]`);
+  const lines = [`${service} ${timestamp} ${traceId}`];
   for (const span of spans) {
     const offset = hrTimeToMillis(span.startTime) - rootStart;
     const depth = computeDepth(span, spans);
@@ -255,8 +255,8 @@ function formatSpan(span, opts) {
   const desc = formatDescription(span);
   const status = formatStatus(span);
   const duration = formatDuration(span, opts?.offsetMs);
-  const traceId = colors.gray(`[${span.spanContext().traceId}]`);
-  return `${label} ${barColor(bar)} ${desc} ${status} ${duration} ${traceId}`;
+  const spanId = colors.gray(`[${span.spanContext().spanId}]`);
+  return `${label} ${barColor(bar)} ${desc} ${status} ${duration} ${spanId}`;
 }
 function formatLabel(span, depth) {
   const indent = "  ".repeat(depth);
@@ -539,13 +539,27 @@ var TreeSpanProcessor = class {
 
 // src/providers.ts
 var getLogProvider = (resource, otlpEndpoint) => {
-  const exporter = otlpEndpoint ? new import_exporter_logs_otlp_http.OTLPLogExporter({ url: `${otlpEndpoint}/v1/logs` }) : new ConsoleLogPrettyExporter();
-  const processor = otlpEndpoint ? new import_sdk_logs.BatchLogRecordProcessor(exporter) : new import_sdk_logs.SimpleLogRecordProcessor(exporter);
-  const provider = new import_sdk_logs.LoggerProvider({
+  if (otlpEndpoint) {
+    const exporter2 = new import_exporter_logs_otlp_http.OTLPLogExporter({ url: `${otlpEndpoint}/v1/logs` });
+    const processors = [
+      new import_sdk_logs.BatchLogRecordProcessor(exporter2)
+    ];
+    if (process.env.LOG_LEVEL) {
+      processors.push(
+        new import_sdk_logs.SimpleLogRecordProcessor(new ConsoleLogPrettyExporter())
+      );
+    }
+    return new import_sdk_logs.LoggerProvider({
+      resource,
+      processors
+    });
+  }
+  const exporter = new ConsoleLogPrettyExporter();
+  const processor = new import_sdk_logs.SimpleLogRecordProcessor(exporter);
+  return new import_sdk_logs.LoggerProvider({
     resource,
     processors: [processor]
   });
-  return provider;
 };
 var getSpanProcessor = (otlpEndpoint) => {
   const exporter = otlpEndpoint ? new import_exporter_trace_otlp_http.OTLPTraceExporter({

package/dist/index.mjs

@@ -204,8 +204,8 @@ function formatSpans(spans) {
   const totalDuration = rootEnd - rootStart;
   const service = formatService(rootSpan.resource);
   const timestamp = formatTimestamp(rootSpan.startTime);
-  const spanId = colors.gray(`[${rootSpan.spanContext().spanId}]`);
-  const lines = [`${service} ${timestamp} ${spanId}`];
+  const traceId = colors.gray(`[${rootSpan.spanContext().traceId}]`);
+  const lines = [`${service} ${timestamp} ${traceId}`];
   for (const span of spans) {
     const offset = hrTimeToMillis(span.startTime) - rootStart;
     const depth = computeDepth(span, spans);
@@ -226,8 +226,8 @@ function formatSpan(span, opts) {
   const desc = formatDescription(span);
   const status = formatStatus(span);
   const duration = formatDuration(span, opts?.offsetMs);
-  const traceId = colors.gray(`[${span.spanContext().traceId}]`);
-  return `${label} ${barColor(bar)} ${desc} ${status} ${duration} ${traceId}`;
+  const spanId = colors.gray(`[${span.spanContext().spanId}]`);
+  return `${label} ${barColor(bar)} ${desc} ${status} ${duration} ${spanId}`;
 }
 function formatLabel(span, depth) {
   const indent = "  ".repeat(depth);
@@ -510,13 +510,27 @@ var TreeSpanProcessor = class {
 
 // src/providers.ts
 var getLogProvider = (resource, otlpEndpoint) => {
-  const exporter = otlpEndpoint ? new OTLPLogExporter({ url: `${otlpEndpoint}/v1/logs` }) : new ConsoleLogPrettyExporter();
-  const processor = otlpEndpoint ? new BatchLogRecordProcessor(exporter) : new SimpleLogRecordProcessor(exporter);
-  const provider = new LoggerProvider({
+  if (otlpEndpoint) {
+    const exporter2 = new OTLPLogExporter({ url: `${otlpEndpoint}/v1/logs` });
+    const processors = [
+      new BatchLogRecordProcessor(exporter2)
+    ];
+    if (process.env.LOG_LEVEL) {
+      processors.push(
+        new SimpleLogRecordProcessor(new ConsoleLogPrettyExporter())
+      );
+    }
+    return new LoggerProvider({
+      resource,
+      processors
+    });
+  }
+  const exporter = new ConsoleLogPrettyExporter();
+  const processor = new SimpleLogRecordProcessor(exporter);
+  return new LoggerProvider({
     resource,
     processors: [processor]
   });
-  return provider;
 };
 var getSpanProcessor = (otlpEndpoint) => {
   const exporter = otlpEndpoint ? new OTLPTraceExporter({

package/package.json

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