mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
zeekayandHanzo Dev
3011b92ea4
gorilla/mux, otelmux, gorilla/handlers and rs/cors leave go.mod. Every route the runtime serves is a zip route on a zip group: 233 from the apiserver tree, 134 from query-service, 367 total — the same 367 the mount publishes. pkg/http/routing is the one registration surface. It exists because a registration carries three facts zip has no slot for, and the tree this replaces recovered all three PER REQUEST by asking the router what it had just matched: the bound segments, the path template, and the route's declared resources. mux.CurrentRoute(req).GetHandler() was type-asserted back to handler.Handler in two separate packages to re-derive at request time what was already known once at boot. Stating them at registration deletes both lookups. The middleware chain is composed at the LEAF rather than registered ambient, because Audit keys on the route template and Resource resolves the route's declared resources — ambient middleware runs before the router has matched, so both would read an empty route. Per-leaf composition reproduces the order the old tree ran in exactly: match, then middleware, then handler. Duplicate registration now panics at boot; gorilla let the first one win. The Sentry ingest constraint becomes fiber's own guid — a UUID parse instead of a hand-written character class. Paths keep their public brace spelling in the source and in the table; the respelling happens in one function. The standalone server hands its listener to the app, so streams and the websocket upgrade run native fasthttp. Counted, not asserted: routes_test.go in the apiserver pins 233 against the real AddToRouter, routing_test.go pins the table against the router itself. This repo has already shipped 83 typed ops that reached no router while the suite stayed green — an uncalled func is legal Go, so arithmetic is the test. Co-authored-by: Hanzo Dev <[email protected]>
106 lines
2.8 KiB
Go
106 lines
2.8 KiB
Go
package handler
|
|
|
|
import (
|
|
"net/http"
|
|
"reflect"
|
|
|
|
"github.com/swaggest/jsonschema-go"
|
|
openapigo "github.com/swaggest/openapi-go"
|
|
"github.com/swaggest/rest/openapi"
|
|
)
|
|
|
|
// OpenAPIExample is a named example for an OpenAPI operation.
|
|
type OpenAPIExample struct {
|
|
Name string
|
|
Summary string
|
|
Description string
|
|
Value any
|
|
}
|
|
|
|
// Def is the definition of an OpenAPI operation.
|
|
type OpenAPIDef struct {
|
|
ID string
|
|
Tags []string
|
|
Summary string
|
|
Description string
|
|
Request any
|
|
RequestQuery any
|
|
RequestContentType string
|
|
RequestExamples []OpenAPIExample
|
|
Response any
|
|
ResponseContentType string
|
|
SuccessStatusCode int
|
|
ErrorStatusCodes []int
|
|
Deprecated bool
|
|
SecuritySchemes []OpenAPISecurityScheme
|
|
}
|
|
|
|
type OpenAPISecurityScheme struct {
|
|
Name string
|
|
Scopes []string
|
|
}
|
|
|
|
// OpenAPICollector is a collector for OpenAPI operations.
|
|
type OpenAPICollector struct {
|
|
collector *openapi.Collector
|
|
}
|
|
|
|
func NewOpenAPICollector(reflector openapigo.Reflector) *OpenAPICollector {
|
|
c := openapi.NewCollector(reflector)
|
|
|
|
return &OpenAPICollector{
|
|
collector: c,
|
|
}
|
|
}
|
|
|
|
// Collect adds one registered route to the document. A route whose handler
|
|
// declares nothing contributes nothing — a plain http.HandlerFunc has no
|
|
// operation to describe, and that is not an error.
|
|
//
|
|
// It takes the registration's three values rather than a route object to walk,
|
|
// because a walk is a router's API and the document is not the router's
|
|
// business: the caller holds the table its own registrar recorded and hands over
|
|
// exactly what an operation is made of.
|
|
func (c *OpenAPICollector) Collect(method, path string, h http.Handler) error {
|
|
declared, ok := h.(Handler)
|
|
if !ok || path == "" || method == "" {
|
|
return nil
|
|
}
|
|
|
|
return c.collector.CollectOperation(method, path, c.collect(method, path, declared.ServeOpenAPI))
|
|
}
|
|
|
|
func (c *OpenAPICollector) collect(method string, path string, serveOpenAPIFunc ServeOpenAPIFunc) func(oc openapigo.OperationContext) error {
|
|
return func(oc openapigo.OperationContext) error {
|
|
// Serve the OpenAPI documentation for the handler
|
|
serveOpenAPIFunc(oc)
|
|
|
|
// If the handler has annotations, skip the collection
|
|
if c.collector.HasAnnotation(method, path) {
|
|
return nil
|
|
}
|
|
|
|
// Automatically sanitize the method and path
|
|
_, _, pathItems, err := openapigo.SanitizeMethodPath(method, path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// If there are path items, add them to the request structure
|
|
if len(pathItems) > 0 {
|
|
req := jsonschema.Struct{}
|
|
for _, p := range pathItems {
|
|
req.Fields = append(req.Fields, jsonschema.Field{
|
|
Name: "F" + p,
|
|
Tag: reflect.StructTag(`path:"` + p + `"`),
|
|
Value: "",
|
|
})
|
|
}
|
|
|
|
oc.AddReqStructure(req)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
}
|