Merge branch 'master' into remake-traces

graph-explorer/pkg/server/http/server.go

@@ -2,6 +2,7 @@ package http
 
 import (
 	"github.com/asim/go-micro/v3"
+	chimiddleware "github.com/go-chi/chi/middleware"
 	svc "github.com/owncloud/ocis/graph-explorer/pkg/service/v0"
 	"github.com/owncloud/ocis/graph-explorer/pkg/version"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
@@ -26,8 +27,8 @@ func Server(opts ...Option) (http.Service, error) {
 		svc.Logger(options.Logger),
 		svc.Config(options.Config),
 		svc.Middleware(
-			middleware.RealIP,
-			middleware.RequestID,
+			chimiddleware.RealIP,
+			chimiddleware.RequestID,
 			middleware.NoCache,
 			middleware.Cors,
 			middleware.Secure,