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.

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

MP Metrics 5.0 support for 4.x #7139

Merged
merged 67 commits into from
Jul 14, 2023
Merged

MP Metrics 5.0 support for 4.x #7139

Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
b3d1193
Initial commit of MP based on Micrometer
tjquinno Jun 16, 2023
88e75c1
More tests; start feature work; start CDI work
tjquinno Jun 19, 2023
a0a8324
More tests; start feature work; start CDI work
tjquinno Jun 19, 2023
9d1ce27
Added basics for timers, gauges
tjquinno Jun 19, 2023
b19be5a
Improve formatter API; fix and expand tests; plug feature in; start o…
tjquinno Jun 20, 2023
97dc30d
Finish missing method impls in metric registry impl; improve formatte…
tjquinno Jun 20, 2023
e4a9a67
Fix some checkstyle, JavaDoc comments, etc.
tjquinno Jun 21, 2023
4693d83
Further style, etc. fixes
tjquinno Jun 21, 2023
c7b178e
metrics/api stable; metrics/metrics WIP
tjquinno Jun 22, 2023
ea53e8d
More improvements to metrics/api and metrics/metrics
tjquinno Jun 22, 2023
c08c7ce
Fixes to metrics/api and metrics/metrics mostly
tjquinno Jun 22, 2023
8cef669
Copyright, spotbugs fixes
tjquinno Jun 22, 2023
8aa27f2
Fix KPI metrics
tjquinno Jun 23, 2023
9002585
Rebasing
tjquinno Jun 23, 2023
f7b7b0e
Copyright and style fixes mostly
tjquinno Jun 23, 2023
3bdb3f6
Try older Prom client version
tjquinno Jun 23, 2023
093cd13
Further small fixes to accomodate MP metrics API changes
tjquinno Jun 23, 2023
318aa71
Fix isolated Prometheus support to deal with later release
tjquinno Jun 23, 2023
dc43b78
Remove temp metrics feature under MP metrics from bom
tjquinno Jun 23, 2023
eff3ade
Clean up tag handling and Prom. formatting
tjquinno Jun 23, 2023
07b0409
Centralize tag handling in existing SystemTagsManager
tjquinno Jun 24, 2023
608a2ce
Some MP clean-up; more to come - push for safekeeping
tjquinno Jun 24, 2023
aa2cc62
Improvements in tag handling for scopes, reject options requests now …
tjquinno Jun 25, 2023
5a24b46
More changes adapting to change in metrics API
tjquinno Jun 25, 2023
f929d00
Fix some tag handling and Prometheus output filtering
tjquinno Jun 25, 2023
c7c1a37
Add back JSON formatting; related fixes
tjquinno Jun 26, 2023
f2fb1eb
Fixes in JSON output rework; various fixes in examples and tests
tjquinno Jun 26, 2023
ea62a4b
A few more fixes in other components and style clean-up
tjquinno Jun 26, 2023
32e8038
A few more edits to FT
tjquinno Jun 26, 2023
18c562e
Fix dead store
tjquinno Jun 26, 2023
c459516
Return to using the deprecated RegistryType annotation (which is a qu…
tjquinno Jun 26, 2023
536debe
Add cross-scope validation of metadata and tag name sets for same-nam…
tjquinno Jun 27, 2023
7608958
Add metric name to error message for more clarity
tjquinno Jun 27, 2023
5f45d77
Enforce same-named metric restrictions within scope only, not across …
tjquinno Jun 27, 2023
9bc9d65
Fix some meter filtering for output; temporarily disable enforcement …
tjquinno Jun 27, 2023
62d8790
Add functional counter support
tjquinno Jun 28, 2023
f47739c
Improve system tag handling
tjquinno Jun 28, 2023
9e20514
Uncomment stringent consistency checking for tag name sets; try arq. …
tjquinno Jun 28, 2023
57f5169
Remove meters from archetype (meters are no longer part of metrics)
tjquinno Jun 28, 2023
73ad2b9
Restore JSON output to MetricsSupport for now
tjquinno Jun 28, 2023
3bcf1ec
Disable exemplar sample check for exemplar while we migrate exemplar …
tjquinno Jun 28, 2023
a7e0722
Fix KPI examples; it needs to look for gauge values now
tjquinno Jun 28, 2023
6ce3654
Add missing verison spec for Helidon artifact
tjquinno Jun 28, 2023
b326082
More fixes; change native test to check timers instead of simple time…
tjquinno Jun 28, 2023
b39de03
Need to use MP FT 4.0.2 to depend on correct MP metrics release
tjquinno Jun 28, 2023
b6f0eea
Adjust to removal of scope tag from JSON output
tjquinno Jun 28, 2023
f368262
Fix bug in deletion; add test (not the cause of the TCK problems, tho…
tjquinno Jun 28, 2023
08f08a4
Fix up JavaDoc link to match changes I made to the referenced method …
tjquinno Jun 28, 2023
4a0f8fc
Minor fix to JSON formatting and to bookstore functional test (to be …
tjquinno Jun 29, 2023
21da420
Handle per-metric enable/disable in formatting
tjquinno Jun 29, 2023
2f2a429
Make sure to return 404 if selective metrics retrieval finds no match…
tjquinno Jun 29, 2023
22a26a6
Add back EOF filtering from Prom. output; fix Optional issue
tjquinno Jun 29, 2023
0151c96
Remove obsolete metrics usage
tjquinno Jun 29, 2023
d67a736
Remove refc to now-removed min value for timer
tjquinno Jun 30, 2023
f5de4d3
Fix bad change for registry type qualification on injection
tjquinno Jun 30, 2023
fc0e002
Various clean-up changes; pruning unneeded files and directories
tjquinno Jun 30, 2023
d187627
Style
tjquinno Jun 30, 2023
8bf9659
Handle injections modified with @RegistryScope as well as @RegistryType
tjquinno Jun 30, 2023
add80e3
Bug fixes
tjquinno Jun 30, 2023
7916312
Further fine-tune regex to exclude TCK jars from Weld scanning
tjquinno Jul 1, 2023
d706ce9
Refine the Arq config
tjquinno Jul 1, 2023
60785d4
Add logic to clear data structures between same-JVM TCK tests (essent…
tjquinno Jul 1, 2023
26c4cc1
Restore metrics TCK runs
tjquinno Jul 1, 2023
21ae6ab
Report 'base' as a scope, even if that registry has not been on-deman…
tjquinno Jul 3, 2023
9438aee
Move clean-out of registries from afterStart to beforeStop; some othe…
tjquinno Jul 11, 2023
ec5fd30
Move per-Arquillian cleanup from before bean discovery to before CDI …
tjquinno Jul 12, 2023
e138b14
Fix copyright date
tjquinno Jul 12, 2023
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
Prev Previous commit
Fix copyright date
  • Loading branch information
@tjquinno
tjquinno committed Jul 13, 2023
commit e138b14da992731751b01d6d236babd6cf4d8de5
2 changes: 1 addition & 1 deletion ...tck-metrics/src/test/java/io/helidon/microprofile/metrics/tck/MetricsTckCdiExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Oracle and/or its affiliates.
* Copyright (c) 2020, 2023 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down