Merge pull request #3673 from Bhashinee/master

Fix getting 404 response when observability is enabled
wso2 · Oct 9, 2024 · e2be222 · e2be222
2 parents 8b6d3d9 + 084650d
commit e2be222
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/...y/src/main/java/org/wso2/micro/integrator/observability/metric/handler/MetricHandler.java b/...y/src/main/java/org/wso2/micro/integrator/observability/metric/handler/MetricHandler.java
@@ -318,11 +318,10 @@ private String getApiName(String contextPath, MessageContext synCtx) {
             if (RESTUtils.matchApiPath(contextPath, apiContextPath)) {
                 apiName = api.getName();
                 synCtx.setProperty(RESTConstants.PROCESSED_API, api);
-                // if we match to a versioned API, search should stop.
-                // else check other API's to see if there is a match
-                if (StringUtils.isNotEmpty(api.getVersion())) {
-                    break;
-                }
+                // Since the APIs are already sorted in descending order, we should stop at the first match with the context path.
+                // Continuing the loop could result in matching a path that only shares the same starting string.
+                // Ex: /test/ API context path will match with /test/1.0.0
+                break;
             }
         }
         return apiName;