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

Migrate to Prometheus lib 1.x #7880

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Migrate to Prometheus lib 1.x #7880

wants to merge 17 commits into from

Commits on Nov 19, 2024

  1. Consolidate all metric collectors into the metrics system 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    0e7db5f View commit details
    Browse the repository at this point in the history

  2. Fixes 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    695a53a View commit details
    Browse the repository at this point in the history

  3. Do not recreate the Prometheus metric system 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    5095e68 View commit details
    Browse the repository at this point in the history

  4. Bump opentelemetry dependencies 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    a4d09ae View commit details
    Browse the repository at this point in the history

  5. Upgrade to Promethus java client 1.x and adapt the code to the new ve… 

    …rsion

Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    a7d8131 View commit details
    Browse the repository at this point in the history

  6. Upgrade Promethus lib to 1.x and adapt the code to the new version 

    Signed-off-by: Fabio Di Fabio <[email protected]>

# 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
    fab-10 committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    43770b4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into upgrade-prometheus-1.x 

    # 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
    fab-10 committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    ea3b2e3 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2024

  1. Add support for counter metric with external supplied value 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    d8ffff4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'labelled-supplied-metric' into upgrade-prometheus-1.x 

    # 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
    fab-10 committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    70b767c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into upgrade-prometheus-1.x 

    # 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
    fab-10 committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    1610025 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2024

  1. Merge branch 'main' into upgrade-prometheus-1.x 

    # Conflicts:
#	CHANGELOG.md
    @fab-10
    fab-10 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    7281076 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    0405e2c View commit details
    Browse the repository at this point in the history

  3. Clean verification metadata 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    539dc5d View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2024

  1. Merge branch 'main' into upgrade-prometheus-1.x

    @fab-10
    fab-10 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    5a577d2 View commit details
    Browse the repository at this point in the history

  2. Create a unique key for cached metric maps 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    f6c79cc View commit details
    Browse the repository at this point in the history

  3. Correct other counters that were created as gauges 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    f343ce5 View commit details
    Browse the repository at this point in the history

  4. Rename ExtranalSummary to SuppliedSummary for consistency 

    Signed-off-by: Fabio Di Fabio <[email protected]>
    @fab-10
    fab-10 committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    306a140 View commit details
    Browse the repository at this point in the history