diff --git a/.config/docker_example.yml b/.config/docker_example.yml index 4d7ec5e1e2..c80cb3851c 100644 --- a/.config/docker_example.yml +++ b/.config/docker_example.yml @@ -173,8 +173,31 @@ id: 'aidx' #sentryForBackend: # enableNodeProfiling: true +# # Specify Sentry integration names to disable individual auto-instrumentation. +# # The names are integration .name values, not factory function names. +# # To check enabled names, set `options.debug: true` and see +# # "Integration installed: " in the Sentry logs. +# # +# # As of 2026-07-07 / @sentry/node 10.62.0, useful names for Misskey include: +# # Postgres ... DB queries (when pg is externalized) +# # Redis ... ioredis commands +# # Fastify ... inbound HTTP routes +# # Http ... inbound/outbound HTTP; disabling this can also affect request isolation +# # NodeFetch ... fetch/undici requests +# disabledIntegrations: ['Postgres'] # options: # dsn: 'https://examplePublicKey@o0.ingest.sentry.io/0' +# # By default, Misskey prevents Sentry trace headers (`sentry-trace` and +# # `baggage`) from being sent to remote ActivityPub/Webhook/etc. hosts. +# # To intentionally propagate distributed traces to trusted internal services, +# # list only those internal URL patterns here. +# # Avoid broad patterns that match remote servers unless you intentionally +# # want to restore Sentry's legacy behavior of propagating traces to all +# # outbound HTTP requests. +# #tracePropagationTargets: [] +# # Internal allowlist example: +# #tracePropagationTargets: +# # - 'internal-service.example' #sentryForFrontend: # vueIntegration: diff --git a/.config/example.yml b/.config/example.yml index 94e2388835..9657d4f4f2 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -329,63 +329,6 @@ id: 'aidx' # #tracePropagationTargets: # # - 'internal-service.example' -# ┌─────────┐ -#───┘ Tracing └──────────────────────────────────────────────── -# OpenTelemetry distributed tracing (Traces only, opt-in). -# Existing API and Queue spans are exported to an OTLP http/protobuf endpoint. -# -# Standard OTEL_* environment variables are honored for values omitted below: -# OTEL_EXPORTER_OTLP_TRACES_ENDPOINT, OTEL_EXPORTER_OTLP_ENDPOINT, -# OTEL_EXPORTER_OTLP_HEADERS, OTEL_TRACES_SAMPLER, OTEL_TRACES_SAMPLER_ARG, etc. -# -# When this is enabled together with sentryForBackend, Misskey shares Sentry's -# TracerProvider and adds an OTLP SpanProcessor to it. In that mode: -# - sampleRate below is ignored; sampling follows sentryForBackend.options -# tracesSampleRate / tracesSampler. -# - resourceAttributes below is ignored; set OTEL_SERVICE_NAME and -# OTEL_RESOURCE_ATTRIBUTES in the environment if you need to override them. -# - spans produced by Sentry integrations are exported to both Sentry and OTLP. -# - sentry-trace / baggage propagation to outbound remote requests is disabled -# by default while OTel is enabled. Set propagateTraceToRemote: true only if -# you intentionally want Sentry trace propagation for your deployment. - -#otelForBackend: -# endpoint: 'http://localhost:4318/v1/traces' -# #headers: -# # authorization: 'Bearer xxxxx' -# #sampleRate: 1.0 -# # Record PostgreSQL query spans. Disabled by default to avoid instrumentation -# # overhead when database-level diagnostics are not needed. -# #capturePgSpans: false -# # Include raw SQL text in PostgreSQL spans. Requires capturePgSpans and is -# # disabled by default because non-parameterized queries can expose values to -# # the OTLP Collector. -# #capturePgStatement: false -# # Include PostgreSQL connection-pool spans with an existing parent span. -# # Requires capturePgSpans and is disabled by default to avoid noisy spans -# # from connection churn. -# #capturePgConnectionSpans: false -# # Record Redis command spans. Disabled by default because subscribing to the -# # ioredis diagnostics channel adds work to every Redis command, including -# # commands without a parent span. Enable for development diagnostics or when -# # the added overhead is acceptable in production. -# #captureRedisCommandSpans: false -# # Include Redis startup/reconnect spans. Disabled by default to avoid noisy -# # connection churn; these spans are recorded even without an HTTP or job -# # parent span. -# #captureRedisConnectionSpans: false -# # Record Redis commands without an HTTP or job parent span. Disabled by -# # default because queue polling and background work can produce many root -# # traces; only applies when captureRedisCommandSpans is enabled. -# #captureRedisRootSpans: false -# #resourceAttributes: -# # deployment.environment: 'production' -# #propagateTraceToRemote: false -# # Queue worker spans are independent traces linked to their enqueuer by default. -# # Set to 'parent' to make them child spans instead. This can create very large -# # traces for high-fan-out queues such as federation delivery. -# #jobTraceContextMode: 'link' - #sentryForFrontend: # vueIntegration: # tracingOptions: diff --git a/.github/workflows/check-misskey-js-autogen.comment.yml b/.github/workflows/check-misskey-js-autogen.comment.yml new file mode 100644 index 0000000000..0403b0c17a --- /dev/null +++ b/.github/workflows/check-misskey-js-autogen.comment.yml @@ -0,0 +1,73 @@ +name: Check Misskey JS autogen (comment) + +on: + workflow_run: + types: [completed] + workflows: + - Check Misskey JS autogen # check-misskey-js-autogen.yml + +jobs: + comment-misskey-js-autogen: + runs-on: ubuntu-latest + # No code is cloned or executed here, so it is safe to hold pull-requests: write + if: ${{ github.event.workflow_run.event == 'pull_request' }} + permissions: + actions: read + pull-requests: write + + steps: + # The result is missing when the run failed before the check job (e.g. the PR does not build), so do not fail here + - name: Download result + id: download-result + continue-on-error: true + uses: actions/download-artifact@v8 + with: + name: misskey-js-autogen-result + path: result + github-token: ${{ github.token }} + repository: ${{ github.repository }} + run-id: ${{ github.event.workflow_run.id }} + + # The artifact comes from a run that built fork code, so validate it before using + - name: Load result + id: load-result + if: steps.download-result.outcome == 'success' + run: | + pr_number="$(cat result/pr-number)" + changes="$(cat result/changes)" + + case "$pr_number" in + ''|*[!0-9]*) echo "invalid pr number"; exit 1;; + esac + case "$changes" in + true|false) ;; + *) echo "invalid result"; exit 1;; + esac + + echo "pr-number=$pr_number" >> "$GITHUB_OUTPUT" + echo "changes=$changes" >> "$GITHUB_OUTPUT" + + - name: send message + if: steps.load-result.outputs.changes == 'true' + uses: thollander/actions-comment-pull-request@v3 + with: + pr-number: ${{ steps.load-result.outputs.pr-number }} + comment-tag: check-misskey-js-autogen + message: |- + Thank you for sending us a great Pull Request! 👍 + Please regenerate misskey-js type definitions! 🙏 + + example: + ```sh + pnpm run build-misskey-js-with-types + ``` + + - name: send message + if: steps.load-result.outputs.changes == 'false' + uses: thollander/actions-comment-pull-request@v3 + with: + pr-number: ${{ steps.load-result.outputs.pr-number }} + comment-tag: check-misskey-js-autogen + mode: delete + message: "Thank you!" + create_if_not_exists: false diff --git a/.github/workflows/check-misskey-js-autogen.yml b/.github/workflows/check-misskey-js-autogen.yml index 631daa79c8..518955dae2 100644 --- a/.github/workflows/check-misskey-js-autogen.yml +++ b/.github/workflows/check-misskey-js-autogen.yml @@ -1,7 +1,8 @@ +# this name is used in check-misskey-js-autogen.comment.yml so be careful when change name name: Check Misskey JS autogen on: - pull_request_target: + pull_request: branches: - master - develop @@ -10,7 +11,6 @@ on: - packages/backend/** jobs: - # pull_request_target safety: permissions: read-all, and there are no secrets used in this job generate-misskey-js: runs-on: ubuntu-latest permissions: @@ -58,7 +58,6 @@ jobs: name: generated-misskey-js path: packages/misskey-js/generator/built/autogen - # pull_request_target safety: permissions: read-all, and no user codes are executed get-actual-misskey-js: runs-on: ubuntu-latest permissions: @@ -78,12 +77,11 @@ jobs: name: actual-misskey-js path: packages/misskey-js/src/autogen - # pull_request_target safety: nothing is cloned from repository - comment-misskey-js-autogen: + check-misskey-js-autogen: runs-on: ubuntu-latest needs: [generate-misskey-js, get-actual-misskey-js] permissions: - pull-requests: write + contents: read steps: - name: download generated-misskey-js uses: actions/download-artifact@v8 @@ -111,28 +109,21 @@ jobs: - name: Print full diff run: cat ./misskey-js.diff - - name: send message - if: steps.check-changes.outputs.changes == 'true' - uses: thollander/actions-comment-pull-request@v3 - with: - comment-tag: check-misskey-js-autogen - message: |- - Thank you for sending us a great Pull Request! 👍 - Please regenerate misskey-js type definitions! 🙏 + # A fork's pull_request token cannot comment, so hand the result to check-misskey-js-autogen.comment.yml + - name: Save result + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + CHANGES: ${{ steps.check-changes.outputs.changes }} + run: | + mkdir -p result + echo "$PR_NUMBER" > result/pr-number + echo "$CHANGES" > result/changes - example: - ```sh - pnpm run build-misskey-js-with-types - ``` - - - name: send message - if: steps.check-changes.outputs.changes == 'false' - uses: thollander/actions-comment-pull-request@v3 + - name: Upload result + uses: actions/upload-artifact@v7 with: - comment-tag: check-misskey-js-autogen - mode: delete - message: "Thank you!" - create_if_not_exists: false + name: misskey-js-autogen-result + path: result - name: Make failure if changes are detected if: steps.check-changes.outputs.changes == 'true' diff --git a/CHANGELOG.md b/CHANGELOG.md index 229e00d2b3..cec97316a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,21 +48,12 @@ - Fix: ノートの詳細表示で削除された引用元が表示されない問題を修正 ### Server -- Feat: OpenTelemetryサポート - - 詳細な設定はconfigファイルを参照してください。 - - Sentryとの併用も可能です。Sentry併用時は、PostgreSQL Query と Redis command は Sentry で計装されます。 - - 以下の自動計装をサポートしています。（計装対象にする項目は設定可能） - - PostgreSQL query - - Redis command - - 全ての受信HTTPリクエスト - - 全ての送信HTTPリクエスト - - ジョブキュー（エンキュー元のトレースを含む） - Feat: ログ基盤の刷新 - API内部エラーのログに構造化属性と正規化したエラー情報を付与し、認証情報を自動的に秘匿するように（従来形式の表示は維持） - ログ全体の既定出力レベルとドメインごとの出力レベルを設定できるように - バックエンドのログを1行JSON形式で出力できるように - - OpenTelemetryのTrace ContextをJSON形式のログへ関連付けられるように - - HTTPのAccess logをstatus class単位で出力できるように（開発時のリクエスト・レスポンス本文、OpenTelemetryのTrace Contextにも対応） + - SentryのTrace ContextをJSON形式のログへ関連付けられるように + - HTTPのAccess logをstatus class単位で出力できるように（開発時のリクエスト・レスポンス本文、SentryのTrace Contextにも対応） - Enhance: Sentry バックエンドの自動計装を `sentryForBackend.disabledIntegrations` で個別に無効化できるように - Enhance: センシティブメディアの判定を外部サービス ([sensitive-detector](https://github.com/misskey-dev/sensitive-detector)) に分離し、`nsfwjs` / `@tensorflow/tfjs(-node)` の同梱と NSFW 判定モデルを廃止 (#16804) - Enhance: Node.js 22.22.2以降、24.17.0以降、26.4.0以降をサポートするように diff --git a/package.json b/package.json index 733db4f22a..5c8346543d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2026.7.0-beta.6", + "version": "2026.7.0-rc.0", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/backend/package.json b/packages/backend/package.json index 1adbde0827..1fb8e50fc8 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -57,7 +57,6 @@ "@fastify/cors": "11.3.0", "@fastify/http-proxy": "11.5.0", "@fastify/multipart": "10.1.0", - "@fastify/otel": "0.20.1", "@fastify/static": "10.1.2", "@kitajs/html": "4.2.13", "@misskey-dev/emoji-assets": "17.0.3", @@ -68,15 +67,6 @@ "@nestjs/common": "11.1.28", "@nestjs/core": "11.1.28", "@nestjs/testing": "11.1.28", - "@opentelemetry/api": "1.9.1", - "@opentelemetry/core": "2.9.0", - "@opentelemetry/exporter-trace-otlp-proto": "0.220.0", - "@opentelemetry/instrumentation": "0.219.0", - "@opentelemetry/instrumentation-pg": "0.72.0", - "@opentelemetry/resources": "2.9.0", - "@opentelemetry/sdk-trace-base": "2.9.0", - "@opentelemetry/sdk-trace-node": "2.9.0", - "@opentelemetry/semantic-conventions": "1.43.0", "@oxc-project/runtime": "0.139.0", "@peertube/http-signature": "1.7.0", "@sentry/node": "10.65.0", diff --git a/packages/backend/rolldown.config.ts b/packages/backend/rolldown.config.ts index 768c3afc03..76bfa35421 100644 --- a/packages/backend/rolldown.config.ts +++ b/packages/backend/rolldown.config.ts @@ -87,7 +87,6 @@ export default defineConfig((args) => { 'class-validator', /^@sentry\/.*/, /^@sentry-internal\/.*/, - /^@opentelemetry\/.*/, '@nestjs/websockets/socket-module', '@nestjs/microservices/microservices-module', '@nestjs/microservices', diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index 66540ae1d1..e42fbc279a 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -27,21 +27,6 @@ type SentryBackendConfig = { disabledIntegrations?: string[]; }; -type OtelBackendConfig = { - endpoint?: string; - headers?: Record; - sampleRate?: number; - capturePgSpans?: boolean; - capturePgStatement?: boolean; - capturePgConnectionSpans?: boolean; - captureRedisCommandSpans?: boolean; - captureRedisConnectionSpans?: boolean; - captureRedisRootSpans?: boolean; - resourceAttributes?: Record; - propagateTraceToRemote?: boolean; - jobTraceContextMode?: 'link' | 'parent'; -}; - /** * 設定ファイルの型 */ @@ -87,7 +72,6 @@ type Source = { scope?: 'local' | 'global' | string[]; }; sentryForBackend?: SentryBackendConfig; - otelForBackend?: OtelBackendConfig; sentryForFrontend?: { options: Partial & { dsn: string }; vueIntegration?: SentryVue.VueIntegrationOptions | null; @@ -233,7 +217,6 @@ export type Config = { redisForTimelines: RedisOptions & RedisOptionsSource; redisForReactions: RedisOptions & RedisOptionsSource; sentryForBackend: SentryBackendConfig | undefined; - otelForBackend: OtelBackendConfig | undefined; sentryForFrontend: { options: Partial & { dsn: string }; vueIntegration?: SentryVue.VueIntegrationOptions | null; @@ -339,7 +322,6 @@ export function loadConfig(): Config { redisForTimelines: config.redisForTimelines ? convertRedisOptions(config.redisForTimelines, host) : redis, redisForReactions: config.redisForReactions ? convertRedisOptions(config.redisForReactions, host) : redis, sentryForBackend: config.sentryForBackend, - otelForBackend: config.otelForBackend, sentryForFrontend: config.sentryForFrontend, id: config.id, proxy: config.proxy, diff --git a/packages/backend/src/core/QueueModule.ts b/packages/backend/src/core/QueueModule.ts index ad25631152..3c893ea419 100644 --- a/packages/backend/src/core/QueueModule.ts +++ b/packages/backend/src/core/QueueModule.ts @@ -9,7 +9,6 @@ import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import { baseQueueOptions, QUEUE } from '@/queue/const.js'; import { allSettled } from '@/misc/promise-tracker.js'; -import { instrumentQueue } from '@/core/telemetry/queue-instrumentation.js'; import { DeliverJobData, EndedPollNotificationJobData, @@ -33,12 +32,7 @@ export type UserWebhookDeliverQueue = Bull.Queue; export type SystemWebhookDeliverQueue = Bull.Queue; function createQueue(queueName: string, config: Config): Bull.Queue { - const queue = new Bull.Queue(queueName, baseQueueOptions(config, queueName)); - // Queue のラップは、enqueue 時に OTel context をジョブデータへ埋め込むためのもの。 - // Sentry 単独ではジョブ間の context 伝播を使わないので、OTel 未設定時は元の Queue を返す。 - if (config.otelForBackend == null) return queue; - - return instrumentQueue(queue); + return new Bull.Queue(queueName, baseQueueOptions(config, queueName)); } const $system: Provider = { diff --git a/packages/backend/src/core/telemetry/TelemetryService.ts b/packages/backend/src/core/telemetry/TelemetryService.ts index 8a62a521df..e73beb4f8a 100644 --- a/packages/backend/src/core/telemetry/TelemetryService.ts +++ b/packages/backend/src/core/telemetry/TelemetryService.ts @@ -5,7 +5,7 @@ import { Injectable } from '@nestjs/common'; import { bindThis } from '@/decorators.js'; -import { captureMessage, shutdownTelemetry, startSpan, startSpanWithTraceContext } from './telemetry-registry.js'; +import { captureMessage, shutdownTelemetry, startSpan } from './telemetry-registry.js'; import type { OnApplicationShutdown } from '@nestjs/common'; import type { TelemetryCaptureMessageOptions } from './adapters/TelemetryAdapter.js'; @@ -21,13 +21,6 @@ export class TelemetryService implements OnApplicationShutdown { return startSpan(name, fn); } - @bindThis - public startSpanWithTraceContext(name: string, jobData: object, fn: () => T): T { - // jobData に enqueue 元の context があれば worker span へ復元する。 - // context の無い既存ジョブは、通常の startSpan と同じ扱いになる。 - return startSpanWithTraceContext(name, jobData, fn); - } - @bindThis public async onApplicationShutdown(_signal?: string): Promise { await shutdownTelemetry(); diff --git a/packages/backend/src/core/telemetry/adapters/OpenTelemetryAdapter.ts b/packages/backend/src/core/telemetry/adapters/OpenTelemetryAdapter.ts deleted file mode 100644 index c3d5064a6b..0000000000 --- a/packages/backend/src/core/telemetry/adapters/OpenTelemetryAdapter.ts +++ /dev/null @@ -1,259 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import * as os from 'node:os'; -import cluster from 'node:cluster'; -import { envOption } from '@/env.js'; -import { registerDiagLogger } from '@/core/telemetry/telemetry-diag.js'; -import { installHttpClientInstrumentation } from '@/core/telemetry/http-client-instrumentation.js'; -import { installDatabaseInstrumentation } from '@/core/telemetry/database-instrumentation.js'; -import { installRedisInstrumentation } from '@/core/telemetry/redis-instrumentation.js'; -import { executeSpan, getQueueTraceContextMode, injectActiveTraceContext, recordSpanError, startSpanWithQueueTraceContext } from '@/core/telemetry/queue-trace-context.js'; -import type { LogTraceContext } from '@/logging/types.js'; -import type { Span, SpanStatusCode, Tracer } from '@opentelemetry/api'; -import type { Resource, ResourceDetector } from '@opentelemetry/resources'; -import type { ParentBasedSampler, Sampler } from '@opentelemetry/sdk-trace-base'; -import type { OtelBackendRuntimeConfig, TelemetryAdapter, TelemetryCaptureMessageOptions } from './TelemetryAdapter.js'; -import type { QueueTraceContextCarrier, QueueTraceContextDeps } from '../queue-trace-context.js'; - -const DEFAULT_SHUTDOWN_TIMEOUT = 5000; - -type OpenTelemetryAdapterDeps = { - tracer: Pick; - provider: { - shutdown(): Promise; - }; - getActiveSpan: () => Span | undefined; - spanStatusCodeError: SpanStatusCode; - shutdownTimeout: number; - shutdownHttpClientInstrumentation?: () => void; - shutdownDatabaseInstrumentation?: () => void; - shutdownRedisInstrumentation?: () => void; - queueTraceContext?: QueueTraceContextDeps; -}; - -type CreateSamplerDeps = { - ParentBasedSampler: new (config: { root: Sampler }) => ParentBasedSampler; - TraceIdRatioBasedSampler: new (sampleRate: number) => Sampler; -}; - -type CreateResourceDeps = { - defaultResource: () => Resource; - resourceFromAttributes: (attributes: Record) => Resource; - detectResources: (config: { detectors: ResourceDetector[] }) => Resource; - envDetector: ResourceDetector; - serviceNameAttribute: string; - serviceInstanceIdAttribute: string; - serviceVersionAttribute: string; - serviceVersion: string; -}; - -export class OpenTelemetryAdapter implements TelemetryAdapter { - public constructor( - private readonly deps: OpenTelemetryAdapterDeps, - ) { - } - - public static async create(config: OtelBackendRuntimeConfig): Promise { - const [ - { context, diag, DiagLogLevel, propagation, ROOT_CONTEXT, SpanKind, SpanStatusCode, trace }, - { W3CTraceContextPropagator }, - { OTLPTraceExporter }, - { defaultResource, detectResources, envDetector, resourceFromAttributes }, - { BatchSpanProcessor, ParentBasedSampler, TraceIdRatioBasedSampler }, - { NodeTracerProvider }, - { ATTR_SERVICE_INSTANCE_ID, ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION }, - ] = await Promise.all([ - import('@opentelemetry/api'), - import('@opentelemetry/core'), - import('@opentelemetry/exporter-trace-otlp-proto'), - import('@opentelemetry/resources'), - import('@opentelemetry/sdk-trace-base'), - import('@opentelemetry/sdk-trace-node'), - import('@opentelemetry/semantic-conventions'), - ]); - - // OTel SDK内部のexport失敗は既定だと見えにくいため、Misskeyのloggerへ橋渡しする。 - registerDiagLogger(diag, DiagLogLevel.WARN); - - // endpoint/headersを未指定にしておくと、OTEL_EXPORTER_OTLP_* 環境変数の標準fallbackが効く。 - const exporter = new OTLPTraceExporter({ - ...(config.endpoint != null ? { url: config.endpoint } : {}), - ...(config.headers != null ? { headers: config.headers } : {}), - }); - const spanProcessor = new BatchSpanProcessor(exporter); - - // SDK 2.xではSpanProcessorをprovider生成時に渡す。ここでOTel単体用のproviderを作る。 - const provider = new NodeTracerProvider({ - resource: createResource(config, { - defaultResource, - resourceFromAttributes, - detectResources, - envDetector, - serviceNameAttribute: ATTR_SERVICE_NAME, - serviceInstanceIdAttribute: ATTR_SERVICE_INSTANCE_ID, - serviceVersionAttribute: ATTR_SERVICE_VERSION, - serviceVersion: config.serviceVersion, - }), - ...(config.sampleRate != null ? { sampler: createSampler(config.sampleRate, { - ParentBasedSampler, - TraceIdRatioBasedSampler, - }) } : {}), - spanProcessors: [spanProcessor], - }); - - // HTTP送信には注入しないが、将来のQueue連結でpropagation APIを使える状態にする。 - provider.register({ - propagator: new W3CTraceContextPropagator(), - }); - - // provider操作をdepsに閉じ込め、span wrapper本体をユニットテストしやすくする。 - const tracer = provider.getTracer('misskey-backend'); - - return new OpenTelemetryAdapter({ - tracer, - provider, - getActiveSpan: () => trace.getActiveSpan(), - spanStatusCodeError: SpanStatusCode.ERROR, - shutdownTimeout: DEFAULT_SHUTDOWN_TIMEOUT, - shutdownHttpClientInstrumentation: installHttpClientInstrumentation({ - tracer, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - }), - // pg のrequire hookとioredis diagnostics channelは、Nest moduleの動的importより前に有効化する。 - shutdownDatabaseInstrumentation: await installDatabaseInstrumentation(provider, { - capturePgSpans: config.capturePgSpans === true, - capturePgStatement: config.capturePgStatement === true, - capturePgConnectionSpans: config.capturePgConnectionSpans === true, - }), - shutdownRedisInstrumentation: installRedisInstrumentation(tracer, SpanKind.CLIENT, SpanStatusCode.ERROR, { - captureConnectionSpans: config.captureRedisConnectionSpans === true, - captureCommandSpans: config.captureRedisCommandSpans === true, - requireParentSpan: config.captureRedisRootSpans !== true, - }), - queueTraceContext: { - tracer, - propagation, - trace, - getActiveContext: () => context.active(), - rootContext: ROOT_CONTEXT, - mode: getQueueTraceContextMode(config.jobTraceContextMode), - spanStatusCodeError: SpanStatusCode.ERROR, - }, - }); - } - - public captureMessage(message: string, _opts: TelemetryCaptureMessageOptions): void { - // captureMessageは例外通知APIなので、OTelでは対象spanにエラー状態を付ける。 - // アクティブspanが無い場合(例: BullMQのjob処理が既に完了しspanが閉じた後の'failed'イベント)でも - // 通知を握り潰さないよう、報告専用の短命spanを作ってそこに記録する。 - const span = this.deps.getActiveSpan(); - if (span != null) { - recordSpanError(span, new Error(message), this.deps.spanStatusCodeError); - return; - } - - this.deps.tracer.startActiveSpan('captureMessage', reportSpan => { - recordSpanError(reportSpan, new Error(message), this.deps.spanStatusCodeError); - reportSpan.end(); - }); - } - - /** activeなSpanの識別子を、Logging基盤で扱える形式へ変換します。 */ - public getActiveTraceContext(): LogTraceContext | undefined { - const activeSpan = this.deps.getActiveSpan(); - if (activeSpan == null) return undefined; - - const { traceId, spanId, traceFlags } = activeSpan.spanContext(); - return { traceId, spanId, traceFlags }; - } - - public startSpan(name: string, fn: () => T): T { - // 既存のTelemetryAdapter契約に合わせ、同期/非同期どちらでも同じspan lifetimeを保証する。 - return this.deps.tracer.startActiveSpan(name, span => executeSpan(span, fn, this.deps.spanStatusCodeError)); - } - - public injectTraceContext(carrier: QueueTraceContextCarrier): void { - const queueTraceContext = this.deps.queueTraceContext; - // Queue context 用の依存は任意なので、無い場合はジョブデータを変更しない。 - if (queueTraceContext == null) return; - injectActiveTraceContext(queueTraceContext, carrier); - } - - public startSpanWithTraceContext(name: string, jobData: object, fn: () => T): T { - const queueTraceContext = this.deps.queueTraceContext; - // Queue context 用の依存が無い場合は、従来の span 作成経路と同じ動作を保つ。 - if (queueTraceContext == null) return this.startSpan(name, fn); - - return startSpanWithQueueTraceContext(queueTraceContext, name, jobData, fn, () => this.startSpan(name, fn)); - } - - public async shutdown(): Promise { - this.deps.shutdownHttpClientInstrumentation?.(); - this.deps.shutdownDatabaseInstrumentation?.(); - this.deps.shutdownRedisInstrumentation?.(); - // BatchSpanProcessorのflushが詰まってもプロセス終了を妨げないよう、上限時間を設ける。 - // タイムアウト側のtimerは、flushが先に終わった場合にイベントループを無駄に引き留めないようclearする。 - let timer: NodeJS.Timeout | undefined; - await Promise.race([ - this.deps.provider.shutdown(), - new Promise(resolve => { - timer = setTimeout(resolve, this.deps.shutdownTimeout); - }), - ]).finally(() => { - if (timer != null) clearTimeout(timer); - }); - } -} - -export function createResource(config: OtelBackendRuntimeConfig, deps: CreateResourceDeps): Resource { - // resourceを明示指定するとSDKのdefaultResource()は自動付与されなくなる(マージではなく上書き)ため、 - // telemetry.sdk.*等の標準属性を失わないよう明示的にmergeする。 - const misskeyDefaultResource = deps.resourceFromAttributes({ - [deps.serviceNameAttribute]: 'misskey-backend', - [deps.serviceInstanceIdAttribute]: `${os.hostname()}:${process.pid}`, - [deps.serviceVersionAttribute]: deps.serviceVersion, - 'misskey.process.role': getMisskeyProcessRole(), - }); - - // OTel標準の OTEL_SERVICE_NAME / OTEL_RESOURCE_ATTRIBUTES を尊重する。 - // mergeは右辺が優先されるため、config.resourceAttributesを最優先にする。 - return deps.defaultResource() - .merge(misskeyDefaultResource) - .merge(deps.detectResources({ detectors: [deps.envDetector] })) - .merge(deps.resourceFromAttributes(config.resourceAttributes ?? {})); -} - -export function createSampler(sampleRate: number, deps: CreateSamplerDeps): ParentBasedSampler { - // 設定ミスを無言でAlwaysOn/AlwaysOffに倒さず、起動時に明確に失敗させる。 - // (YAMLでクォートされた数値文字列などnumber型の保証が無い値が来てもここで弾く) - if (typeof sampleRate !== 'number' || !Number.isFinite(sampleRate) || sampleRate < 0 || sampleRate > 1) { - throw new Error('otelForBackend.sampleRate must be a number between 0.0 and 1.0.'); - } - - return new deps.ParentBasedSampler({ - root: new deps.TraceIdRatioBasedSampler(sampleRate), - }); -} - -export function getMisskeyProcessRole(): string { - // Trace backend上でserver/queue/workerを見分けられるよう、Misskey固有の役割をresourceに載せる。 - if (envOption.disableClustering) { - if (envOption.onlyServer) return 'primary-server'; - if (envOption.onlyQueue) return 'primary-queue'; - return 'primary-server+queue'; - } - - if (cluster.isPrimary) { - if (envOption.onlyServer) return 'fork-only'; - if (envOption.onlyQueue) return 'primary-queue'; - return 'primary-server'; - } - - // worker.tsのworkerMainに合わせる: onlyServerならserver()、それ以外はjobQueue()を実行する。 - if (envOption.onlyServer) return 'worker-server'; - return 'worker-queue'; -} diff --git a/packages/backend/src/core/telemetry/adapters/SentryTelemetryAdapter.ts b/packages/backend/src/core/telemetry/adapters/SentryTelemetryAdapter.ts index fd65f414f6..126049e520 100644 --- a/packages/backend/src/core/telemetry/adapters/SentryTelemetryAdapter.ts +++ b/packages/backend/src/core/telemetry/adapters/SentryTelemetryAdapter.ts @@ -3,18 +3,13 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import Logger from '@/logger.js'; -import { registerDiagLogger } from '@/core/telemetry/telemetry-diag.js'; -import { getQueueTraceContextMode, injectActiveTraceContext, startSpanWithQueueTraceContext } from '@/core/telemetry/queue-trace-context.js'; import type { LogTraceContext } from '@/logging/types.js'; import type * as SentryNode from '@sentry/node'; import type { NodeOptions } from '@sentry/node'; -import type { OtelBackendRuntimeConfig, SentryBackendConfig, TelemetryAdapter, TelemetryCaptureMessageOptions } from './TelemetryAdapter.js'; -import type { QueueTraceContextCarrier, QueueTraceContextDeps } from '../queue-trace-context.js'; +import type { SentryBackendConfig, TelemetryAdapter, TelemetryCaptureMessageOptions } from './TelemetryAdapter.js'; -// OpenTelemetryAdapterのDEFAULT_SHUTDOWN_TIMEOUTと揃え、Sentryのtransportが詰まってもプロセス終了を妨げないようにする。 +// Sentryのtransportが詰まってもプロセス終了を妨げないようにする。 const DEFAULT_SHUTDOWN_TIMEOUT = 5000; -const logger = new Logger('telemetry', 'green'); type SentryIntegrationsOption = NonNullable; // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -73,50 +68,9 @@ export function buildSentryNodeOptions( }; } -type BuildSentryOtlpInitOptions = { - sentryConfig: SentryBackendConfig; - otelConfig: OtelBackendRuntimeConfig; - otlpProcessor: unknown; - nodeProfilingIntegration?: () => SentryIntegration; - warn?: (message: string) => void; -}; - -export function buildSentryOtlpInitOptions(options: BuildSentryOtlpInitOptions): SentryNodeOptions { - // OTel併存時も、remoteへtrace headerを漏らさないデフォルトはSentry単体時と揃える。 - // propagateTraceToRemote: true か、options.tracePropagationTargets の明示指定がある場合のみ既定を上書きする。 - const { tracePropagationTargets, ...sentryOptions } = options.sentryConfig.options; - const propagateTraceToRemote = options.otelConfig.propagateTraceToRemote === true || tracePropagationTargets != null; - const warn = options.warn ?? ((message: string) => logger.warn(message)); - - if (options.otelConfig.sampleRate != null) { - warn('otelForBackend.sampleRate is ignored when sentryForBackend is also configured; configure sentryForBackend.options.tracesSampleRate or tracesSampler instead.'); - } - - if (options.otelConfig.resourceAttributes != null) { - warn('otelForBackend.resourceAttributes is ignored when sentryForBackend is also configured; configure OTEL_RESOURCE_ATTRIBUTES instead.'); - } - - return { - ...buildSentryNodeOptions({ - ...options.sentryConfig, - options: { - ...sentryOptions, - ...(propagateTraceToRemote ? { tracePropagationTargets } : {}), - }, - }, options.nodeProfilingIntegration), - - // Sentryの単一TracerProviderにOTLP processorを追加し、親欠損や二重providerを避ける。 - openTelemetrySpanProcessors: [ - ...(options.sentryConfig.options.openTelemetrySpanProcessors ?? []), - options.otlpProcessor as NonNullable[number], - ], - }; -} - export class SentryTelemetryAdapter implements TelemetryAdapter { private constructor( private readonly Sentry: typeof SentryNode, - private readonly queueTraceContext?: QueueTraceContextDeps, ) { } @@ -129,45 +83,6 @@ export class SentryTelemetryAdapter implements TelemetryAdapter { return new SentryTelemetryAdapter(Sentry); } - public static async createWithOtlpExport( - sentryConfig: SentryBackendConfig, - otelConfig: OtelBackendRuntimeConfig, - ): Promise { - const Sentry = await import('@sentry/node'); - const { nodeProfilingIntegration } = await import('@sentry/profiling-node'); - const { context, diag, DiagLogLevel, propagation, ROOT_CONTEXT, SpanStatusCode, trace } = await import('@opentelemetry/api'); - const { BatchSpanProcessor } = await import('@opentelemetry/sdk-trace-base'); - const { OTLPTraceExporter } = await import('@opentelemetry/exporter-trace-otlp-proto'); - - registerDiagLogger(diag, DiagLogLevel.WARN); - - // OTLP送信だけを担うprocessorを作り、provider生成はSentry.init側に任せる。 - const otlpProcessor = new BatchSpanProcessor(new OTLPTraceExporter({ - ...(otelConfig.endpoint != null ? { url: otelConfig.endpoint } : {}), - ...(otelConfig.headers != null ? { headers: otelConfig.headers } : {}), - })); - - // SentryとOTLPを同一providerに集約することで、どちらの宛先にも同じspan実体を流す。 - Sentry.init(buildSentryOtlpInitOptions({ - sentryConfig, - otelConfig, - otlpProcessor, - nodeProfilingIntegration, - })); - - // Sentry が初期化した同じ OTel provider から tracer/context API を受け取り、 - // Queue を跨ぐ context 伝播も Sentry と OTLP の両方へ同一 span として出力する。 - return new SentryTelemetryAdapter(Sentry, { - tracer: trace.getTracer('misskey-backend'), - propagation, - trace, - getActiveContext: () => context.active(), - rootContext: ROOT_CONTEXT, - mode: getQueueTraceContextMode(otelConfig.jobTraceContextMode), - spanStatusCodeError: SpanStatusCode.ERROR, - }); - } - public captureMessage(message: string, opts: TelemetryCaptureMessageOptions): void { this.Sentry.captureMessage(message, { level: opts.level, @@ -189,19 +104,6 @@ export class SentryTelemetryAdapter implements TelemetryAdapter { return this.Sentry.startSpan({ name }, fn); } - public injectTraceContext(carrier: QueueTraceContextCarrier): void { - // Sentry 単体構成では queueTraceContext を持たず、従来どおりジョブデータを変更しない。 - if (this.queueTraceContext == null) return; - injectActiveTraceContext(this.queueTraceContext, carrier); - } - - public startSpanWithTraceContext(name: string, jobData: object, fn: () => T): T { - // Sentry 単体構成では Sentry 既存の span 作成経路を使う。 - if (this.queueTraceContext == null) return this.startSpan(name, fn); - - return startSpanWithQueueTraceContext(this.queueTraceContext, name, jobData, fn, () => this.startSpan(name, fn)); - } - public async shutdown(): Promise { // timeout未指定だとtransportのflushが詰まった際にプロセス終了を妨げるため、上限時間を設ける。 await this.Sentry.close(DEFAULT_SHUTDOWN_TIMEOUT); diff --git a/packages/backend/src/core/telemetry/adapters/TelemetryAdapter.ts b/packages/backend/src/core/telemetry/adapters/TelemetryAdapter.ts index 29cbb61f4c..d17430d0c0 100644 --- a/packages/backend/src/core/telemetry/adapters/TelemetryAdapter.ts +++ b/packages/backend/src/core/telemetry/adapters/TelemetryAdapter.ts @@ -5,19 +5,14 @@ import type { Config } from '@/config.js'; import type { LogTraceContext } from '@/logging/types.js'; -import type { QueueTraceContextCarrier } from '../queue-trace-context.js'; export type SentryBackendConfig = NonNullable; -export type OtelBackendConfig = NonNullable; -export type OtelBackendRuntimeConfig = OtelBackendConfig & { - serviceVersion: string; -}; export interface TelemetryCaptureMessageOptions { /** 現在はエラー通知用途だけに絞る。追加する場合は各adapterでの扱いを揃えること。 */ level: 'error'; - /** Sentryではuser.idへ渡す。OTel adapterは現在span属性へ付与していないため、必要ならadapter側で拡張する。 */ + /** Sentryではuser.idへ渡す補助情報です。 */ userId?: string; /** queue名やendpoint名など、通知先で調査に使う補助情報。 */ @@ -25,14 +20,14 @@ export interface TelemetryCaptureMessageOptions { } /** - * Sentry・OpenTelemetryなど、エラートラッキング/APMサービスごとの実装差異を隠蔽するための抽象。 + * エラートラッキング/APMサービスごとの実装差異を隠蔽するための抽象。 * 新しいサービスを追加する場合はこのインターフェースを実装するアダプタをこのディレクトリに追加し、 * telemetry-registry.tsのinitTelemetry内で登録する。 */ export interface TelemetryAdapter { /** * 実行中の処理で起きたエラー相当の事象を記録する。 - * Sentryはmessage通知、OTelはactive spanまたは短命spanへの例外記録として扱う。 + * Sentryではmessage通知として扱う。 */ captureMessage(message: string, opts: TelemetryCaptureMessageOptions): void; @@ -45,18 +40,6 @@ export interface TelemetryAdapter { */ startSpan(name: string, fn: () => T): T; - /** - * BullMQ のジョブデータへ保存する carrier に、active trace context を注入する。 - * OTel を使わない adapter は実装しない。 - */ - injectTraceContext?(carrier: QueueTraceContextCarrier): void; - - /** - * ジョブに保存された enqueue 元の context を、worker span の Link または parent として復元する。 - * context を持たないジョブの互換性は adapter 側で保つ。 - */ - startSpanWithTraceContext?(name: string, jobData: object, fn: () => T): T; - /** * プロセス終了時にtelemetry backendへ残りのデータをflushする。 * 実装側ではtransport停止に引きずられないよう、待機時間に上限を設ける。 diff --git a/packages/backend/src/core/telemetry/database-instrumentation.ts b/packages/backend/src/core/telemetry/database-instrumentation.ts deleted file mode 100644 index 206fa4c916..0000000000 --- a/packages/backend/src/core/telemetry/database-instrumentation.ts +++ /dev/null @@ -1,86 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import type { Span, TracerProvider } from '@opentelemetry/api'; - -type Instrumentation = { - setTracerProvider(provider: TracerProvider): void; - enable(): void; - disable(): void; -}; - -type PgInstrumentationConfig = { - enhancedDatabaseReporting: boolean; - requireParentSpan: boolean; - ignoreConnectSpans: boolean; - requestHook?(span: Span): void; -}; - -type InstrumentationConstructor = new (config: PgInstrumentationConfig) => Instrumentation; - -type InstrumentationDeps = { - PgInstrumentation: InstrumentationConstructor; -}; - -type DatabaseInstrumentationOptions = { - capturePgStatement: boolean; - capturePgConnectionSpans: boolean; -}; - -type InstallDatabaseInstrumentationOptions = DatabaseInstrumentationOptions & { - capturePgSpans: boolean; -}; - -/** - * pg はアプリケーションが import する前に有効化しないと、require hook 型の - * 自動計装がモジュールを patch できない。そのため、 - * telemetry provider の登録直後にこの関数を呼び出す。 - */ -export async function installDatabaseInstrumentation(provider: TracerProvider, options: InstallDatabaseInstrumentationOptions): Promise<() => void> { - if (!options.capturePgSpans) return () => {}; - - const { PgInstrumentation } = await import('@opentelemetry/instrumentation-pg'); - - return installInstrumentation(provider, { PgInstrumentation }, options); -} - -export function installInstrumentation(provider: TracerProvider, deps: InstrumentationDeps, options: DatabaseInstrumentationOptions = { - capturePgStatement: false, - capturePgConnectionSpans: false, -}): () => void { - const instrumentations = [ - new deps.PgInstrumentation({ - // SQLパラメータには投稿内容・認証情報などが含まれ得るため、常に記録しない。 - enhancedDatabaseReporting: false, - requireParentSpan: true, - ignoreConnectSpans: !options.capturePgConnectionSpans, - // instrumentation-pgはSQL本文を無加工で属性へ追加する。明示opt-in時だけ残す。 - ...(options.capturePgStatement ? {} : { - requestHook: (span: Span) => { - span.setAttribute('db.statement', '[REDACTED]'); - span.setAttribute('db.query.text', '[REDACTED]'); - }, - }), - }), - ]; - - try { - for (const instrumentation of instrumentations) { - instrumentation.setTracerProvider(provider); - instrumentation.enable(); - } - } catch (error) { - for (const instrumentation of instrumentations) { - instrumentation.disable(); - } - throw error; - } - - return () => { - for (const instrumentation of instrumentations) { - instrumentation.disable(); - } - }; -} diff --git a/packages/backend/src/core/telemetry/http-client-instrumentation.ts b/packages/backend/src/core/telemetry/http-client-instrumentation.ts deleted file mode 100644 index a2ae4b5692..0000000000 --- a/packages/backend/src/core/telemetry/http-client-instrumentation.ts +++ /dev/null @@ -1,122 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { channel } from 'node:diagnostics_channel'; -import type { ClientRequest, IncomingMessage } from 'node:http'; -import type { Span, SpanOptions, SpanStatusCode, Tracer } from '@opentelemetry/api'; - -const HTTP_CLIENT_REQUEST_CREATED = 'http.client.request.created'; -const HTTP_CLIENT_RESPONSE_FINISH = 'http.client.response.finish'; -const HTTP_CLIENT_REQUEST_ERROR = 'http.client.request.error'; - -type HttpClientSpan = Pick; - -type HttpClientInstrumentationDeps = { - tracer: Pick; - spanKindClient: SpanOptions['kind']; - spanStatusCodeError: SpanStatusCode; - subscribe: (name: string, listener: (message: unknown) => void) => () => void; -}; - -type RequestCreatedMessage = { request: ClientRequest }; -type ResponseFinishMessage = { request: ClientRequest; response: IncomingMessage }; -type RequestErrorMessage = { request: ClientRequest; error: Error }; - -/** - * require フックを使わず、Node.js 組み込み HTTP クライアントの diagnostics channel を計装する。 - * telemetry 初期化前に読み込まれたモジュールも対象になる。 - */ -export function createHttpClientInstrumentation(deps: HttpClientInstrumentationDeps): () => void { - const spans = new WeakMap(); - - const unsubscribeCreated = deps.subscribe(HTTP_CLIENT_REQUEST_CREATED, (message: unknown) => { - const { request } = message as RequestCreatedMessage; - const { url, host, port } = getRequestDetails(request); - const method = request.method ?? 'GET'; - const span = deps.tracer.startSpan(method, { - kind: deps.spanKindClient, - attributes: { - 'http.request.method': method, - 'url.full': url, - 'server.address': host, - 'server.port': port, - }, - }); - spans.set(request, span); - }); - - const unsubscribeResponseFinish = deps.subscribe(HTTP_CLIENT_RESPONSE_FINISH, (message: unknown) => { - const { request, response } = message as ResponseFinishMessage; - const span = spans.get(request); - if (span == null) return; - - const statusCode = response.statusCode; - if (statusCode != null) { - span.setAttribute('http.response.status_code', statusCode); - } - if (response.httpVersion != null) { - span.setAttribute('network.protocol.version', response.httpVersion); - } - if (statusCode != null && statusCode >= 400) { - span.setAttribute('error.type', String(statusCode)); - span.setStatus({ code: deps.spanStatusCodeError }); - } - span.end(); - spans.delete(request); - }); - - const unsubscribeRequestError = deps.subscribe(HTTP_CLIENT_REQUEST_ERROR, (message: unknown) => { - const { request, error } = message as RequestErrorMessage; - const span = spans.get(request); - if (span == null) return; - - span.recordException(error); - span.setAttribute('error.type', getErrorType(error)); - span.setStatus({ code: deps.spanStatusCodeError }); - span.end(); - spans.delete(request); - }); - - return () => { - unsubscribeCreated(); - unsubscribeResponseFinish(); - unsubscribeRequestError(); - }; -} - -export function installHttpClientInstrumentation(deps: Omit): () => void { - return createHttpClientInstrumentation({ - ...deps, - subscribe: (name, listener) => { - const diagnosticChannel = channel(name); - diagnosticChannel.subscribe(listener); - return () => diagnosticChannel.unsubscribe(listener); - }, - }); -} - -function getRequestDetails(request: ClientRequest): { url: string; host: string; port: number } { - const protocol = request.protocol ?? 'http:'; - const host = request.getHeader('host')?.toString() ?? request.host ?? 'localhost'; - const url = new URL(request.path || '/', `${protocol}//${host}`); - // URL 属性には認証情報やクエリ文字列を含めない。 - url.username = ''; - url.password = ''; - url.search = ''; - url.hash = ''; - - return { - url: url.toString(), - host: url.hostname, - // URL.port は既定ポートでは空文字列になるため、スキームから補う。 - port: url.port === '' ? (url.protocol === 'https:' ? 443 : 80) : Number(url.port), - }; -} - -function getErrorType(error: Error): string { - // Node.js の system error code は安定した低カーディナリティの識別子になる。 - const code = (error as NodeJS.ErrnoException).code; - return code ?? error.name; -} diff --git a/packages/backend/src/core/telemetry/queue-instrumentation.ts b/packages/backend/src/core/telemetry/queue-instrumentation.ts deleted file mode 100644 index 90eb710efa..0000000000 --- a/packages/backend/src/core/telemetry/queue-instrumentation.ts +++ /dev/null @@ -1,33 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { injectTraceContext } from './telemetry-registry.js'; -import { injectQueueTraceContext } from './queue-trace-context.js'; -import type * as Bull from 'bullmq'; - -/** - * Queue の add/addBulk をラップし、全ての BullMQ enqueue 経路を一箇所で捕捉する。 - * QueueService を通さず直接 add/addBulk する呼び出し元もあるため、それぞれで注入すると漏れやすい。 - */ -export function instrumentQueue(queue: Bull.Queue): Bull.Queue { - // BullMQ のメソッドは Queue インスタンスを this として使うため、差し替え前に bind して保持する。 - const add = queue.add.bind(queue); - queue.add = ((name, data, opts) => { - // BullMQ が data を Redis 用にシリアライズする前に、enqueue 元の context を内部フィールドへ追加する。 - injectQueueTraceContext(data, injectTraceContext); - return add(name, data, opts); - }) as typeof queue.add; - - // addBulk は複数ジョブを一度にシリアライズするので、各 data へ同じ context を注入する。 - const addBulk = queue.addBulk.bind(queue); - queue.addBulk = ((jobs) => { - for (const job of jobs) { - injectQueueTraceContext(job.data, injectTraceContext); - } - return addBulk(jobs); - }) as typeof queue.addBulk; - - return queue; -} diff --git a/packages/backend/src/core/telemetry/queue-trace-context.ts b/packages/backend/src/core/telemetry/queue-trace-context.ts deleted file mode 100644 index d9f7f7462d..0000000000 --- a/packages/backend/src/core/telemetry/queue-trace-context.ts +++ /dev/null @@ -1,182 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import type { Context, PropagationAPI, Span, SpanContext, SpanOptions, SpanStatusCode, Tracer } from '@opentelemetry/api'; - -/* - * enqueue (push) から worker による取得・処理 (pop) までをテレメトリ上で関連付け、 - * Queue を挟む非同期処理を一連の流れとして追跡できるようにする。 - * そのため、trace context を次の流れで伝播する: - * - * 1. producer 側で active context を W3C Trace Context 形式の carrier へ注入する。 - * 2. carrier をジョブデータの内部フィールドに保存し、BullMQ/Redis 経由で worker へ渡す。 - * 3. worker 側で carrier を context へ戻し、設定に応じて Link または parent に使う。 - * - * OTel API への依存を引数にしているのは、OTel 単体構成と Sentry + OTLP 構成で - * 同じ伝播処理を使うため。 - */ -/** Redis 上のジョブデータにだけ保存する、OpenTelemetry propagator 用の carrier。 */ -export type QueueTraceContextCarrier = Record; -export type QueueTraceContextMode = 'link' | 'parent'; - -// 通常のジョブプロセッサが参照しない Misskey 内部フィールドとして、ユーザー定義の data と区別する。 -const QUEUE_TRACE_CONTEXT_KEY = '__misskeyTraceContext'; - -export type QueueTraceContextDeps = { - tracer: Pick; - propagation: Pick; - trace: { - getSpanContext(context: Context): SpanContext | undefined; - }; - getActiveContext: () => Context; - rootContext: Context; - mode: QueueTraceContextMode; - spanStatusCodeError: SpanStatusCode; -}; - -export type QueueSpanContext = { - options: SpanOptions; - parentContext: Context; -}; - -type QueueSpanContextDeps = Pick; - -/** - * enqueue 元の active context を、ジョブ本来のデータを壊さない内部フィールドとして保持する。 - * propagator が何も注入しなかった場合は、Redis に不要な空オブジェクトを残さない。 - */ -export function injectQueueTraceContext(data: unknown, inject: (carrier: QueueTraceContextCarrier) => void): void { - // BullMQ の型定義外から渡される値も考慮し、書き込めない値は無視する。 - if (data == null || typeof data !== 'object') return; - - const carrier: QueueTraceContextCarrier = {}; - inject(carrier); - - // active span が無い場合、propagator は何も注入しない。空の内部フィールドは Redis に保存しない。 - if (Object.keys(carrier).length === 0) return; - Object.assign(data, { [QUEUE_TRACE_CONTEXT_KEY]: carrier }); -} - -/** 現在実行中の span を propagator の標準形式で carrier へ書き出す。 */ -export function injectActiveTraceContext(deps: QueueTraceContextDeps, carrier: QueueTraceContextCarrier): void { - deps.propagation.inject(deps.getActiveContext(), carrier); -} - -/** - * ジョブに保存された carrier から、worker span の開始に必要な context と options を組み立てる。 - * - * - parent: enqueue span の子として同じ trace を継続する。 - * - link: worker span を別の root trace にし、enqueue span への関連だけを Link に残す。 - * - * link モードで trace を分けることで、worker 側の sampling 判定を enqueue 側から独立させられる。 - */ -export function getQueueSpanContext(data: unknown, deps: QueueSpanContextDeps): QueueSpanContext | undefined { - const carrier = getQueueTraceContextCarrier(data); - if (carrier == null) return undefined; - - // Redis から復元した carrier は別プロセス由来なので、現在の context ではなく ROOT_CONTEXT から展開する。 - const extractedContext = deps.propagation.extract(deps.rootContext, carrier); - if (deps.mode === 'parent') { - return { - options: {}, - parentContext: extractedContext, - }; - } - - // Link が受け取るのは Context ではなく SpanContext なので、extract 後に取り出す。 - const spanContext = deps.trace.getSpanContext(extractedContext); - return { - options: { - root: true, - ...(spanContext != null ? { links: [{ context: spanContext }] } : {}), - }, - parentContext: deps.rootContext, - }; -} - -/** - * context を持つジョブは Link/parent の規則で span を開始する。 - * デプロイ前に enqueue されたジョブなど、context を持たない場合は既存の adapter 固有実装へ委ねる。 - */ -export function startSpanWithQueueTraceContext( - deps: QueueTraceContextDeps, - name: string, - jobData: object, - fn: () => T, - fallback: () => T, -): T { - const spanContext = getQueueSpanContext(jobData, deps); - if (spanContext == null) return fallback(); - - return deps.tracer.startActiveSpan(name, spanContext.options, spanContext.parentContext, span => executeSpan(span, fn, deps.spanStatusCodeError)); -} - -/** - * 既存の TelemetryAdapter 契約に合わせ、同期値と Promise のどちらを返す処理も span で包む。 - * 成功・失敗のどちらでも処理完了まで span を開き、必ず一度だけ閉じる。 - */ -export function executeSpan(span: Span, fn: () => T, spanStatusCodeError: SpanStatusCode): T { - try { - const result = fn(); - if (isPromiseLike(result)) { - // fn() の戻り値は T のまま保ちつつ、Promise の settle 時に span を閉じる。 - return result.then( - value => { - span.end(); - return value; - }, - error => { - recordSpanError(span, error, spanStatusCodeError); - span.end(); - throw error; - }, - ) as T; - } - - span.end(); - return result; - } catch (error) { - // fn() が同期的に throw した場合も、Promise の reject と同じ形で記録して呼び出し元へ戻す。 - recordSpanError(span, error, spanStatusCodeError); - span.end(); - throw error; - } -} - -/** Error 以外の throw 値も OTel exporter が扱える例外に正規化し、span をエラー状態にする。 */ -export function recordSpanError(span: Span, error: unknown, spanStatusCodeError: SpanStatusCode): void { - const exception = error instanceof Error ? error : new Error(String(error)); - span.recordException(exception); - span.setStatus({ - code: spanStatusCodeError, - message: exception.message, - }); -} - -/** - * 未設定時は、enqueue と worker の sampling を分離できる link を使う。 - * 設定ミスを無言でフォールバックさせないため、未知の値は起動時にエラーにする。 - */ -export function getQueueTraceContextMode(mode: unknown): QueueTraceContextMode { - if (mode == null || mode === 'link') return 'link'; - if (mode === 'parent') return 'parent'; - throw new Error('otelForBackend.jobTraceContextMode must be either \'link\' or \'parent\'.'); -} - -function getQueueTraceContextCarrier(data: unknown): QueueTraceContextCarrier | undefined { - if (data == null || typeof data !== 'object') return undefined; - const carrier = (data as Record)[QUEUE_TRACE_CONTEXT_KEY]; - if (carrier == null || typeof carrier !== 'object' || Array.isArray(carrier)) return undefined; - - // Redis 上の旧いジョブや壊れたデータで worker を落とさないよう、propagator に渡せる string map だけを受け入れる。 - const entries = Object.entries(carrier); - if (entries.length === 0 || entries.some(([, value]) => typeof value !== 'string')) return undefined; - return Object.fromEntries(entries) as QueueTraceContextCarrier; -} - -function isPromiseLike(value: T): value is T & PromiseLike> { - // native Promise に限らず thenable も span の完了を待てるよう、instanceof ではなく then の有無で判定する。 - return value != null && typeof (value as { then?: unknown }).then === 'function'; -} diff --git a/packages/backend/src/core/telemetry/redis-instrumentation.ts b/packages/backend/src/core/telemetry/redis-instrumentation.ts deleted file mode 100644 index b3e8d80b39..0000000000 --- a/packages/backend/src/core/telemetry/redis-instrumentation.ts +++ /dev/null @@ -1,178 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { tracingChannel } from 'node:diagnostics_channel'; -import { context, trace } from '@opentelemetry/api'; -import type { Span, SpanKind, SpanStatusCode, Tracer } from '@opentelemetry/api'; - -type IORedisCommandContext = { - command: string; - args: string[]; - database: number; - serverAddress: string; - serverPort: number | undefined; -}; - -type IORedisConnectContext = { - serverAddress: string; - serverPort: number | undefined; -}; - -type TracingChannelSubscribers = { - start(message: T): void; - end(message: T & { error?: unknown }): void; - asyncStart(message: T & { error?: unknown }): void; - asyncEnd(message: T & { error?: unknown }): void; - error(message: T & { error: unknown }): void; -}; - -type TracingChannel = { - subscribe(subscribers: TracingChannelSubscribers): void; - unsubscribe(subscribers: TracingChannelSubscribers): void; -}; - -type RedisInstrumentationDeps = { - tracingChannel(name: string): TracingChannel; - tracer: Pick; - getActiveSpan(): Span | undefined; - spanKindClient: SpanKind; - spanStatusCodeError: SpanStatusCode; -}; - -type RedisInstrumentationOptions = { - captureCommandSpans?: boolean; - /** requireParentSpan is the official ioredis instrumentation's default. */ - requireParentSpan?: boolean; - captureConnectionSpans?: boolean; -}; - -/** - * ioredis 5.11以降が公開する native diagnostics channel を購読する。 - * バンドル後もioredis自身が発行するイベントを使うため、require hook に - * 依存せず、ESM import 経路でもコマンド span を取得できる。 - */ -export function installRedisInstrumentation( - tracer: Pick, - spanKindClient: SpanKind, - spanStatusCodeError: SpanStatusCode, - options: RedisInstrumentationOptions = {}, -): () => void { - return createRedisInstrumentation({ - tracingChannel, - tracer, - getActiveSpan: () => trace.getSpan(context.active()), - spanKindClient, - spanStatusCodeError, - }, options); -} - -export function createRedisInstrumentation(deps: RedisInstrumentationDeps, options: RedisInstrumentationOptions = {}): () => void { - const requireParentSpan = options.requireParentSpan ?? true; - const cleanup: Array<() => void> = []; - if (options.captureCommandSpans === true) { - const commandChannel = deps.tracingChannel('ioredis:command'); - const commandSubscribers = createTracingChannelSubscribers(commandChannel, deps, requireParentSpan, message => ({ - name: message.command, - attributes: { - 'db.system.name': 'redis', - 'db.namespace': message.database.toString(10), - 'db.operation.name': message.command, - 'server.address': message.serverAddress, - ...(message.serverPort != null ? { 'server.port': message.serverPort } : {}), - }, - })); - cleanup.push(() => commandChannel.unsubscribe(commandSubscribers)); - } - if (options.captureConnectionSpans === true) { - const connectChannel = deps.tracingChannel('ioredis:connect'); - // Connection spans are explicitly opt-in and should include startup and reconnect attempts. - const connectSubscribers = createTracingChannelSubscribers(connectChannel, deps, false, message => ({ - name: 'connect', - attributes: { - 'db.system.name': 'redis', - 'db.operation.name': 'connect', - 'server.address': message.serverAddress, - ...(message.serverPort != null ? { 'server.port': message.serverPort } : {}), - }, - })); - cleanup.push(() => connectChannel.unsubscribe(connectSubscribers)); - } - - return () => { - for (const unsubscribe of cleanup) { - unsubscribe(); - } - }; -} - -function createTracingChannelSubscribers( - channel: TracingChannel, - deps: RedisInstrumentationDeps, - requireParentSpan: boolean, - getSpanOptions: (message: T) => { name: string; attributes: Record }, -): TracingChannelSubscribers { - const spans = new WeakMap(); - - const recordError = (state: { span: Span; recordedError: boolean }, value: unknown): void => { - if (state.recordedError) return; - const error = toError(value); - state.span.recordException(error); - state.span.setStatus({ code: deps.spanStatusCodeError, message: error.message }); - state.span.setAttribute('error.type', getErrorType(error)); - const statusCode = getRedisErrorStatusCode(error.message); - if (statusCode != null) state.span.setAttribute('db.response.status_code', statusCode); - state.recordedError = true; - }; - - const finish = (message: T & { error?: unknown }): void => { - const state = spans.get(message); - if (state == null) return; - - if (message.error != null) { - recordError(state, message.error); - } - state.span.end(); - spans.delete(message); - }; - - const subscribers: TracingChannelSubscribers = { - start: (message) => { - if (requireParentSpan && deps.getActiveSpan() == null) return; - - const options = getSpanOptions(message); - const span = deps.tracer.startSpan(options.name, { - kind: deps.spanKindClient, - attributes: options.attributes, - }); - spans.set(message, { span, recordedError: false }); - }, - // Promiseを返すコマンドでは完了前にもendイベントが来るため、同期例外だけここで閉じる。 - end: (message) => { - if (message.error != null) finish(message); - }, - asyncStart: () => {}, - asyncEnd: finish, - error: (message) => { - const state = spans.get(message); - if (state == null) return; - recordError(state, message.error); - }, - }; - - channel.subscribe(subscribers); - return subscribers; -} - -function toError(value: unknown): Error { - return value instanceof Error ? value : new Error(String(value)); -} - -function getRedisErrorStatusCode(message: string): string | undefined { - return message.match(/^([A-Z][A-Z0-9_]*)\b/)?.[1]; -} - -function getErrorType(error: Error): string { - return (error as NodeJS.ErrnoException).code ?? error.name; -} diff --git a/packages/backend/src/core/telemetry/telemetry-diag.ts b/packages/backend/src/core/telemetry/telemetry-diag.ts deleted file mode 100644 index 9d72d0a6bf..0000000000 --- a/packages/backend/src/core/telemetry/telemetry-diag.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import Logger from '@/logger.js'; -import type { DiagAPI, DiagLogger, DiagLogLevel } from '@opentelemetry/api'; - -export function registerDiagLogger( - diagApi: DiagAPI, - diagLogLevelWarn: DiagLogLevel, -): void { - // diagはプロセスグローバルなので、通常運用で必要なWARN以上だけをMisskeyのログに流す。 - const logger = new Logger('otel', 'green'); - const diagLogger: DiagLogger = { - error: (message, ...args) => logger.error(formatDiagMessage(message, args)), - warn: (message, ...args) => logger.warn(formatDiagMessage(message, args)), - info: (message, ...args) => logger.info(formatDiagMessage(message, args)), - debug: (message, ...args) => logger.debug(formatDiagMessage(message, args)), - verbose: (message, ...args) => logger.debug(formatDiagMessage(message, args)), - }; - - diagApi.setLogger(diagLogger, { - logLevel: diagLogLevelWarn, - suppressOverrideMessage: true, - }); -} - -function formatDiagMessage(message: string, args: unknown[]): string { - if (args.length === 0) return message; - return `${message} ${args.map(arg => { - if (arg instanceof Error) return arg.stack ?? arg.message; - if (typeof arg === 'string') return arg; - try { - return JSON.stringify(arg); - } catch { - return String(arg); - } - }).join(' ')}`; -} diff --git a/packages/backend/src/core/telemetry/telemetry-registry.ts b/packages/backend/src/core/telemetry/telemetry-registry.ts index 94e26e21d8..aa17a97f76 100644 --- a/packages/backend/src/core/telemetry/telemetry-registry.ts +++ b/packages/backend/src/core/telemetry/telemetry-registry.ts @@ -5,10 +5,8 @@ import type { Config } from '@/config.js'; import { setLogTraceContextProvider } from '@/logging/logging-runtime.js'; -import { OpenTelemetryAdapter } from './adapters/OpenTelemetryAdapter.js'; import { SentryTelemetryAdapter } from './adapters/SentryTelemetryAdapter.js'; -import type { OtelBackendRuntimeConfig, TelemetryAdapter, TelemetryCaptureMessageOptions } from './adapters/TelemetryAdapter.js'; -import type { QueueTraceContextCarrier } from './queue-trace-context.js'; +import type { TelemetryAdapter, TelemetryCaptureMessageOptions } from './adapters/TelemetryAdapter.js'; /** * NestのDIコンテナが構築される前(boot処理内)で初期化する必要があるため、 @@ -18,24 +16,8 @@ import type { QueueTraceContextCarrier } from './queue-trace-context.js'; const adapters: TelemetryAdapter[] = []; export async function initTelemetry(config: Config): Promise { - const otelForBackend: OtelBackendRuntimeConfig | undefined = config.otelForBackend == null ? undefined : { - ...config.otelForBackend, - serviceVersion: config.version, - }; - - // SentryとOTelを同時に使う場合はproviderを分けず、Sentry側へOTLP processorを追加する。 - let adapter: TelemetryAdapter | undefined; - if (config.sentryForBackend && otelForBackend) { - adapter = await SentryTelemetryAdapter.createWithOtlpExport(config.sentryForBackend, otelForBackend); - } else if (config.sentryForBackend) { - // Sentry単体時は既存のSentry adapterだけを登録する。 - adapter = await SentryTelemetryAdapter.create(config.sentryForBackend); - } else if (otelForBackend) { - // OTel単体時だけMisskey自身でNodeTracerProviderを立てる。 - adapter = await OpenTelemetryAdapter.create(otelForBackend); - } - - if (adapter != null) { + if (config.sentryForBackend) { + const adapter = await SentryTelemetryAdapter.create(config.sentryForBackend); adapters.push(adapter); // Telemetryの初期化後に登録し、初期化前のBootstrapログは従来どおり出力する。 setLogTraceContextProvider(() => adapter.getActiveTraceContext?.()); @@ -63,19 +45,6 @@ export function startSpan(name: string, fn: () => T): T { return wrapped(); } -export function injectTraceContext(carrier: QueueTraceContextCarrier): void { - // Queue の carrier は共有データなので、通知と異なり全 adapter にブロードキャストしない。 - // OTel provider は現在 1 つだけなので、同じ header を上書きしないよう最初の対応 adapter だけを使う。 - adapters.find(adapter => adapter.injectTraceContext != null)?.injectTraceContext?.(carrier); -} - -export function startSpanWithTraceContext(name: string, jobData: object, fn: () => T): T { - // Queue context を解釈できる adapter に span 作成を任せる。 - // 対応 adapter が無い構成では通常の startSpan へフォールバックする。 - const adapter = adapters.find(adapter => adapter.startSpanWithTraceContext != null); - return adapter?.startSpanWithTraceContext?.(name, jobData, fn) ?? startSpan(name, fn); -} - export async function shutdownTelemetry(): Promise { // 終了時は登録済みadapterを並列にflush/shutdownする。 await Promise.allSettled(adapters.map(adapter => adapter.shutdown())); diff --git a/packages/backend/src/core/telemetry/telemetry-shutdown.ts b/packages/backend/src/core/telemetry/telemetry-shutdown.ts deleted file mode 100644 index 1ee1b42649..0000000000 --- a/packages/backend/src/core/telemetry/telemetry-shutdown.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -/** - * Telemetry-specific shutdown is implemented by telemetry-registry.ts. - * Signal coordination belongs to boot/shutdown-handler.ts so telemetry and - * logging remain independent domains. - */ -export { shutdownTelemetry } from './telemetry-registry.js'; diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts index 631fc64e6e..925a8e3cbb 100644 --- a/packages/backend/src/queue/QueueProcessorService.ts +++ b/packages/backend/src/queue/QueueProcessorService.ts @@ -11,7 +11,7 @@ import type Logger from '@/logger.js'; import { bindThis } from '@/decorators.js'; import { TelemetryService } from '@/core/telemetry/TelemetryService.js'; import { CheckModeratorsActivityProcessorService } from '@/queue/processors/CheckModeratorsActivityProcessorService.js'; -import { runQueueJobWithTraceContext } from './queue-job-runner.js'; +import { runQueueJob } from './queue-job-runner.js'; import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js'; import { SystemWebhookDeliverProcessorService } from './processors/SystemWebhookDeliverProcessorService.js'; import { EndedPollNotificationProcessorService } from './processors/EndedPollNotificationProcessorService.js'; @@ -159,8 +159,7 @@ export class QueueProcessorService implements OnApplicationShutdown { }; } - // 以下の各 Worker は job.data に保存された enqueue 元の trace context を復元し、 - // ジョブの実処理全体を Link または parent の worker span で囲む。 + // 以下の各 Worker はジョブの実処理全体を worker span で囲む。 //#region system { const processer = (job: Bull.Job) => { @@ -180,10 +179,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('system'); this.systemQueueWorker = new Bull.Worker(QUEUE.SYSTEM, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: System: ' + job.name, - job.data, () => processer(job) as Promise, err => { logger.error(`failed(${err.name}: ${err.message}) id=${job.id}`, { job: renderJob(job), e: renderError(err) }); @@ -235,10 +233,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('db'); this.dbQueueWorker = new Bull.Worker(QUEUE.DB, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: DB: ' + job.name, - job.data, () => processer(job), err => { logger.error(`failed(${err.name}: ${err.message}) id=${job.id}`, { job: renderJob(job), e: renderError(err) }); @@ -266,10 +263,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('deliver'); this.deliverQueueWorker = new Bull.Worker(QUEUE.DELIVER, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: Deliver', - job.data, () => this.deliverProcessorService.process(job), err => { logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} to=${job.data.to}`, { e: renderError(err) }); @@ -305,10 +301,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('inbox'); this.inboxQueueWorker = new Bull.Worker(QUEUE.INBOX, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: Inbox', - job.data, () => this.inboxProcessorService.process(job), err => { const activityId = job.data.activity ? job.data.activity.id : 'none'; @@ -345,10 +340,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('user-webhook'); this.userWebhookDeliverQueueWorker = new Bull.Worker(QUEUE.USER_WEBHOOK_DELIVER, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: UserWebhookDeliver', - job.data, () => this.userWebhookDeliverProcessorService.process(job), err => { logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} to=${job.data.to}`, { e: renderError(err) }); @@ -384,10 +378,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('system-webhook'); this.systemWebhookDeliverQueueWorker = new Bull.Worker(QUEUE.SYSTEM_WEBHOOK_DELIVER, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: SystemWebhookDeliver', - job.data, () => this.systemWebhookDeliverProcessorService.process(job), err => { logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} to=${job.data.to}`, { e: renderError(err) }); @@ -432,10 +425,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('relationship'); this.relationshipQueueWorker = new Bull.Worker(QUEUE.RELATIONSHIP, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: Relationship: ' + job.name, - job.data, () => processer(job), err => { logger.error(`failed(${err.name}: ${err.message}) id=${job.id}`, { job: renderJob(job), e: renderError(err) }); @@ -475,10 +467,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('objectStorage'); this.objectStorageQueueWorker = new Bull.Worker(QUEUE.OBJECT_STORAGE, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: ObjectStorage: ' + job.name, - job.data, () => processer(job) as Promise, err => { logger.error(`failed(${err.name}: ${err.message}) id=${job.id}`, { job: renderJob(job), e: renderError(err) }); @@ -507,10 +498,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('ended-poll-notification'); this.endedPollNotificationQueueWorker = new Bull.Worker(QUEUE.ENDED_POLL_NOTIFICATION, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: EndedPollNotification', - job.data, () => this.endedPollNotificationProcessorService.process(job), err => { logger.error(`failed(${err.name}: ${err.message}) id=${job.id}`, { job: renderJob(job), e: renderError(err) }); @@ -532,10 +522,9 @@ export class QueueProcessorService implements OnApplicationShutdown { const logger = this.logger.createSubLogger('post-scheduled-note'); this.postScheduledNoteQueueWorker = new Bull.Worker(QUEUE.POST_SCHEDULED_NOTE, (job) => { - return runQueueJobWithTraceContext( + return runQueueJob( this.telemetryService, 'Queue: PostScheduledNote', - job.data, () => this.postScheduledNoteProcessorService.process(job), err => { logger.error(`failed(${err.name}: ${err.message}) id=${job.id}`, { job: renderJob(job), e: renderError(err) }); diff --git a/packages/backend/src/queue/queue-job-runner.ts b/packages/backend/src/queue/queue-job-runner.ts index aa1d29c512..72c9957a8e 100644 --- a/packages/backend/src/queue/queue-job-runner.ts +++ b/packages/backend/src/queue/queue-job-runner.ts @@ -5,17 +5,16 @@ import type { TelemetryService } from '@/core/telemetry/TelemetryService.js'; -type QueueTelemetryService = Pick; +type QueueTelemetryService = Pick; -/** QueueのprocessorをTrace Context付きで実行し、失敗処理をSpan内で行います。 */ -export function runQueueJobWithTraceContext( +/** Queueのprocessorを実行し、失敗処理をSpan内で行います。 */ +export function runQueueJob( telemetryService: QueueTelemetryService, spanName: string, - jobData: object, processJob: () => T | Promise, onError: (error: Error) => void, ): Promise { - return telemetryService.startSpanWithTraceContext(spanName, jobData, async (): Promise => { + return telemetryService.startSpan(spanName, async (): Promise => { try { return await processJob(); } catch (error) { diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts index 522d6e2b71..e17bccb094 100644 --- a/packages/backend/src/server/ServerService.ts +++ b/packages/backend/src/server/ServerService.ts @@ -32,7 +32,6 @@ import { HealthServerService } from './HealthServerService.js'; import { ClientServerService } from './web/ClientServerService.js'; import { OpenApiServerService } from './api/openapi/OpenApiServerService.js'; import { OAuth2ProviderService } from './oauth/OAuth2ProviderService.js'; -import { registerHttpServerInstrumentation } from './http-server-instrumentation.js'; import { registerHttpAccessLog } from './http-access-log.js'; const _dirname = fileURLToPath(new URL('.', import.meta.url)); @@ -82,7 +81,6 @@ export class ServerService implements OnApplicationShutdown { logger: false, }); this.#fastify = fastify; - await registerHttpServerInstrumentation(fastify, this.config); registerHttpAccessLog(fastify); // HSTS diff --git a/packages/backend/src/server/api/endpoints/fetch-rss.ts b/packages/backend/src/server/api/endpoints/fetch-rss.ts index ba48b0119e..7b777e46c4 100644 --- a/packages/backend/src/server/api/endpoints/fetch-rss.ts +++ b/packages/backend/src/server/api/endpoints/fetch-rss.ts @@ -7,8 +7,11 @@ import Parser from 'rss-parser'; import { Injectable } from '@nestjs/common'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; +import { ApiError } from '../error.js'; -const rssParser = new Parser(); +const MAX_URL_LENGTH = 8192; +const MAX_RESPONSE_SIZE = 1024 * 1024; +const MAX_CONCURRENT_REQUESTS = 32; export const meta = { tags: ['meta'], @@ -17,6 +20,34 @@ export const meta = { allowGet: true, cacheSec: 60 * 3, + limit: { + duration: 60 * 1000, + max: 300, + }, + + errors: { + invalidUrl: { + message: 'Invalid URL.', + code: 'INVALID_URL', + id: '89b7ee05-ccfc-4bdd-9b13-61172fd1e06c', + httpStatusCode: 400, + }, + fetchRssFailed: { + message: 'Failed to fetch RSS.', + code: 'FETCH_RSS_FAILED', + id: '8db5d3d8-31d7-452f-b0cc-ca3b8925de12', + kind: 'server', + httpStatusCode: 422, + }, + fetchRssUnavailable: { + message: 'RSS fetching is temporarily unavailable.', + code: 'FETCH_RSS_UNAVAILABLE', + id: '91e6ff44-c63f-4725-9ad0-b7a40d7f7655', + kind: 'server', + httpStatusCode: 503, + }, + }, + res: { type: 'object', properties: { @@ -215,21 +246,84 @@ export const paramDef = { @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export + private readonly inFlightRequests = new Map>>>(); + private activeRequestCount = 0; + constructor( private httpRequestService: HttpRequestService, ) { - super(meta, paramDef, async (ps, me) => { - const res = await this.httpRequestService.send(ps.url, { - method: 'GET', - headers: { - Accept: 'application/rss+xml, */*', - }, - timeout: 5000, - }); + super(meta, paramDef, async (ps) => { + const url = this.normalizeUrl(ps.url); + const inFlightRequest = this.inFlightRequests.get(url); + if (inFlightRequest != null) { + return await inFlightRequest; + } - const text = await res.text(); + if (this.activeRequestCount >= MAX_CONCURRENT_REQUESTS) { + throw new ApiError(meta.errors.fetchRssUnavailable); + } - return rssParser.parseString(text); + this.activeRequestCount++; + const request = this.fetchRss(url) + .catch(() => { + throw new ApiError(meta.errors.fetchRssFailed); + }) + .finally(() => { + this.inFlightRequests.delete(url); + this.activeRequestCount--; + }); + this.inFlightRequests.set(url, request); + + return await request; }); } + + private normalizeUrl(input: string): string { + if (input.length === 0 || input.length > MAX_URL_LENGTH) { + throw new ApiError(meta.errors.invalidUrl); + } + + let url: URL; + try { + url = new URL(input); + } catch { + throw new ApiError(meta.errors.invalidUrl); + } + + if ( + (url.protocol !== 'http:' && url.protocol !== 'https:') || + url.username !== '' || + url.password !== '' + ) { + throw new ApiError(meta.errors.invalidUrl); + } + + url.hash = ''; + return url.href; + } + + private async fetchRss(url: string): Promise>> { + const res = await this.httpRequestService.send(url, { + method: 'GET', + headers: { + Accept: 'application/rss+xml, */*', + }, + timeout: 5000, + size: MAX_RESPONSE_SIZE, + }); + + const finalUrl = new URL(res.url); + if (finalUrl.protocol !== 'http:' && finalUrl.protocol !== 'https:') { + throw new Error('Invalid final URL protocol'); + } + + const text = await res.text(); + const rssParser = new Parser({ + xml2js: { + async: true, + }, + }); + + return await rssParser.parseString(text); + } } diff --git a/packages/backend/src/server/http-access-log.ts b/packages/backend/src/server/http-access-log.ts index 93b61aaf9d..2194206276 100644 --- a/packages/backend/src/server/http-access-log.ts +++ b/packages/backend/src/server/http-access-log.ts @@ -123,7 +123,7 @@ export function registerHttpAccessLog(fastify: FastifyInstance, manager: LogMana const states = new WeakMap(); - // HTTP計装の後に登録し、リクエスト開始時のactiveなTrace Contextを保存します。 + // リクエスト開始時のactiveなTrace Contextを保存します。 fastify.addHook('onRequest', (request, _reply, done) => { states.set(request, { traceContext: manager.getActiveTraceContext(), diff --git a/packages/backend/src/server/http-server-instrumentation.ts b/packages/backend/src/server/http-server-instrumentation.ts deleted file mode 100644 index c17f3c1bc0..0000000000 --- a/packages/backend/src/server/http-server-instrumentation.ts +++ /dev/null @@ -1,35 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import type { Config } from '@/config.js'; -import type { FastifyInstance } from 'fastify'; - -type TelemetryConfig = Pick; - -export function shouldRegisterHttpServerInstrumentation(config: TelemetryConfig): boolean { - // Sentryもリクエストspanを作成するため、両方を登録すると重複して出力される。 - return config.otelForBackend != null && config.sentryForBackend == null; -} - -/** - * すべてのルート・フックより前にリクエスト計装を登録し、ActivityPubや - * well-knownを含む全HTTP受信経路を1つのroot spanとして計測する。 - */ -export async function registerHttpServerInstrumentation(fastify: FastifyInstance, config: TelemetryConfig): Promise { - if (!shouldRegisterHttpServerInstrumentation(config)) return; - - const { FastifyOtelInstrumentation } = await import('@fastify/otel'); - const instrumentation = new FastifyOtelInstrumentation({ - requestHook: (span, request) => { - const route = request.routeOptions.url; - if (route != null) { - // デフォルトだとトレース名が「request」で固定されてしまうため、判別がつかなくなる。 - // ルート名をspan名に設定することで、トレースビューでルートごとの処理時間を確認できるようになる。 - span.updateName(`${request.method} ${route}`); - } - }, - }); - await fastify.register(instrumentation.plugin()); -} diff --git a/packages/backend/test/e2e/telemetry-redis-instrumentation.ts b/packages/backend/test/e2e/telemetry-redis-instrumentation.ts deleted file mode 100644 index 620f6adc69..0000000000 --- a/packages/backend/test/e2e/telemetry-redis-instrumentation.ts +++ /dev/null @@ -1,88 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { randomUUID } from 'node:crypto'; -import { describe, expect, test } from 'vitest'; -import { Queue, Worker } from 'bullmq'; -import { SpanKind, SpanStatusCode } from '@opentelemetry/api'; -import { InMemorySpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'; -import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; -import { loadConfig } from '@/config.js'; -import { installRedisInstrumentation } from '@/core/telemetry/redis-instrumentation.js'; - -const config = loadConfig(); - -describe('Redis telemetry instrumentation', () => { - test('records Redis spans below HTTP and BullMQ worker spans without Redis arguments', async () => { - const exporter = new InMemorySpanExporter(); - const provider = new NodeTracerProvider({ - spanProcessors: [new SimpleSpanProcessor(exporter)], - }); - provider.register(); - - const tracer = provider.getTracer('telemetry-redis-instrumentation-test'); - const uninstall = installRedisInstrumentation(tracer, SpanKind.CLIENT, SpanStatusCode.ERROR, { - captureCommandSpans: true, - }); - const queueName = `telemetry-${randomUUID()}`; - const prefix = `telemetry-${randomUUID()}`; - const connection = { - host: config.redis.host, - port: config.redis.port, - ...(config.redis.password != null ? { password: config.redis.password } : {}), - }; - const queue = new Queue(queueName, { connection, prefix }); - let worker: Worker | undefined; - let httpSpanId: string | undefined; - let jobSpanId: string | undefined; - const secret = `secret-${randomUUID()}`; - - try { - const processed = new Promise((resolve, reject) => { - worker = new Worker(queueName, async job => { - return await tracer.startActiveSpan('Queue: telemetry test', async jobSpan => { - jobSpanId = jobSpan.spanContext().spanId; - try { - // updateData uses BullMQ's worker-side ioredis client. - await job.updateData({ secret }); - return 'ok'; - } finally { - jobSpan.end(); - } - }); - }, { connection, prefix }); - worker.once('completed', () => resolve()); - worker.once('failed', (_job, error) => reject(error)); - }); - - await tracer.startActiveSpan('HTTP POST /telemetry-test', async httpSpan => { - httpSpanId = httpSpan.spanContext().spanId; - try { - // Queue#add uses BullMQ's producer-side ioredis client. - await queue.add('probe', { secret }); - } finally { - httpSpan.end(); - } - }); - await processed; - await provider.forceFlush(); - - const redisSpans = exporter.getFinishedSpans().filter(span => span.attributes['db.system.name'] === 'redis'); - expect(redisSpans.some(span => span.parentSpanContext?.spanId === httpSpanId)).toBe(true); - expect(redisSpans.some(span => span.parentSpanContext?.spanId === jobSpanId)).toBe(true); - for (const span of redisSpans) { - expect(span.attributes).not.toHaveProperty('db.statement'); - expect(span.attributes).not.toHaveProperty('db.query.text'); - expect(Object.values(span.attributes)).not.toContain(secret); - } - } finally { - await worker?.close(); - await queue.obliterate({ force: true }); - await queue.close(); - uninstall(); - await provider.shutdown(); - } - }, 30000); -}); diff --git a/packages/backend/test/unit/core/telemetry/adapters/OpenTelemetryAdapter.ts b/packages/backend/test/unit/core/telemetry/adapters/OpenTelemetryAdapter.ts deleted file mode 100644 index ad6a559250..0000000000 --- a/packages/backend/test/unit/core/telemetry/adapters/OpenTelemetryAdapter.ts +++ /dev/null @@ -1,379 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { beforeEach, describe, expect, test, vi } from 'vitest'; -import { SpanStatusCode } from '@opentelemetry/api'; -import { defaultResource, detectResources, envDetector, resourceFromAttributes } from '@opentelemetry/resources'; -import { ParentBasedSampler, TraceIdRatioBasedSampler } from '@opentelemetry/sdk-trace-base'; -import { ATTR_SERVICE_INSTANCE_ID, ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions'; -import type { Context, SpanContext } from '@opentelemetry/api'; -import { OpenTelemetryAdapter, createResource, createSampler, getMisskeyProcessRole } from '@/core/telemetry/adapters/OpenTelemetryAdapter.js'; - -const mocks = vi.hoisted(() => { - return { - envOption: { - disableClustering: false, - onlyServer: false, - onlyQueue: false, - }, - isPrimary: false, - }; -}); - -vi.mock('@/env.js', () => ({ - envOption: mocks.envOption, -})); - -vi.mock('node:cluster', () => ({ - default: { - get isPrimary() { - return mocks.isPrimary; - }, - }, -})); - -const samplerDeps = { - ParentBasedSampler, - TraceIdRatioBasedSampler, -}; - -describe('OpenTelemetryAdapter', () => { - test('wraps async work in an active span and ends it after success', async () => { - const span = { - end: vi.fn(), - recordException: vi.fn(), - setStatus: vi.fn(), - }; - const tracer = { - startActiveSpan: vi.fn(async (_name: string, fn: (spanArg: any) => Promise) => fn(span)), - } as any; - const provider = { - shutdown: vi.fn(), - }; - const adapter = new OpenTelemetryAdapter({ - tracer, - provider, - getActiveSpan: () => undefined, - spanStatusCodeError: SpanStatusCode.ERROR, - shutdownTimeout: 10, - }); - - await expect(adapter.startSpan('API: test', async () => 'ok')).resolves.toBe('ok'); - - expect(tracer.startActiveSpan).toHaveBeenCalledWith('API: test', expect.any(Function)); - expect(span.recordException).not.toHaveBeenCalled(); - expect(span.setStatus).not.toHaveBeenCalled(); - expect(span.end).toHaveBeenCalledTimes(1); - }); - - test('records thrown errors on the active span before rethrowing', async () => { - const error = new Error('boom'); - const span = { - end: vi.fn(), - recordException: vi.fn(), - setStatus: vi.fn(), - }; - const tracer = { - startActiveSpan: vi.fn(async (_name: string, fn: (spanArg: any) => Promise) => fn(span)), - } as any; - const adapter = new OpenTelemetryAdapter({ - tracer, - provider: { shutdown: vi.fn() }, - getActiveSpan: () => undefined, - spanStatusCodeError: SpanStatusCode.ERROR, - shutdownTimeout: 10, - }); - - await expect(adapter.startSpan('Queue: test', async () => { - throw error; - })).rejects.toThrow(error); - - expect(span.recordException).toHaveBeenCalledWith(error); - expect(span.setStatus).toHaveBeenCalledWith({ - code: SpanStatusCode.ERROR, - message: error.message, - }); - expect(span.end).toHaveBeenCalledTimes(1); - }); - - test('creates a root worker span linked to the enqueue span by default', () => { - const span = { - end: vi.fn(), - recordException: vi.fn(), - setStatus: vi.fn(), - }; - const rootContext = {} as Context; - const extractedContext = {} as Context; - const sourceSpanContext = { - traceId: '0123456789abcdef0123456789abcdef', - spanId: '0123456789abcdef', - traceFlags: 1, - isRemote: true, - } as SpanContext; - const propagation = { - isPropagationApi: true, - inject: vi.fn(), - extract(this: { isPropagationApi: boolean }) { - if (!this.isPropagationApi) throw new Error('lost propagation API receiver'); - return extractedContext; - }, - }; - const tracer = { - startActiveSpan: vi.fn((_name: string, _options: unknown, _context: unknown, fn: (spanArg: typeof span) => string) => fn(span)), - } as any; - const adapter = new OpenTelemetryAdapter({ - tracer, - provider: { shutdown: vi.fn() }, - getActiveSpan: () => undefined, - spanStatusCodeError: SpanStatusCode.ERROR, - shutdownTimeout: 10, - queueTraceContext: { - tracer, - propagation: propagation as any, - trace: { getSpanContext: () => sourceSpanContext }, - getActiveContext: () => rootContext, - rootContext, - mode: 'link', - spanStatusCodeError: SpanStatusCode.ERROR, - }, - }); - - expect(adapter.startSpanWithTraceContext('Queue: Deliver', { - __misskeyTraceContext: { - traceparent: '00-0123456789abcdef0123456789abcdef-0123456789abcdef-01', - }, - }, () => 'ok')).toBe('ok'); - - expect(tracer.startActiveSpan).toHaveBeenCalledWith('Queue: Deliver', { - root: true, - links: [{ context: sourceSpanContext }], - }, rootContext, expect.any(Function)); - expect(span.end).toHaveBeenCalledTimes(1); - }); - - test('returns the active span context for log enrichment', () => { - const adapter = new OpenTelemetryAdapter({ - tracer: { startActiveSpan: vi.fn() }, - provider: { shutdown: vi.fn() }, - getActiveSpan: () => ({ - spanContext: () => ({ - traceId: '0123456789abcdef0123456789abcdef', - spanId: '0123456789abcdef', - traceFlags: 0, - }), - } as any), - spanStatusCodeError: SpanStatusCode.ERROR, - shutdownTimeout: 10, - }); - - expect(adapter.getActiveTraceContext()).toEqual({ - traceId: '0123456789abcdef0123456789abcdef', - spanId: '0123456789abcdef', - traceFlags: 0, - }); - }); - - test('bridges captureMessage to the active span when one exists', () => { - const activeSpan = { - recordException: vi.fn(), - setStatus: vi.fn(), - }; - const adapter = new OpenTelemetryAdapter({ - tracer: { startActiveSpan: vi.fn() }, - provider: { shutdown: vi.fn() }, - getActiveSpan: () => activeSpan as any, - spanStatusCodeError: SpanStatusCode.ERROR, - shutdownTimeout: 10, - }); - - adapter.captureMessage('Queue failed', { - level: 'error', - extra: { queue: 'deliver' }, - }); - - expect(activeSpan.recordException).toHaveBeenCalledWith(expect.objectContaining({ - message: 'Queue failed', - })); - expect(activeSpan.setStatus).toHaveBeenCalledWith({ - code: SpanStatusCode.ERROR, - message: 'Queue failed', - }); - }); - - test('times out shutdown instead of waiting forever', async () => { - vi.useFakeTimers(); - const adapter = new OpenTelemetryAdapter({ - tracer: { startActiveSpan: vi.fn() }, - provider: { shutdown: vi.fn(() => new Promise(() => {})) }, - getActiveSpan: () => undefined, - spanStatusCodeError: SpanStatusCode.ERROR, - shutdownTimeout: 50, - }); - - const shutdown = adapter.shutdown(); - await vi.advanceTimersByTimeAsync(50); - - await expect(shutdown).resolves.toBeUndefined(); - vi.useRealTimers(); - }); - - test('clears the shutdown timeout timer once provider.shutdown() resolves first', async () => { - vi.useFakeTimers(); - const clearTimeoutSpy = vi.spyOn(global, 'clearTimeout'); - const adapter = new OpenTelemetryAdapter({ - tracer: { startActiveSpan: vi.fn() }, - provider: { shutdown: vi.fn().mockResolvedValue(undefined) }, - getActiveSpan: () => undefined, - spanStatusCodeError: SpanStatusCode.ERROR, - shutdownTimeout: 5000, - }); - - await adapter.shutdown(); - - expect(clearTimeoutSpy).toHaveBeenCalled(); - clearTimeoutSpy.mockRestore(); - vi.useRealTimers(); - }); - - test('captureMessage starts a standalone span to report the error when there is no active span', () => { - const reportSpan = { - end: vi.fn(), - recordException: vi.fn(), - setStatus: vi.fn(), - }; - const tracer = { - startActiveSpan: vi.fn((_name: string, fn: (spanArg: typeof reportSpan) => void) => fn(reportSpan)), - }; - const adapter = new OpenTelemetryAdapter({ - tracer: tracer as any, - provider: { shutdown: vi.fn() }, - getActiveSpan: () => undefined, - spanStatusCodeError: SpanStatusCode.ERROR, - shutdownTimeout: 10, - }); - - adapter.captureMessage('Queue: Deliver failed', { - level: 'error', - extra: { queue: 'deliver' }, - }); - - expect(tracer.startActiveSpan).toHaveBeenCalledWith('captureMessage', expect.any(Function)); - expect(reportSpan.recordException).toHaveBeenCalledWith(expect.objectContaining({ - message: 'Queue: Deliver failed', - })); - expect(reportSpan.setStatus).toHaveBeenCalledWith({ - code: SpanStatusCode.ERROR, - message: 'Queue: Deliver failed', - }); - expect(reportSpan.end).toHaveBeenCalledTimes(1); - }); -}); - -describe('createSampler', () => { - test('accepts sample rates within [0, 1]', () => { - expect(() => createSampler(0, samplerDeps)).not.toThrow(); - expect(() => createSampler(0.5, samplerDeps)).not.toThrow(); - expect(() => createSampler(1, samplerDeps)).not.toThrow(); - }); - - test('rejects sample rates outside [0, 1]', () => { - expect(() => createSampler(-0.1, samplerDeps)).toThrow(); - expect(() => createSampler(1.1, samplerDeps)).toThrow(); - }); - - test('rejects NaN instead of silently disabling sampling', () => { - expect(() => createSampler(Number.NaN, samplerDeps)).toThrow(); - }); - - test('rejects non-number values that pass through YAML as strings', () => { - expect(() => createSampler('0.5' as unknown as number, samplerDeps)).toThrow(); - }); -}); - -describe('createResource', () => { - test('lets explicit config override OTEL resource env, and env override Misskey defaults', () => { - const previousServiceName = process.env['OTEL_SERVICE_NAME']; - const previousResourceAttributes = process.env['OTEL_RESOURCE_ATTRIBUTES']; - process.env['OTEL_SERVICE_NAME'] = 'env-service'; - process.env['OTEL_RESOURCE_ATTRIBUTES'] = [ - 'deployment.environment=staging', - 'misskey.process.role=env-role', - 'service.instance.id=env-instance', - 'env.only=value', - ].join(','); - - try { - const resource = createResource({ - serviceVersion: '2026.1.0', - resourceAttributes: { - [ATTR_SERVICE_NAME]: 'config-service', - 'deployment.environment': 'production', - 'config.only': 'value', - }, - }, { - defaultResource, - resourceFromAttributes, - detectResources, - envDetector, - serviceNameAttribute: ATTR_SERVICE_NAME, - serviceInstanceIdAttribute: ATTR_SERVICE_INSTANCE_ID, - serviceVersionAttribute: ATTR_SERVICE_VERSION, - serviceVersion: '2026.1.0', - }); - - expect(resource.attributes[ATTR_SERVICE_NAME]).toBe('config-service'); - expect(resource.attributes[ATTR_SERVICE_INSTANCE_ID]).toBe('env-instance'); - expect(resource.attributes[ATTR_SERVICE_VERSION]).toBe('2026.1.0'); - expect(resource.attributes['deployment.environment']).toBe('production'); - expect(resource.attributes['misskey.process.role']).toBe('env-role'); - expect(resource.attributes['env.only']).toBe('value'); - expect(resource.attributes['config.only']).toBe('value'); - } finally { - if (previousServiceName == null) { - delete process.env['OTEL_SERVICE_NAME']; - } else { - process.env['OTEL_SERVICE_NAME'] = previousServiceName; - } - if (previousResourceAttributes == null) { - delete process.env['OTEL_RESOURCE_ATTRIBUTES']; - } else { - process.env['OTEL_RESOURCE_ATTRIBUTES'] = previousResourceAttributes; - } - } - }); -}); - -describe('getMisskeyProcessRole', () => { - beforeEach(() => { - mocks.envOption.disableClustering = false; - mocks.envOption.onlyServer = false; - mocks.envOption.onlyQueue = false; - mocks.isPrimary = false; - }); - - test('labels non-clustered onlyServer as primary-server', () => { - mocks.envOption.disableClustering = true; - mocks.envOption.onlyServer = true; - expect(getMisskeyProcessRole()).toBe('primary-server'); - }); - - test('labels clustered primary with onlyServer as fork-only', () => { - mocks.isPrimary = true; - mocks.envOption.onlyServer = true; - expect(getMisskeyProcessRole()).toBe('fork-only'); - }); - - test('labels clustered worker running the HTTP server (onlyServer) as worker-server, not worker-queue', () => { - mocks.isPrimary = false; - mocks.envOption.onlyServer = true; - expect(getMisskeyProcessRole()).toBe('worker-server'); - }); - - test('labels clustered worker without onlyServer as worker-queue', () => { - mocks.isPrimary = false; - mocks.envOption.onlyServer = false; - expect(getMisskeyProcessRole()).toBe('worker-queue'); - }); -}); diff --git a/packages/backend/test/unit/core/telemetry/adapters/SentryTelemetryAdapter.ts b/packages/backend/test/unit/core/telemetry/adapters/SentryTelemetryAdapter.ts index 9423aebe51..cc8a0c39f0 100644 --- a/packages/backend/test/unit/core/telemetry/adapters/SentryTelemetryAdapter.ts +++ b/packages/backend/test/unit/core/telemetry/adapters/SentryTelemetryAdapter.ts @@ -4,7 +4,7 @@ */ import { describe, expect, test, vi } from 'vitest'; -import { SentryTelemetryAdapter, buildSentryIntegrations, buildSentryNodeOptions, buildSentryOtlpInitOptions } from '@/core/telemetry/adapters/SentryTelemetryAdapter.js'; +import { SentryTelemetryAdapter, buildSentryIntegrations, buildSentryNodeOptions } from '@/core/telemetry/adapters/SentryTelemetryAdapter.js'; type TestIntegration = Parameters>[0][number]; @@ -35,9 +35,7 @@ describe('SentryTelemetryAdapter', () => { nodeProfilingIntegration: () => testIntegration('ProfilingIntegration'), }); - const result = integrations([ - testIntegration('Http'), - ]); + const result = integrations([testIntegration('Http')]); expect(result.map((integration: TestIntegration) => integration.name)).toEqual(['Http', 'ProfilingIntegration']); }); @@ -50,9 +48,7 @@ describe('SentryTelemetryAdapter', () => { warn, }); - const result = integrations([ - testIntegration('Http'), - ]); + const result = integrations([testIntegration('Http')]); expect(result.map((integration: TestIntegration) => integration.name)).toEqual(['Http']); expect(warn).toHaveBeenCalledWith('Unknown Sentry integration configured in sentryForBackend.disabledIntegrations: Unknown'); @@ -77,88 +73,6 @@ describe('SentryTelemetryAdapter', () => { expect(options.tracePropagationTargets).toEqual(['^https://internal\\.example/']); }); - - test('builds Sentry options that export spans to both Sentry and OTLP', () => { - const existingProcessor = { name: 'existingProcessor' }; - const otlpProcessor = { name: 'otlpProcessor' }; - - const result = buildSentryOtlpInitOptions({ - sentryConfig: { - enableNodeProfiling: false, - disabledIntegrations: ['Redis'], - options: { - openTelemetrySpanProcessors: [existingProcessor as any], - tracesSampleRate: 0.25, - }, - }, - otelConfig: { serviceVersion: '2026.1.0' }, - otlpProcessor, - }); - - expect(result.tracesSampleRate).toBe(0.25); - expect(result.openTelemetrySpanProcessors).toEqual([existingProcessor, otlpProcessor]); - // OTel併存時もremoteへtrace headerを漏らさないデフォルトはSentry単体時と揃える。 - expect(result.tracePropagationTargets).toEqual([]); - expect((result.integrations as any)([ - testIntegration('Http'), - testIntegration('Redis'), - testIntegration('Postgres'), - ]).map((integration: TestIntegration) => integration.name)).toEqual(['Http', 'Postgres']); - }); - - test('does not disable Sentry trace propagation when explicitly enabled for OTel coexistence', () => { - const result = buildSentryOtlpInitOptions({ - sentryConfig: { - enableNodeProfiling: false, - options: {}, - }, - otelConfig: { - serviceVersion: '2026.1.0', - propagateTraceToRemote: true, - }, - otlpProcessor: { name: 'otlpProcessor' }, - }); - - expect(result.tracePropagationTargets).toBeUndefined(); - }); - - test('honors explicit tracePropagationTargets for OTel coexistence even without propagateTraceToRemote', () => { - const result = buildSentryOtlpInitOptions({ - sentryConfig: { - enableNodeProfiling: false, - options: { - tracePropagationTargets: ['^https://internal\\.example/'], - }, - }, - otelConfig: { serviceVersion: '2026.1.0' }, - otlpProcessor: { name: 'otlpProcessor' }, - }); - - expect(result.tracePropagationTargets).toEqual(['^https://internal\\.example/']); - }); - - test('warns when OTel-only options are ignored in Sentry coexistence mode', () => { - const warn = vi.fn(); - - buildSentryOtlpInitOptions({ - sentryConfig: { - enableNodeProfiling: false, - options: {}, - }, - otelConfig: { - serviceVersion: '2026.1.0', - sampleRate: 0.25, - resourceAttributes: { - 'deployment.environment': 'production', - }, - }, - otlpProcessor: { name: 'otlpProcessor' }, - warn, - }); - - expect(warn).toHaveBeenCalledWith(expect.stringContaining('otelForBackend.sampleRate is ignored')); - expect(warn).toHaveBeenCalledWith(expect.stringContaining('otelForBackend.resourceAttributes is ignored')); - }); }); describe('SentryTelemetryAdapter trace context', () => { @@ -220,69 +134,3 @@ describe('SentryTelemetryAdapter.shutdown', () => { vi.doUnmock('@sentry/profiling-node'); }); }); - -describe('SentryTelemetryAdapter.createWithOtlpExport', () => { - test('registers the OTel diag logger before creating the OTLP exporter', async () => { - const init = vi.fn(); - const close = vi.fn(); - const setLogger = vi.fn(); - const nodeProfilingIntegration = vi.fn(); - const BatchSpanProcessor = vi.fn(function (this: { exporter: unknown }, exporter: unknown) { - this.exporter = exporter; - }); - const OTLPTraceExporter = vi.fn(function (this: { options: unknown }, options: unknown) { - this.options = options; - }); - - vi.doMock('@sentry/node', () => ({ - init, - close, - })); - vi.doMock('@sentry/profiling-node', () => ({ - nodeProfilingIntegration, - })); - vi.doMock('@opentelemetry/api', () => ({ - context: { active: vi.fn() }, - diag: { setLogger }, - DiagLogLevel: { WARN: 50 }, - propagation: { inject: vi.fn(), extract: vi.fn() }, - ROOT_CONTEXT: {}, - SpanStatusCode: { ERROR: 2 }, - trace: { getTracer: vi.fn(), getSpanContext: vi.fn() }, - })); - vi.doMock('@opentelemetry/sdk-trace-base', () => ({ - BatchSpanProcessor, - })); - vi.doMock('@opentelemetry/exporter-trace-otlp-proto', () => ({ - OTLPTraceExporter, - })); - - await SentryTelemetryAdapter.createWithOtlpExport({ - enableNodeProfiling: false, - options: {}, - }, { - serviceVersion: '2026.1.0', - endpoint: 'http://collector:4318/v1/traces', - }); - - expect(setLogger).toHaveBeenCalledWith(expect.objectContaining({ - error: expect.any(Function), - warn: expect.any(Function), - }), { - logLevel: 50, - suppressOverrideMessage: true, - }); - expect(OTLPTraceExporter).toHaveBeenCalledWith({ - url: 'http://collector:4318/v1/traces', - }); - expect(init).toHaveBeenCalledWith(expect.objectContaining({ - openTelemetrySpanProcessors: [expect.any(Object)], - })); - - vi.doUnmock('@sentry/node'); - vi.doUnmock('@sentry/profiling-node'); - vi.doUnmock('@opentelemetry/api'); - vi.doUnmock('@opentelemetry/sdk-trace-base'); - vi.doUnmock('@opentelemetry/exporter-trace-otlp-proto'); - }); -}); diff --git a/packages/backend/test/unit/core/telemetry/http-client-instrumentation.ts b/packages/backend/test/unit/core/telemetry/http-client-instrumentation.ts deleted file mode 100644 index e05f4407e4..0000000000 --- a/packages/backend/test/unit/core/telemetry/http-client-instrumentation.ts +++ /dev/null @@ -1,108 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { describe, expect, test, vi } from 'vitest'; -import { SpanKind, SpanStatusCode } from '@opentelemetry/api'; -import { createHttpClientInstrumentation } from '@/core/telemetry/http-client-instrumentation.js'; - -function request() { - return { - method: 'POST', - protocol: 'https:', - path: '/inbox?token=secret', - host: 'remote.example', - getHeader: vi.fn((name: string) => name === 'host' ? 'user:password@remote.example:8443' : undefined), - }; -} - -describe('http-client-instrumentation', () => { - test('creates and completes a sanitized CLIENT span from diagnostics channels', () => { - const listeners = new Map void>(); - const span = { - end: vi.fn(), - recordException: vi.fn(), - setAttribute: vi.fn(), - setStatus: vi.fn(), - }; - const tracer = { startSpan: vi.fn(() => span) } as any; - const unsubscribe = createHttpClientInstrumentation({ - tracer, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - subscribe: (name, listener) => { - listeners.set(name, listener); - return () => listeners.delete(name); - }, - }); - const clientRequest = request(); - - listeners.get('http.client.request.created')!({ request: clientRequest }); - listeners.get('http.client.response.finish')!({ - request: clientRequest, - response: { statusCode: 201, httpVersion: '1.1' }, - }); - - expect(tracer.startSpan).toHaveBeenCalledWith('POST', { - kind: SpanKind.CLIENT, - attributes: { - 'http.request.method': 'POST', - 'url.full': 'https://remote.example:8443/inbox', - 'server.address': 'remote.example', - 'server.port': 8443, - }, - }); - expect(span.setAttribute).toHaveBeenCalledWith('http.response.status_code', 201); - expect(span.setAttribute).toHaveBeenCalledWith('network.protocol.version', '1.1'); - expect(span.end).toHaveBeenCalledTimes(1); - unsubscribe(); - expect(listeners).toHaveLength(0); - }); - - test('records a request error and ends the span once', () => { - const listeners = new Map void>(); - const span = { end: vi.fn(), recordException: vi.fn(), setAttribute: vi.fn(), setStatus: vi.fn() }; - const error = Object.assign(new Error('connection refused'), { code: 'ECONNREFUSED' }); - const clientRequest = request(); - createHttpClientInstrumentation({ - tracer: { startSpan: vi.fn(() => span) } as any, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - subscribe: (name, listener) => { - listeners.set(name, listener); - return () => listeners.delete(name); - }, - }); - - listeners.get('http.client.request.created')!({ request: clientRequest }); - listeners.get('http.client.request.error')!({ request: clientRequest, error }); - listeners.get('http.client.response.finish')!({ request: clientRequest, response: { statusCode: 200 } }); - - expect(span.recordException).toHaveBeenCalledWith(error); - expect(span.setAttribute).toHaveBeenCalledWith('error.type', 'ECONNREFUSED'); - expect(span.setStatus).toHaveBeenCalledWith({ code: SpanStatusCode.ERROR }); - expect(span.end).toHaveBeenCalledTimes(1); - }); - - test('records the response status code as error.type for an error response', () => { - const listeners = new Map void>(); - const span = { end: vi.fn(), recordException: vi.fn(), setAttribute: vi.fn(), setStatus: vi.fn() }; - const clientRequest = request(); - createHttpClientInstrumentation({ - tracer: { startSpan: vi.fn(() => span) } as any, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - subscribe: (name, listener) => { - listeners.set(name, listener); - return () => listeners.delete(name); - }, - }); - - listeners.get('http.client.request.created')!({ request: clientRequest }); - listeners.get('http.client.response.finish')!({ request: clientRequest, response: { statusCode: 502 } }); - - expect(span.setAttribute).toHaveBeenCalledWith('error.type', '502'); - expect(span.setStatus).toHaveBeenCalledWith({ code: SpanStatusCode.ERROR }); - }); -}); diff --git a/packages/backend/test/unit/core/telemetry/queue-instrumentation.ts b/packages/backend/test/unit/core/telemetry/queue-instrumentation.ts deleted file mode 100644 index ac73df3c13..0000000000 --- a/packages/backend/test/unit/core/telemetry/queue-instrumentation.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { beforeEach, describe, expect, test, vi } from 'vitest'; -import type * as Bull from 'bullmq'; -import { instrumentQueue } from '@/core/telemetry/queue-instrumentation.js'; - -const mocks = vi.hoisted(() => ({ - injectTraceContext: vi.fn((carrier: Record) => { - carrier['traceparent'] = '00-0123456789abcdef0123456789abcdef-0123456789abcdef-01'; - }), -})); - -vi.mock('@/core/telemetry/telemetry-registry.js', () => ({ - injectTraceContext: mocks.injectTraceContext, -})); - -describe('queue-instrumentation', () => { - beforeEach(() => { - mocks.injectTraceContext.mockClear(); - }); - - test('injects the active trace context for add()', () => { - const add = vi.fn(); - const queue = instrumentQueue({ add, addBulk: vi.fn() } as unknown as Bull.Queue<{ noteId: string }>); - const data = { noteId: '9d6b9a65-46c9-4e1b-a640-9589693893c9' }; - - queue.add('endedPollNotification', data); - - expect(mocks.injectTraceContext).toHaveBeenCalledTimes(1); - expect(data).toMatchObject({ - __misskeyTraceContext: { - traceparent: '00-0123456789abcdef0123456789abcdef-0123456789abcdef-01', - }, - }); - expect(add).toHaveBeenCalledWith('endedPollNotification', data, undefined); - }); - - test('injects every job passed to addBulk()', () => { - const addBulk = vi.fn(); - const queue = instrumentQueue({ add: vi.fn(), addBulk } as unknown as Bull.Queue<{ to: string }>); - const jobs = [ - { name: 'deliver', data: { to: 'https://remote.example/inbox' } }, - { name: 'deliver', data: { to: 'https://remote2.example/inbox' } }, - ]; - - queue.addBulk(jobs); - - expect(mocks.injectTraceContext).toHaveBeenCalledTimes(2); - expect(jobs).toEqual(expect.arrayContaining([ - expect.objectContaining({ data: expect.objectContaining({ __misskeyTraceContext: expect.any(Object) }) }), - ])); - expect(addBulk).toHaveBeenCalledWith(jobs); - }); -}); diff --git a/packages/backend/test/unit/core/telemetry/queue-trace-context.ts b/packages/backend/test/unit/core/telemetry/queue-trace-context.ts deleted file mode 100644 index 3ecf4fe270..0000000000 --- a/packages/backend/test/unit/core/telemetry/queue-trace-context.ts +++ /dev/null @@ -1,132 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { describe, expect, test, vi } from 'vitest'; -import type { Context, SpanContext } from '@opentelemetry/api'; -import { getQueueSpanContext, getQueueTraceContextMode, injectActiveTraceContext, injectQueueTraceContext } from '@/core/telemetry/queue-trace-context.js'; - -const rootContext = {} as Context; -const extractedContext = {} as Context; -const sourceSpanContext: SpanContext = { - traceId: '0123456789abcdef0123456789abcdef', - spanId: '0123456789abcdef', - traceFlags: 1, - isRemote: true, -}; - -function jobData() { - return { - name: 'deliver', - __misskeyTraceContext: { - traceparent: '00-0123456789abcdef0123456789abcdef-0123456789abcdef-01', - }, - }; -} - -describe('queue-trace-context', () => { - test('stores only a non-empty carrier in the job data', () => { - const data = { noteId: '9d6b9a65-46c9-4e1b-a640-9589693893c9' }; - - injectQueueTraceContext(data, carrier => { - carrier['traceparent'] = '00-0123456789abcdef0123456789abcdef-0123456789abcdef-01'; - }); - - expect(data).toMatchObject({ - __misskeyTraceContext: { - traceparent: '00-0123456789abcdef0123456789abcdef-0123456789abcdef-01', - }, - }); - }); - - test('does not store an empty carrier when no active trace exists', () => { - const data = { noteId: '9d6b9a65-46c9-4e1b-a640-9589693893c9' }; - - injectQueueTraceContext(data, () => {}); - - expect(data).not.toHaveProperty('__misskeyTraceContext'); - }); - - test('ignores non-object job data', () => { - const inject = vi.fn(); - - injectQueueTraceContext(null, inject); - injectQueueTraceContext('not a job object', inject); - - expect(inject).not.toHaveBeenCalled(); - }); - - test('injects the active context with the configured propagator', () => { - const activeContext = {} as Context; - const carrier = {}; - const inject = vi.fn(); - - injectActiveTraceContext({ - tracer: { startActiveSpan: vi.fn() } as any, - propagation: { inject, extract: vi.fn() } as any, - trace: { getSpanContext: vi.fn() }, - getActiveContext: () => activeContext, - rootContext, - mode: 'link', - spanStatusCodeError: 2 as any, - }, carrier); - - expect(inject).toHaveBeenCalledWith(activeContext, carrier); - }); - - test('starts a new root trace with a link by default', () => { - const extract = vi.fn(() => extractedContext); - const getSpanContext = vi.fn(() => sourceSpanContext); - - const result = getQueueSpanContext(jobData(), { - rootContext, - propagation: { inject: vi.fn(), extract }, - trace: { getSpanContext }, - mode: 'link', - }); - - expect(extract).toHaveBeenCalledWith(rootContext, jobData().__misskeyTraceContext); - expect(result).toEqual({ - options: { - root: true, - links: [{ context: sourceSpanContext }], - }, - parentContext: rootContext, - }); - }); - - test('uses the extracted context as the parent when parent mode is selected', () => { - const result = getQueueSpanContext(jobData(), { - rootContext, - propagation: { inject: vi.fn(), extract: () => extractedContext }, - trace: { getSpanContext: () => sourceSpanContext }, - mode: 'parent', - }); - - expect(result).toEqual({ - options: {}, - parentContext: extractedContext, - }); - }); - - test('ignores malformed or missing carriers', () => { - const extract = vi.fn(() => extractedContext); - const deps = { - rootContext, - propagation: { inject: vi.fn(), extract }, - trace: { getSpanContext: () => sourceSpanContext }, - mode: 'link' as const, - }; - - expect(getQueueSpanContext({}, deps)).toBeUndefined(); - expect(getQueueSpanContext({ __misskeyTraceContext: { traceparent: 1 } }, deps)).toBeUndefined(); - expect(extract).not.toHaveBeenCalled(); - }); - - test('defaults to link mode and rejects invalid configuration', () => { - expect(getQueueTraceContextMode(undefined)).toBe('link'); - expect(getQueueTraceContextMode('parent')).toBe('parent'); - expect(() => getQueueTraceContextMode('children')).toThrow('otelForBackend.jobTraceContextMode'); - }); -}); diff --git a/packages/backend/test/unit/queue/queue-job-runner.ts b/packages/backend/test/unit/queue/queue-job-runner.ts index 3a587b0623..72c4a77ef2 100644 --- a/packages/backend/test/unit/queue/queue-job-runner.ts +++ b/packages/backend/test/unit/queue/queue-job-runner.ts @@ -4,13 +4,13 @@ */ import { describe, expect, test, vi } from 'vitest'; -import { runQueueJobWithTraceContext } from '@/queue/queue-job-runner.js'; +import { runQueueJob } from '@/queue/queue-job-runner.js'; import { TelemetryService } from '@/core/telemetry/TelemetryService.js'; -describe('runQueueJobWithTraceContext', () => { +describe('runQueueJob', () => { test('returns the processor result without invoking the error handler', async () => { let spanActive = false; - const startSpanWithTraceContext = vi.fn((_name: string, _jobData: object, fn: () => T): T => { + const startSpan = vi.fn((_name: string, fn: () => T): T => { spanActive = true; const result = fn(); if (result instanceof Promise) return result.finally(() => { spanActive = false; }) as T; @@ -18,11 +18,11 @@ describe('runQueueJobWithTraceContext', () => { return result; }); const telemetryService = { - startSpanWithTraceContext, + startSpan, } as unknown as TelemetryService; const onError = vi.fn(); - await expect(runQueueJobWithTraceContext(telemetryService, 'Queue: test', {}, () => 'ok', onError)).resolves.toBe('ok'); + await expect(runQueueJob(telemetryService, 'Queue: test', () => 'ok', onError)).resolves.toBe('ok'); expect(onError).not.toHaveBeenCalled(); expect(spanActive).toBe(false); @@ -30,7 +30,7 @@ describe('runQueueJobWithTraceContext', () => { test('handles failures while the processor span is active and rethrows the original error', async () => { let spanActive = false; - const startSpanWithTraceContext = vi.fn((_name: string, _jobData: object, fn: () => T): T => { + const startSpan = vi.fn((_name: string, fn: () => T): T => { spanActive = true; const result = fn(); if (result instanceof Promise) return result.finally(() => { spanActive = false; }) as T; @@ -38,7 +38,7 @@ describe('runQueueJobWithTraceContext', () => { return result; }); const telemetryService = { - startSpanWithTraceContext, + startSpan, } as unknown as TelemetryService; const onError = vi.fn((error: Error) => { expect(spanActive).toBe(true); @@ -46,7 +46,7 @@ describe('runQueueJobWithTraceContext', () => { }); const originalError = new Error('failed'); - await expect(runQueueJobWithTraceContext(telemetryService, 'Queue: test', {}, async () => { + await expect(runQueueJob(telemetryService, 'Queue: test', async () => { throw originalError; }, onError)).rejects.toBe(originalError); diff --git a/packages/backend/test/unit/server/api/endpoints/fetch-rss.ts b/packages/backend/test/unit/server/api/endpoints/fetch-rss.ts new file mode 100644 index 0000000000..186b785d9b --- /dev/null +++ b/packages/backend/test/unit/server/api/endpoints/fetch-rss.ts @@ -0,0 +1,192 @@ +/* + * SPDX-FileCopyrightText: syuilo and misskey-project + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { beforeEach, describe, expect, test, vi } from 'vitest'; +import { HttpRequestService } from '@/core/HttpRequestService.js'; +import FetchRssEndpoint, { meta } from '@/server/api/endpoints/fetch-rss.js'; +import { ApiError } from '@/server/api/error.js'; +import type { Mocked } from 'vitest'; +import type { Response } from 'node-fetch'; + +const rssParserMocks = vi.hoisted(() => ({ + constructor: vi.fn(), + parseString: vi.fn(), +})); + +vi.mock('rss-parser', () => ({ + default: class { + constructor(options: unknown) { + rssParserMocks.constructor(options); + } + + public parseString(input: string) { + return rssParserMocks.parseString(input); + } + }, +})); + +const RSS = 'Test'; + +function deferred() { + let resolve!: (value: T) => void; + let reject!: (reason?: unknown) => void; + const promise = new Promise((res, rej) => { + resolve = res; + reject = rej; + }); + return { promise, resolve, reject }; +} + +function response(url: string, text = RSS): Response { + return { + url, + text: vi.fn().mockResolvedValue(text), + } as unknown as Response; +} + +describe('fetch-rss endpoint', () => { + let httpRequestService: Mocked; + let endpoint: FetchRssEndpoint; + + beforeEach(() => { + rssParserMocks.constructor.mockReset(); + rssParserMocks.parseString.mockReset(); + rssParserMocks.parseString.mockResolvedValue({ items: [] }); + httpRequestService = { + send: vi.fn(), + } as unknown as Mocked; + endpoint = new FetchRssEndpoint(httpRequestService); + }); + + async function exec(url: string) { + return await endpoint.exec({ url }, null, null); + } + + async function expectApiError(promise: Promise, code: string, status: number) { + await expect(promise).rejects.toMatchObject({ + code, + httpStatusCode: status, + info: undefined, + }); + } + + test.each([ + '', + 'not a URL', + 'ftp://example.com/feed.xml', + `https://example.com/${'a'.repeat(8192)}`, + ])('rejects invalid URL: %s', async (url) => { + await expectApiError(exec(url), 'INVALID_URL', 400); + expect(httpRequestService.send).not.toHaveBeenCalled(); + }); + + test.each([ + 'https://user@example.com/feed.xml', + 'https://user:password@example.com/feed.xml', + ])('rejects URL containing credentials: %s', async (url) => { + await expectApiError(exec(url), 'INVALID_URL', 400); + expect(httpRequestService.send).not.toHaveBeenCalled(); + }); + + test('does not expose details from internal errors', async () => { + httpRequestService.send.mockRejectedValue(new Error('secret upstream details')); + + const promise = exec('https://example.com/feed.xml'); + await expectApiError(promise, 'FETCH_RSS_FAILED', 422); + await expect(promise).rejects.not.toMatchObject({ + message: expect.stringContaining('secret upstream details'), + }); + }); + + test('passes the 1 MiB response limit to HttpRequestService', async () => { + httpRequestService.send.mockResolvedValue(response('https://example.com/feed.xml')); + + await exec('https://example.com/feed.xml'); + + expect(httpRequestService.send).toHaveBeenCalledWith('https://example.com/feed.xml', expect.objectContaining({ + size: 1024 * 1024, + })); + }); + + test('creates an asynchronous RSS parser for every request', async () => { + httpRequestService.send + .mockResolvedValueOnce(response('https://example.com/first.xml')) + .mockResolvedValueOnce(response('https://example.com/second.xml')); + + await exec('https://example.com/first.xml'); + await exec('https://example.com/second.xml'); + + expect(rssParserMocks.constructor).toHaveBeenCalledTimes(2); + expect(rssParserMocks.constructor).toHaveBeenNthCalledWith(1, { xml2js: { async: true } }); + expect(rssParserMocks.constructor).toHaveBeenNthCalledWith(2, { xml2js: { async: true } }); + }); + + test('rejects a non-HTTP final URL without exposing it', async () => { + httpRequestService.send.mockResolvedValue(response('file:///secret/feed.xml')); + + await expectApiError(exec('https://example.com/feed.xml'), 'FETCH_RSS_FAILED', 422); + }); + + test('shares an in-flight request for the same normalized URL', async () => { + const pending = deferred(); + httpRequestService.send.mockReturnValue(pending.promise); + + const first = exec('HTTPS://EXAMPLE.COM:443/feed.xml#first'); + const second = exec('https://example.com/feed.xml#second'); + expect(httpRequestService.send).toHaveBeenCalledTimes(1); + + pending.resolve(response('https://example.com/feed.xml')); + await expect(Promise.all([first, second])).resolves.toHaveLength(2); + expect(httpRequestService.send).toHaveBeenCalledTimes(1); + }); + + test('limits concurrent requests for different URLs to 32', async () => { + const pending = deferred(); + httpRequestService.send.mockReturnValue(pending.promise); + + const requests = Array.from({ length: 32 }, (_, i) => exec(`https://example.com/${i}.xml`)); + expect(httpRequestService.send).toHaveBeenCalledTimes(32); + await expectApiError(exec('https://example.com/overflow.xml'), 'FETCH_RSS_UNAVAILABLE', 503); + expect(httpRequestService.send).toHaveBeenCalledTimes(32); + + pending.resolve(response('https://example.com/feed.xml')); + await Promise.all(requests); + + httpRequestService.send.mockResolvedValue(response('https://example.com/after.xml')); + await expect(exec('https://example.com/after.xml')).resolves.toBeDefined(); + }); + + test('cleans up the in-flight request and concurrency slot after success', async () => { + httpRequestService.send.mockResolvedValue(response('https://example.com/feed.xml')); + + await exec('https://example.com/feed.xml'); + await exec('https://example.com/feed.xml'); + + expect(httpRequestService.send).toHaveBeenCalledTimes(2); + }); + + test('cleans up the in-flight request and concurrency slot after failure', async () => { + httpRequestService.send.mockRejectedValue(new Error('upstream failed')); + const requests = Array.from({ length: 32 }, (_, i) => exec(`https://example.com/${i}.xml`)); + await Promise.allSettled(requests); + + httpRequestService.send.mockResolvedValue(response('https://example.com/0.xml')); + await expect(exec('https://example.com/0.xml')).resolves.toBeDefined(); + expect(httpRequestService.send).toHaveBeenCalledTimes(33); + }); + + test('has the expected rate limit metadata', () => { + expect(meta.limit).toEqual({ + duration: 60 * 1000, + max: 300, + }); + }); + + test('uses only the declared structured API errors', () => { + expect(new ApiError(meta.errors.invalidUrl)).toMatchObject({ code: 'INVALID_URL', httpStatusCode: 400 }); + expect(new ApiError(meta.errors.fetchRssFailed)).toMatchObject({ code: 'FETCH_RSS_FAILED', httpStatusCode: 422 }); + expect(new ApiError(meta.errors.fetchRssUnavailable)).toMatchObject({ code: 'FETCH_RSS_UNAVAILABLE', httpStatusCode: 503 }); + }); +}); diff --git a/packages/backend/test/unit/server/http-server-instrumentation.ts b/packages/backend/test/unit/server/http-server-instrumentation.ts deleted file mode 100644 index 3e4baae14a..0000000000 --- a/packages/backend/test/unit/server/http-server-instrumentation.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { describe, expect, test, vi } from 'vitest'; -import { shouldRegisterHttpServerInstrumentation, registerHttpServerInstrumentation } from '@/server/http-server-instrumentation.js'; - -const mocks = vi.hoisted(() => ({ - plugin: vi.fn(), - instrumentation: vi.fn(), -})); - -vi.mock('@fastify/otel', () => ({ - FastifyOtelInstrumentation: class { - public plugin = mocks.plugin; - - public constructor(options: unknown) { - mocks.instrumentation(options); - } - }, -})); - -describe('http-server-instrumentation', () => { - test('registers Fastify instrumentation when only OpenTelemetry is configured', async () => { - const plugin = vi.fn(); - const fastify = { register: vi.fn().mockResolvedValue(undefined) }; - mocks.plugin.mockReturnValue(plugin); - - await registerHttpServerInstrumentation(fastify as any, { otelForBackend: {} } as any); - - expect(mocks.instrumentation).toHaveBeenCalledTimes(1); - expect(fastify.register).toHaveBeenCalledWith(plugin); - - const requestHook = mocks.instrumentation.mock.calls[0][0].requestHook; - const span = { updateName: vi.fn() }; - requestHook(span, { method: 'POST', routeOptions: { url: '/notes/create' } }); - expect(span.updateName).toHaveBeenCalledWith('POST /notes/create'); - }); - - test('does not register duplicate request instrumentation with Sentry', async () => { - const fastify = { register: vi.fn() }; - - await registerHttpServerInstrumentation(fastify as any, { otelForBackend: {}, sentryForBackend: {} } as any); - - expect(fastify.register).not.toHaveBeenCalled(); - expect(shouldRegisterHttpServerInstrumentation({ otelForBackend: {}, sentryForBackend: {} } as any)).toBe(false); - }); - - test('does not register instrumentation without OpenTelemetry', () => { - expect(shouldRegisterHttpServerInstrumentation({} as any)).toBe(false); - }); -}); diff --git a/packages/backend/test/unit/telemetry-database-instrumentation.ts b/packages/backend/test/unit/telemetry-database-instrumentation.ts deleted file mode 100644 index 5ac31fd0e6..0000000000 --- a/packages/backend/test/unit/telemetry-database-instrumentation.ts +++ /dev/null @@ -1,108 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { describe, expect, test, vi } from 'vitest'; -import { installDatabaseInstrumentation, installInstrumentation } from '@/core/telemetry/database-instrumentation.js'; - -describe('database-instrumentation', () => { - test('does not install PostgreSQL instrumentation when disabled', async () => { - const uninstall = await installDatabaseInstrumentation({} as any, { - capturePgSpans: false, - capturePgStatement: false, - capturePgConnectionSpans: false, - }); - - expect(uninstall).toBeTypeOf('function'); - expect(() => uninstall()).not.toThrow(); - }); - - test('registers pg instrumentation with the active provider', () => { - const provider = {}; - const pg = { setTracerProvider: vi.fn(), enable: vi.fn(), disable: vi.fn() }; - const config = vi.fn(); - const PgInstrumentation = class { - public constructor(options: unknown) { - config(options); - return pg as any; - } - }; - - const uninstall = installInstrumentation(provider as any, { - PgInstrumentation: PgInstrumentation as any, - }, { - capturePgStatement: false, - capturePgConnectionSpans: false, - }); - - expect(pg.setTracerProvider).toHaveBeenCalledWith(provider); - expect(pg.enable).toHaveBeenCalledOnce(); - expect(config).toHaveBeenCalledWith(expect.objectContaining({ - enhancedDatabaseReporting: false, - requireParentSpan: true, - ignoreConnectSpans: true, - requestHook: expect.any(Function), - })); - - const span = { setAttribute: vi.fn() }; - (config.mock.calls[0][0] as { requestHook: (span: any) => void }).requestHook(span); - expect(span.setAttribute).toHaveBeenCalledWith('db.statement', '[REDACTED]'); - expect(span.setAttribute).toHaveBeenCalledWith('db.query.text', '[REDACTED]'); - - uninstall(); - - expect(pg.disable).toHaveBeenCalledOnce(); - }); - - test('keeps SQL statement attributes when explicitly enabled', () => { - const pg = { setTracerProvider: vi.fn(), enable: vi.fn(), disable: vi.fn() }; - const config = vi.fn(); - - installInstrumentation({} as any, { - PgInstrumentation: class { - public constructor(options: unknown) { - config(options); - return pg as any; - } - } as any, - }, { - capturePgStatement: true, - capturePgConnectionSpans: false, - }); - - expect(config.mock.calls[0][0]).not.toHaveProperty('requestHook'); - }); - - test('enables connection spans when explicitly configured', () => { - const pg = { setTracerProvider: vi.fn(), enable: vi.fn(), disable: vi.fn() }; - const config = vi.fn(); - - installInstrumentation({} as any, { - PgInstrumentation: class { - public constructor(options: unknown) { - config(options); - return pg as any; - } - } as any, - }, { - capturePgStatement: false, - capturePgConnectionSpans: true, - }); - - expect(config).toHaveBeenCalledWith(expect.objectContaining({ - ignoreConnectSpans: false, - })); - }); - - test('cleans up both instrumentations when initialization fails', () => { - const pg = { setTracerProvider: vi.fn(), enable: vi.fn(), disable: vi.fn() }; - pg.enable.mockImplementation(() => { throw new Error('failed'); }); - - expect(() => installInstrumentation({} as any, { - PgInstrumentation: class { public constructor() { return pg as any; } } as any, - })).toThrow('failed'); - - expect(pg.disable).toHaveBeenCalledOnce(); - }); -}); diff --git a/packages/backend/test/unit/telemetry-redis-instrumentation.ts b/packages/backend/test/unit/telemetry-redis-instrumentation.ts deleted file mode 100644 index 85a7df3dca..0000000000 --- a/packages/backend/test/unit/telemetry-redis-instrumentation.ts +++ /dev/null @@ -1,148 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { describe, expect, test, vi } from 'vitest'; -import { SpanKind, SpanStatusCode } from '@opentelemetry/api'; -import { createRedisInstrumentation } from '@/core/telemetry/redis-instrumentation.js'; - -describe('redis-instrumentation', () => { - test('creates and completes a span for an ioredis command', () => { - let subscribers: any; - const unsubscribe = vi.fn(); - const span = { end: vi.fn(), recordException: vi.fn(), setStatus: vi.fn(), setAttribute: vi.fn() }; - const tracer = { startSpan: vi.fn(() => span) }; - const uninstall = createRedisInstrumentation({ - tracingChannel: () => ({ subscribe: (value) => { subscribers = value; }, unsubscribe }), - tracer: tracer as any, - getActiveSpan: () => ({}) as any, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - }, { captureCommandSpans: true }); - const command = { command: 'get', args: ['key'], database: 0, serverAddress: 'redis', serverPort: 6379 }; - - subscribers.start(command); - subscribers.asyncEnd(command); - - expect(tracer.startSpan).toHaveBeenCalledWith('get', expect.objectContaining({ - kind: SpanKind.CLIENT, - attributes: expect.objectContaining({ - 'db.system.name': 'redis', - 'db.operation.name': 'get', - 'server.address': 'redis', - 'server.port': 6379, - }), - })); - expect(span.end).toHaveBeenCalledOnce(); - - uninstall(); - expect(unsubscribe).toHaveBeenCalledWith(subscribers); - }); - - test('records rejected Redis commands as errors', () => { - let subscribers: any; - const span = { end: vi.fn(), recordException: vi.fn(), setStatus: vi.fn(), setAttribute: vi.fn() }; - createRedisInstrumentation({ - tracingChannel: () => ({ subscribe: (value) => { subscribers = value; }, unsubscribe: vi.fn() }), - tracer: { startSpan: vi.fn(() => span) } as any, - getActiveSpan: () => ({}) as any, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - }, { captureCommandSpans: true }); - const command = { command: 'get', args: ['key'], database: 0, serverAddress: 'redis', serverPort: undefined }; - const error = Object.assign(new Error('ERR Redis failed'), { code: 'ERR' }); - - subscribers.start(command); - Object.assign(command, { error }); - subscribers.error(command); - subscribers.asyncEnd(command); - - expect(span.recordException).toHaveBeenCalledWith(error); - expect(span.recordException).toHaveBeenCalledOnce(); - expect(span.setStatus).toHaveBeenCalledWith({ code: SpanStatusCode.ERROR, message: 'ERR Redis failed' }); - expect(span.setAttribute).toHaveBeenCalledWith('error.type', 'ERR'); - expect(span.setAttribute).toHaveBeenCalledWith('db.response.status_code', 'ERR'); - expect(span.end).toHaveBeenCalledOnce(); - }); - - test('does not create a root span when no parent span is active', () => { - let subscribers: any; - const tracer = { startSpan: vi.fn() }; - createRedisInstrumentation({ - tracingChannel: () => ({ subscribe: (value) => { subscribers = value; }, unsubscribe: vi.fn() }), - tracer: tracer as any, - getActiveSpan: () => undefined, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - }, { captureCommandSpans: true }); - - subscribers.start({ command: 'get', args: ['key'], database: 0, serverAddress: 'redis', serverPort: 6379 }); - - expect(tracer.startSpan).not.toHaveBeenCalled(); - }); - - test('creates a root span when explicitly enabled', () => { - let subscribers: any; - const span = { end: vi.fn(), recordException: vi.fn(), setStatus: vi.fn(), setAttribute: vi.fn() }; - const tracer = { startSpan: vi.fn(() => span) }; - createRedisInstrumentation({ - tracingChannel: () => ({ subscribe: (value) => { subscribers = value; }, unsubscribe: vi.fn() }), - tracer: tracer as any, - getActiveSpan: () => undefined, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - }, { captureCommandSpans: true, requireParentSpan: false }); - - const command = { command: 'get', args: ['key'], database: 0, serverAddress: 'redis', serverPort: 6379 }; - subscribers.start(command); - subscribers.asyncEnd(command); - - expect(tracer.startSpan).toHaveBeenCalledOnce(); - expect(span.end).toHaveBeenCalledOnce(); - }); - - test('records connection spans only when explicitly enabled', () => { - const subscribers = new Map(); - const unsubscribe = vi.fn(); - const span = { end: vi.fn(), recordException: vi.fn(), setStatus: vi.fn(), setAttribute: vi.fn() }; - const tracer = { startSpan: vi.fn(() => span) }; - const uninstall = createRedisInstrumentation({ - tracingChannel: (name) => ({ subscribe: (value) => { subscribers.set(name, value); }, unsubscribe }), - tracer: tracer as any, - getActiveSpan: () => undefined, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - }, { captureConnectionSpans: true }); - - const connection = { serverAddress: 'redis', serverPort: 6379 }; - subscribers.get('ioredis:connect').start(connection); - subscribers.get('ioredis:connect').asyncEnd(connection); - - expect(tracer.startSpan).toHaveBeenCalledWith('connect', expect.objectContaining({ - kind: SpanKind.CLIENT, - attributes: expect.objectContaining({ - 'db.operation.name': 'connect', - 'server.address': 'redis', - 'server.port': 6379, - }), - })); - expect(span.end).toHaveBeenCalledOnce(); - - uninstall(); - expect(unsubscribe).toHaveBeenCalledWith(subscribers.get('ioredis:connect')); - }); - - test('does not subscribe to Redis command diagnostics unless explicitly enabled', () => { - const tracingChannel = vi.fn(); - createRedisInstrumentation({ - tracingChannel, - tracer: { startSpan: vi.fn() } as any, - getActiveSpan: () => undefined, - spanKindClient: SpanKind.CLIENT, - spanStatusCodeError: SpanStatusCode.ERROR, - }); - - expect(tracingChannel).not.toHaveBeenCalled(); - }); -}); diff --git a/packages/backend/test/unit/telemetry-registry.ts b/packages/backend/test/unit/telemetry-registry.ts index dbf10c9176..f3cdf5cc27 100644 --- a/packages/backend/test/unit/telemetry-registry.ts +++ b/packages/backend/test/unit/telemetry-registry.ts @@ -9,8 +9,6 @@ import type { Config } from '@/config.js'; const mocks = vi.hoisted(() => { return { sentryCreate: vi.fn(), - sentryCreateWithOtlpExport: vi.fn(), - otelCreate: vi.fn(), setLogTraceContextProvider: vi.fn(), }; }); @@ -22,13 +20,6 @@ vi.mock('@/logging/logging-runtime.js', () => ({ vi.mock('@/core/telemetry/adapters/SentryTelemetryAdapter.js', () => ({ SentryTelemetryAdapter: { create: mocks.sentryCreate, - createWithOtlpExport: mocks.sentryCreateWithOtlpExport, - }, -})); - -vi.mock('@/core/telemetry/adapters/OpenTelemetryAdapter.js', () => ({ - OpenTelemetryAdapter: { - create: mocks.otelCreate, }, })); @@ -43,44 +34,37 @@ describe('telemetry-registry', () => { beforeEach(() => { vi.resetModules(); mocks.sentryCreate.mockReset(); - mocks.sentryCreateWithOtlpExport.mockReset(); - mocks.otelCreate.mockReset(); mocks.setLogTraceContextProvider.mockReset(); mocks.sentryCreate.mockResolvedValue({ shutdown: vi.fn(), captureMessage: vi.fn(), startSpan: vi.fn() }); - mocks.sentryCreateWithOtlpExport.mockResolvedValue({ shutdown: vi.fn(), captureMessage: vi.fn(), startSpan: vi.fn() }); - mocks.otelCreate.mockResolvedValue({ shutdown: vi.fn(), captureMessage: vi.fn(), startSpan: vi.fn() }); }); - test('uses OpenTelemetryAdapter when only otelForBackend is configured', async () => { + test('does not initialize an adapter when Sentry is not configured', async () => { const { initTelemetry } = await import('@/core/telemetry/telemetry-registry.js'); - const otelForBackend = { endpoint: 'http://collector:4318/v1/traces' }; - await initTelemetry(config({ otelForBackend })); + await initTelemetry(config({})); - expect(mocks.otelCreate).toHaveBeenCalledWith({ - ...otelForBackend, - serviceVersion: '2026.1.0', - }); expect(mocks.sentryCreate).not.toHaveBeenCalled(); - expect(mocks.sentryCreateWithOtlpExport).not.toHaveBeenCalled(); + expect(mocks.setLogTraceContextProvider).not.toHaveBeenCalled(); }); - test('registers the adapter trace context provider after telemetry initialization', async () => { + test('initializes Sentry and registers its trace context provider', async () => { const { initTelemetry } = await import('@/core/telemetry/telemetry-registry.js'); + const sentryForBackend = { options: {}, enableNodeProfiling: false }; const getActiveTraceContext = vi.fn(() => ({ traceId: '0123456789abcdef0123456789abcdef', spanId: '0123456789abcdef', traceFlags: 0, })); - mocks.otelCreate.mockResolvedValue({ + mocks.sentryCreate.mockResolvedValue({ shutdown: vi.fn(), captureMessage: vi.fn(), startSpan: vi.fn(), getActiveTraceContext, }); - await initTelemetry(config({ otelForBackend: { endpoint: 'http://collector:4318/v1/traces' } })); + await initTelemetry(config({ sentryForBackend })); + expect(mocks.sentryCreate).toHaveBeenCalledWith(sentryForBackend); expect(mocks.setLogTraceContextProvider).toHaveBeenCalledWith(expect.any(Function)); const provider = mocks.setLogTraceContextProvider.mock.calls[0][0] as () => unknown; expect(provider()).toEqual({ @@ -91,21 +75,6 @@ describe('telemetry-registry', () => { expect(getActiveTraceContext).toHaveBeenCalledOnce(); }); - test('adds OTLP export to the Sentry provider when both Sentry and OTel are configured', async () => { - const { initTelemetry } = await import('@/core/telemetry/telemetry-registry.js'); - const sentryForBackend = { options: {}, enableNodeProfiling: false }; - const otelForBackend = { endpoint: 'http://collector:4318/v1/traces' }; - - await initTelemetry(config({ sentryForBackend, otelForBackend })); - - expect(mocks.sentryCreateWithOtlpExport).toHaveBeenCalledWith(sentryForBackend, { - ...otelForBackend, - serviceVersion: '2026.1.0', - }); - expect(mocks.sentryCreate).not.toHaveBeenCalled(); - expect(mocks.otelCreate).not.toHaveBeenCalled(); - }); - test('startSpan runs fn directly when no adapter is registered', async () => { const { startSpan } = await import('@/core/telemetry/telemetry-registry.js'); @@ -114,67 +83,32 @@ describe('telemetry-registry', () => { expect(fn).toHaveBeenCalledTimes(1); }); - test('startSpan delegates directly to the single registered adapter without extra wrapping', async () => { + test('startSpan delegates to the Sentry adapter', async () => { const { initTelemetry, startSpan } = await import('@/core/telemetry/telemetry-registry.js'); - const otelForBackend = { endpoint: 'http://collector:4318/v1/traces' }; const adapterStartSpan = vi.fn((_name: string, fn: () => string) => fn()); - mocks.otelCreate.mockResolvedValue({ shutdown: vi.fn(), captureMessage: vi.fn(), startSpan: adapterStartSpan }); + mocks.sentryCreate.mockResolvedValue({ shutdown: vi.fn(), captureMessage: vi.fn(), startSpan: adapterStartSpan }); - await initTelemetry(config({ otelForBackend })); + await initTelemetry(config({ sentryForBackend: { options: {}, enableNodeProfiling: false } })); const fn = vi.fn().mockReturnValue('result'); expect(startSpan('test', fn)).toBe('result'); expect(adapterStartSpan).toHaveBeenCalledWith('test', fn); }); - test('startSpan wraps work through multiple registered adapters in order for future adapter combinations', async () => { - const { initTelemetry, startSpan } = await import('@/core/telemetry/telemetry-registry.js'); - const calls: string[] = []; - mocks.sentryCreate.mockResolvedValue({ - shutdown: vi.fn(), - captureMessage: vi.fn(), - startSpan: vi.fn((_name: string, fn: () => string) => { - calls.push('sentry:start'); - const result = fn(); - calls.push('sentry:end'); - return result; - }), - }); - mocks.otelCreate.mockResolvedValue({ - shutdown: vi.fn(), - captureMessage: vi.fn(), - startSpan: vi.fn((_name: string, fn: () => string) => { - calls.push('otel:start'); - const result = fn(); - calls.push('otel:end'); - return result; - }), - }); - - await initTelemetry(config({ sentryForBackend: { options: {}, enableNodeProfiling: false } })); - await initTelemetry(config({ otelForBackend: { endpoint: 'http://collector:4318/v1/traces' } })); - - const fn = vi.fn(() => { - calls.push('work'); - return 'result'; - }); - - expect(startSpan('test', fn)).toBe('result'); - expect(calls).toEqual(['sentry:start', 'otel:start', 'work', 'otel:end', 'sentry:end']); - }); - - test('shutdownTelemetry waits for every adapter even when one shutdown rejects', async () => { + test('shutdownTelemetry waits for all registered adapters even when one rejects', async () => { const { initTelemetry, shutdownTelemetry } = await import('@/core/telemetry/telemetry-registry.js'); - const sentryShutdown = vi.fn().mockRejectedValue(new Error('sentry failed')); - const otelShutdown = vi.fn().mockResolvedValue(undefined); - mocks.sentryCreate.mockResolvedValue({ shutdown: sentryShutdown, captureMessage: vi.fn(), startSpan: vi.fn() }); - mocks.otelCreate.mockResolvedValue({ shutdown: otelShutdown, captureMessage: vi.fn(), startSpan: vi.fn() }); + const firstShutdown = vi.fn().mockRejectedValue(new Error('first failed')); + const secondShutdown = vi.fn().mockResolvedValue(undefined); + mocks.sentryCreate + .mockResolvedValueOnce({ shutdown: firstShutdown, captureMessage: vi.fn(), startSpan: vi.fn() }) + .mockResolvedValueOnce({ shutdown: secondShutdown, captureMessage: vi.fn(), startSpan: vi.fn() }); - await initTelemetry(config({ sentryForBackend: { options: {}, enableNodeProfiling: false } })); - await initTelemetry(config({ otelForBackend: { endpoint: 'http://collector:4318/v1/traces' } })); + const sentryForBackend = { options: {}, enableNodeProfiling: false }; + await initTelemetry(config({ sentryForBackend })); + await initTelemetry(config({ sentryForBackend })); await expect(shutdownTelemetry()).resolves.toBeUndefined(); - expect(sentryShutdown).toHaveBeenCalledTimes(1); - expect(otelShutdown).toHaveBeenCalledTimes(1); + expect(firstShutdown).toHaveBeenCalledTimes(1); + expect(secondShutdown).toHaveBeenCalledTimes(1); }); }); diff --git a/packages/frontend/src/components/MkLightbox.item.vue b/packages/frontend/src/components/MkLightbox.item.vue index 91751f16b5..d358f20767 100644 --- a/packages/frontend/src/components/MkLightbox.item.vue +++ b/packages/frontend/src/components/MkLightbox.item.vue @@ -83,16 +83,16 @@ SPDX-License-Identifier: AGPL-3.0-only v-else-if="content.type === 'video'" ref="videoEl" data-gallery-click-action="video" - :class="$style.content" + :class="[$style.video, { [$style.videoSized]: videoAspectRatio != null }]" :src="content.url" :alt="content.file?.comment ?? undefined" draggable="false" :controls="prefer.s.useNativeUiForVideoAudioPlayer" playsinline - @loadedmetadata="originalContentLoaded = true" + @loadedmetadata="onVideoLoadedMetadata" @click.stop="onVideoClick" > -
+
@@ -224,6 +224,21 @@ const isVideoPlaying = computed(() => videoControl.value?.isPlaying ?? false); const isVideoActuallyPlaying = computed(() => videoControl.value?.isActuallyPlaying ?? false); let canOpenAnimation = false; +const videoAspectRatio = ref( + props.content.width != null && props.content.height != null && props.content.width > 0 && props.content.height > 0 + ? props.content.width / props.content.height + : null +); + +function onVideoLoadedMetadata() { + originalContentLoaded.value = true; + + // ドライブ上のメタデータが無い場合に限り、動画自体の初期サイズから縦横比を確定させる + if (videoAspectRatio.value != null) return; + if (videoEl.value == null || videoEl.value.videoWidth === 0 || videoEl.value.videoHeight === 0) return; + videoAspectRatio.value = videoEl.value.videoWidth / videoEl.value.videoHeight; +} + const headerSize = 30; const footerSize = props.content.type === 'video' && !prefer.s.useNativeUiForVideoAudioPlayer ? 80 : 0; @@ -941,6 +956,25 @@ defineExpose({ object-fit: contain; } +.video { + display: block; + user-select: none; + position: absolute; + top: 50%; + left: 50%; + translate: -50% -50%; + width: 100%; + height: 100%; + object-fit: contain; +} + +.videoSized { + width: min(100cqw, calc(100cqh * v-bind("videoAspectRatio ?? 16 / 9"))); + height: auto; + background-color: #000; + aspect-ratio: v-bind("videoAspectRatio ?? 16 / 9"); +} + .loading { position: absolute; top: 0; @@ -969,6 +1003,8 @@ defineExpose({ position: relative; width: 100%; height: 100%; + // .videoSizedが使う100cqw / 100cqhの基準 (= paddingを除いた実際の表示領域) + container-type: size; transition: scale 200ms ease, opacity 200ms ease !important; } @@ -985,6 +1021,7 @@ defineExpose({ height: 100%; display: grid; place-items: center; + pointer-events: none; } .playIcon { @@ -1000,8 +1037,8 @@ defineExpose({ transition: scale 100ms ease; } -.playIconWrapper:hover .playIcon, -.playIcon:hover { +// アイコン自体はクリックを受け取らないので、hoverは下のvideo要素を経由して拾う +.video:hover ~ .playIconWrapper .playIcon { scale: 1.2; } diff --git a/packages/frontend/src/components/MkUploaderItems.vue b/packages/frontend/src/components/MkUploaderItems.vue index cf92828e2f..ec7423e971 100644 --- a/packages/frontend/src/components/MkUploaderItems.vue +++ b/packages/frontend/src/components/MkUploaderItems.vue @@ -49,7 +49,7 @@ SPDX-License-Identifier: AGPL-3.0-only