Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove otel handler per function handler in router (#2664)

Browse Source 
Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2022-12-11 22:32:24 +05:30
committed by GitHub
parent 3ae1742953
commit 31f4f8c57e
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/router/httpTriggers.go
+2 -10
View File
@@ -39,7 +39,6 @@ import (
"github.com/fission/fission/pkg/throttler" "github.com/fission/fission/pkg/throttler"
"github.com/fission/fission/pkg/utils" "github.com/fission/fission/pkg/utils"
"github.com/fission/fission/pkg/utils/metrics" "github.com/fission/fission/pkg/utils/metrics"
"github.com/fission/fission/pkg/utils/otel"
) )
// HTTPTriggerSet represents an HTTP trigger set // HTTPTriggerSet represents an HTTP trigger set
@@ -200,12 +199,7 @@ func (ts *HTTPTriggerSet) getRouter(fnTimeoutMap map[types.UID]int) *mux.Router
} }
} }
var handler http.Handler handler := http.HandlerFunc(fh.handler)
if trigger.Spec.Prefix != nil && *trigger.Spec.Prefix != "" {
handler = otel.GetHandlerWithOTEL(http.HandlerFunc(fh.handler), *trigger.Spec.Prefix)
} else {
handler = otel.GetHandlerWithOTEL(http.HandlerFunc(fh.handler), trigger.Spec.RelativeURL)
}
if trigger.Spec.Prefix != nil && *trigger.Spec.Prefix != "" { if trigger.Spec.Prefix != nil && *trigger.Spec.Prefix != "" {
prefix := *trigger.Spec.Prefix prefix := *trigger.Spec.Prefix
@@ -269,11 +263,9 @@ func (ts *HTTPTriggerSet) getRouter(fnTimeoutMap map[types.UID]int) *mux.Router
unTapServiceTimeout: ts.unTapServiceTimeout, unTapServiceTimeout: ts.unTapServiceTimeout,
} }
var handler http.Handler
internalRoute := utils.UrlForFunction(fn.ObjectMeta.Name, fn.ObjectMeta.Namespace) internalRoute := utils.UrlForFunction(fn.ObjectMeta.Name, fn.ObjectMeta.Namespace)
internalPrefixRoute := internalRoute + "/" internalPrefixRoute := internalRoute + "/"
handler = otel.GetHandlerWithOTEL(http.HandlerFunc(fh.handler), internalRoute) handler := http.HandlerFunc(fh.handler)
muxRouter.Handle(internalRoute, handler) muxRouter.Handle(internalRoute, handler)
muxRouter.PathPrefix(internalPrefixRoute).Handler(handler) muxRouter.PathPrefix(internalPrefixRoute).Handler(handler)
ts.logger.Debug("add internal handler and prefix route for function", zap.String("router", internalRoute), zap.Any("function", fn)) ts.logger.Debug("add internal handler and prefix route for function", zap.String("router", internalRoute), zap.Any("function", fn))