Merge branch 'wso2:master' into master

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,31 @@
+name: "🐞 Report a Bug"
+description: Create an issue if something does not work as expected.
+labels: ["Type/Bug"]
+body:
+  - type: textarea
+    id: background
+    attributes:
+      label: Description
+      description: Please share a clear and concise description of the problem.
+      placeholder: Description
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to Reproduce
+      description: List the steps you followed when you encountered the issue. Provide sample source code to reproduce the issue where applicable.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Enter product/component version.
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment Details (with versions)
+      description: Mention the environment details (OS, Client, etc.) that the product is running on.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: General Question
-    url: https://stackoverflow.com/questions/tagged/wso2-micro-integrator
-    about: "If you have a question then please ask on Stack Overflow using the #wso2-micro-integrator tag."
-  - name: Chat on help-micro-integrator Discord Channel
-    url: https://discord.com/invite/Xa5VubmThw
-    about: "Chat about anything else with the community."
+- name: '📚 Documentation Issue'
+  about: Request a new article, missing topic, or report an issue if a topic is incorrect in the current documentation.
+  url: https://github.com/wso2/docs-mi/issues/new/choose
+- name: General Question
+  url: https://stackoverflow.com/questions/tagged/wso2-micro-integrator
+  about: "If you have a question then please ask on Stack Overflow using the #wso2-micro-integrator tag."
+- name: Chat on help-micro-integrator Discord Channel
+  url: https://discord.com/invite/Xa5VubmThw
+  about: "Chat about anything else with the community."

.github/ISSUE_TEMPLATE/improvement.yml

@@ -0,0 +1,25 @@
+name: "🚀 Improvement Request"
+description: Suggest an improvement to the product.
+labels: ["Type/Improvement"]
+body:
+  - type: textarea
+    id: limitation
+    attributes:
+      label: Current Limitation
+      description: Describe the the current limitation.
+    validations:
+      required: true
+  - type: textarea
+    id: suggestion
+    attributes:
+      label: Suggested Improvement
+      description: Describe the the improvement you suggest.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Enter component version.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/new-feature.yml

@@ -0,0 +1,32 @@
+name: "💡 New Feature Request"
+description: Suggest new functionality and features for the product.
+labels: ["Type/NewFeature"]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description: What is the problem this feature will solve?
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed Solution
+      description: Describe the solution you'd like to have.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives
+      description: Describe any alternatives have you considered
+    validations:
+      required: false
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Enter product/component version.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/task.yml

@@ -0,0 +1,18 @@
+name: "✍️ Create a Task"
+description: Create a new task.
+labels: ["Type/Task"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear description of what needs to be done.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Enter product/component version.
+    validations:
+      required: false

components/mediation/data-publishers/org.wso2.micro.integrator.observability/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;

components/mediation/tasks/org.wso2.micro.integrator.ntask.core/src/main/java/org/wso2/micro/integrator/ntask/coordination/task/TaskEventListener.java

@@ -75,12 +75,6 @@ public void memberAdded(NodeDetail nodeDetail) {
                 LOG.error("Exception occurred while resolving un assigned tasks upon member addition " + nodeDetail
                         .getNodeId(), e);
             }
-        } else if (clusterCoordinator.getThisNodeId().equals(nodeDetail.getNodeId())
-                && isMemberRejoinedAfterUnresponsiveness()) {
-            // This node became unresponsive and rejoined the cluster hence removing all tasks assigned to this node
-            // then start the scheduler again after cleaning the locally running tasks.
-            becameUnresponsive(nodeDetail.getNodeId());
-            reJoined(nodeDetail.getNodeId(), null);
         }
     }
 
@@ -120,7 +114,7 @@ public void becameUnresponsive(String nodeId) {
         // stop all running coordinated tasks.
         tasks.forEach(task -> {
             try {
-                taskManager.stopExecution(task);
+                taskManager.stopExecutionTemporarily(task);
             } catch (TaskException e) {
                 LOG.error("Unable to pause the task " + task, e);
             }
@@ -134,15 +128,6 @@ public void becameUnresponsive(String nodeId) {
         }
     }
 
-    /**
-     * Check whether the member has rejoined after being unresponsive.
-     *
-     * @return true if the member has rejoined after being unresponsive, false otherwise
-     */
-    public boolean isMemberRejoinedAfterUnresponsiveness() {
-        return taskManager.getLocallyRunningCoordinatedTasks().size() > 0;
-    }
-
 
     @Override
     public void reJoined(String nodeId, RDBMSMemberEventCallBack callBack) {

components/mediation/tasks/org.wso2.micro.integrator.ntask.core/src/main/java/org/wso2/micro/integrator/ntask/coordination/task/scehduler/CoordinatedTaskScheduler.java

@@ -121,7 +121,7 @@ private void checkInterrupted() throws InterruptedException {
                 // stop all running coordinated tasks.
                 tasks.forEach(task -> {
                     try {
-                        taskManager.stopExecution(task);
+                        taskManager.stopExecutionTemporarily(task);
                     } catch (TaskException e) {
                         LOG.error("Unable to pause the task " + task, e);
                     }