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

Jump to bottom

Add histogram to metrics system #7944

Merged
merged 32 commits into from
Nov 27, 2024
Merged

Add histogram to metrics system #7944

merged 32 commits into from
Nov 27, 2024

Conversation

fab-10
Copy link
Contributor

@fab-10 fab-10 commented Nov 27, 2024

PR description

Fixed Issue(s)

Thanks for sending a pull request! Have you done the following?

  • Checked out our contribution guidelines?
  • Considered documentation and added the doc-change-required label to this PR if updates are required.
  • Considered the changelog and included an update if required.
  • For database changes (e.g. KeyValueSegmentIdentifier) considered compatibility and performed forwards and backwards compatibility tests

Locally, you can run these tests to catch failures early:

  • unit tests: ./gradlew build
  • acceptance tests: ./gradlew acceptanceTest
  • integration tests: ./gradlew integrationTest
  • reference tests: ./gradlew ethereum:referenceTests:referenceTests

fab-10 and others added 30 commits November 19, 2024 16:00
@fab-10
Consolidate all metric collectors into the metrics system
0e7db5f 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Fixes
695a53a 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Do not recreate the Prometheus metric system
5095e68 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Bump opentelemetry dependencies
a4d09ae 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Upgrade to Promethus java client 1.x and adapt the code to the new ve…
a7d8131 
…rsion

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Upgrade Promethus lib to 1.x and adapt the code to the new version
43770b4 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

# Conflicts:
#	metrics/core/build.gradle
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetrySystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
#	metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java
#	plugin-api/build.gradle
#	plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java
@fab-10
Merge branch 'main' into upgrade-prometheus-1.x
ea3b2e3 
# Conflicts:
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java
#	metrics/core/build.gradle
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
@fab-10
Add support for counter metric with external supplied value
d8ffff4 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Merge branch 'labelled-supplied-metric' into upgrade-prometheus-1.x
70b767c 
# Conflicts:
#	CHANGELOG.md
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusSuppliedValueCollector.java
@fab-10
Merge branch 'main' into upgrade-prometheus-1.x
1610025 
# Conflicts:
#	CHANGELOG.md
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusSuppliedValueCollector.java
@fab-10
Merge branch 'main' into upgrade-prometheus-1.x
7281076 
# Conflicts:
#	CHANGELOG.md
@fab-10
Update CHANGELOG
0405e2c 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Clean verification metadata
539dc5d 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Merge branch 'main' into upgrade-prometheus-1.x
5a577d2
@fab-10
Create a unique key for cached metric maps
f6c79cc 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Correct other counters that were created as gauges
f343ce5 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Add histogram collectors to the metrics system
aa4fe85 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Rename ExtranalSummary to SuppliedSummary for consistency
306a140 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Merge branch 'main' into upgrade-prometheus-1.x
b76bdee 
# Conflicts:
#	plugin-api/build.gradle
@fab-10
Push up some common collectors methods
66eaa69 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Merge branch 'main' into upgrade-prometheus-1.x
187ff9b 
# Conflicts:
#	gradle/verification-metadata.xml
@fab-10
Revert "Push up some common collectors methods"
fd9f323 
This reverts commit 66eaa69.

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Fix tests
a58c2cc 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Improve javadoc
ffc7907 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Fixes
1c2da80 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Merge branch 'main' into upgrade-prometheus-1.x
4a74167
@fab-10
o.prometheus:prometheus-metrics-bom:1.3.4
2d75538 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10 @macfarla
Update CHANGELOG.md
9d7011a 
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Merge branch 'main' into upgrade-prometheus-1.x
6ccc049 
# Conflicts:
#	plugin-api/build.gradle
@fab-10
Merge branch 'upgrade-prometheus-1.x' into add-histogram-to-metrics-s…
e6f98ff 
…ystem

# Conflicts:
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetrySystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
#	metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java
#	plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java
@fab-10
Merge branch 'main' into add-histogram-to-metrics-system
0c0a352 
# Conflicts:
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetrySystem.java
#	metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
#	metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java
#	plugin-api/build.gradle
#	plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java
@fab-10
Implement histogram collector in the metric systems
4265dd9 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10 fab-10 force-pushed the add-histogram-to-metrics-system branch from d5d273d to 4265dd9 Compare November 27, 2024 13:20
@fab-10 fab-10 marked this pull request as ready for review November 27, 2024 13:31
@fab-10 fab-10 enabled auto-merge (squash) November 27, 2024 14:31
@fab-10 fab-10 merged commit 14dec7b into hyperledger:main Nov 27, 2024
43 checks passed
@fab-10 fab-10 deleted the add-histogram-to-metrics-system branch November 27, 2024 15:02
ahamlat pushed a commit to ahamlat/besu that referenced this pull request Dec 2, 2024
@fab-10 @ahamlat
Add histogram to metrics system (hyperledger#7944)
1dbc590 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: Ameziane H. <ameziane.hamlat@consensys.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jflo jflo jflo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fab-10 @jflo