Consolidate to use one JAX-RS filter from `com.ibm.ws.jaxrs.2.x.monitor` for MP Metrics 5.x #28298

Channyboy · 2024-04-29T21:01:52Z

fixes #24693
#build

LibbyBot · 2024-04-29T21:02:09Z

Your personal build request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=6957bb05-dadf-451f-91ef-62e91e80e288

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-04-29T22:03:55Z

Your personal build request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=561c3812-6a38-4f42-9d8d-15e1d617f07f

Target locations of links might be accessible only to IBM employees.

Channyboy · 2024-04-30T17:52:38Z

#build
#libby

…r for MP Metrics 5.x

Channyboy · 2024-04-30T17:58:52Z

...stfulWS.mpMetrics.filter/src/io/openliberty/restfulws/mpmetrics/MonitorAppStateListener.java

@@ -109,37 +75,4 @@ public void setMonitorMetricsHandler(MonitorMetricsHandler monitorMetricsHandler
        monitorMetricsHandler = monitorMetricsHandlerService;
    }

-    @Activate
-    protected void activate(ComponentContext context, Map<String, Object> properties) {


This is related to disabling the filter if the "REST" string is not part of the filter attribute for the monitor element in serer.xml. But since we are removing the filter and using a callback mechanism instead, its no longer needed here.

Channyboy · 2024-04-30T17:58:59Z

...stfulWS.mpMetrics.filter/src/io/openliberty/restfulws/mpmetrics/MonitorAppStateListener.java

@@ -39,20 +31,6 @@ public class MonitorAppStateListener implements ApplicationStateListener {

    static MonitorMetricsHandler monitorMetricsHandler;

-    private final static String MONITORING_GROUP_FILTER = "filter";


This is related to disabling the filter if the "REST" string is not part of the filter attribute for the monitor element in serer.xml. But since we are removing the filter and using a callback mechanism instead, its no longer needed here.

Channyboy · 2024-04-30T17:59:25Z

...stfulWS.mpMetrics.filter/src/io/openliberty/restfulws/mpmetrics/MonitorAppStateListener.java

-         * JaxRsMonitorFilter class for more information.
-         *
-         */
-        if (appInfo.getClass().getName().endsWith("EARApplicationInfoImpl")) {


no longer using a filter in this bundle, therefore no longer need to resolve such information.

Channyboy · 2024-04-30T18:00:54Z

dev/com.ibm.ws.jaxrs.2.x.monitor/src/com/ibm/ws/jaxrs/monitor/JaxRsMonitorFilter.java

+                    statsContext.monitorKey.statsMethodName);
+
+            /*
+             * If we have a MP5RestMetricsCallback service set, follow through to create


creating REST metric (for mp metrics 5.x ( right when we create the MBean)

LibbyBot · 2024-04-30T18:19:56Z

Your personal build request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=4ff34d68-7039-4fdb-a824-7beb2bf5a8c2

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-04-30T18:20:04Z

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_4gdtoAcVEe-9IeXbkm35aA

Target locations of links might be accessible only to IBM employees.

fmhwong · 2024-04-30T18:39:08Z

...stfulWS.mpMetrics.filter/src/io/openliberty/restfulws/mpmetrics/RestMetricsCallbackImpl.java

+     * @param statsKey the appName[/moduleName]/class/method(params...)
+     * @return the derived appName
+     */
+    private String resolveAppNameFromStatsKey(String statsKey) {


Can an exception be thrown here rather than using FAILURE_STRING?

new commit to address this

Channyboy · 2024-04-30T20:54:18Z

#build
#libby

LibbyBot · 2024-04-30T20:54:31Z

Your personal build request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=ae792f31-1429-4a0d-9562-df9553403578

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-04-30T20:54:33Z

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_dwnk4AcrEe-9IeXbkm35aA

Target locations of links might be accessible only to IBM employees.

fmhwong · 2024-04-30T21:18:11Z

...stfulWS.mpMetrics.filter/src/io/openliberty/restfulws/mpmetrics/RestMetricsCallbackImpl.java

@@ -12,6 +12,7 @@
 *******************************************************************************/
 package io.openliberty.restfulws.mpmetrics;

+import java.nio.charset.MalformedInputException;


Unused import

fmhwong · 2024-04-30T21:18:20Z

...stfulWS.mpMetrics.filter/src/io/openliberty/restfulws/mpmetrics/RestMetricsCallbackImpl.java

@@ -29,6 +30,7 @@

 import com.ibm.websphere.ras.Tr;
 import com.ibm.websphere.ras.TraceComponent;
+import com.ibm.ws.ffdc.annotation.FFDCIgnore;


Unused import

LibbyBot · 2024-05-01T03:05:02Z

https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=4ff34d68-7039-4fdb-a824-7beb2bf5a8c2 completed.

LibbyBot · 2024-05-01T04:30:40Z

https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=ae792f31-1429-4a0d-9562-df9553403578 has errors/failures.

Channyboy · 2024-05-01T04:50:32Z

#build
#libby

LibbyBot · 2024-05-01T04:50:45Z

Your personal build request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=25afb646-3561-4ea9-b3ae-30197eef10c8

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-05-01T04:50:49Z

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/__5TbcAdtEe-9IeXbkm35aA

Target locations of links might be accessible only to IBM employees.

LibbyBot · 2024-05-01T04:50:51Z

Code analysis and actions

DO NOT DELETE THIS COMMENT.

12 product code files were changed.
Please describe in a separate comment how you tested your changes.
1 infrastructure code files were changed.

LibbyBot · 2024-05-01T06:56:21Z

The build Channyboy-28298-20240430-1128
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_4gdtoAcVEe-9IeXbkm35aA
completed successfully!

LibbyBot · 2024-05-01T09:59:33Z

The build Channyboy-28298-20240430-1403
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_dwnk4AcrEe-9IeXbkm35aA
completed successfully!

fmhwong

LGTM

LibbyBot · 2024-05-01T15:53:49Z

https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=25afb646-3561-4ea9-b3ae-30197eef10c8 has errors/failures.

LibbyBot · 2024-05-01T17:34:19Z

The build Channyboy-28298-20240430-2200
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/__5TbcAdtEe-9IeXbkm35aA
completed successfully!

Channyboy · 2024-05-06T19:24:34Z

Reverting due to issue with #28351 since we don't want to introduce the bug into release (and not enough time to incorporate fix)

Channyboy marked this pull request as draft April 29, 2024 21:02

LibbyBot added the CLA Signed label Apr 29, 2024

Channyboy force-pushed the RESTFilterExperiment branch 2 times, most recently from 02578a0 to be487c7 Compare April 30, 2024 17:36

OpenLiberty deleted a comment from LibbyBot Apr 30, 2024

Consolidate to use one JAX-RS filter from com.ibm.ws.jaxrs.2.x.monito…

a94afca

…r for MP Metrics 5.x

Channyboy force-pushed the RESTFilterExperiment branch from be487c7 to a94afca Compare April 30, 2024 17:56

Channyboy commented Apr 30, 2024

View reviewed changes

Channyboy requested a review from fmhwong April 30, 2024 18:00

Channyboy commented Apr 30, 2024

View reviewed changes

fmhwong reviewed Apr 30, 2024

View reviewed changes

Handle error better

d38d29e

fmhwong reviewed Apr 30, 2024

View reviewed changes

remove unused imports

156761c

Channyboy requested a review from fmhwong May 1, 2024 04:49

fmhwong approved these changes May 1, 2024

View reviewed changes

Channyboy marked this pull request as ready for review May 1, 2024 19:31

Channyboy merged commit 0877a4a into OpenLiberty:integration May 1, 2024
3 of 4 checks passed

Channyboy changed the title ~~Rest filter experiment~~ Consolidate MP Metrics JAX-RS/RESTful-WS filters to use only one in com.ibm.ws.jaxrs.2.x.monitor May 1, 2024

Channyboy changed the title ~~Consolidate MP Metrics JAX-RS/RESTful-WS filters to use only one in com.ibm.ws.jaxrs.2.x.monitor~~ Consolidate to use one JAX-RS filter from com.ibm.ws.jaxrs.2.x.monitor for MP Metrics 5.x May 1, 2024

jdmcclur mentioned this pull request May 6, 2024

The new metrics RestMetricsCallbackImpl not working when MPGraphQL is enabled. #28351

Closed

Channyboy mentioned this pull request May 6, 2024

Revert "Consolidate to use one JAX-RS filter from com.ibm.ws.jaxrs.2.x.monitor for MP Metrics 5.x" #28353

Merged

LibbyBot mentioned this pull request May 6, 2024

Re-introduce change reverted from 28298 #28354

Closed

Channyboy mentioned this pull request May 7, 2024

Consolidate to use one JAX-RS filter from com.ibm.ws.jaxrs.2.x.monitor for MP Metrics 5.x (+ dynamic service fix) #28364

Merged

jhanders34 added the performance label May 10, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidate to use one JAX-RS filter from `com.ibm.ws.jaxrs.2.x.monitor` for MP Metrics 5.x #28298

Consolidate to use one JAX-RS filter from `com.ibm.ws.jaxrs.2.x.monitor` for MP Metrics 5.x #28298

Channyboy commented Apr 29, 2024 •

edited

LibbyBot commented Apr 29, 2024

LibbyBot commented Apr 29, 2024

Channyboy commented Apr 30, 2024

Channyboy Apr 30, 2024

Channyboy Apr 30, 2024

Channyboy Apr 30, 2024

Channyboy Apr 30, 2024

LibbyBot commented Apr 30, 2024

LibbyBot commented Apr 30, 2024

fmhwong Apr 30, 2024

Channyboy Apr 30, 2024

Channyboy commented Apr 30, 2024

LibbyBot commented Apr 30, 2024

LibbyBot commented Apr 30, 2024

fmhwong Apr 30, 2024

fmhwong Apr 30, 2024

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

Channyboy commented May 1, 2024

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

fmhwong left a comment

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

Channyboy commented May 6, 2024

		@@ -39,20 +31,6 @@ public class MonitorAppStateListener implements ApplicationStateListener {

		static MonitorMetricsHandler monitorMetricsHandler;

		private final static String MONITORING_GROUP_FILTER = "filter";

Consolidate to use one JAX-RS filter from com.ibm.ws.jaxrs.2.x.monitor for MP Metrics 5.x #28298

Consolidate to use one JAX-RS filter from com.ibm.ws.jaxrs.2.x.monitor for MP Metrics 5.x #28298

Conversation

Channyboy commented Apr 29, 2024 • edited

LibbyBot commented Apr 29, 2024

LibbyBot commented Apr 29, 2024

Channyboy commented Apr 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LibbyBot commented Apr 30, 2024

LibbyBot commented Apr 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Channyboy commented Apr 30, 2024

LibbyBot commented Apr 30, 2024

LibbyBot commented Apr 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

Channyboy commented May 1, 2024

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

Code analysis and actions

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

fmhwong left a comment

Choose a reason for hiding this comment

LibbyBot commented May 1, 2024

LibbyBot commented May 1, 2024

Channyboy commented May 6, 2024

Consolidate to use one JAX-RS filter from `com.ibm.ws.jaxrs.2.x.monitor` for MP Metrics 5.x #28298

Consolidate to use one JAX-RS filter from `com.ibm.ws.jaxrs.2.x.monitor` for MP Metrics 5.x #28298

Channyboy commented Apr 29, 2024 •

edited