Fix merge conflict + Address PR Comment

Author: ginaxu1

exchange/consent-engine/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"log/slog"
 	"net/http"
 	"os"
@@ -129,14 +128,9 @@ func main() {
 		IdleTimeout:  60 * time.Second,
 	}
 
-<<<<<<< HEAD
-	// Wrap the mux with monitoring and then CORS from v1 router
-	handler := v1Router.ApplyCORS(monitoring.HTTPMetricsMiddleware(mux))
-=======
-	// Wrap the mux with metrics (outermost) and CORS middleware
+	// Wrap the mux with metrics (outermost) and then CORS from v1 router
 	// Metrics must be outermost to capture all requests, including CORS-blocked ones
-	handler := monitoring.HTTPMetricsMiddleware(corsMiddleware(mux))
->>>>>>> 7f25a11 (connect CE and PDP to observabilit stack)
+	handler := monitoring.HTTPMetricsMiddleware(v1Router.ApplyCORS(mux))
 	httpServer := utils.CreateServer(serverConfig, handler)
 
 	// Start server with graceful shutdown

exchange/shared/monitoring/metrics.go

@@ -138,20 +138,18 @@ func normalizeRoute(path string) string {
 	fullPath := "/" + strings.Join(parts, "/")
 
 	routesMu.RLock()
+	defer routesMu.RUnlock()
 	// Check exact static routes first (O(1) lookup)
 	if exactMatch, exists := routes[fullPath]; exists && exactMatch {
-		routesMu.RUnlock()
 		return fullPath
 	}
 
 	// Match against registered templates
 	for _, template := range routeTemplates {
 		if matchesTemplate(fullPath, template, parts) {
-			routesMu.RUnlock()
 			return template
 		}
 	}
-	routesMu.RUnlock()
 
 	// Fallback: detect ID patterns for unregistered routes (checks all segments)
 	if len(parts) == 1 {