Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion router/core/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,13 @@ func (r *Router) initModules(ctx context.Context) error {

moduleList = sortModules(moduleList)

// Router.postOriginHandlers registers HeaderPropagation.
// Then, the initModules function appends custom modules after that.
// As a result, HeaderPropagation is called first.
// Since HeaderPropagation always returns a new response object, the OnOriginResponse of custom modules will never be called.
// This is problematic, so Router.postOriginHandlers should place HeaderPropagation after the custom modules.
modulesPostOriginHandlers := make([]TransportPostHandler, 0, len(moduleList))

for _, moduleInfo := range moduleList {
now := time.Now()

Expand Down Expand Up @@ -673,7 +680,7 @@ func (r *Router) initModules(ctx context.Context) error {
}

if handler, ok := moduleInstance.(EnginePostOriginHandler); ok {
r.postOriginHandlers = append(r.postOriginHandlers, handler.OnOriginResponse)
modulesPostOriginHandlers = append(modulesPostOriginHandlers, handler.OnOriginResponse)
}

if handler, ok := moduleInstance.(TracePropagationProvider); ok {
Expand Down Expand Up @@ -703,6 +710,11 @@ func (r *Router) initModules(ctx context.Context) error {
)
}

for _, handler := range r.postOriginHandlers {
modulesPostOriginHandlers = append(modulesPostOriginHandlers, handler)
}
r.postOriginHandlers = modulesPostOriginHandlers

return nil
}

Expand Down