* 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>
125 lines
3.8 KiB
Go
125 lines
3.8 KiB
Go
package historyimport
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
)
|
|
|
|
type PlexServerProvider struct {
|
|
client *PlexClient
|
|
baseURL string
|
|
token string
|
|
accountToken string
|
|
}
|
|
|
|
func NewPlexServerProvider(client *PlexClient, baseURL, token string) *PlexServerProvider {
|
|
return &PlexServerProvider{client: client, baseURL: baseURL, token: token}
|
|
}
|
|
|
|
// WithAccountToken enables account-level fetches (the watchlist). Empty
|
|
// disables them: server-token-only imports still work, minus the watchlist.
|
|
func (p *PlexServerProvider) WithAccountToken(token string) *PlexServerProvider {
|
|
p.accountToken = token
|
|
return p
|
|
}
|
|
|
|
func (p *PlexServerProvider) Fetch(ctx context.Context) ([]Record, []string, error) {
|
|
sections, err := p.client.FetchLibrarySections(ctx, p.baseURL, p.token)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
var allItems []PlexItem
|
|
var warnings []string
|
|
|
|
for _, section := range sections {
|
|
switch section.Type {
|
|
case "movie":
|
|
items, err := p.client.FetchWatchedItems(ctx, p.baseURL, p.token, section.Key, 1)
|
|
if err != nil {
|
|
warnings = append(warnings, fmt.Sprintf("failed to fetch movies from section %q: %v", section.Title, err))
|
|
continue
|
|
}
|
|
allItems = append(allItems, items...)
|
|
case "show":
|
|
items, err := p.client.FetchWatchedItems(ctx, p.baseURL, p.token, section.Key, 4)
|
|
if err != nil {
|
|
warnings = append(warnings, fmt.Sprintf("failed to fetch episodes from section %q: %v", section.Title, err))
|
|
continue
|
|
}
|
|
allItems = append(allItems, items...)
|
|
}
|
|
}
|
|
|
|
onDeck, err := p.client.FetchOnDeck(ctx, p.baseURL, p.token)
|
|
if err != nil {
|
|
warnings = append(warnings, fmt.Sprintf("failed to fetch on-deck items: %v", err))
|
|
} else {
|
|
allItems = append(allItems, onDeck...)
|
|
}
|
|
|
|
seriesMeta := p.fetchSeriesMetadata(ctx, allItems, &warnings)
|
|
|
|
merged := make(map[string]Record, len(allItems))
|
|
for _, item := range allItems {
|
|
record := NormalizePlexItem(item, seriesMeta[item.GrandparentRatingKey])
|
|
existing, ok := merged[record.ExternalID]
|
|
if !ok {
|
|
merged[record.ExternalID] = record
|
|
continue
|
|
}
|
|
merged[record.ExternalID] = mergeRecords(existing, record)
|
|
}
|
|
|
|
records := make([]Record, 0, len(merged))
|
|
for _, record := range merged {
|
|
records = append(records, record)
|
|
}
|
|
// The account watchlist rides along with the history import. Best
|
|
// effort: a watchlist fetch failure downgrades to a warning so the
|
|
// watch-history import still completes (issue #245).
|
|
if p.accountToken != "" {
|
|
items, watchlistWarnings, err := p.client.FetchWatchlist(ctx, p.accountToken)
|
|
if err != nil {
|
|
warnings = append(warnings, fmt.Sprintf("watchlist fetch failed: %v", err))
|
|
} else {
|
|
warnings = append(warnings, watchlistWarnings...)
|
|
for _, item := range items {
|
|
records = append(records, NormalizePlexWatchlistItem(item))
|
|
}
|
|
}
|
|
}
|
|
|
|
return records, warnings, nil
|
|
}
|
|
|
|
func (p *PlexServerProvider) fetchSeriesMetadata(ctx context.Context, items []PlexItem, warnings *[]string) map[string]*PlexItem {
|
|
seen := make(map[string]struct{})
|
|
var seriesKeys []string
|
|
for _, item := range items {
|
|
if item.Type != "episode" || item.GrandparentRatingKey == "" {
|
|
continue
|
|
}
|
|
if _, ok := seen[item.GrandparentRatingKey]; ok {
|
|
continue
|
|
}
|
|
seen[item.GrandparentRatingKey] = struct{}{}
|
|
seriesKeys = append(seriesKeys, item.GrandparentRatingKey)
|
|
}
|
|
|
|
result := make(map[string]*PlexItem, len(seriesKeys))
|
|
for _, key := range seriesKeys {
|
|
meta, err := p.client.FetchMetadata(ctx, p.baseURL, p.token, key)
|
|
if err != nil {
|
|
slog.WarnContext(ctx, "plex history import: failed to fetch series metadata", "component", "historyimport", "rating_key", key, "error", err)
|
|
*warnings = append(*warnings, fmt.Sprintf("failed to fetch series metadata for %s: %v", key, err))
|
|
continue
|
|
}
|
|
if meta != nil {
|
|
result[key] = meta
|
|
}
|
|
}
|
|
return result
|
|
}
|