From 1ff26598f320566b12cd56984de890cf7f8f01ac Mon Sep 17 00:00:00 2001 From: Lasse Alm Date: Mon, 13 Jan 2025 11:24:56 +0100 Subject: [PATCH 1/3] update to be using correct vale --- backend-rust/src/bin/ccdscan-api.rs | 14 ++++++++++---- backend-rust/src/bin/ccdscan-indexer.rs | 16 ++++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/backend-rust/src/bin/ccdscan-api.rs b/backend-rust/src/bin/ccdscan-api.rs index 4b4d3cee0..d9dc423ba 100644 --- a/backend-rust/src/bin/ccdscan-api.rs +++ b/backend-rust/src/bin/ccdscan-api.rs @@ -2,7 +2,10 @@ use anyhow::Context; use async_graphql::SDLExportOptions; use clap::Parser; use concordium_scan::{graphql_api, router}; -use prometheus_client::registry::Registry; +use prometheus_client::{ + metrics::{family::Family, gauge::Gauge}, + registry::Registry, +}; use sqlx::postgres::PgPoolOptions; use std::{net::SocketAddr, path::PathBuf}; use tokio::net::TcpListener; @@ -58,12 +61,15 @@ async fn main() -> anyhow::Result<()> { .await .context("Failed constructing database connection pool")?; let cancel_token = CancellationToken::new(); - + let service_info_family = Family::, Gauge>::default(); + let gauge = + service_info_family.get_or_create(&vec![("version", clap::crate_version!().to_string())]); + gauge.set(1); let mut registry = Registry::with_prefix("api"); registry.register( - "service", + "service_info", "Information about the software", - prometheus_client::metrics::info::Info::new(vec![("version", clap::crate_version!())]), + service_info_family.clone(), ); registry.register( "service_startup_timestamp_millis", diff --git a/backend-rust/src/bin/ccdscan-indexer.rs b/backend-rust/src/bin/ccdscan-indexer.rs index 9e46712e2..c036fab3b 100644 --- a/backend-rust/src/bin/ccdscan-indexer.rs +++ b/backend-rust/src/bin/ccdscan-indexer.rs @@ -5,7 +5,10 @@ use concordium_scan::{ indexer::{self, IndexerServiceConfig}, router, }; -use prometheus_client::registry::Registry; +use prometheus_client::{ + metrics::{family::Family, gauge::Gauge}, + registry::Registry, +}; use sqlx::postgres::PgPoolOptions; use std::net::SocketAddr; use tokio::net::TcpListener; @@ -64,11 +67,16 @@ async fn main() -> anyhow::Result<()> { .context("Failed constructing database connection pool")?; let cancel_token = CancellationToken::new(); - let mut registry = Registry::with_prefix("indexer"); + let registry = Registry::with_prefix("indexer"); + let service_info_family = Family::, Gauge>::default(); + let gauge = + service_info_family.get_or_create(&vec![("version", clap::crate_version!().to_string())]); + gauge.set(1); + let mut registry = Registry::with_prefix("api"); registry.register( - "service", + "service_info", "Information about the software", - prometheus_client::metrics::info::Info::new(vec![("version", clap::crate_version!())]), + service_info_family.clone(), ); registry.register( "service_startup_timestamp_millis", From dde2e81fbbeadc3e13cb5f49ee1fd7014af648be Mon Sep 17 00:00:00 2001 From: Lasse Alm Date: Mon, 13 Jan 2025 11:46:32 +0100 Subject: [PATCH 2/3] update version --- backend-rust/src/bin/ccdscan-indexer.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend-rust/src/bin/ccdscan-indexer.rs b/backend-rust/src/bin/ccdscan-indexer.rs index c036fab3b..7e60e2450 100644 --- a/backend-rust/src/bin/ccdscan-indexer.rs +++ b/backend-rust/src/bin/ccdscan-indexer.rs @@ -67,12 +67,11 @@ async fn main() -> anyhow::Result<()> { .context("Failed constructing database connection pool")?; let cancel_token = CancellationToken::new(); - let registry = Registry::with_prefix("indexer"); + let mut registry = Registry::with_prefix("indexer"); let service_info_family = Family::, Gauge>::default(); let gauge = service_info_family.get_or_create(&vec![("version", clap::crate_version!().to_string())]); gauge.set(1); - let mut registry = Registry::with_prefix("api"); registry.register( "service_info", "Information about the software", From 7cb06201684bff68ece6145ed32002c379394ed7 Mon Sep 17 00:00:00 2001 From: Lasse Alm Date: Mon, 13 Jan 2025 11:51:56 +0100 Subject: [PATCH 3/3] bump version --- backend-rust/Cargo.lock | 2 +- backend-rust/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend-rust/Cargo.lock b/backend-rust/Cargo.lock index f95531c3d..6dd2bee43 100644 --- a/backend-rust/Cargo.lock +++ b/backend-rust/Cargo.lock @@ -904,7 +904,7 @@ dependencies = [ [[package]] name = "concordium-scan" -version = "0.1.9" +version = "0.1.10" dependencies = [ "anyhow", "async-graphql", diff --git a/backend-rust/Cargo.toml b/backend-rust/Cargo.toml index 5d0ba5158..2bfa1631f 100644 --- a/backend-rust/Cargo.toml +++ b/backend-rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium-scan" -version = "0.1.9" +version = "0.1.10" edition = "2021" description = "CCDScan: Indexer and API for the Concordium blockchain" authors = ["Concordium "]