diff options
| author | Dave Henderson <dhenderson@gmail.com> | 2020-09-17 23:46:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-17 21:46:24 -0600 |
| commit | d16ede358a2ec049bda28bf37e79c9cfcaa64c29 (patch) | |
| tree | 9304f4b06287fa2cbeafda019a70556a00e119ee /modules/caddyhttp/routes.go | |
| parent | c82c231ba7ec7c400e4d48ab943f57a6b29a2a2a (diff) | |
metrics: Fix hidden panic while observing with bad exemplars (#3733)
* metrics: Fixing panic while observing with bad exemplars
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
* Minor cleanup
The server is already added to the context. So, we can simply use that
to get the server name, which is a field on the server.
* Add integration test for auto HTTP->HTTPS redirects
A test like this would have caught the problem in the first place
Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>
Diffstat (limited to 'modules/caddyhttp/routes.go')
| -rw-r--r-- | modules/caddyhttp/routes.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/modules/caddyhttp/routes.go b/modules/caddyhttp/routes.go index be23d39..83e6354 100644 --- a/modules/caddyhttp/routes.go +++ b/modules/caddyhttp/routes.go @@ -243,12 +243,9 @@ func wrapRoute(route Route) Middleware { // pointer into its own stack frame to preserve it so it // won't be overwritten in future loop iterations. func wrapMiddleware(ctx caddy.Context, mh MiddlewareHandler) Middleware { - // first, wrap the middleware with metrics instrumentation - metricsHandler := newMetricsInstrumentedHandler( - serverNameFromContext(ctx.Context), - caddy.GetModuleName(mh), - mh, - ) + // wrap the middleware with metrics instrumentation + metricsHandler := newMetricsInstrumentedHandler(caddy.GetModuleName(mh), mh) + return func(next Handler) Handler { // copy the next handler (it's an interface, so it's // just a very lightweight copy of a pointer); this |