@deepseek-ai/dsh-otel 0.2.1-alpha.1 → 0.2.1-alpha.3

package/README.i18n.yaml

@@ -18,8 +18,8 @@
   en: f141a9d909c555d8
   zh: e4f5b690ccb1337c
 /deepseek-ai-dsh-otel/understand-the-implementation:
-  en: d1b6f8f2b25ea252
-  zh: 73d6147bae811ce0
+  en: 56298bd5a3be2cdb
+  zh: 4dff467a0cb30a38
 /deepseek-ai-dsh-otel/further-exploration:
   en: ee17b991de098cc0
   zh: f90257e411921f2b

package/README.md

@@ -34,7 +34,9 @@ Headers are explicit. The service does not add a channel header or inherit ambie
 <a id="understand-the-implementation"></a>
 ## Understand the implementation
 
-`src/index.ts` registers the service; `event-log.ts` owns ordinary SDK batching; `session-log.ts` owns byte/count scheduling; `transport.ts` supplies the Session SDK JSON HTTP delegate; `event-transport.ts` uses Got for cancellable ordinary-event HTTP requests and retry waits with SDK serialization and export accounting. No global OTel provider is installed. The Session processor measures each record once, groups conservative sizes, and waits for the SDK concurrency queue to clear after every callback before sending another request.
+`src/index.ts` registers the service; `event-log.ts` owns ordinary SDK batching; `session-log.ts` owns byte/count scheduling; `transport.ts` supplies the Session SDK JSON HTTP delegate and owns the shared exporter metrics recorder, which receives no meter provider and records nothing; `event-transport.ts` uses Got for cancellable ordinary-event HTTP requests and retry waits with SDK serialization and export accounting. No global OTel provider is installed; the accepted exporter options exclude the upstream `selfObsMeterProvider`, and the Session processor accepts only the batching fields it implements, so exporter and Session-processor self-observability metrics stay unrecorded. The Session processor measures each record once, groups conservative sizes, and waits for the SDK concurrency queue to clear after every callback before sending another request.
+
+OpenTelemetry SDK dependencies use exact versions from one coordinated release across this service and its two adapters.
 
 Composition tests exercise independent channels and service removal; adapter tests cover dependent-fiber cleanup and feedback authorization.
 

package/README.zh.md

@@ -34,7 +34,9 @@ Header 显式提供。服务不会附加 channel header，也不继承环境中
 <a id="understand-the-implementation"></a>
 ## 理解实现
 
-`src/index.ts` 注册服务；`event-log.ts` 负责普通事件的 SDK 聚合；`session-log.ts` 负责字节和条数调度；`transport.ts` 提供 Session 的 SDK JSON HTTP delegate；`event-transport.ts` 使用 Got 实现可取消的普通事件 HTTP 请求和重试等待，序列化与导出计数仍由 SDK 负责。不安装全局 OTel provider。Session processor 对每条记录只计量一次，按保守大小组包，并在每次回调后等待 SDK 并发队列清理完成才发送下一请求。
+`src/index.ts` 注册服务；`event-log.ts` 负责普通事件的 SDK 聚合；`session-log.ts` 负责字节和条数调度；`transport.ts` 提供 Session 的 SDK JSON HTTP delegate，并持有共享的 exporter 指标记录器（不接收 meter provider，不记录任何指标）；`event-transport.ts` 使用 Got 实现可取消的普通事件 HTTP 请求和重试等待，序列化与导出计数仍由 SDK 负责。不安装全局 OTel provider；接受的 exporter 选项排除上游的 `selfObsMeterProvider`，Session processor 也只接受它实现的聚合字段，因此 exporter 和 Session processor 的自观测指标都不会被记录。Session processor 对每条记录只计量一次，按保守大小组包，并在每次回调后等待 SDK 并发队列清理完成才发送下一请求。
+
+本服务及其两个适配器的 OpenTelemetry SDK 依赖使用同一配套版本系列的精确版本。
 
 组合测试覆盖独立通道和服务移除；适配器测试覆盖依赖 fiber 清理与反馈授权。
 

package/lib/index.js

@@ -7,17 +7,27 @@ import { BatchLogRecordProcessor, LoggerProvider } from "@opentelemetry/sdk-logs
 import { gzipSync } from "node:zlib";
 import got from "got";
 import { OTLPExporterBase, createOtlpNetworkExportDelegate, getSharedConfigurationDefaults, mergeOtlpSharedConfigurationWithDefaults } from "@opentelemetry/otlp-exporter-base";
-import { JsonLogsSerializer } from "@opentelemetry/otlp-transformer";
-import { createOtlpHttpExportDelegate, getSharedConfigurationFromEnvironment, httpAgentFactoryFromOptions } from "@opentelemetry/otlp-exporter-base/node-http";
+import { JsonLogsSerializer, LogsExporterMetricsHelper } from "@opentelemetry/otlp-transformer";
+import { createOtlpHttpExportDelegate, createOtlpHttpExporterMetrics, getSharedConfigurationFromEnvironment, httpAgentFactoryFromOptions } from "@opentelemetry/otlp-exporter-base/node-http";
 //#region lib/types/transport.js
 /** Explicit OTLP JSON transport for feedback-authorized Session logs. */
+/** `otel.component.type` reported by OTLP HTTP log exporter self-observability metrics. */
+const OTLP_HTTP_LOG_EXPORTER_COMPONENT_TYPE = "otlp_http_log_exporter";
 /**
 * Create an SDK JSON exporter without inheriting another collector's headers or TLS identity.
 * @param options - explicit endpoint, headers, agent, and SDK transport settings.
 * @returns the exporter owned by one independent log pipeline.
 */
 function createLogExporter(options) {
-	return new OTLPExporterBase(createOtlpHttpExportDelegate(logTransportOptions(options), JsonLogsSerializer));
+	return new OTLPExporterBase(createOtlpHttpExportDelegate(logTransportOptions(options), JsonLogsSerializer, OTLP_HTTP_LOG_EXPORTER_COMPONENT_TYPE, LogsExporterMetricsHelper, void 0));
+}
+/**
+* Create one log exporter's self-observability metrics; without a meter provider they record nothing.
+* @param url - collector endpoint recorded as the metrics server address and port.
+* @returns the metrics recorder required by an OTLP HTTP log export delegate.
+*/
+function createLogExporterMetrics(url) {
+	return createOtlpHttpExporterMetrics(OTLP_HTTP_LOG_EXPORTER_COMPONENT_TYPE, LogsExporterMetricsHelper, url, void 0);
 }
 /**
 * Resolve collector-local headers and agents with shared SDK timeout and compression defaults.
@@ -50,7 +60,7 @@ function logTransportOptions(options) {
 function createEventLogExporter(options, signal) {
 	const config = logTransportOptions(options);
 	let agent;
-	const exporter = new OTLPExporterBase(createOtlpNetworkExportDelegate(config, JsonLogsSerializer, {
+	const exporter = new OTLPExporterBase(createOtlpNetworkExportDelegate(config, JsonLogsSerializer, createLogExporterMetrics(config.url), {
 		async send(data, timeoutMillis) {
 			signal.throwIfAborted();
 			agent ??= config.agentFactory(new URL(config.url).protocol);

package/lib/types/event-log.d.ts

@@ -3,6 +3,7 @@ import type { Attributes } from '@opentelemetry/api';
 import { SeverityNumber } from '@opentelemetry/api-logs';
 import type { BatchLogRecordProcessorOptions } from '@opentelemetry/sdk-logs';
 import type { SessionLogOptions } from './session-log.ts';
+import type { LogExporterOptions } from './transport.ts';
 /** Scalar values accepted by the collector's Arrow attributes map. */
 export type OTelEventScalar = string | number | boolean;
 /** Explicitly selected analytics fields; object values may contain scalars only. */
@@ -20,7 +21,7 @@ export interface OTelEventRecord {
 }
 /** Ordinary-event transport, resource, scope, and count-batching options. */
 export interface EventLogOptions {
-    exporter: SessionLogOptions['exporter'];
+    exporter: LogExporterOptions;
     resourceAttributes: Attributes;
     scope: {
         name: string;

package/lib/types/event-transport.d.ts

@@ -1,12 +1,10 @@
-import { type OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base';
 import type { LogRecordExporter } from '@opentelemetry/sdk-logs';
+import { type LogExporterOptions } from './transport.ts';
 /**
  * Create a channel-owned exporter whose cancellation releases requests and retry timers.
  * @param options - explicit collector and SDK HTTP settings.
  * @param signal - channel cancellation, shared by current and future batch exports.
  * @returns the SDK exporter; shutdown also destroys its owned HTTP agent.
  */
-export declare function createEventLogExporter(options: OTLPExporterNodeConfigBase & {
-    url: string;
-}, signal: AbortSignal): LogRecordExporter;
+export declare function createEventLogExporter(options: LogExporterOptions, signal: AbortSignal): LogRecordExporter;
 //# sourceMappingURL=event-transport.d.ts.map

package/lib/types/index.d.ts

@@ -26,5 +26,6 @@ export default class OTel extends Service {
     createSessionLogReporter(options: SessionLogOptions): SessionLogReporter;
 }
 export type { EventLogOptions, OTelEventRecord, OTelEventScalar, EventLogReporter } from './event-log.ts';
-export type { SessionLogRecord, SessionLogOptions, SessionLogReporter } from './session-log.ts';
+export type { SessionLogProcessorOptions, SessionLogRecord, SessionLogOptions, SessionLogReporter } from './session-log.ts';
+export type { LogExporterOptions } from './transport.ts';
 //# sourceMappingURL=index.d.ts.map

package/lib/types/session-log.d.ts

@@ -2,8 +2,8 @@
 import type { SessionEvent, SessionId } from '@deepseek-ai/dsh-session';
 import type { Attributes } from '@opentelemetry/api';
 import { SeverityNumber } from '@opentelemetry/api-logs';
-import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base';
 import { type BatchLogRecordProcessorOptions } from '@opentelemetry/sdk-logs';
+import { type LogExporterOptions } from './transport.ts';
 /** Collector request ceiling in uncompressed UTF-8 bytes, including the OTLP envelope. */
 export declare const SESSION_LOG_MAX_REQUEST_BYTES = 4000000;
 /** One canonical event with its separately owned Session identity and redacted payload. */
@@ -18,15 +18,19 @@ export interface SessionLogRecord {
     /** Omitted values use INFO. */
     severityNumber?: SeverityNumber;
 }
+/**
+ * Byte and count batching fields implemented by {@link SessionLogProcessor}.
+ *
+ * `exporter` belongs to the owning channel, and `selfObsMeterProvider` is
+ * excluded because this processor implements no self-observability metering.
+ */
+export type SessionLogProcessorOptions = Omit<BatchLogRecordProcessorOptions, 'exporter' | 'selfObsMeterProvider'>;
 /** Session-log transport and byte/count queue settings. */
 export interface SessionLogOptions {
-    /** Explicit destination and SDK transport options. */
-    exporter: OTLPExporterNodeConfigBase & {
-        /** Full HTTP(S) logs destination. */
-        url: string;
-    };
+    /** Explicit destination and SDK transport settings; exporter self-observability metering is not supported. */
+    exporter: LogExporterOptions;
     /** Session-only queue settings, independent of product-event aggregation. */
-    processor?: Omit<BatchLogRecordProcessorOptions, 'exporter'>;
+    processor?: SessionLogProcessorOptions;
     /** May lower, but never exceed, the collector's 4,000,000-byte limit. */
     maxRequestBytes?: number;
     /** Instrumentation scope supplied by the business owner. */

package/lib/types/transport.d.ts

@@ -1,21 +1,33 @@
 /** Explicit OTLP JSON transport for feedback-authorized Session logs. */
 import { createOtlpHttpExportDelegate } from '@opentelemetry/otlp-exporter-base/node-http';
-import { type OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base';
-import type { LogRecordExporter } from '@opentelemetry/sdk-logs';
+import { type ExporterMetrics, type OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base';
+import type { LogRecordExporter, ReadableLogRecord } from '@opentelemetry/sdk-logs';
+/**
+ * Collector and SDK HTTP settings accepted by this package's log exporters.
+ *
+ * `OTLPExporterConfigBase.selfObsMeterProvider` is excluded: every channel here
+ * passes no meter provider to the exporter metrics recorder, which stays noop.
+ */
+export type LogExporterOptions = Omit<OTLPExporterNodeConfigBase, 'selfObsMeterProvider'> & {
+    /** Full HTTP(S) logs destination. */
+    url: string;
+};
 /**
  * Create an SDK JSON exporter without inheriting another collector's headers or TLS identity.
  * @param options - explicit endpoint, headers, agent, and SDK transport settings.
  * @returns the exporter owned by one independent log pipeline.
  */
-export declare function createLogExporter(options: OTLPExporterNodeConfigBase & {
-    url: string;
-}): LogRecordExporter;
+export declare function createLogExporter(options: LogExporterOptions): LogRecordExporter;
+/**
+ * Create one log exporter's self-observability metrics; without a meter provider they record nothing.
+ * @param url - collector endpoint recorded as the metrics server address and port.
+ * @returns the metrics recorder required by an OTLP HTTP log export delegate.
+ */
+export declare function createLogExporterMetrics(url: string): ExporterMetrics<ReadableLogRecord[]>;
 /**
  * Resolve collector-local headers and agents with shared SDK timeout and compression defaults.
  * @param options - explicit endpoint and SDK HTTP settings.
  * @returns resolved transport settings without ambient credentials.
  */
-export declare function logTransportOptions(options: OTLPExporterNodeConfigBase & {
-    url: string;
-}): Parameters<typeof createOtlpHttpExportDelegate>[0];
+export declare function logTransportOptions(options: LogExporterOptions): Parameters<typeof createOtlpHttpExportDelegate>[0];
 //# sourceMappingURL=transport.d.ts.map

package/locale/en.json

@@ -0,0 +1,5 @@
+{
+  "meta": {
+    "title": "otel"
+  }
+}

package/locale/zh.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "OpenTelemetry 上报服务",
+    "description": "为产品事件和会话日志提供独立的数据上报通道。"
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-otel",
   "description": "Cordis service for independent ordinary-event and byte-bounded Session-log OTLP channels",
-  "version": "0.2.1-alpha.1",
+  "version": "0.2.1-alpha.3",
   "publishConfig": {
     "access": "public"
   },
@@ -19,29 +19,31 @@
       "default": "./lib/index.js"
     },
     "./src/*": "./src/*",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./locale/*.json": "./locale/*.json"
   },
   "files": [
+    "locale/*.json",
     "lib/index.js",
     "lib/types/**/*.d.ts"
   ],
   "license": "MIT",
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "@opentelemetry/api-logs": "^0.220.0",
-    "@opentelemetry/otlp-exporter-base": "^0.220.0",
-    "@opentelemetry/resources": "^2.9.0",
-    "@opentelemetry/sdk-logs": "^0.220.0",
-    "@opentelemetry/core": "2.9.0",
-    "@opentelemetry/otlp-transformer": "^0.220.0",
+    "@opentelemetry/api-logs": "0.222.0",
+    "@opentelemetry/otlp-exporter-base": "0.222.0",
+    "@opentelemetry/resources": "2.11.0",
+    "@opentelemetry/sdk-logs": "0.222.0",
+    "@opentelemetry/core": "2.11.0",
+    "@opentelemetry/otlp-transformer": "0.222.0",
     "got": "^14.6.6"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "~4.0.5-alpha.1",
-    "@deepseek-ai/dsh-session": "0.2.1-alpha.1"
+    "@deepseek-ai/cordis": "~4.0.5-alpha.2",
+    "@deepseek-ai/dsh-session": "0.2.1-alpha.3"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "~4.0.5-alpha.1",
-    "@deepseek-ai/dsh-session": "0.2.1-alpha.1"
+    "@deepseek-ai/cordis": "~4.0.5-alpha.2",
+    "@deepseek-ai/dsh-session": "0.2.1-alpha.3"
   }
 }