30fc7775a5
Modernizes several `internal/*` packages under the Go proxy, replaces
third-party forks with standard-library primitives, and brings the
test suite from near-zero to high coverage across the touched packages.
Package changes
- **`internal/errors`** — Rewrites the `pkg/errors` fork as a thin
wrapper
over stdlib `errors`. A single `withStack` struct captures stack
traces via `runtime.Callers`; `fmt.Errorf("%w", ...)` handles all
message wrapping. Restores `errors.Is`/`As`/`Unwrap` chain traversal
(silently broken in the fork) and deletes ~190 lines of stack/frame
formatting. `Is`, `As`, `Unwrap`, and `Join` are re-exported so
callers need a single import.
- **`internal/logger`** — Swaps stdlib `log.Logger` for `log/slog` JSON
handlers with UTC timestamps and custom level labels (`verb`, `debug`,
`warn`, `error`). Hides `withContextID` (no external callers).
- **`internal/sync`** — Converts `Map[K, V]` from a concrete struct to
an interface with a `NewMap` constructor for testability.
- **`internal/signal`** — Adds `signalNotify` / `osExit` indirections so
`InstallSignals` and `InstallForceQuit` can be exercised without real
OS signals or process termination.
- **`internal/utils`** — Drops deprecated `io/ioutil` and the stdlib
`errors` alias (the internal `errors` package re-exports what's
needed).
- **`internal/version`** — No code changes; fully covered by new tests.
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
44 lines
1.0 KiB
Go
44 lines
1.0 KiB
Go
// Copyright (c) 2026 Winlin
|
|
//
|
|
// SPDX-License-Identifier: MIT
|
|
package logger
|
|
|
|
import (
|
|
"context"
|
|
"crypto/rand"
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
)
|
|
|
|
type key string
|
|
|
|
var cidKey key = "cid.srsx.ossrs.org"
|
|
|
|
// GenerateContextID generates a random context id in string.
|
|
func GenerateContextID() string {
|
|
randomBytes := make([]byte, 32)
|
|
_, _ = rand.Read(randomBytes)
|
|
hash := sha256.Sum256(randomBytes)
|
|
hashString := hex.EncodeToString(hash[:])
|
|
cid := hashString[:7]
|
|
return cid
|
|
}
|
|
|
|
// WithContext creates a new context with cid, which will be used for log.
|
|
func WithContext(ctx context.Context) context.Context {
|
|
return withContextID(ctx, GenerateContextID())
|
|
}
|
|
|
|
// withContextID creates a new context with cid, which will be used for log.
|
|
func withContextID(ctx context.Context, cid string) context.Context {
|
|
return context.WithValue(ctx, cidKey, cid)
|
|
}
|
|
|
|
// ContextID returns the cid in context, or empty string if not set.
|
|
func ContextID(ctx context.Context) string {
|
|
if cid, ok := ctx.Value(cidKey).(string); ok {
|
|
return cid
|
|
}
|
|
return ""
|
|
}
|