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

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 { SpanKind, trace, INVALID_SPAN_CONTEXT, propagation, context, SpanStatusCode, TraceFlags } from '@opentelemetry/api';
+import { context, SpanKind, trace, INVALID_SPAN_CONTEXT, propagation, 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 context2 = null;
+    var context4 = null;
     function errorContext(cb) {
       if (config_1.config.useDeprecatedSynchronousErrorHandling) {
-        var isRoot = !context2;
+        var isRoot = !context4;
         if (isRoot) {
-          context2 = {
+          context4 = {
             errorThrown: false,
             error: null
           };
         }
         cb();
         if (isRoot) {
-          var _a = context2, errorThrown = _a.errorThrown, error = _a.error;
-          context2 = null;
+          var _a = context4, errorThrown = _a.errorThrown, error = _a.error;
+          context4 = 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 && context2) {
-        context2.errorThrown = true;
-        context2.error = err;
+      if (config_1.config.useDeprecatedSynchronousErrorHandling && context4) {
+        context4.errorThrown = true;
+        context4.error = err;
       }
     }
     __name(captureError, "captureError");
@@ -8842,7 +8842,7 @@ __name(hrTimeToNanosNumber, "hrTimeToNanosNumber");
 
 // package.json
 var package_default = {
-  version: "1.0.4-alpha.3"};
+  version: "1.0.4-alpha.4"};
 
 // src/const.ts
 var AppEnv = /* @__PURE__ */ (function(AppEnv2) {
@@ -8874,83 +8874,6 @@ function convertAttributesToString(attributes) {
 }
 __name(convertAttributesToString, "convertAttributesToString");
 
-// src/core/point-kill/index.ts
-var PointKillManager = class _PointKillManager {
-  static {
-    __name(this, "PointKillManager");
-  }
-  static instance;
-  static CONFIG_HEADER_NAME = "x-force-observability-pointkill";
-  config = {
-    logs: {
-      modules: []
-    },
-    traces: {
-      modules: []
-    },
-    metrics: {
-      modules: []
-    }
-  };
-  constructor() {
-  }
-  static getInstance() {
-    if (!_PointKillManager.instance) {
-      _PointKillManager.instance = new _PointKillManager();
-    }
-    return _PointKillManager.instance;
-  }
-  getConfig() {
-    return this.config;
-  }
-  updateConfig(newConfig) {
-    this.config = {
-      logs: {
-        modules: [
-          ...newConfig.logs.modules
-        ]
-      },
-      traces: {
-        modules: [
-          ...newConfig.traces.modules
-        ]
-      },
-      metrics: {
-        modules: [
-          ...newConfig.metrics.modules
-        ]
-      }
-    };
-  }
-  setConfig(configStr) {
-    if (!configStr) return;
-    try {
-      const res = JSON.parse(configStr);
-      const { logs: logs2, traces, metrics } = res ?? {};
-      this.updateConfig({
-        logs: {
-          modules: Array.isArray(logs2?.modules) ? logs2.modules : []
-        },
-        traces: {
-          modules: Array.isArray(traces?.modules) ? traces.modules : []
-        },
-        metrics: {
-          modules: Array.isArray(metrics?.modules) ? metrics.modules : []
-        }
-      });
-    } catch (error) {
-      console.error("Failed to parse sniping config:", error);
-    }
-  }
-  updateFromHeaders(headers) {
-    const snipingConfig = headers[_PointKillManager.CONFIG_HEADER_NAME] || headers[_PointKillManager.CONFIG_HEADER_NAME.toLowerCase()];
-    if (snipingConfig) {
-      this.setConfig(snipingConfig);
-    }
-  }
-};
-var pointKillManager = PointKillManager.getInstance();
-
 // src/core/log-exporter.ts
 var CustomExporter = class {
   static {
@@ -8961,19 +8884,12 @@ var CustomExporter = class {
   constructor() {
   }
   export(logs2, resultCallback) {
-    const snipingConfig = pointKillManager.getConfig();
-    console.log("snipingConfig", snipingConfig);
-    if (snipingConfig.logs.modules.includes("*")) {
-      resultCallback({
-        code: ExportResultCode.SUCCESS
-      });
-      return;
-    }
+    const pointKillConfig = context.active().getValue(POINT_KILL_TAG);
     const filteredLogs = logs2.filter((log) => {
-      const module = log.attributes?.module;
-      if (module && snipingConfig.logs.modules.includes(module)) {
-        return false;
-      }
+      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;
       return true;
     });
     if (filteredLogs.length === 0) {
@@ -8993,19 +8909,23 @@ var CustomExporter = class {
           ...defaultResourceAttr
         }
       },
-      logRecords: filteredLogs.map((log) => ({
-        timeUnixNano: hrTimeToNanosNumber(log.hrTime),
-        observedTimeUnixNano: hrTimeToNanosNumber(log.hrTimeObserved),
-        severityNumber: log.severityNumber,
-        severityText: log.severityText,
-        body: log.body,
-        attributes: convertAttributesToString({
+      logRecords: filteredLogs.map((log) => {
+        const rawAttributes = {
           ...defaultAttributes,
           ...log.attributes ?? {}
-        }),
-        traceID: log.spanContext?.traceId,
-        spanID: log.spanContext?.spanId
-      }))
+        };
+        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
+        };
+      })
     };
     console.log(this.logPrefix + JSON.stringify(otlpLikeStructure) + this.logSuffix);
     resultCallback({
@@ -9052,25 +8972,17 @@ var CustomTraceExporter = class {
   tracePrefix = "force-trace-prefix";
   traceSuffix = "force-trace-suffix";
   export(spans, resultCallback) {
-    const snipingConfig = pointKillManager.getConfig();
-    console.log("snipingConfig", snipingConfig);
-    if (snipingConfig.traces.modules.includes("*")) {
-      resultCallback({
-        code: ExportResultCode.SUCCESS
-      });
-      return;
-    }
     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;
-      const module = span.attributes?.module;
-      if (module && snipingConfig.traces.modules.includes(module)) {
-        return false;
-      }
+      if (pointKillConfig?.traces?.modules?.includes("*")) return false;
+      const moduleName = span.attributes?.module;
+      if (moduleName && pointKillConfig?.traces?.modules?.includes(moduleName)) return false;
       return true;
     });
     if (!finalSpans.length) {
@@ -9119,7 +9031,36 @@ 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");
@@ -9160,13 +9101,13 @@ var AppOTelSDK = class _AppOTelSDK {
   * wrapper 形式
   */
   startContext(headers, name, fn) {
-    pointKillManager.updateFromHeaders(headers);
     const carrier = {};
     const customTraceId = headers["rpc-persist-apaas-observability-trace"];
     if (customTraceId && _AppOTelSDK.CUSTOM_FORMAT_REGEX.test(customTraceId)) {
       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);