* feat(observability): OpenTelemetry logs+traces with secret redaction Part of #265. Adds opt-in OpenTelemetry (logs + traces) alongside the existing stderr + opslog pipeline, plus secret redaction on all sinks. Default-off: with no OTEL_* / SILO_OTEL_ENABLED config, behavior is unchanged. Bootstrap (internal/telemetry): - Setup() builds one shared resource, a TracerProvider (parent-based trace-id ratio sampler), a LoggerProvider, and the W3C TraceContext+Baggage propagator from env. It installs NO MeterProvider — metrics stay on Prometheus, and the built-in no-op global MeterProvider keeps the trace instrumentation libs from double-emitting. Shutdown is deferred with a flush timeout. - Logs are bridged via otelslog fan-out (slog.MultiHandler), level-gated by the shared LevelVar and best-effort so a failing collector can't break the console or DB branches. stderr + opslog stay untouched. Secret redaction (internal/logredact): - A slog.Handler masks secret-keyed attributes (password, token, api_key, authorization, cookie, ...) — including .With-bound attrs, nested groups, secret-keyed group subtrees, and values behind a LogValuer — on the console and OTLP sinks, with a no-op fast path when a record has no secret keys. opslog.shouldRedact delegates to logredact.SecretKey so all sinks share one marker list. Rotation is infra-managed (no custom file sink): container runtime for stderr, collector/backend for OTLP, opslog partition-pruning for the DB. Documented in docs/architecture/observability.md. Verification: go build ./..., go vet, gofmt -l — clean; go test ./internal/telemetry/ ./internal/logredact/ -race pass. AI-use disclosure: implemented with AI assistance (Claude Code), including adversarial reviews that hardened the bootstrap and fixed two redaction leak paths; reviewed by the author. * refactor(observability): slog context+component sweep, sloglint gate (phase 3) Part of #265. Builds on the OTel bootstrap + redaction commit. Standardizes every log call site onto the context-carrying slog variants so records correlate with the active OpenTelemetry trace, and locks the standard in with a machine gate so future code (human- or AI-authored) can't drift back. - Call-site sweep: converted the remaining slog.<Level>(...) calls to the slog.<Level>Context(ctx, ...) form wherever a context.Context is in scope (background/init calls with no ctx are left as-is), across 183 files. Applied via a type-aware AST codemod. Log levels and message strings are preserved verbatim; a component attr (canonical per-package name) is added to direct package-level slog calls. Bound-logger calls keep their existing .With bindings. The main.go and telemetry package conversions rode with their file in the previous commit to keep each file within a single commit. - Enforcement (.golangci.yml): enable sloglint with context=scope, static-msg, key-naming-case=snake, no-mixed-args. After the sweep all four report zero violations repo-wide (tests included), so make lint / CI now blocks any regression to the non-context form. The gate ships with the sweep because it cannot be green until the legacy sites are converted. Metrics remain on Prometheus; no behavior change to /metrics or Grafana. Verification: go build ./..., go vet ./..., gofmt -l — clean; sloglint (all 4 rules) 0 violations repo-wide; log levels verified unchanged. AI-use disclosure: implemented with AI assistance (Claude Code), including the codemod; reviewed by the author. * fix(observability): honor per-signal OTLP protocol and secret WithGroup names Two Codex review findings on PR #290: - telemetry: OTEL_EXPORTER_OTLP_{TRACES,LOGS}_PROTOCOL now override the generic OTEL_EXPORTER_OTLP_PROTOCOL per signal, so mixed collector setups (e.g. HTTP logs + gRPC traces) build the right exporter. - logredact: entering a group whose name is secret-bearing (e.g. WithGroup("authorization")) now masks every leaf in that subtree, matching how slog.Group("authorization", ...) is masked as a whole. * fix(observability): address review feedback on telemetry bootstrap - Telemetry setup failure no longer kills boot: Setup returns usable no-op providers alongside the error and main logs and continues with telemetry disabled, honoring the best-effort contract. - Honor OTEL_TRACES_SAMPLER (always_on/off, traceidratio, parentbased_* variants); unsupported values fall back to parentbased_traceidratio. - Attach node identity as semconv service.instance.id instead of the non-semconv node.name. - Rename opslog retention-scope log attrs to target_component/target_level so they no longer collide with the canonical component routing key, and tag those lines with component=opslog. - Fix stale levelGated comment casing; use WarnContext in the telemetry shutdown defer; document the LogValuer double-resolve on the redaction slow path. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Quick <31828688+Quick104@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
222 lines
7.4 KiB
Go
222 lines
7.4 KiB
Go
package playback
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"log/slog"
|
|
"net/http"
|
|
"os/exec"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// StreamExtractOpts configures a single streaming subtitle extract.
|
|
type StreamExtractOpts struct {
|
|
// InputPath is the path to the source media file.
|
|
InputPath string
|
|
// TrackIndex is the subtitle stream ordinal within the container
|
|
// (matches ffmpeg's `0:s:N` specifier). Callers pass the same index
|
|
// they would to ExtractSubtitle.
|
|
TrackIndex int
|
|
// SourceCodec is the codec name reported during probe (e.g. "subrip",
|
|
// "ass"). Controls whether we copy the stream (for ASS, which carries
|
|
// styling) or remux to WebVTT (for everything else).
|
|
SourceCodec string
|
|
// SeekSeconds asks ffmpeg to start demuxing at this position. For
|
|
// text-event codecs this is the key win — ffmpeg skips the prefix of
|
|
// the container instead of scanning from byte 0 to produce earlier
|
|
// cues the client will never display. Ignored for ASS because ASS
|
|
// output needs the script header that only appears at offset 0.
|
|
SeekSeconds float64
|
|
// DurationSeconds bounds the extract to a window of this length
|
|
// (passed as ffmpeg's `-t`). Zero means "until end of file". A
|
|
// bounded window lets the client consume one fetch to completion
|
|
// while keeping memory and in-flight state finite; the client
|
|
// requests subsequent windows as playback approaches the tail.
|
|
DurationSeconds float64
|
|
// FFmpegPath overrides the ffmpeg binary lookup.
|
|
FFmpegPath string
|
|
// Writer receives ffmpeg's stdout bytes as they arrive. When it
|
|
// implements http.Flusher, each chunk is flushed so cues reach the
|
|
// browser in real time.
|
|
Writer io.Writer
|
|
}
|
|
|
|
// StreamExtractSubtitle runs ffmpeg to extract a single subtitle track,
|
|
// seeked to SeekSeconds, and pipes its stdout to opts.Writer. The process
|
|
// exits when ffmpeg finishes; the function returns nil on clean exit or
|
|
// an error that includes truncated ffmpeg stderr on failure.
|
|
//
|
|
// Unlike ExtractSubtitle this does not buffer the full output — the
|
|
// writer sees cues as ffmpeg emits them. The first cue typically lands
|
|
// within a second even on network storage because the `-ss` input seek
|
|
// lets ffmpeg skip most of the container.
|
|
func StreamExtractSubtitle(ctx context.Context, opts StreamExtractOpts) error {
|
|
if opts.Writer == nil {
|
|
return errors.New("StreamExtractSubtitle: Writer is required")
|
|
}
|
|
if opts.InputPath == "" {
|
|
return errors.New("StreamExtractSubtitle: InputPath is required")
|
|
}
|
|
|
|
bin := opts.FFmpegPath
|
|
if bin == "" {
|
|
bin = "ffmpeg"
|
|
}
|
|
|
|
cmd := exec.CommandContext(ctx, bin, streamExtractArgs(opts)...)
|
|
stdout, err := cmd.StdoutPipe()
|
|
if err != nil {
|
|
return fmt.Errorf("stdout pipe: %w", err)
|
|
}
|
|
stderrBuf := &strings.Builder{}
|
|
cmd.Stderr = stderrBuf
|
|
|
|
start := time.Now()
|
|
if err := cmd.Start(); err != nil {
|
|
return fmt.Errorf("start ffmpeg: %w", err)
|
|
}
|
|
|
|
// Copy stdout → writer with per-chunk flush so the browser receives
|
|
// cues as they're produced rather than at ffmpeg exit.
|
|
copyErr := copyAndFlush(opts.Writer, stdout)
|
|
|
|
waitErr := cmd.Wait()
|
|
slog.DebugContext(ctx, "subtitle stream extract finished", "component", "playback",
|
|
"track", opts.TrackIndex,
|
|
"seek", opts.SeekSeconds,
|
|
"elapsed_ms", time.Since(start).Milliseconds(),
|
|
"ffmpeg_err", waitErr,
|
|
)
|
|
|
|
if waitErr != nil {
|
|
// ExitError with non-zero status is ffmpeg reporting a real
|
|
// problem. Client disconnect (copy failed) manifests as the
|
|
// context being cancelled, which surfaces here as ffmpeg being
|
|
// killed — propagate it as a regular cancellation error.
|
|
if ctx.Err() != nil {
|
|
return ctx.Err()
|
|
}
|
|
return fmt.Errorf("ffmpeg subtitle stream failed: %w (stderr: %s)",
|
|
waitErr, truncateStderr(stderrBuf.String()))
|
|
}
|
|
if copyErr != nil && !errors.Is(copyErr, io.EOF) {
|
|
return copyErr
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// streamExtractArgs builds the ffmpeg argument list for a streaming
|
|
// subtitle extract.
|
|
func streamExtractArgs(opts StreamExtractOpts) []string {
|
|
outCodec, outFormat := streamExtractOutput(opts.SourceCodec)
|
|
|
|
args := []string{
|
|
"-hide_banner", "-nostats", "-loglevel", "error",
|
|
}
|
|
|
|
// Input seek (before -i) is the fast variant: ffmpeg jumps near the
|
|
// requested position before demuxing. ASS can't use it because the
|
|
// output needs the [Script Info] header which only sits at offset 0.
|
|
// PGS can't either: the client (libpgs) fetches the .sup stream
|
|
// exactly once and consumes it whole, so the output must cover the
|
|
// complete track from offset 0 with original timestamps — windowing
|
|
// would silently drop every cue outside the window. The same logic
|
|
// excludes both from the -t duration cap below.
|
|
windowable := !IsASS(opts.SourceCodec) && !IsPGS(opts.SourceCodec)
|
|
seekApplied := opts.SeekSeconds > 0 && windowable
|
|
if seekApplied {
|
|
args = append(args, "-ss", strconv.FormatFloat(opts.SeekSeconds, 'f', 3, 64))
|
|
}
|
|
|
|
// Duration limit must be an *input* option (placed before -i) so it
|
|
// caps how much of the file we read. Placed as an output option, -t
|
|
// combined with -copyts stops output when PTS reaches the given
|
|
// value — which with a non-zero seek is already in the past, so
|
|
// ffmpeg would emit only the WEBVTT header and zero cues.
|
|
if opts.DurationSeconds > 0 && windowable {
|
|
args = append(args, "-t", strconv.FormatFloat(opts.DurationSeconds, 'f', 3, 64))
|
|
}
|
|
|
|
args = append(args,
|
|
"-i", opts.InputPath,
|
|
"-map", fmt.Sprintf("0:s:%d", opts.TrackIndex),
|
|
"-c:s", outCodec,
|
|
)
|
|
|
|
// When we seek the input, preserve the absolute source timestamps
|
|
// in the output. Without this ffmpeg rebases cues to start at 0,
|
|
// which makes every cue play `opts.SeekSeconds` earlier than it
|
|
// should — the symptom is subtitles that look "out of sync" with
|
|
// the video the player is showing at the same media time.
|
|
if seekApplied {
|
|
args = append(args, "-copyts", "-avoid_negative_ts", "disabled")
|
|
}
|
|
|
|
return append(args,
|
|
"-f", outFormat,
|
|
"pipe:1",
|
|
)
|
|
}
|
|
|
|
// copyAndFlush streams from src to dst in 32KB chunks, calling Flush on
|
|
// dst after each successful write when dst implements http.Flusher.
|
|
func copyAndFlush(dst io.Writer, src io.Reader) error {
|
|
flusher, _ := dst.(http.Flusher)
|
|
buf := make([]byte, 32*1024)
|
|
for {
|
|
n, readErr := src.Read(buf)
|
|
if n > 0 {
|
|
if _, writeErr := dst.Write(buf[:n]); writeErr != nil {
|
|
return writeErr
|
|
}
|
|
if flusher != nil {
|
|
flusher.Flush()
|
|
}
|
|
}
|
|
if readErr != nil {
|
|
if errors.Is(readErr, io.EOF) {
|
|
return nil
|
|
}
|
|
return readErr
|
|
}
|
|
}
|
|
}
|
|
|
|
// streamExtractOutput picks the ffmpeg output codec and muxer format for
|
|
// a given source codec. ASS/SSA is copied so styling survives; PGS is
|
|
// copied into a .sup elementary stream for client-side bitmap rendering
|
|
// (libpgs); everything else is transmuxed to WebVTT for direct `<track>`
|
|
// consumption.
|
|
func streamExtractOutput(codec string) (outCodec, outFormat string) {
|
|
switch {
|
|
case IsASS(codec):
|
|
return "copy", "ass"
|
|
case IsPGS(codec):
|
|
return "copy", "sup"
|
|
}
|
|
return "webvtt", "webvtt"
|
|
}
|
|
|
|
// LogSubtitleStreamError writes a non-fatal warning for subtitle stream
|
|
// failures. Handlers that already committed HTTP headers call this so
|
|
// the user sees a truncated subtitle instead of an error response, and
|
|
// operators still have a log trail to debug from.
|
|
func LogSubtitleStreamError(ctx context.Context, err error, fileID, trackIndex int) {
|
|
if err == nil {
|
|
return
|
|
}
|
|
if ctx.Err() != nil {
|
|
// Normal client disconnect mid-stream — don't warn.
|
|
return
|
|
}
|
|
slog.WarnContext(ctx, "subtitle stream extract failed", "component", "playback",
|
|
"file_id", fileID,
|
|
"track", trackIndex,
|
|
"error", err,
|
|
)
|
|
}
|