Skip to content
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.

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

fix: add support for Hikari pool metrics [DHIS2-15419] #15623

Merged
merged 5 commits into from
Nov 8, 2023

Conversation

netroms
Copy link
Contributor

@netroms netroms commented Nov 8, 2023

Summary

  • Adds support for collecting metrics from the Hikari DB pool.
  • Before this fix, enabling metrics with the property monitoring.dbpool.enabled = on, when also the Hikari pool is enabled with the property db.pool.type = hikari , would cause the server failing to start.

JIRA:

DHIS2-15419

@netroms netroms changed the title fix: add support for Hikari pool metrics fix: add support for Hikari pool metrics [DHIS2-15419] Nov 8, 2023
Copy link

codecov bot commented Nov 8, 2023

Codecov Report

Merging #15623 (4e3eed1) into master (178839d) will increase coverage by 0.00%.
Report is 10 commits behind head on master.
The diff coverage is 2.08%.

@@            Coverage Diff            @@
##             master   #15623   +/-   ##
=========================================
  Coverage     66.23%   66.23%           
- Complexity    31250    31264   +14     
=========================================
  Files          3485     3487    +2     
  Lines        129791   129811   +20     
  Branches      15145    15146    +1     
=========================================
+ Hits          85965    85980   +15     
- Misses        36741    36748    +7     
+ Partials       7085     7083    -2     
Flag Coverage Δ
integration 49.80% <2.08%> (+0.01%) ⬆️
integration-h2 32.41% <2.08%> (-0.01%) ⬇️
unit 30.34% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
.../monitoring/metrics/jdbc/C3p0MetadataProvider.java 0.00% <ø> (ø)
...isp/dhis/monitoring/metrics/jdbc/PoolMetadata.java 0.00% <ø> (ø)
.../monitoring/metrics/jdbc/AbstractPoolMetadata.java 0.00% <0.00%> (ø)
...ng/metrics/jdbc/CompositePoolMetadataProvider.java 0.00% <0.00%> (ø)
...monitoring/metrics/jdbc/PoolMetadataProviders.java 0.00% <0.00%> (ø)
...onitoring/metrics/DataSourcePoolMetricsConfig.java 16.66% <11.11%> (-7.15%) ⬇️
...onitoring/metrics/jdbc/HikariMetadataProvider.java 0.00% <0.00%> (ø)
...hisp/dhis/monitoring/metrics/jdbc/PoolMetrics.java 0.00% <0.00%> (ø)
...oring/metrics/jdbc/HikariPoolMetadataAccessor.java 0.00% <0.00%> (ø)

... and 21 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 178839d...4e3eed1. Read the comment docs.

Copy link

sonarqubecloud bot commented Nov 8, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@netroms netroms merged commit 94e33c8 into master Nov 8, 2023
18 checks passed
@netroms netroms deleted the DHIS2-15419_2.41 branch November 8, 2023 08:49
netroms added a commit that referenced this pull request Sep 4, 2024
* fix: add support for Hikari pool metrics

(cherry picked from commit 94e33c8)
netroms added a commit that referenced this pull request Sep 4, 2024
* fix: add support for Hikari pool metrics

(cherry picked from commit 94e33c8)
netroms added a commit that referenced this pull request Sep 6, 2024
* fix: add support for Hikari pool metrics [DHIS2-15419] (#15623)

(cherry picked from commit 94e33c8)
netroms added a commit that referenced this pull request Sep 6, 2024
* fix: add support for Hikari pool metrics [DHIS2-15419] (#15623)

(cherry picked from commit 94e33c8)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants