@lark-apaas/observable 1.0.4-alpha.5 → 1.0.4-alpha.7

package/dist/index.d.cts

@@ -7,6 +7,8 @@ declare class AppOTelSDK {
     private sdk;
     private logProcessor;
     private spanProcessor;
+    private logger;
+    private isStarted;
     private static CUSTOM_FORMAT_REGEX;
     static emptySpan: Span;
     start(): void;

package/dist/index.d.ts

@@ -7,6 +7,8 @@ declare class AppOTelSDK {
     private sdk;
     private logProcessor;
     private spanProcessor;
+    private logger;
+    private isStarted;
     private static CUSTOM_FORMAT_REGEX;
     static emptySpan: Span;
     start(): void;

package/dist/index.js

@@ -2,7 +2,7 @@ import { NodeSDK } from '@opentelemetry/sdk-node';
 import { BatchLogRecordProcessor } from '@opentelemetry/sdk-logs';
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-node';
 import { detectResources } from '@opentelemetry/resources';
-import { context, SpanKind, trace, INVALID_SPAN_CONTEXT, propagation, SpanStatusCode, TraceFlags } from '@opentelemetry/api';
+import { SpanKind, trace, INVALID_SPAN_CONTEXT, propagation, context, SpanStatusCode, TraceFlags } from '@opentelemetry/api';
 import { logs, SeverityNumber } from '@opentelemetry/api-logs';
 import { ExportResultCode } from '@opentelemetry/core';
 import { randomBytes } from 'crypto';
@@ -518,20 +518,20 @@ var require_errorContext = __commonJS({
     });
     exports$1.captureError = exports$1.errorContext = void 0;
     var config_1 = require_config();
-    var context4 = null;
+    var context2 = null;
     function errorContext(cb) {
       if (config_1.config.useDeprecatedSynchronousErrorHandling) {
-        var isRoot = !context4;
+        var isRoot = !context2;
         if (isRoot) {
-          context4 = {
+          context2 = {
             errorThrown: false,
             error: null
           };
         }
         cb();
         if (isRoot) {
-          var _a = context4, errorThrown = _a.errorThrown, error = _a.error;
-          context4 = null;
+          var _a = context2, errorThrown = _a.errorThrown, error = _a.error;
+          context2 = null;
           if (errorThrown) {
             throw error;
           }
@@ -543,9 +543,9 @@ var require_errorContext = __commonJS({
     __name(errorContext, "errorContext");
     exports$1.errorContext = errorContext;
     function captureError(err) {
-      if (config_1.config.useDeprecatedSynchronousErrorHandling && context4) {
-        context4.errorThrown = true;
-        context4.error = err;
+      if (config_1.config.useDeprecatedSynchronousErrorHandling && context2) {
+        context2.errorThrown = true;
+        context2.error = err;
       }
     }
     __name(captureError, "captureError");
@@ -8800,7 +8800,7 @@ var PlatformDetector = class {
   * @param config 探测配置 (可选)
   */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  detect(config) {
+  detect(_config) {
     const attributes = {};
     const cleanAttributes = Object.entries(attributes).reduce((acc, [key, value]) => {
       if (value !== void 0 && value !== null && value !== "") {
@@ -8842,7 +8842,7 @@ __name(hrTimeToNanosNumber, "hrTimeToNanosNumber");
 
 // package.json
 var package_default = {
-  version: "1.0.4-alpha.4"};
+  version: "1.0.4-alpha.7"};
 
 // src/const.ts
 var AppEnv = /* @__PURE__ */ (function(AppEnv2) {
@@ -8855,6 +8855,7 @@ var defaultResourceAttr = {
   "sdk_type": "client-backend",
   "sdk_language": "node"
 };
+var pointKillTag = "__point_kill_info";
 var TraceDropToken = "TraceDropToken";
 
 // src/utils/convertAllAttrIntoString.ts
@@ -8874,6 +8875,34 @@ function convertAttributesToString(attributes) {
 }
 __name(convertAttributesToString, "convertAttributesToString");
 
+// src/utils/getSnippingConfig.ts
+function processSnipConfig(configStr) {
+  if (!configStr) return;
+  try {
+    const res = JSON.parse(configStr);
+    const { logs: logs2, traces, metrics } = res ?? {};
+    if (res) {
+      return {
+        logs: {
+          modules: Array.isArray(logs2?.modules) ? logs2.modules : []
+        },
+        traces: {
+          modules: Array.isArray(traces?.modules) ? traces.modules : []
+        },
+        metrics: {
+          modules: Array.isArray(metrics?.modules) ? metrics.modules : []
+        }
+      };
+    } else {
+      return void 0;
+    }
+  } catch (error) {
+    console.error("Failed to parse sniping config:", error);
+    return void 0;
+  }
+}
+__name(processSnipConfig, "processSnipConfig");
+
 // src/core/log-exporter.ts
 var CustomExporter = class {
   static {
@@ -8884,12 +8913,22 @@ var CustomExporter = class {
   constructor() {
   }
   export(logs2, resultCallback) {
-    const pointKillConfig = context.active().getValue(POINT_KILL_TAG);
     const filteredLogs = logs2.filter((log) => {
-      if (!pointKillConfig) return true;
-      const moduleName = log.attributes?.module;
-      if (pointKillConfig.logs?.modules?.includes("*")) return false;
-      if (moduleName && pointKillConfig.logs?.modules?.includes(moduleName)) return false;
+      const pkTag = log.attributes?.[pointKillTag];
+      if (pkTag) {
+        try {
+          const snipingConfig = processSnipConfig(pkTag);
+          if (snipingConfig?.logs?.modules?.includes("*")) {
+            return false;
+          }
+          const module = log.attributes?.module;
+          if (module && snipingConfig?.logs?.modules?.includes(module)) {
+            return false;
+          }
+        } catch (e) {
+          console.error(`Failed to parse ${pointKillTag} in log exporter:`, e);
+        }
+      }
       return true;
     });
     if (filteredLogs.length === 0) {
@@ -8909,23 +8948,19 @@ var CustomExporter = class {
           ...defaultResourceAttr
         }
       },
-      logRecords: filteredLogs.map((log) => {
-        const rawAttributes = {
+      logRecords: filteredLogs.map((log) => ({
+        timeUnixNano: hrTimeToNanosNumber(log.hrTime),
+        observedTimeUnixNano: hrTimeToNanosNumber(log.hrTimeObserved),
+        severityNumber: log.severityNumber,
+        severityText: log.severityText,
+        body: log.body,
+        attributes: convertAttributesToString({
           ...defaultAttributes,
           ...log.attributes ?? {}
-        };
-        delete rawAttributes["__point_kill_logs"];
-        return {
-          timeUnixNano: hrTimeToNanosNumber(log.hrTime),
-          observedTimeUnixNano: hrTimeToNanosNumber(log.hrTimeObserved),
-          severityNumber: log.severityNumber,
-          severityText: log.severityText,
-          body: log.body,
-          attributes: convertAttributesToString(rawAttributes),
-          traceID: log.spanContext?.traceId,
-          spanID: log.spanContext?.spanId
-        };
-      })
+        }),
+        traceID: log.spanContext?.traceId,
+        spanID: log.spanContext?.spanId
+      }))
     };
     console.log(this.logPrefix + JSON.stringify(otlpLikeStructure) + this.logSuffix);
     resultCallback({
@@ -8972,17 +9007,23 @@ var CustomTraceExporter = class {
   tracePrefix = "force-trace-prefix";
   traceSuffix = "force-trace-suffix";
   export(spans, resultCallback) {
-    const isDev = process.env.NODE_ENV === "development";
-    const defaultAttributes = {
-      uuid: idGenerator.generateTraceId(),
-      app_env: isDev ? AppEnv.Dev : AppEnv.Prod
-    };
     const finalSpans = spans.filter((span) => {
-      const pointKillConfig = context.active().getValue(POINT_KILL_TAG);
       if ((span.attributes ?? {})[TraceDropToken]) return false;
-      if (pointKillConfig?.traces?.modules?.includes("*")) return false;
-      const moduleName = span.attributes?.module;
-      if (moduleName && pointKillConfig?.traces?.modules?.includes(moduleName)) return false;
+      const pkTag = span.attributes?.[pointKillTag];
+      if (pkTag) {
+        try {
+          const snipingConfig = processSnipConfig(pkTag);
+          if (snipingConfig?.traces?.modules?.includes("*")) {
+            return false;
+          }
+          const module = span.attributes?.module;
+          if (module && snipingConfig?.traces?.modules?.includes(module)) {
+            return false;
+          }
+        } catch (e) {
+          console.error(`Failed to parse in trace exporter:`, e);
+        }
+      }
       return true;
     });
     if (!finalSpans.length) {
@@ -8991,6 +9032,11 @@ var CustomTraceExporter = class {
       });
       return;
     }
+    const isDev = process.env.NODE_ENV === "development";
+    const defaultAttributes = {
+      uuid: idGenerator.generateTraceId(),
+      app_env: isDev ? AppEnv.Dev : AppEnv.Prod
+    };
     const otlpLikeStructure = {
       resource: {
         attributes: {
@@ -9031,36 +9077,7 @@ function isObservable(input) {
 }
 __name(isObservable, "isObservable");
 
-// src/utils/getSnippingConfig.ts
-function processSnipConfig(configStr) {
-  if (!configStr) return;
-  try {
-    const res = JSON.parse(configStr);
-    const { logs: logs2, traces, metrics } = res ?? {};
-    if (res) {
-      return {
-        logs: {
-          modules: Array.isArray(logs2?.modules) ? logs2.modules : []
-        },
-        traces: {
-          modules: Array.isArray(traces?.modules) ? traces.modules : []
-        },
-        metrics: {
-          modules: Array.isArray(metrics?.modules) ? metrics.modules : []
-        }
-      };
-    } else {
-      return void 0;
-    }
-  } catch (error) {
-    console.error("Failed to parse sniping config:", error);
-    return void 0;
-  }
-}
-__name(processSnipConfig, "processSnipConfig");
-
 // src/core/sdk.ts
-var POINT_KILL_TAG = /* @__PURE__ */ Symbol("__point_kill");
 var AppOTelSDK = class _AppOTelSDK {
   static {
     __name(this, "AppOTelSDK");
@@ -9068,9 +9085,13 @@ var AppOTelSDK = class _AppOTelSDK {
   sdk = null;
   logProcessor = null;
   spanProcessor = null;
+  logger = null;
+  isStarted = false;
   static CUSTOM_FORMAT_REGEX = /^[0-9a-fA-F]{32}-[0-9a-fA-F]{16}$/;
   static emptySpan = trace.wrapSpanContext(INVALID_SPAN_CONTEXT);
   start() {
+    if (this.isStarted) return;
+    this.isStarted = true;
     const resource = detectResources({
       detectors: [
         new PlatformDetector()
@@ -9094,6 +9115,7 @@ var AppOTelSDK = class _AppOTelSDK {
       spanProcessor: this.spanProcessor
     });
     this.sdk.start();
+    this.logger = logs.getLogger("app-logger");
   }
   /**
   * [框架专用 API] 开启一个根 Span (Root Span)
@@ -9107,7 +9129,6 @@ var AppOTelSDK = class _AppOTelSDK {
       carrier["traceparent"] = `00-${customTraceId}-01`;
     }
     const activeContext = propagation.extract(context.active(), carrier);
-    activeContext.setValue(POINT_KILL_TAG, processSnipConfig(headers["x-force-observability-pointkill"]));
     const tracer = trace.getTracer("app-core");
     tracer.startActiveSpan(name, {}, activeContext, (span) => {
       fn(span);
@@ -9166,7 +9187,7 @@ var AppOTelSDK = class _AppOTelSDK {
   */
   log(level, message, extra = {}, spanAttr) {
     try {
-      const logger = logs.getLogger("app-logger");
+      if (!this.logger) return;
       const severityNumber = mapSeverity(level);
       const severityText = mapSeverityText(level);
       const attributes = {
@@ -9187,7 +9208,7 @@ var AppOTelSDK = class _AppOTelSDK {
       } catch {
         logContext = context.active();
       }
-      logger.emit({
+      this.logger.emit({
         body: message,
         severityNumber,
         severityText,