mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
4102219754
* fork: own SigNoz platform deps under hanzoai, repath imports off upstream brand
Phase 1 of the full-fork mandate: eliminate upstream-branded SigNoz modules,
own them as public hanzoai forks, and repath all imports to hanzoai paths.
Owned deps (new public hanzoai forks, module renamed to hanzoai path):
github.com/SigNoz/signoz-otel-collector v0.144.3
-> github.com/hanzoai/signoz-otel-collector v0.144.6 (module renamed)
github.com/SigNoz/clickhouse-go-mock v0.14.0
-> github.com/hanzoai/clickhouse-go-mock v0.14.1 (module renamed)
github.com/SigNoz/govaluate v0.0.0-20240203125216-988004ccc7fd
-> github.com/hanzoai/govaluate v0.1.0 (module renamed)
github.com/SigNoz/expr (replace target for github.com/expr-lang/expr)
-> github.com/hanzoai/expr v1.17.8 (upstream module path preserved,
consumed via replace exactly like the prior SigNoz/expr fork)
In-repo repath: the vendored SigNoz source tree in pkg/, ee/, cmd/ is now
self-referenced as github.com/hanzoai/o11y/... instead of
github.com/SigNoz/signoz/... (1300+ import lines across 377 files), matching
the 750 files already on the hanzoai path. Zero SigNoz-branded module
references remain in go.mod or any .go import.
Generic ecosystem libraries (golang.org/x, google.golang.org, prometheus,
opentelemetry, gin, cobra, luxfi/*, etc.) are left untouched — only the
SigNoz platform fork is owned.
Pre-existing (NOT introduced here): origin/main does not `go build ./...`
because 22 packages are imported but absent from the vendored tree; 14 of
them (roletypes, grammar, cloudintegrations, resourcefilter, integrationtypes,
metricsexplorer, metrics_explorer, times, agg_rewrite, bucket_cache,
sqlitesqlstore, sqlschema/postgressqlschema, sqlstore/postgressqlstore,
cloudintegrations/services) exist in no upstream SigNoz version and must be
vendored into hanzoai/o11y from hanzoai/signoz@770f464f to finish. This
repath is orthogonal to that gap.
* docs(LLM.md): fork boundary map + pre-existing compile-gap inventory
---------
Co-authored-by: Hanzo Dev <[email protected]>
77 lines
1.8 KiB
Go
77 lines
1.8 KiB
Go
package middleware
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/hanzoai/o11y/pkg/errors"
|
|
)
|
|
|
|
const (
|
|
headerName string = "timeout"
|
|
)
|
|
|
|
type Timeout struct {
|
|
logger *slog.Logger
|
|
excluded map[string]struct{}
|
|
// The default timeout
|
|
defaultTimeout time.Duration
|
|
// The max allowed timeout
|
|
maxTimeout time.Duration
|
|
}
|
|
|
|
func NewTimeout(logger *slog.Logger, excludedRoutes []string, defaultTimeout time.Duration, maxTimeout time.Duration) *Timeout {
|
|
excluded := make(map[string]struct{}, len(excludedRoutes))
|
|
for _, route := range excludedRoutes {
|
|
excluded[route] = struct{}{}
|
|
}
|
|
|
|
if defaultTimeout.Seconds() == 0 {
|
|
defaultTimeout = 60 * time.Second
|
|
}
|
|
|
|
if maxTimeout == 0 {
|
|
maxTimeout = 600 * time.Second
|
|
}
|
|
|
|
return &Timeout{
|
|
logger: logger.With(slog.String("pkg", pkgname)),
|
|
excluded: excluded,
|
|
defaultTimeout: defaultTimeout,
|
|
maxTimeout: maxTimeout,
|
|
}
|
|
}
|
|
|
|
func (middleware *Timeout) Wrap(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
|
|
if _, ok := middleware.excluded[req.URL.Path]; !ok {
|
|
actual := middleware.defaultTimeout
|
|
incoming := req.Header.Get(headerName)
|
|
if incoming != "" {
|
|
parsed, err := time.ParseDuration(strings.TrimSpace(incoming) + "s")
|
|
if err != nil {
|
|
middleware.logger.WarnContext(req.Context(), "cannot parse timeout in header, using default timeout", slog.String("timeout", incoming), errors.Attr(err))
|
|
} else {
|
|
if parsed > middleware.maxTimeout {
|
|
actual = middleware.maxTimeout
|
|
} else {
|
|
actual = parsed
|
|
}
|
|
}
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(req.Context(), actual)
|
|
defer cancel()
|
|
|
|
req = req.WithContext(ctx)
|
|
next.ServeHTTP(rw, req)
|
|
return
|
|
}
|
|
|
|
next.ServeHTTP(rw, req)
|
|
})
|
|
}
|