Skip to content

remove idleCount in druid plugin #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 3 commits into from
Apr 10, 2024
Merged

remove idleCount in druid plugin #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98efe43
remove idleCount in druid plugin
AlchemyDing Apr 10, 2024
5a990cc
remove CI idleCount
AlchemyDing Apr 10, 2024
0ed5072
Update expectedData.yaml
wu-sheng Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .../java/org/apache/skywalking/apm/plugin/druid/v1/PoolingAddDruidDataSourceInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,9 @@ public void handleMethodException(Class clazz, Method method, Object[] allArgume
}

private Map<String, Function<DruidDataSourceMBean, Supplier<Double>>> getMetrics() {
Map<String, Function<DruidDataSourceMBean, Supplier<Double>>> metricMap = new HashMap();
Map<String, Function<DruidDataSourceMBean, Supplier<Double>>> metricMap = new HashMap<>();
metricMap.put("activeCount", (DruidDataSourceMBean druidDataSource) -> () -> (double) druidDataSource.getActiveCount());
metricMap.put("poolingCount", (DruidDataSourceMBean druidDataSource) -> () -> (double) druidDataSource.getPoolingCount());
metricMap.put("idleCount", (DruidDataSourceMBean druidDataSource) -> () -> (double) (druidDataSource.getPoolingCount() - druidDataSource.getActiveCount()));
metricMap.put("lockQueueLength", (DruidDataSourceMBean druidDataSource) -> () -> (double) druidDataSource.getLockQueueLength());
metricMap.put("maxWaitThreadCount", (DruidDataSourceMBean druidDataSource) -> () -> (double) druidDataSource.getMaxWaitThreadCount());
metricMap.put("commitCount", (DruidDataSourceMBean druidDataSource) -> () -> (double) druidDataSource.getCommitCount());
Expand Down
8 changes: 1 addition & 7 deletions test/plugin/scenarios/druid-1.x-scenario/config/expectedData.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ segmentItems:
- {key: http.status_code, value: '200'}
meterItems:
- serviceName: druid-1.x-scenario
meterSize: 14
meterSize: 13
meters:
- meterId:
name: datasource
Expand All @@ -220,12 +220,6 @@ meterItems:
- {name: name, value: test_mysql-server:3306}
- {name: status, value: poolingCount}
singleValue: ge 0
- meterId:
name: datasource
tags:
- {name: name, value: test_mysql-server:3306}
- {name: status, value: idleCount}
singleValue: ge 0
- meterId:
name: datasource
tags:
Expand Down