Skip to content

Commit

Permalink
Revert "Merge pull request wso2#3067 from Amila-Rukshan/jmx-monitoring"
Browse files Browse the repository at this point in the history
This reverts commit 4de1d0b, reversing
changes made to 12b81d7.
  • Loading branch information
slahirucd7 committed Nov 2, 2022
1 parent cf2c4fe commit d032842
Show file tree
Hide file tree
Showing 11 changed files with 1 addition and 465 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
import org.wso2.choreo.connect.enforcer.config.dto.TracingDTO;
import org.wso2.choreo.connect.enforcer.constants.APIConstants;
import org.wso2.choreo.connect.enforcer.constants.Constants;
import org.wso2.choreo.connect.enforcer.jmx.MBeanRegistrator;
import org.wso2.choreo.connect.enforcer.throttle.databridge.agent.conf.AgentConfiguration;
import org.wso2.choreo.connect.enforcer.util.BackendJwtUtils;
import org.wso2.choreo.connect.enforcer.util.FilterUtils;
Expand Down Expand Up @@ -236,8 +235,6 @@ private void populateAuthService(Service cdsAuth) {
authDto.setMaxMessageSize(cdsAuth.getMaxMessageSize());

ThreadPoolConfig threadPool = new ThreadPoolConfig();
MBeanRegistrator.registerMBean(threadPool);

threadPool.setCoreSize(cdsAuth.getThreadPool().getCoreSize());
threadPool.setKeepAliveTime(cdsAuth.getThreadPool().getKeepAliveTime());
threadPool.setMaxSize(cdsAuth.getThreadPool().getMaxSize());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
* Holds the configurations related to threading of gRPC netty server.
*/
public class ThreadPoolConfig implements ThreadPoolConfigMBean {
public class ThreadPoolConfig {
private int coreSize;
private int maxSize;
private int keepAliveTime;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@
import org.wso2.choreo.connect.enforcer.constants.HttpConstants;
import org.wso2.choreo.connect.enforcer.constants.RouterAccessLogConstants;
import org.wso2.choreo.connect.enforcer.deniedresponse.DeniedResponsePreparer;
import org.wso2.choreo.connect.enforcer.jmx.JMXUtils;
import org.wso2.choreo.connect.enforcer.metrics.MetricsExporter;
import org.wso2.choreo.connect.enforcer.metrics.MetricsManager;
import org.wso2.choreo.connect.enforcer.metrics.jmx.impl.ExtAuthMetrics;
import org.wso2.choreo.connect.enforcer.server.HttpRequestHandler;
import org.wso2.choreo.connect.enforcer.tracing.TracingConstants;
import org.wso2.choreo.connect.enforcer.tracing.TracingContextHolder;
Expand Down Expand Up @@ -95,9 +93,6 @@ public void check(CheckRequest request, StreamObserver<CheckResponse> responseOb
MetricsExporter metricsExporter = MetricsManager.getInstance();
metricsExporter.trackMetric("enforcerLatency", System.currentTimeMillis() - starTimestamp);
}
if (JMXUtils.isJMXMetricsEnabled()) {
ExtAuthMetrics.getInstance().recordMetric(System.currentTimeMillis() - starTimestamp);
}
}
}

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit d032842

Please sign in to comment.