Merge pull request #3099 from DedunuKarunarathne/fix-404

Fix 404 errors for APIs when enabling MetricHandler
wso2 · Jun 19, 2024 · e032de0 · e032de0
2 parents 2206450 + 74a9200
commit e032de0
Showing 1 changed file with 5 additions and 1 deletion.
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
@@ -311,7 +311,11 @@ private void incrementInboundEndpointErrorCount(String name) {
     private String getApiName(String contextPath, MessageContext synCtx) {
         String apiName = null;
         for (API api : synCtx.getEnvironment().getSynapseConfiguration().getAPIs()) {
-            if (RESTUtils.matchApiPath(contextPath, api.getContext())) {
+            String apiContextPath = api.getContext();
+            if (api.getVersionStrategy().getVersion() != null) {
+                apiContextPath = apiContextPath + "/" + api.getVersionStrategy().getVersion();
+            }
+            if (RESTUtils.matchApiPath(contextPath, apiContextPath)) {
                 apiName = api.getName();
                 synCtx.setProperty(RESTConstants.PROCESSED_API, api);
                 // if we match to a versioned API, search should stop.