From b1072a9c658f08a22ded2ac41d398887ae4a2024 Mon Sep 17 00:00:00 2001 From: Lan_zhijiang Date: Sat, 3 Oct 2026 17:17:59 +0800 Subject: [PATCH 1/6] =?UTF-8?q?docs:=20=E5=BC=95=E7=94=A8=E8=B7=A8=20Peer?= =?UTF-8?q?=20=E5=8F=AF=E8=A7=82=E6=B5=8B=E6=80=A7=E5=A5=91=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/_shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_shared b/docs/_shared index d87049c..a603b03 160000 --- a/docs/_shared +++ b/docs/_shared @@ -1 +1 @@ -Subproject commit d87049c49ba10f0a710022dce23abcd316127b3c +Subproject commit a603b036fd41dae5a471dea24cd7609bb4927bd5 From b81554d94ffce93628a18c7c4b78b207e65828ae Mon Sep 17 00:00:00 2001 From: Lan_zhijiang Date: Sat, 3 Oct 2026 18:16:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E6=8C=89=E9=9C=80=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E6=B5=8F=E8=A7=88=E5=99=A8=20OTLP=20=E4=B8=8E?= =?UTF-8?q?=E8=B7=A8=20Peer=20Job=20=E8=BF=BD=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client-web/src/core.ts | 16 +- apps/client-web/src/locales/messages/en.json | 9 +- .../src/locales/messages/zh-CN.json | 9 +- apps/client-web/src/views/jobs/job/job.vue | 10 +- .../src/views/settings/settings.vue | 17 +- .../client-runtime-and-delegation.md | 34 ++ docs/40-deployment/web-delivery.md | 33 ++ packages/core/package.json | 9 + packages/core/src/base/db-api.ts | 29 +- packages/core/src/config/schema.ts | 16 + .../core/src/database/database.generated.ts | 6 + packages/core/src/index.ts | 9 +- packages/core/src/job/job.ts | 2 + packages/core/src/job/manager.ts | 101 ++++-- packages/core/src/obsrv/index.ts | 1 + packages/core/src/obsrv/telemetry.ts | 305 ++++++++++++++++++ packages/core/src/peer/contracts.ts | 3 +- packages/core/src/peer/http.ts | 152 +++++---- packages/core/src/peer/manager.ts | 61 ++-- pnpm-lock.yaml | 239 ++++++++++++++ 20 files changed, 938 insertions(+), 123 deletions(-) create mode 100644 packages/core/src/obsrv/telemetry.ts diff --git a/apps/client-web/src/core.ts b/apps/client-web/src/core.ts index 5a1b70e..3e2f24c 100644 --- a/apps/client-web/src/core.ts +++ b/apps/client-web/src/core.ts @@ -7,6 +7,9 @@ import { configStore, + initializeTelemetry, + shutdownTelemetry, + flushTelemetry, ExtensionRegistryOriginResolver, DEFAULT_EXTENSION_REGISTRY_ORIGIN, localStorageAdapter, @@ -205,9 +208,10 @@ export function getExtensionSetupContribution(name: string): ExtensionSetupContr } /** Replace the browser-owned lease runtime after a validated Settings cutover. */ -export function adoptWebPeerRuntime(runtime: WebPeerRuntime): void { +export async function adoptWebPeerRuntime(runtime: WebPeerRuntime): Promise { webPeerRuntime?.stop() webPeerRuntime = runtime + await initializeTelemetry(configStore.metaConfig, WEB_PEER_IDENTITY.applicationVersion) JobManager.startWorker() } @@ -216,6 +220,7 @@ export async function stopWebPeerRuntime(): Promise { webPeerRuntime = null currentWebPeer.value = null await JobManager.stopWorker() + await shutdownTelemetry() } /** Start the lease after Settings has mounted and loaded recovery configuration. */ @@ -226,7 +231,7 @@ export async function startConfiguredWebPeerRuntime(): Promise { const peer = await candidate.register() await configStore.loadPeerConfig() await candidate.start() - adoptWebPeerRuntime(candidate) + await adoptWebPeerRuntime(candidate) currentWebPeer.value = { id: peer.id, name: peer.name } } catch (error) { candidate.stop() @@ -335,7 +340,7 @@ export async function initializeCore(options: { loadPeerConfig?: boolean } = {}) const peer = await candidate.register() await configStore.loadPeerConfig() await candidate.start() - adoptWebPeerRuntime(candidate) + await adoptWebPeerRuntime(candidate) currentWebPeer.value = { id: peer.id, name: peer.name } } catch (error) { candidate.stop() @@ -353,3 +358,8 @@ export async function initializeCore(options: { loadPeerConfig?: boolean } = {}) export async function shutdownCore(): Promise { await stopWebPeerRuntime() } + +// Page termination is best effort; normal connection shutdown awaits bounded SDK drain. +window.addEventListener('pagehide', () => { + void flushTelemetry() +}) diff --git a/apps/client-web/src/locales/messages/en.json b/apps/client-web/src/locales/messages/en.json index be3759e..3d5cfc7 100644 --- a/apps/client-web/src/locales/messages/en.json +++ b/apps/client-web/src/locales/messages/en.json @@ -69,7 +69,11 @@ "resetConfirmMessage": "Are you sure you want to reset all settings to default? This action cannot be undone.", "exportConfig": "Export", "importConfig": "Import", - "importError": "Unable to restore configuration. Check the file and deployment connection." + "importError": "Unable to restore configuration. Check the file and deployment connection.", + "telemetryEnabled": "Enable telemetry for this browser Peer", + "telemetryHelp": "Takes effect after saving the connection. Requires deployment observability endpoints; existing Job logs remain available.", + "telemetryRelay": "Peer telemetry relay URL (optional)", + "telemetryRelayHelp": "Use only a trusted deployment Peer relay. This connection’s short-lived Peer identity authenticates requests; leave empty to use deployment public observability endpoints." }, "source": { "deleteConfirmTitle": "Delete Source", @@ -198,7 +202,8 @@ "retry": "Retry", "notAvailable": "N/A", "notFound": "Job not found", - "sourceNotFound": "Source not found" + "sourceNotFound": "Source not found", + "openDiagnostics": "Open diagnostics (search by Job ID)" }, "logs": { "loading": "Loading logs…", diff --git a/apps/client-web/src/locales/messages/zh-CN.json b/apps/client-web/src/locales/messages/zh-CN.json index e2d1946..d945afb 100644 --- a/apps/client-web/src/locales/messages/zh-CN.json +++ b/apps/client-web/src/locales/messages/zh-CN.json @@ -69,7 +69,11 @@ "resetConfirmMessage": "确定要重置所有设置为默认值吗？此操作无法撤销。", "exportConfig": "导出", "importConfig": "导入", - "importError": "无法恢复配置，请检查文件及部署连接。" + "importError": "无法恢复配置，请检查文件及部署连接。", + "telemetryEnabled": "启用此浏览器 Peer 的遥测", + "telemetryHelp": "保存连接后生效。需要部署配置观测出口；原有 Job 日志继续保留。", + "telemetryRelay": "Peer 遥测中转地址（可选）", + "telemetryRelayHelp": "仅填写可信部署 Peer 的中转地址。此连接的短期 Peer 身份将用于认证；留空使用部署的公开观测出口。" }, "source": { "deleteConfirmTitle": "删除数据源", @@ -199,7 +203,8 @@ "retry": "重试", "notAvailable": "不可用", "notFound": "未找到任务", - "sourceNotFound": "未找到数据源" + "sourceNotFound": "未找到数据源", + "openDiagnostics": "打开诊断入口（使用 Job ID 查询）" }, "logs": { "loading": "正在读取日志…", diff --git a/apps/client-web/src/views/jobs/job/job.vue b/apps/client-web/src/views/jobs/job/job.vue index 20ca40e..4bed875 100644 --- a/apps/client-web/src/views/jobs/job/job.vue +++ b/apps/client-web/src/views/jobs/job/job.vue @@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n' import { useAsyncState, useIntervalFn } from '@vueuse/core' import { InkLoading, InkButton, InkField, InkSkeleton } from '@inkcre/ui-web' import LogsViewer from '@/components/obsrv/LogsViewer/LogsViewer.vue' -import { APIError, Job, JobStatus, Source } from '@inkcre/core' +import { APIError, Job, JobStatus, Source, telemetryDiagnosticsUrl } from '@inkcre/core' import dayjs from 'dayjs' const route = useRoute() @@ -147,6 +147,14 @@ watch( {{ job.id }} + {{ t('job.openDiagnostics') }} +
diff --git a/apps/client-web/src/views/settings/settings.vue b/apps/client-web/src/views/settings/settings.vue index 32f3b6b..1cb7aaa 100644 --- a/apps/client-web/src/views/settings/settings.vue +++ b/apps/client-web/src/views/settings/settings.vue @@ -67,7 +67,7 @@ const onSave = async () => { try { const validatedMeta = MetaConfigSchema.parse(metaFormConfig) const runtime = await configStore.connectAndSave(validatedMeta, WEB_PEER_IDENTITY) - adoptWebPeerRuntime(runtime) + await adoptWebPeerRuntime(runtime) void refreshCurrentWebPeer() Object.assign(metaFormConfig, configStore.metaConfig) feedback.value = { action: 'save', error: false, message: t('settings.saveSuccess') } @@ -128,7 +128,7 @@ const onFileSelected = async (event: Event) => { try { const imported = SettingsExportSchema.parse(JSON.parse(await file.text())) const runtime = await configStore.connectAndSave(imported.metaConfig, WEB_PEER_IDENTITY) - adoptWebPeerRuntime(runtime) + await adoptWebPeerRuntime(runtime) void refreshCurrentWebPeer() await setLocale(imported.locale) Object.assign(metaFormConfig, configStore.metaConfig) @@ -169,6 +169,19 @@ const onFileSelected = async (event: Event) => { :disabled="formBusy" /> + +

{{ t('settings.telemetryHelp') }}

+ +

{{ t('settings.telemetryRelayHelp') }}

+
` PostgreSQL 日志查询始终保留。 + +开启后只读取 `configs` 中 `inkcre.observability` / `inkcre.observability.v1` 的公共投影。 +`deployment_id` 由部署 owner 创建，浏览器不分配部署身份。三个 OTLP/HTTP 完整信号 URL +分别启用标准浏览器 SDK 的 OTLP/HTTP protobuf exporter。连接还可显式指定 `telemetry_peer_relay_url`， +从此 base 的 `/v1/traces`、`/v1/logs`、`/v1/metrics` 经现有短期 Peer JWT 认证导出； +JWT 签名闭包绑定初始化时的连接，旧批次不会借用新连接凭据。此地址不是启用开关， +也没有自动推导或失败回退。配置不可用或初始化失败不会阻止业务启动。配置读取、 +exporter 超时和正常关闭排空均有界，页面退出只能 best effort。Job 页面提供可选 +`diagnostics_url` 链接，用户以 Job ID 在诊断端查询，不把 Grafana 查询语法写入业务层。 + +`JobManager.create` 在同一个 PostgREST INSERT 中写入 SDK 注入的提交 carrier。超出 +512 UTF-8 bytes 的可选 tracestate 会被省略并计数。执行成功 claim 后创建独立 trace， +通过 SDK Span Link 关联提交；claim、取消和 close 不重写提交列。Job ID 是诊断关联字段， +不是 trace ID。`job.submitted`、`job.started`、`job.closed` 只从明确的业务边界发出结构化 +事件；既有应用日志、异常 message、参数和内容不会桥接到新增 OTLP。 + +浏览器原生 `await` 不能依赖 StackContextManager 或 ZoneContextManager 自动保留当前 +span。本实现显式传递标准 OTel Context：`PeerManager.delegate` 的 context 传给 outbound， +`PeerHTTPOutbound` 在真实请求边界注入；Job submit 的 context 在 await 后仍显式用于 +carrier 捕获。执行 trace 自身携带 Job ID 与 Link。扩展 handler 内部、独立 PostgREST 请求 +和任意 provider 的原生 async 调用尚不自动继承执行 context；不得将这些独立 span 宣称为 +完整执行树。新的调用者可以使用 `JobManager.create` / `PeerManager.delegate` 的可选 +Context 参数接续已有 SDK context。 + +Peer HTTP 是唯一新增 W3C 传播 owner，目标来自已验证的 Peer advertisement。普通 +PostgREST 请求只生成本地 client span，不注入传播头，也不冒充远端 server/SQL span。 +开启传播的 Peer 请求使用 `redirect: error`，包括同 origin 跳转也不跟随；重定向失败仍为 +`PeerOutcomeUnknown` 且不重试，关闭态保留既有 fetch 行为。无全局 fetch patch；外部 provider、Source 和内容读取不会意外携带内部 trace 或 baggage。 diff --git a/docs/40-deployment/web-delivery.md b/docs/40-deployment/web-delivery.md index 7bbb7aa..a5677e8 100644 --- a/docs/40-deployment/web-delivery.md +++ b/docs/40-deployment/web-delivery.md @@ -58,3 +58,36 @@ acceptance is a separate black-box activity. When an eligible internal PR closes, [`.github/workflows/pages-cleanup.yml`](../../.github/workflows/pages-cleanup.yml) replaces only that exact preview alias with a closed-page tombstone. Manual cleanup accepts an explicit positive PR number and applies the same closed internal-PR identity checks. + +## 浏览器可选观测出口 + +部署 owner 先通过 core-py 的部署配置流程创建 `inkcre.observability.v1`，保留稳定的 +`deployment_id`，并按需填写 traces、logs、metrics 完整 OTLP/HTTP URL 与诊断入口。 +浏览器不会因这些 URL 存在而自动启用；在连接设置中勾选遥测并保存后才接入。 +只启用部分信号时其余信号不远端导出；没有有效共享配置时保留本地固定原因诊断， +修复配置后重新保存连接。取消勾选并保存可以停止新采集，PG 历史和 Job 查询不受影响。 + +浏览器出口必须是部署 owner 已验证的公开受限写入入口，或受控按请求转发入口； +不得把 Grafana/其他 SaaS 的服务端 ingest token 放入浏览器配置、URL、静态环境变量 +或前端代码。URL 校验拒绝 userinfo、query 和 fragment，不接受任意自定义认证 headers。 +如使用 core-py 的受控中转，在浏览器连接设置显式填写 `telemetry_peer_relay_url`，例如 +`https://peer.example/telemetry`。SDK 追加 `/v1/{traces,logs,metrics}`，每批请求用现有 +签名 authority 产生此连接的短期 Peer JWT；私密 SaaS headers 仍只在服务器。 +浏览器三信号统一使用官方 OTLP/HTTP protobuf exporter 和 `application/x-protobuf`； +core 中转只接受此格式，Trace/Span ID 与 Links 由标准 protobuf 消息保留，不经过通用 +JSON 字节转换。该地址需属于可信部署 Peer；填写地址不会启用遥测，失败也不会切回公开出口。 +留空时沿用共享公开出口且不附加 Peer JWT。 +负责入口的部署 owner 须验证 CORS、写入权限、部署归属、配额和失效行为。浏览器自报的 +部署 ID 只是关联属性，不能作为授权依据。客户端不提供常驻 Collector，也不代表某个 +SaaS 的真实账号、免费额度或入口已经验收。 + +Peer HTTP 入口需要在原有认证和 CORS 配置下允许 `traceparent`、`tracestate`；CORS +本身不授予调用权限。开启遥测的 Peer endpoint 必须直接响应，浏览器不跟随重定向， +避免向配置边界外的地址转发内部 context。OTLP 只包含操作名、固定结果、状态码、Job/Peer/部署标识与计时， +不包含请求 URL/query、prompt、工具原文或任意异常 message。受信部署 owner 配置出口， +外部观测服务获取这些元数据；误把私密凭据交给公开浏览器会跨越凭据边界，因此首次出口 +验收只使用合成数据，直到公开入口和保留策略获得独立验证。 + +浏览器正常关闭 SDK 的等待上限为 1.5 秒；刷新、断网和进程终止仍可丢遥测。OTLP +失败不会重放业务请求，Peer 的 not-executed、unknown 和 exact-target 规则不变。 +新增 Job carrier schema 按共享契约协调升级，旧页面重新连接前需刷新到匹配版本。 diff --git a/packages/core/package.json b/packages/core/package.json index b90e21a..c2de786 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -20,6 +20,15 @@ "type-check": "tsc --noEmit" }, "dependencies": { + "@opentelemetry/api": "^1.9.1", + "@opentelemetry/core": "^2.11.0", + "@opentelemetry/exporter-logs-otlp-proto": "^0.222.0", + "@opentelemetry/exporter-metrics-otlp-proto": "^0.222.0", + "@opentelemetry/exporter-trace-otlp-proto": "^0.222.0", + "@opentelemetry/resources": "^2.11.0", + "@opentelemetry/sdk-logs": "^0.222.0", + "@opentelemetry/sdk-metrics": "^2.11.0", + "@opentelemetry/sdk-trace-web": "^2.11.0", "@supabase/postgrest-js": "^2.84.0", "dayjs": "^1.11.0", "jose": "^5.0.0", diff --git a/packages/core/src/base/db-api.ts b/packages/core/src/base/db-api.ts index 9d85491..fc968e4 100644 --- a/packages/core/src/base/db-api.ts +++ b/packages/core/src/base/db-api.ts @@ -1,3 +1,4 @@ +import { observeOperation, SpanKind, SpanStatusCode } from '../obsrv/telemetry' import { configStore as sharedConfigStore } from '../config' import { authStore } from '../auth' import { PostgrestClient } from '@supabase/postgrest-js' @@ -65,7 +66,19 @@ export async function rawPostgrestFetch( headers.set('Accept-Profile', schema) headers.set('Content-Profile', schema) - const response = await fetch(url, { ...init, headers }) + const response = await observeOperation( + 'postgrest.http', + async (_active, span, outcome) => { + const result = await fetch(url, { ...init, headers }) + span?.setAttribute('http.response.status_code', result.status) + if (result.status >= 400) { + outcome.outcome = 'error' + span?.setStatus({ code: SpanStatusCode.ERROR }) + } + return result + }, + { kind: SpanKind.CLIENT } + ) if (!response.ok) { const errorResponse = response.clone() let details: unknown @@ -121,7 +134,19 @@ export class DBAPIClient< const token = await tokenProvider() const headers = new Headers(init?.headers) headers.set('Authorization', `Bearer ${token}`) - return fetch(input, { ...init, headers }) + return observeOperation( + 'postgrest.http', + async (_active, span, outcome) => { + const response = await fetch(input, { ...init, headers }) + span?.setAttribute('http.response.status_code', response.status) + if (response.status >= 400) { + outcome.outcome = 'error' + span?.setStatus({ code: SpanStatusCode.ERROR }) + } + return response + }, + { kind: SpanKind.CLIENT } + ) }, }) diff --git a/packages/core/src/config/schema.ts b/packages/core/src/config/schema.ts index a23d659..826070a 100644 --- a/packages/core/src/config/schema.ts +++ b/packages/core/src/config/schema.ts @@ -47,6 +47,22 @@ const CurrentMetaConfigSchema = z.object({ INKCRE_PGREST_URL: UnconfiguredUrlSchema.default(''), INKCRE_JWT_SECRET: z.string().default(''), INKCRE_PEER_ID: GeneratedPeerIdSchema, + telemetry_enabled: z.boolean().default(false), + telemetry_peer_relay_url: z + .union([ + z.literal(''), + z.url().refine((value) => { + const url = new URL(value) + return ( + ['http:', 'https:'].includes(url.protocol) && + !url.username && + !url.password && + !url.search && + !url.hash + ) + }, 'Peer relay URL must be HTTP(S) without credentials, query or fragment'), + ]) + .default(''), }) /** Preserve one browser origin's old technical identity during the Peer cutover. */ diff --git a/packages/core/src/database/database.generated.ts b/packages/core/src/database/database.generated.ts index 0e81d3d..b8901e9 100644 --- a/packages/core/src/database/database.generated.ts +++ b/packages/core/src/database/database.generated.ts @@ -427,6 +427,8 @@ export type Database = { started_at: string | null state: Json status: Database['inkcre']['Enums']['jobstatus'] + submission_traceparent: string | null + submission_tracestate: string | null timeout_seconds: number type: string } @@ -439,6 +441,8 @@ export type Database = { started_at?: string | null state?: Json status?: Database['inkcre']['Enums']['jobstatus'] + submission_traceparent?: string | null + submission_tracestate?: string | null timeout_seconds: number type: string } @@ -451,6 +455,8 @@ export type Database = { started_at?: string | null state?: Json status?: Database['inkcre']['Enums']['jobstatus'] + submission_traceparent?: string | null + submission_tracestate?: string | null timeout_seconds?: number type?: string } diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index f06fba2..530c9a2 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -130,7 +130,14 @@ export { export { Cron, CronForm } from './cron' // Observability -export { Log, type LogRef } from './obsrv' +export { + Log, + type LogRef, + initializeTelemetry, + shutdownTelemetry, + flushTelemetry, + telemetryDiagnosticsUrl, +} from './obsrv' // Info-Base (Blocks, Relations, Storage, Resolvers) export { diff --git a/packages/core/src/job/job.ts b/packages/core/src/job/job.ts index 12a16da..e1e059f 100644 --- a/packages/core/src/job/job.ts +++ b/packages/core/src/job/job.ts @@ -50,6 +50,8 @@ export class Job extends Z.class({ JobStatus.TIMED_OUT, JobStatus.ABORTED, ]), + submission_traceparent: z.string().nullable().default(null), + submission_tracestate: z.string().nullable().default(null), created_at: z.coerce.date(), started_at: z.coerce.date().nullable(), closed_at: z.coerce.date().nullable(), diff --git a/packages/core/src/job/manager.ts b/packages/core/src/job/manager.ts index bf4e1dc..b97e42e 100644 --- a/packages/core/src/job/manager.ts +++ b/packages/core/src/job/manager.ts @@ -1,3 +1,12 @@ +import { + observeOperation, + emitJobEvent, + SpanStatusCode, + captureSubmission, + submissionLinks, + ROOT_CONTEXT, + type Context, +} from '../obsrv/telemetry' import { z } from 'zod' import { Job, JobStatus, JobType, type JobRef, type JobTypeRef } from './job' @@ -36,25 +45,37 @@ export class JobManager { static async create( type: JobTypeRef, parameters: Record, - timeoutSeconds?: number + timeoutSeconds?: number, + parent?: Context ): Promise { - const jobType = await JobType.get(type) - const handler = this.handlers.get(type) - const normalized = handler ? handler.parameters.parse(parameters) : parameters - const timeout = timeoutSeconds ?? jobType.default_timeout_seconds - if (!Number.isInteger(timeout) || timeout <= 0) { - throw new TypeError('Job timeout must be a positive number of seconds') - } - const result = await Job.dbApi - .insert({ - type, - parameters: normalized, - timeout_seconds: timeout, - state: {}, - }) - .select() - .single() - return Job.parse(result.data) + return observeOperation( + 'job.submit', + async (active, span) => { + const jobType = await JobType.get(type) + const handler = this.handlers.get(type) + const normalized = handler ? handler.parameters.parse(parameters) : parameters + const timeout = timeoutSeconds ?? jobType.default_timeout_seconds + if (!Number.isInteger(timeout) || timeout <= 0) { + throw new TypeError('Job timeout must be a positive number of seconds') + } + const result = await Job.dbApi + .insert({ + type, + parameters: normalized, + timeout_seconds: timeout, + state: {}, + ...captureSubmission(active), + }) + .select() + .single() + const job = Job.parse(result.data) + span?.setAttribute('inkcre.job.id', job.id) + emitJobEvent('job.submitted', job.id, active) + return job + }, + {}, + parent + ) } private static async prepare(job: Job): Promise<[JobHandler, unknown] | null> { @@ -80,7 +101,9 @@ export class JobManager { .eq('id', job.id) .eq('status', JobStatus.RUNNING) .select('id') - return (result.data?.length ?? 0) > 0 + const closed = (result.data?.length ?? 0) > 0 + if (closed) job.status = status as Job['status'] + return closed } static async run(id: JobRef): Promise { @@ -96,7 +119,7 @@ export class JobManager { if (!claimed) return false console.error('Persisted Job parameters are invalid', id, error) claimed.state = { ...claimed.state, error: error.message } - await this.close(claimed, JobStatus.FAILED) + await this.observeExecution(claimed, () => this.close(claimed, JobStatus.FAILED)) return true } if (!prepared) return false @@ -105,13 +128,15 @@ export class JobManager { // stopWorker may have run while claim was in flight. Do not start a handler // after its Extension resources have been disposed. if (!this.accepting) { - await this.close(claimed, JobStatus.ABORTED) + await this.observeExecution(claimed, () => this.close(claimed, JobStatus.ABORTED)) return true } const [handler, parameters] = prepared const controller = new AbortController() - const completion = this.execute(claimed, handler, parameters, controller) + const completion = this.observeExecution(claimed, () => + this.execute(claimed, handler, parameters, controller) + ) this.active.set(id, { controller, completion }) try { await completion @@ -121,6 +146,38 @@ export class JobManager { return true } + private static async observeExecution( + claimed: Job, + execute: () => Promise + ): Promise { + await observeOperation( + 'job.execute', + async (active, span, result) => { + emitJobEvent('job.started', claimed.id, active) + await execute() + switch (claimed.status) { + case JobStatus.FINISHED: + result.outcome = 'success' + break + case JobStatus.ABORTED: + result.outcome = 'cancelled' + break + case JobStatus.TIMED_OUT: + result.outcome = 'timeout' + break + default: + result.outcome = 'error' + } + span?.setAttribute('inkcre.job.status', claimed.status) + if (claimed.status === JobStatus.FAILED || claimed.status === JobStatus.TIMED_OUT) + span?.setStatus({ code: SpanStatusCode.ERROR }) + if (claimed.isTerminal) emitJobEvent('job.closed', claimed.id, active, claimed.status) + }, + { ...submissionLinks(claimed), attributes: { 'inkcre.job.id': claimed.id } }, + ROOT_CONTEXT + ) + } + private static async execute( claimed: Job, handler: JobHandler, diff --git a/packages/core/src/obsrv/index.ts b/packages/core/src/obsrv/index.ts index 1f9f80b..810e9b6 100644 --- a/packages/core/src/obsrv/index.ts +++ b/packages/core/src/obsrv/index.ts @@ -1 +1,2 @@ export * from './log' +export * from './telemetry' diff --git a/packages/core/src/obsrv/telemetry.ts b/packages/core/src/obsrv/telemetry.ts new file mode 100644 index 0000000..c694f57 --- /dev/null +++ b/packages/core/src/obsrv/telemetry.ts @@ -0,0 +1,305 @@ +import { + context, + createContextKey, + ROOT_CONTEXT, + SpanKind, + SpanStatusCode, + trace, + type Context, + type Span, + type SpanOptions, + type Tracer, +} from '@opentelemetry/api' +import { W3CTraceContextPropagator } from '@opentelemetry/core' +import { shallowRef } from 'vue' +import { z } from 'zod' +import type { MetaConfig } from '../config/schema' +import type { LoggerProvider } from '@opentelemetry/sdk-logs' +import type { MeterProvider } from '@opentelemetry/sdk-metrics' +import type { WebTracerProvider } from '@opentelemetry/sdk-trace-web' + +// Shared config is public to admitted browsers; never accept credential-bearing URLs. +const PublicUrl = z.url().refine((value) => { + const url = new URL(value) + return ( + ['https:', 'http:'].includes(url.protocol) && + !url.username && + !url.password && + !url.search && + !url.hash + ) +}, 'Observability URLs must be HTTP(S) without credentials, query or fragment') +export const ObservabilityConfigSchema = z.object({ + deployment_id: z.uuid(), + otlp_http_endpoints: z + .object({ + traces: PublicUrl.nullish(), + logs: PublicUrl.nullish(), + metrics: PublicUrl.nullish(), + }) + .nullish(), + diagnostics_url: PublicUrl.nullish(), +}) +export const telemetryDiagnosticsUrl = shallowRef(null) +const propagator = new W3CTraceContextPropagator() +const getter = { + keys: Object.keys, + get: (carrier: Record, key: string) => carrier[key], +} +const setter = { + set: (carrier: Record, key: string, value: string) => { + carrier[key] = value + }, +} +let providers: Array = [] +let tracer: Tracer | undefined +let logger: ReturnType | undefined +let duration: ReturnType['createHistogram']> | undefined +let droppedCarrier: ReturnType['createCounter']> | undefined +const operationLoggerKey = createContextKey('inkcre.operation.logger') +let initialization = Promise.resolve() + +/** Serialized connection cutover; disabled peers do not even read shared telemetry configuration. */ +export function initializeTelemetry(meta: MetaConfig, version: string): Promise { + const connection = { ...meta } + initialization = initialization.then(async () => { + await shutdownTelemetry() + if (!connection.telemetry_enabled) return + try { + const { DBAPIClient } = await import('../base/db-api') + const { signDatabaseToken } = await import('../auth') + const tokenProvider = () => signDatabaseToken(connection.INKCRE_JWT_SECRET) + const database = new DBAPIClient( + 'configs', + undefined, + 'inkcre', + connection.INKCRE_PGREST_URL, + tokenProvider + ) + const { data, error } = await database + .from() + .select('schema,value') + .eq('key', 'inkcre.observability') + .abortSignal(AbortSignal.timeout(1500)) + .maybeSingle() + if (error || !data || data.schema !== 'inkcre.observability.v1') { + console.warn('[Telemetry] Shared observability configuration is unavailable.') + return + } + await configureTelemetry( + data.value, + connection.INKCRE_PEER_ID, + version, + connection.telemetry_peer_relay_url + ? { url: connection.telemetry_peer_relay_url, tokenProvider } + : undefined + ) + } catch { + console.warn('[Telemetry] Initialization failed; business services remain available.') + await shutdownTelemetry() + } + }) + return initialization +} + +/** Initialize an explicitly enabled connection using its public deployment projection. */ +export async function configureTelemetry( + value: unknown, + peerId: string, + version: string, + relay?: { url: string; tokenProvider: () => Promise } +): Promise { + const config = ObservabilityConfigSchema.parse(value) + telemetryDiagnosticsUrl.value = config.diagnostics_url ?? null + const relayBase = relay ? PublicUrl.parse(relay.url).replace(/\/+$/, '') : null + const endpoints = relayBase + ? { + traces: `${relayBase}/v1/traces`, + logs: `${relayBase}/v1/logs`, + metrics: `${relayBase}/v1/metrics`, + } + : (config.otlp_http_endpoints ?? {}) + if (!endpoints.traces && !endpoints.logs && !endpoints.metrics) { + console.warn('[Telemetry] No OTLP endpoint is configured; remote export is disabled.') + return + } + // Only an explicitly selected Peer relay receives the captured connection's short-lived JWT. + const headers = relay + ? async () => ({ Authorization: `Bearer ${await relay.tokenProvider()}` }) + : undefined + const { resourceFromAttributes } = await import('@opentelemetry/resources') + const resource = resourceFromAttributes({ + 'service.name': 'inkcre.client-web', + 'service.version': version, + 'service.instance.id': crypto.randomUUID(), + 'inkcre.deployment.id': config.deployment_id, + 'inkcre.peer.id': peerId, + }) + const { WebTracerProvider, BatchSpanProcessor } = await import('@opentelemetry/sdk-trace-web') + const { OTLPTraceExporter } = await import('@opentelemetry/exporter-trace-otlp-proto') + const traceProvider = new WebTracerProvider({ + resource, + spanProcessors: endpoints.traces + ? [ + new BatchSpanProcessor( + new OTLPTraceExporter({ url: endpoints.traces, timeoutMillis: 1000, headers }), + { exportTimeoutMillis: 1200 } + ), + ] + : [], + }) + providers.push(traceProvider) + tracer = traceProvider.getTracer('inkcre.browser') + if (endpoints.logs) { + const { LoggerProvider, BatchLogRecordProcessor } = await import('@opentelemetry/sdk-logs') + const { OTLPLogExporter } = await import('@opentelemetry/exporter-logs-otlp-proto') + const provider = new LoggerProvider({ + resource, + processors: [ + new BatchLogRecordProcessor({ + exporter: new OTLPLogExporter({ url: endpoints.logs, timeoutMillis: 1000, headers }), + exportTimeoutMillis: 1200, + }), + ], + }) + providers.push(provider) + logger = provider.getLogger('inkcre.browser') + } + if (endpoints.metrics) { + const { MeterProvider, PeriodicExportingMetricReader } = + await import('@opentelemetry/sdk-metrics') + const { OTLPMetricExporter } = await import('@opentelemetry/exporter-metrics-otlp-proto') + const provider = new MeterProvider({ + resource, + readers: [ + new PeriodicExportingMetricReader({ + exporter: new OTLPMetricExporter({ + url: endpoints.metrics, + timeoutMillis: 1000, + headers, + }), + exportIntervalMillis: 60_000, + exportTimeoutMillis: 1200, + }), + ], + }) + providers.push(provider) + const meter = provider.getMeter('inkcre.browser') + duration = meter.createHistogram('inkcre.operation.duration', { unit: 's' }) + droppedCarrier = meter.createCounter('inkcre.job.carrier.dropped') + } +} + +async function bounded(operation: Promise): Promise { + let timer: ReturnType | undefined + try { + await Promise.race([ + operation.catch(() => undefined), + new Promise((resolve) => { + timer = setTimeout(resolve, 1500) + }), + ]) + } finally { + clearTimeout(timer) + } +} +export async function flushTelemetry(): Promise { + if (providers.length) + await bounded(Promise.allSettled(providers.map((provider) => provider.forceFlush()))) +} +export async function shutdownTelemetry(): Promise { + const closing = providers + providers = [] + tracer = undefined + logger = undefined + duration = undefined + droppedCarrier = undefined + telemetryDiagnosticsUrl.value = null + if (closing.length) + await bounded(Promise.allSettled(closing.map((provider) => provider.shutdown()))) +} + +type OperationResult = { outcome: 'success' | 'error' | 'cancelled' | 'timeout' } + +/** Explicit SDK context survives native browser await without a global Promise patch. */ +export async function observeOperation( + name: 'job.submit' | 'job.execute' | 'peer.delegate' | 'peer.http' | 'postgrest.http', + operation: (parent: Context, span: Span | undefined, result: OperationResult) => Promise, + options: SpanOptions = {}, + parent: Context = context.active() +): Promise { + const result: OperationResult = { outcome: 'success' } + if (!tracer) return operation(parent, undefined, result) + const span = tracer.startSpan(name, options, parent) + const operationDuration = duration + const operationLogger = logger + const active = trace.setSpan(parent, span).setValue(operationLoggerKey, operationLogger) + const started = performance.now() + try { + return await operation(active, span, result) + } catch (error) { + result.outcome = 'error' + span.setStatus({ code: SpanStatusCode.ERROR }) + throw error + } finally { + span.end() + const attributes = { 'inkcre.operation': name, 'inkcre.outcome': result.outcome } + operationDuration?.record((performance.now() - started) / 1000, attributes) + operationLogger?.emit({ + context: active, + eventName: 'inkcre.operation.completed', + body: 'inkcre.operation.completed', + attributes, + }) + } +} + +export function captureSubmission(parent: Context): { + submission_traceparent: string | null + submission_tracestate: string | null +} { + const carrier: Record = {} + if (tracer) propagator.inject(parent, carrier, setter) + const state = carrier.tracestate + const oversized = state !== undefined && new TextEncoder().encode(state).length > 512 + if (oversized) droppedCarrier?.add(1, { reason: 'tracestate_too_large' }) + return { + submission_traceparent: carrier.traceparent ?? null, + submission_tracestate: oversized ? null : (state ?? null), + } +} +export function submissionLinks(job: { + submission_traceparent?: string | null + submission_tracestate?: string | null +}): SpanOptions { + if (!tracer || !job.submission_traceparent) return {} + const carrier = { + traceparent: job.submission_traceparent, + tracestate: job.submission_tracestate ?? '', + } + const extracted = trace.getSpanContext(propagator.extract(ROOT_CONTEXT, carrier, getter)) + return extracted ? { links: [{ context: extracted }] } : {} +} +export function injectPeerContext(parent: Context, headers: Headers): boolean { + if (!tracer) return false + headers.delete('traceparent') + headers.delete('tracestate') + propagator.inject(parent, headers, { set: (target, key, value) => target.set(key, value) }) + return true +} +export function emitJobEvent( + name: 'job.submitted' | 'job.started' | 'job.closed', + jobId: number, + parent: Context, + status?: string +): void { + const operationLogger = parent.getValue(operationLoggerKey) as typeof logger + operationLogger?.emit({ + context: parent, + eventName: name, + body: name, + attributes: { 'inkcre.job.id': jobId, ...(status ? { 'inkcre.job.status': status } : {}) }, + }) +} +export { ROOT_CONTEXT, SpanKind, SpanStatusCode } +export type { Context } diff --git a/packages/core/src/peer/contracts.ts b/packages/core/src/peer/contracts.ts index da1d571..9bd7989 100644 --- a/packages/core/src/peer/contracts.ts +++ b/packages/core/src/peer/contracts.ts @@ -1,3 +1,4 @@ +import type { Context } from '../obsrv/telemetry' import { z } from 'zod' export type JsonValue = @@ -88,7 +89,7 @@ export type PeerProtocolRequest = z.infer export type PeerProtocolResponse = z.infer export interface PeerOutbound { - execute(payload: JsonValue): Promise + execute(payload: JsonValue, parent?: Context): Promise } export class PeerError extends Error {} diff --git a/packages/core/src/peer/http.ts b/packages/core/src/peer/http.ts index 15c1399..ca7b987 100644 --- a/packages/core/src/peer/http.ts +++ b/packages/core/src/peer/http.ts @@ -1,3 +1,10 @@ +import { + observeOperation, + injectPeerContext, + SpanKind, + SpanStatusCode, + type Context, +} from '../obsrv/telemetry' import { z } from 'zod' import { authStore } from '../auth' import { configStore } from '../config' @@ -66,71 +73,94 @@ export class PeerHTTPOutbound { this.parameters = parsed.data } - async execute(payload: JsonValue): Promise { - const parsed = PeerProtocolRequestSchema.safeParse(payload) - if (!parsed.success) throw new PeerProtocolError('Invalid Peer HTTP request envelope') - const request = parsed.data - const url = new URL(this.parameters.url) - for (const [name, values] of Object.entries(request.query)) { - for (const value of values) url.searchParams.append(name, value) - } + async execute(payload: JsonValue, parent?: Context): Promise { + return observeOperation( + 'peer.http', + async (active, span, result) => { + const parsed = PeerProtocolRequestSchema.safeParse(payload) + if (!parsed.success) throw new PeerProtocolError('Invalid Peer HTTP request envelope') + const request = parsed.data + const url = new URL(this.parameters.url) + for (const [name, values] of Object.entries(request.query)) { + for (const value of values) url.searchParams.append(name, value) + } - const headers = new Headers() - for (const [name, values] of Object.entries(request.headers)) { - if (RESERVED_REQUEST_HEADERS.has(name)) { - throw new PeerProtocolError(`Peer HTTP payload attempted reserved header: ${name}`) - } - for (const value of values) headers.append(name, value) - } - headers.set('Authorization', `Bearer ${await authStore.getToken()}`) + const headers = new Headers() + for (const [name, values] of Object.entries(request.headers)) { + if (RESERVED_REQUEST_HEADERS.has(name)) { + throw new PeerProtocolError(`Peer HTTP payload attempted reserved header: ${name}`) + } + for (const value of values) headers.append(name, value) + } + headers.set('Authorization', `Bearer ${await authStore.getToken()}`) - let body: string | undefined - if (Object.prototype.hasOwnProperty.call(request, 'body')) { - body = JSON.stringify(request.body) - if (!headers.has('Content-Type')) headers.set('Content-Type', 'application/json') - } + let body: string | undefined + if (Object.prototype.hasOwnProperty.call(request, 'body')) { + body = JSON.stringify(request.body) + if (!headers.has('Content-Type')) headers.set('Content-Type', 'application/json') + } - let response: Response - try { - response = await this.fetcher(url, { - method: this.parameters.method, - headers, - body, - signal: AbortSignal.timeout(configStore.peerConfig.peer_http_timeout_ms), - }) - } catch (error) { - throw new PeerOutcomeUnknown( - `Peer ${this.peer.id} dispatch may have executed: ${error instanceof Error ? error.message : 'fetch failed'}` - ) - } + const propagating = injectPeerContext(active, headers) + let response: Response + try { + response = await this.fetcher(url, { + method: this.parameters.method, + // A redirect could disclose deployment context beyond the configured Peer endpoint. + ...(propagating ? { redirect: 'error' as const } : {}), + headers, + body, + signal: AbortSignal.timeout(configStore.peerConfig.peer_http_timeout_ms), + }) + } catch (error) { + throw new PeerOutcomeUnknown( + `Peer ${this.peer.id} dispatch may have executed: ${error instanceof Error ? error.message : 'fetch failed'}` + ) + } - if (response.headers.get(PEER_EXECUTION_HEADER)?.trim().toLowerCase() === PEER_NOT_EXECUTED) { - throw new PeerRequestNotExecuted(`Peer ${this.peer.id} reported non-execution`) - } + span?.setAttribute('http.response.status_code', response.status) + if (response.status >= 400) { + result.outcome = 'error' + span?.setStatus({ code: SpanStatusCode.ERROR }) + } + if ( + response.headers.get(PEER_EXECUTION_HEADER)?.trim().toLowerCase() === PEER_NOT_EXECUTED + ) { + throw new PeerRequestNotExecuted(`Peer ${this.peer.id} reported non-execution`) + } - const responseHeaders: Record = {} - response.headers.forEach((value, name) => { - responseHeaders[name.toLowerCase()] = [value] - }) - const responseEnvelope: Record = { - status: response.status, - headers: responseHeaders, - } - let text: string - try { - text = await response.text() - } catch (error) { - throw new PeerOutcomeUnknown( - `Peer ${this.peer.id} response could not be read after dispatch: ${error instanceof Error ? error.message : 'response read failed'}` - ) - } - if (text) { - try { - responseEnvelope.body = JSON.parse(text) - } catch { - throw new PeerProtocolError(`Peer ${this.peer.id} returned a non-JSON HTTP body`) - } - } - return PeerProtocolResponseSchema.parse(responseEnvelope) as JsonValue + const responseHeaders: Record = {} + response.headers.forEach((value, name) => { + responseHeaders[name.toLowerCase()] = [value] + }) + const responseEnvelope: Record = { + status: response.status, + headers: responseHeaders, + } + let text: string + try { + text = await response.text() + } catch (error) { + throw new PeerOutcomeUnknown( + `Peer ${this.peer.id} response could not be read after dispatch: ${error instanceof Error ? error.message : 'response read failed'}` + ) + } + if (text) { + try { + responseEnvelope.body = JSON.parse(text) + } catch { + throw new PeerProtocolError(`Peer ${this.peer.id} returned a non-JSON HTTP body`) + } + } + return PeerProtocolResponseSchema.parse(responseEnvelope) as JsonValue + }, + { + kind: SpanKind.CLIENT, + attributes: { + 'inkcre.peer.target.id': this.peer.id, + 'http.request.method': this.parameters.method, + }, + }, + parent + ) } } diff --git a/packages/core/src/peer/manager.ts b/packages/core/src/peer/manager.ts index 41a46f3..5909239 100644 --- a/packages/core/src/peer/manager.ts +++ b/packages/core/src/peer/manager.ts @@ -1,3 +1,4 @@ +import { observeOperation, type Context } from '../obsrv/telemetry' import { APIError } from '../base' import { configStore } from '../config' import { ZodError } from 'zod' @@ -50,34 +51,42 @@ export class PeerManager { static async delegate( capability: CapabilityID, payload: JsonValue, - routeToPeer: PeerRef | null = null + routeToPeer: PeerRef | null = null, + parent?: Context ): Promise { - const candidates = await PeerManager.candidates(capability, routeToPeer) - let attempted = 0 - for (const candidate of candidates) { - const factory = PeerManager.outbounds.get(candidate.protocol) - if (!factory) continue - let outbound: PeerOutbound - try { - outbound = factory(candidate.peer, candidate.parameters) - } catch (error) { - if (error instanceof PeerProtocolConfigurationError) continue - throw error - } - attempted += 1 - try { - return await outbound.execute(payload) - } catch (error) { - if (error instanceof PeerRequestNotExecuted) { - if (routeToPeer !== null) break - continue + return observeOperation( + 'peer.delegate', + async (active) => { + const candidates = await PeerManager.candidates(capability, routeToPeer) + let attempted = 0 + for (const candidate of candidates) { + const factory = PeerManager.outbounds.get(candidate.protocol) + if (!factory) continue + let outbound: PeerOutbound + try { + outbound = factory(candidate.peer, candidate.parameters) + } catch (error) { + if (error instanceof PeerProtocolConfigurationError) continue + throw error + } + attempted += 1 + try { + return await outbound.execute(payload, active) + } catch (error) { + if (error instanceof PeerRequestNotExecuted) { + if (routeToPeer !== null) break + continue + } + if (error instanceof PeerOutcomeUnknown) throw error + throw error + } } - if (error instanceof PeerOutcomeUnknown) throw error - throw error - } - } - throw new CapabilityDelegationUnavailable( - `No eligible Peer completed capability ${capability}; attempted=${attempted}` + throw new CapabilityDelegationUnavailable( + `No eligible Peer completed capability ${capability}; attempted=${attempted}` + ) + }, + {}, + parent ) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7b67084..02b5b18 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -451,6 +451,33 @@ importers: packages/core: dependencies: + '@opentelemetry/api': + specifier: ^1.9.1 + version: 1.9.1 + '@opentelemetry/core': + specifier: ^2.11.0 + version: 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/exporter-logs-otlp-proto': + specifier: ^0.222.0 + version: 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/exporter-metrics-otlp-proto': + specifier: ^0.222.0 + version: 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/exporter-trace-otlp-proto': + specifier: ^0.222.0 + version: 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/resources': + specifier: ^2.11.0 + version: 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-logs': + specifier: ^0.222.0 + version: 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-metrics': + specifier: ^2.11.0 + version: 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-trace-web': + specifier: ^2.11.0 + version: 2.11.0(@opentelemetry/api@1.9.1) '@supabase/postgrest-js': specifier: ^2.84.0 version: 2.110.8 @@ -1585,10 +1612,100 @@ packages: resolution: {integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==} engines: {node: ^14.21.3 || >=16} + '@opentelemetry/api-logs@0.222.0': + resolution: {integrity: sha512-9mb1If+IF6u0ZVXkHQ6ogEae5HwA6ajIVUgpSDQyRASxft6BSXHvBvPooRle3yFN/fKnCdSOnuu0OC3PLcF6+g==} + engines: {node: '>=8.0.0'} + '@opentelemetry/api@1.9.0': resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==} engines: {node: '>=8.0.0'} + '@opentelemetry/api@1.9.1': + resolution: {integrity: sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==} + engines: {node: '>=8.0.0'} + + '@opentelemetry/core@2.11.0': + resolution: {integrity: sha512-7YP44XH0tV6+Mb54x2YGf84i7yi+31MBZlE8JwvozkxyTvXbSp10X7cI7YE49ChJ3shMJoBmCJF3+1QFBJctGA==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/exporter-logs-otlp-proto@0.222.0': + resolution: {integrity: sha512-LlCDJuaznfFPzjHoKXjN/r9T5pgCZpmVheZ/EmwMUhMvpxI7RXDmsdLXoYpl5suYQNkwyXAUZhVEXKe3lev8Hg==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + + '@opentelemetry/exporter-metrics-otlp-http@0.222.0': + resolution: {integrity: sha512-6Ko+0bgNP6V4G/RsmNBSk5lO1B/lo9z6tvLpFY3ykPPevXNzFmOW3C9hEmTt0zKCvHovyrol3TYlg4HVb5gwjg==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + + '@opentelemetry/exporter-metrics-otlp-proto@0.222.0': + resolution: {integrity: sha512-s1ZPwS8Ig7cpRmL3kCobPaFbemM81dJ03LNPrsuN32h3mCDvNF2NQ1pRHruOju0P0o1TZ24LkZA685rtQal1KA==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + + '@opentelemetry/exporter-trace-otlp-proto@0.222.0': + resolution: {integrity: sha512-imLrLzNhnABJt3tUyT63h6MqfZrG3Gdv3TE7+OUQTvwD088RfCUx3rF01lcgfu2KXBFk13vwi0yKZLvFEalkIA==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + + '@opentelemetry/otlp-exporter-base@0.222.0': + resolution: {integrity: sha512-YbywG3veEm2Fb6TbdxRkuquWob6eVWXuA8/Ba1tXz9jHfUqpdE3keilOHEtPboC4CvS1bjeeVfNkWGOOrLj+lw==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + + '@opentelemetry/otlp-transformer@0.222.0': + resolution: {integrity: sha512-/F3BZ89+CJQnZkMh2tCrtcdB+XT2Dxhj4FFE+WPQ//413hmFL0/RfEX6vgOIWGhiSzrkHWTK3+6SiT7K5/g/jQ==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': ^1.3.0 + + '@opentelemetry/resources@2.11.0': + resolution: {integrity: sha512-Ie7+8q8MDF4FAEQCKVMTx3ReUvxiIAgIiiW3c9JdmP8+HMcDy20puT+AHjexnExgnbvBxjQ9fjkFDWrikJ2jQA==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.3.0 <1.10.0' + + '@opentelemetry/sdk-logs@0.222.0': + resolution: {integrity: sha512-+19YHODIjaUCArxleaJtuufFZVpz/xvvK+VllQqE+W8hHolxdoRwHfK/s667zezwh1hkx6FFF+oYzetYgqK+Bg==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.4.0 <1.10.0' + + '@opentelemetry/sdk-metrics@2.11.0': + resolution: {integrity: sha512-7GXXcObyHyDUUSG+L+kJoquty01bzm7ivE7+SSgXXJcHuPzGviptxwARmI2c+bnnxjexGQbJnyNlN8HxBP/Y7A==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.9.0 <1.10.0' + + '@opentelemetry/sdk-trace-base@2.11.0': + resolution: {integrity: sha512-H19x/TX/LZdqiYOjM7fqtSxwlplC5pgelavqbQdHbhdq0q/AI/TGkM2dfGuuynTXmJPeF2HoZVoPDu+TGoW78A==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.3.0 <1.10.0' + + '@opentelemetry/sdk-trace-web@2.11.0': + resolution: {integrity: sha512-8hgLI437x8VRKzgUr+WRcHFp9AeaHmveKRsPIMNele9tethgCKprakRRqZCWyt41ilALHATfspUMl1An0OTMUQ==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.0.0 <1.10.0' + + '@opentelemetry/sdk-trace@2.11.0': + resolution: {integrity: sha512-fFnTqGm8/G73GQVnxYi7LXa1ZVYEUvgL6XI1LpvV0bPC7WQ/ZGgKxCSl8FnlZBKto9JHHEFTO6s6CUpvvtwFrA==} + engines: {node: ^18.19.0 || >=20.6.0} + peerDependencies: + '@opentelemetry/api': '>=1.3.0 <1.10.0' + + '@opentelemetry/semantic-conventions@1.43.0': + resolution: {integrity: sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg==} + engines: {node: '>=14'} + '@oxc-parser/binding-android-arm-eabi@0.131.0': resolution: {integrity: sha512-t2xicr9pfzkSRYx5aPqZqlLaayIwJTqgQ81Jor31Xep2nGyL2Aq3d0K5wOfeR7VevaSdxaS9dzSQP9xDwn8fDg==} engines: {node: ^20.19.0 || >=22.12.0} @@ -3067,123 +3184,145 @@ packages: resolution: {integrity: sha512-fjkATm+fg4r6Ss8o82u3j33PfIqhSs4A0WEEw9kOwhMx/ui/RQ0ZAsCtF6e7UG2CWGOGXAJspLlfk2tr3rjjKQ==} cpu: [arm64] os: [darwin] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-darwin-x64@0.7.4': resolution: {integrity: sha512-Hj0KvHpS1RJY/bgM3BADzmXXkKO3+bq3M8bMq4b0j0LsVi1SeWYpD/hJLJFwHeNMS+jO4vlZ343yjb4DEb9XXQ==} cpu: [x64] os: [darwin] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-freebsd-x64@0.7.4': resolution: {integrity: sha512-GLKBZvqVFvC1bvNPoPZRj0UxUaAZZKCzb8IPNyvRhXesOk+Af9UbhbVPwx9Do4o2AVf6R5FPzyRWWIihQdCp+A==} cpu: [x64] os: [freebsd] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-linux-arm-gnu@0.7.4': resolution: {integrity: sha512-CAjbJexBJUqHgIPgOCJO7EYRnFluNLt5VD3jNS40wmsNZqa04HbewVVcgfmzfzuBhjX6ookntLDG3lWieyTAVw==} cpu: [arm] os: [linux] libc: [glibc] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-linux-arm-musl@0.7.4': resolution: {integrity: sha512-HQMuKBltnKFUqhUh8wNiivd76coRwDngdCxbcAULlatAlc2OXo8L6jLTkVnNeUuOw9JYzSq9LY2/7zvrg63Ddg==} cpu: [arm] os: [linux] libc: [musl] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-linux-arm64-gnu@0.7.4': resolution: {integrity: sha512-cnU7ZVxK/Oq/TIS2iq56rouy1dqnLYgWR2puWcrxGCtmbdxiMISANYhI5t2tMLzTGZMyhawM2zYlyI+gnpBupQ==} cpu: [arm64] os: [linux] libc: [glibc] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-linux-arm64-musl@0.7.4': resolution: {integrity: sha512-NyuabTumcxPtZv/Q+pMVvrcKxLn1SPcpdBGtekVJz7JwI36SuExTq4IG4EZsk7YDmFKP8wDEvmKYOpV/a8Lwhw==} cpu: [arm64] os: [linux] libc: [musl] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-linux-x64-gnu@0.7.4': resolution: {integrity: sha512-w3EnCLPD2vpJw0F+0qVV/1KSOAw4SgzjbGUbbwXUh9w5Kxo1Hdc3mN+/Nvk50oA6cCbSOCEaILnPHXPCauArvg==} cpu: [x64] os: [linux] libc: [glibc] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-linux-x64-musl@0.7.4': resolution: {integrity: sha512-FXKQlFjDM8FxqJ/TncAni7e7JyaXIB3Hv6boApxSs5ZUlvqP4TbrjYVk3mYDQt6xQAE/kEHplxM6m5SKx5sfRg==} cpu: [x64] os: [linux] libc: [musl] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-win32-arm64@0.7.4': resolution: {integrity: sha512-rWr899KEvZIWMx9yUXQl4i90OGIs4gaw4X1UsS2rxsI3qnp8acLIVKI3N5WDqaertkW10crDRZvIxxyw7kTMTQ==} cpu: [arm64] os: [win32] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-codegen/binding-win32-x64@0.7.4': resolution: {integrity: sha512-3Olgmkd5rDrIN9g7wJFMRRC9jub5zAwiQOtwOVhvNe/nZE/rSufFRa7vrFupqSCQml+Zxbcy9npzo3Qne3rA2A==} cpu: [x64] os: [win32] + deprecated: yuku-codegen is pure JavaScript since 0.14 '@yuku-parser/binding-darwin-arm64@0.7.4': resolution: {integrity: sha512-rUetRGukIlPOkDCy+Fo0YTee66n9A04XRQMONptbemWSU27CCV6RDj56+4ne4eSE4gJ0139RWUfbqMtt744pWQ==} cpu: [arm64] os: [darwin] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-darwin-x64@0.7.4': resolution: {integrity: sha512-9bHrGQUot2vWTg0YTdyIBHGd38fy2BSQH1WaqUDVuNqSn7HffrTUzWOgbaWRNd5GTOvDdrt9SDZIG7nfqzeBtg==} cpu: [x64] os: [darwin] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-freebsd-x64@0.7.4': resolution: {integrity: sha512-159565OJ/LR6cCP781nH8DxB5GqlqqWk3uyOLZIznQhsj9zeht4X7+jz9IQH1l/TUio+ojEXf8yt2+DJrN+QVw==} cpu: [x64] os: [freebsd] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-linux-arm-gnu@0.7.4': resolution: {integrity: sha512-j3s3LJxEbOyP58hmzuXpJlKzgxaswuOTu8nAbDpE119b5W3gP1SW+HndLscGUOACpyMdH5WJ6gBHRxq0HCRVBw==} cpu: [arm] os: [linux] libc: [glibc] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-linux-arm-musl@0.7.4': resolution: {integrity: sha512-PUpHPmvWIDxhYTS5oah08RQ28t6dlFBxRPJcftS6HgquiPsm/e0gL5vKwPJpyjaPBHzRH61IAUDDfrRe8iFs8g==} cpu: [arm] os: [linux] libc: [musl] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-linux-arm64-gnu@0.7.4': resolution: {integrity: sha512-Hi3w0et5mu3i7S+qE0UgOev4RqJ/U9DW8xn79t4nttiICYCx3NveC0Goo78uqzxttsDI3hfRY43lrrF26svqcw==} cpu: [arm64] os: [linux] libc: [glibc] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-linux-arm64-musl@0.7.4': resolution: {integrity: sha512-i073u4ENL9DJeWBRKioRCz8i5hg6EmUcH89eH1lts9f9AFPA1GphODwK6OXOXUbpi2AwZ1deFIUWgLGP2mdmmA==} cpu: [arm64] os: [linux] libc: [musl] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-linux-x64-gnu@0.7.4': resolution: {integrity: sha512-j5pt0LyDGxCzfoqRTR3cmMG21+bgSxIufAzJXFOWXkbg/22Ih51eGEsbInnSD5Q9FvJ3ooIn/jfok0dBdhudnA==} cpu: [x64] os: [linux] libc: [glibc] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-linux-x64-musl@0.7.4': resolution: {integrity: sha512-RR1hNhrSpv3FanLM6u5uD+9CYA9IM8U3uGscgvKKV77gtj7ttO4UubpwN7vcx1KknoEIQHKJFPVKoeVy+avf6w==} cpu: [x64] os: [linux] libc: [musl] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-win32-arm64@0.7.4': resolution: {integrity: sha512-1xhYwOLo9TjppHHwNYi3X/dGgOvnj9xh62jpgP4U8nEtTGA70NtJDCkN45pRQdU3B6/U7oQj1T4esP3aFJg6BA==} cpu: [arm64] os: [win32] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-parser/binding-win32-x64@0.7.4': resolution: {integrity: sha512-HonZAapmSKusxLZPnU9WrMzAUdPSBJliGw3CSkA9Er/aq15STEOEy9SOsVGvj4maBv95EmWxt2LThHXnFnGfNg==} cpu: [x64] os: [win32] + deprecated: yuku-parser runs on yuku-core since 0.14 '@yuku-toolchain/types@0.7.4': resolution: {integrity: sha512-iUFXr+UnUJjzVLNI6GIv07poi9NwcG5hTBJSheJh3SdpkYpIjCl9kAGe7dbJMHn5sXeceCL4H12pKa0b6pkouQ==} @@ -7636,8 +7775,108 @@ snapshots: '@noble/hashes@1.8.0': {} + '@opentelemetry/api-logs@0.222.0': + dependencies: + '@opentelemetry/api': 1.9.0 + '@opentelemetry/api@1.9.0': {} + '@opentelemetry/api@1.9.1': {} + + '@opentelemetry/core@2.11.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/semantic-conventions': 1.43.0 + + '@opentelemetry/exporter-logs-otlp-proto@0.222.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/otlp-exporter-base': 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/otlp-transformer': 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-logs': 0.222.0(@opentelemetry/api@1.9.1) + + '@opentelemetry/exporter-metrics-otlp-http@0.222.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/otlp-exporter-base': 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/otlp-transformer': 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-metrics': 2.11.0(@opentelemetry/api@1.9.1) + + '@opentelemetry/exporter-metrics-otlp-proto@0.222.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/exporter-metrics-otlp-http': 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/otlp-exporter-base': 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/otlp-transformer': 0.222.0(@opentelemetry/api@1.9.1) + + '@opentelemetry/exporter-trace-otlp-proto@0.222.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/otlp-exporter-base': 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/otlp-transformer': 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-trace': 2.11.0(@opentelemetry/api@1.9.1) + + '@opentelemetry/otlp-exporter-base@0.222.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/otlp-transformer': 0.222.0(@opentelemetry/api@1.9.1) + + '@opentelemetry/otlp-transformer@0.222.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/api-logs': 0.222.0 + '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-logs': 0.222.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-metrics': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-trace': 2.11.0(@opentelemetry/api@1.9.1) + + '@opentelemetry/resources@2.11.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/semantic-conventions': 1.43.0 + + '@opentelemetry/sdk-logs@0.222.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/api-logs': 0.222.0 + '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/semantic-conventions': 1.43.0 + + '@opentelemetry/sdk-metrics@2.11.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1) + + '@opentelemetry/sdk-trace-base@2.11.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-trace': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/semantic-conventions': 1.43.0 + + '@opentelemetry/sdk-trace-web@2.11.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/sdk-trace-base': 2.11.0(@opentelemetry/api@1.9.1) + + '@opentelemetry/sdk-trace@2.11.0(@opentelemetry/api@1.9.1)': + dependencies: + '@opentelemetry/api': 1.9.1 + '@opentelemetry/core': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/resources': 2.11.0(@opentelemetry/api@1.9.1) + '@opentelemetry/semantic-conventions': 1.43.0 + + '@opentelemetry/semantic-conventions@1.43.0': {} + '@oxc-parser/binding-android-arm-eabi@0.131.0': optional: true From af7e96ae9171491ce9bf7b4b4066b9ea32f90371 Mon Sep 17 00:00:00 2001 From: Lan_zhijiang Date: Sat, 3 Oct 2026 18:33:42 +0800 Subject: [PATCH 3/6] =?UTF-8?q?test:=20=E6=98=8E=E7=A1=AE=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=E6=81=A2=E5=A4=8D=E5=90=8E=E7=9A=84=E9=81=A5=E6=B5=8B?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/e2e/peer-database.spec.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/e2e/peer-database.spec.ts b/tests/e2e/peer-database.spec.ts index 49ac29f..d6fbf4d 100644 --- a/tests/e2e/peer-database.spec.ts +++ b/tests/e2e/peer-database.spec.ts @@ -369,6 +369,8 @@ test('Settings export restores the complete browser experience', async ({ page } INKCRE_PGREST_URL: postgrestUrl, INKCRE_JWT_SECRET: jwtSecret, INKCRE_PEER_ID: '00000000-0000-4000-8000-000000000001', + telemetry_enabled: false, + telemetry_peer_relay_url: '', }, locale: 'en', }) @@ -398,6 +400,9 @@ test('Settings export restores the complete browser experience', async ({ page } })) ) .toEqual({ metaConfig: exported.metaConfig, locale: 'en' }) + await expect( + page.getByRole('checkbox', { name: 'Enable telemetry for this browser Peer', exact: true }) + ).not.toBeChecked() } finally { const cleanup = await fetch(endpoint, { method: 'DELETE', From df9075551c6d05ca86dd5476043ab65fec1d9e1a Mon Sep 17 00:00:00 2001 From: Lan_zhijiang Date: Sat, 3 Oct 2026 20:52:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?docs:=20=E5=AF=B9=E9=BD=90=E5=B7=B2?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=9A=84=E5=8F=AF=E8=A7=82=E6=B5=8B=E6=80=A7?= =?UTF-8?q?=E5=85=B1=E4=BA=AB=E5=A5=91=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/_shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_shared b/docs/_shared index a603b03..7916312 160000 --- a/docs/_shared +++ b/docs/_shared @@ -1 +1 @@ -Subproject commit a603b036fd41dae5a471dea24cd7609bb4927bd5 +Subproject commit 7916312c12cfaf2ee396d7dc1afffee67d4f0721 From b64e5eb5d6563b039e49530ea18296d10e519902 Mon Sep 17 00:00:00 2001 From: Lan_zhijiang Date: Sat, 3 Oct 2026 21:06:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=B8=BA=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=E4=BA=91=E7=AB=AF=E9=81=A5=E6=B5=8B=E4=BF=9D=E7=95=99=E6=9C=89?= =?UTF-8?q?=E7=95=8C=E7=BD=91=E7=BB=9C=E9=A2=84=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client-runtime-and-delegation.md | 5 +++- packages/core/src/obsrv/telemetry.ts | 25 +++++++++++++------ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/docs/30-unit-tdd/client-runtime-and-delegation.md b/docs/30-unit-tdd/client-runtime-and-delegation.md index 7483931..eb5e2c4 100644 --- a/docs/30-unit-tdd/client-runtime-and-delegation.md +++ b/docs/30-unit-tdd/client-runtime-and-delegation.md @@ -142,7 +142,10 @@ success. `PeerOutcomeUnknown` remains visible and does not trigger reload or aut 从此 base 的 `/v1/traces`、`/v1/logs`、`/v1/metrics` 经现有短期 Peer JWT 认证导出； JWT 签名闭包绑定初始化时的连接，旧批次不会借用新连接凭据。此地址不是启用开关， 也没有自动推导或失败回退。配置不可用或初始化失败不会阻止业务启动。配置读取、 -exporter 超时和正常关闭排空均有界，页面退出只能 best effort。Job 页面提供可选 +exporter 超时和正常关闭排空均有界：配置读取最多等待 10 秒后放弃观测初始化；直发 +exporter 为 10 秒，经 relay 为 35 秒，以覆盖服务端最多 32 秒的转发预算和网络余量。 +处理器的等待比对应 exporter 多 5 秒。flush/shutdown 的调用方只等待 1.5 秒，这不会 +取消已开始的 SDK 导出，也不证明排空成功；页面退出只能 best effort。Job 页面提供可选 `diagnostics_url` 链接，用户以 Job ID 在诊断端查询，不把 Grafana 查询语法写入业务层。 `JobManager.create` 在同一个 PostgREST INSERT 中写入 SDK 注入的提交 carrier。超出 diff --git a/packages/core/src/obsrv/telemetry.ts b/packages/core/src/obsrv/telemetry.ts index c694f57..7689fd3 100644 --- a/packages/core/src/obsrv/telemetry.ts +++ b/packages/core/src/obsrv/telemetry.ts @@ -80,7 +80,7 @@ export function initializeTelemetry(meta: MetaConfig, version: string): Promise< .from() .select('schema,value') .eq('key', 'inkcre.observability') - .abortSignal(AbortSignal.timeout(1500)) + .abortSignal(AbortSignal.timeout(10_000)) .maybeSingle() if (error || !data || data.schema !== 'inkcre.observability.v1') { console.warn('[Telemetry] Shared observability configuration is unavailable.') @@ -112,6 +112,9 @@ export async function configureTelemetry( const config = ObservabilityConfigSchema.parse(value) telemetryDiagnosticsUrl.value = config.diagnostics_url ?? null const relayBase = relay ? PublicUrl.parse(relay.url).replace(/\/+$/, '') : null + // The relay may spend up to 32 seconds forwarding a batch; allow network headroom. + const transportTimeoutMs = relay ? 35_000 : 10_000 + const exportTimeoutMs = transportTimeoutMs + 5_000 const endpoints = relayBase ? { traces: `${relayBase}/v1/traces`, @@ -142,8 +145,12 @@ export async function configureTelemetry( spanProcessors: endpoints.traces ? [ new BatchSpanProcessor( - new OTLPTraceExporter({ url: endpoints.traces, timeoutMillis: 1000, headers }), - { exportTimeoutMillis: 1200 } + new OTLPTraceExporter({ + url: endpoints.traces, + timeoutMillis: transportTimeoutMs, + headers, + }), + { exportTimeoutMillis: exportTimeoutMs } ), ] : [], @@ -157,8 +164,12 @@ export async function configureTelemetry( resource, processors: [ new BatchLogRecordProcessor({ - exporter: new OTLPLogExporter({ url: endpoints.logs, timeoutMillis: 1000, headers }), - exportTimeoutMillis: 1200, + exporter: new OTLPLogExporter({ + url: endpoints.logs, + timeoutMillis: transportTimeoutMs, + headers, + }), + exportTimeoutMillis: exportTimeoutMs, }), ], }) @@ -175,11 +186,11 @@ export async function configureTelemetry( new PeriodicExportingMetricReader({ exporter: new OTLPMetricExporter({ url: endpoints.metrics, - timeoutMillis: 1000, + timeoutMillis: transportTimeoutMs, headers, }), exportIntervalMillis: 60_000, - exportTimeoutMillis: 1200, + exportTimeoutMillis: exportTimeoutMs, }), ], }) From 6026b2d9248b7faf7ebced7245565626f47008e7 Mon Sep 17 00:00:00 2001 From: Lan_zhijiang Date: Sat, 3 Oct 2026 21:16:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E8=B7=A8=20Peer?= =?UTF-8?q?=20=E6=97=B6=E5=BB=B6=E6=8C=87=E6=A0=87=E7=9A=84=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=B8=8E=E7=A7=92=E5=88=86=E6=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client-runtime-and-delegation.md | 4 +++- packages/core/src/obsrv/telemetry.ts | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/docs/30-unit-tdd/client-runtime-and-delegation.md b/docs/30-unit-tdd/client-runtime-and-delegation.md index eb5e2c4..db7a77c 100644 --- a/docs/30-unit-tdd/client-runtime-and-delegation.md +++ b/docs/30-unit-tdd/client-runtime-and-delegation.md @@ -151,7 +151,9 @@ exporter 为 10 秒，经 relay 为 35 秒，以覆盖服务端最多 32 秒的 `JobManager.create` 在同一个 PostgREST INSERT 中写入 SDK 注入的提交 carrier。超出 512 UTF-8 bytes 的可选 tracestate 会被省略并计数。执行成功 claim 后创建独立 trace， 通过 SDK Span Link 关联提交；claim、取消和 close 不重写提交列。Job ID 是诊断关联字段， -不是 trace ID。`job.submitted`、`job.started`、`job.closed` 只从明确的业务边界发出结构化 +不是 trace ID。时延指标 `inkcre.operation.duration` 使用与 Core 一致的 `operation` / +`outcome` 标签和 5ms 至 300s 的显式秒分桶，便于跨 Peer 聚合；日志保留 `inkcre.*` 属性。 +`job.submitted`、`job.started`、`job.closed` 只从明确的业务边界发出结构化 事件；既有应用日志、异常 message、参数和内容不会桥接到新增 OTLP。 浏览器原生 `await` 不能依赖 StackContextManager 或 ZoneContextManager 自动保留当前 diff --git a/packages/core/src/obsrv/telemetry.ts b/packages/core/src/obsrv/telemetry.ts index 7689fd3..9a0a61c 100644 --- a/packages/core/src/obsrv/telemetry.ts +++ b/packages/core/src/obsrv/telemetry.ts @@ -177,11 +177,23 @@ export async function configureTelemetry( logger = provider.getLogger('inkcre.browser') } if (endpoints.metrics) { - const { MeterProvider, PeriodicExportingMetricReader } = + const { MeterProvider, PeriodicExportingMetricReader, AggregationType } = await import('@opentelemetry/sdk-metrics') const { OTLPMetricExporter } = await import('@opentelemetry/exporter-metrics-otlp-proto') const provider = new MeterProvider({ resource, + // Match the Core histogram so cross-Peer aggregation keeps seconds and buckets aligned. + views: [ + { + instrumentName: 'inkcre.operation.duration', + aggregation: { + type: AggregationType.EXPLICIT_BUCKET_HISTOGRAM, + options: { + boundaries: [0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 30, 60, 300], + }, + }, + }, + ], readers: [ new PeriodicExportingMetricReader({ exporter: new OTLPMetricExporter({ @@ -255,7 +267,10 @@ export async function observeOperation( } finally { span.end() const attributes = { 'inkcre.operation': name, 'inkcre.outcome': result.outcome } - operationDuration?.record((performance.now() - started) / 1000, attributes) + operationDuration?.record((performance.now() - started) / 1000, { + operation: name, + outcome: result.outcome, + }) operationLogger?.emit({ context: active, eventName: 'inkcre.operation.completed',