Skip to content

Commit 4c9cb19

Browse files
committed
refactor: move metrics to new package
1 parent 9be0509 commit 4c9cb19

File tree

24 files changed

+740
-23
lines changed

24 files changed

+740
-23
lines changed

.github/workflows/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
cargo publish -p torrust-tracker-configuration
7575
cargo publish -p torrust-tracker-contrib-bencode
7676
cargo publish -p torrust-tracker-located-error
77+
cargo publish -p torrust-tracker-metrics
7778
cargo publish -p torrust-tracker-primitives
7879
cargo publish -p torrust-tracker-test-helpers
7980
cargo publish -p torrust-tracker-torrent-repository

Cargo.lock

Lines changed: 18 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/axum-rest-tracker-api-server/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ torrust-rest-tracker-api-core = { version = "3.0.0-develop", path = "../rest-tra
3737
torrust-server-lib = { version = "3.0.0-develop", path = "../server-lib" }
3838
torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
3939
torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
40+
torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
4041
torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
4142
torrust-udp-tracker-server = { version = "3.0.0-develop", path = "../udp-tracker-server" }
4243
tower = { version = "0", features = ["timeout"] }

packages/axum-rest-tracker-api-server/src/v1/context/stats/resources.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! API context.
33
use serde::{Deserialize, Serialize};
44
use torrust_rest_tracker_api_core::statistics::services::{TrackerLabeledMetrics, TrackerMetrics};
5-
use torrust_tracker_primitives::metrics::metric_collection::MetricCollection;
5+
use torrust_tracker_metrics::metric_collection::MetricCollection;
66

77
/// It contains all the statistics generated by the tracker.
88
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]

packages/http-tracker-core/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ thiserror = "2"
2525
tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
2626
torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
2727
torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
28+
torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
2829
torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
2930
tracing = "0"
3031

packages/http-tracker-core/src/statistics/event/handler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::net::IpAddr;
22

3-
use torrust_tracker_primitives::metrics::label_set::{LabelName, LabelSet, LabelValue};
4-
use torrust_tracker_primitives::metrics::metric::MetricName;
3+
use torrust_tracker_metrics::label_set::{LabelName, LabelSet, LabelValue};
4+
use torrust_tracker_metrics::metric::MetricName;
55
use torrust_tracker_primitives::DurationSinceUnixEpoch;
66

77
use crate::event::Event;

packages/http-tracker-core/src/statistics/metrics.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use serde::Serialize;
2-
use torrust_tracker_primitives::metrics::label_set::LabelSet;
3-
use torrust_tracker_primitives::metrics::metric::MetricName;
4-
use torrust_tracker_primitives::metrics::metric_collection::MetricCollection;
2+
use torrust_tracker_metrics::label_set::LabelSet;
3+
use torrust_tracker_metrics::metric::MetricName;
4+
use torrust_tracker_metrics::metric_collection::MetricCollection;
55
use torrust_tracker_primitives::DurationSinceUnixEpoch;
66

77
/// Metrics collected by the tracker.

packages/http-tracker-core/src/statistics/repository.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::sync::Arc;
22

33
use tokio::sync::{RwLock, RwLockReadGuard};
4-
use torrust_tracker_primitives::metrics::label_set::LabelSet;
5-
use torrust_tracker_primitives::metrics::metric::MetricName;
4+
use torrust_tracker_metrics::label_set::LabelSet;
5+
use torrust_tracker_metrics::metric::MetricName;
66
use torrust_tracker_primitives::DurationSinceUnixEpoch;
77

88
use super::metrics::Metrics;

packages/metrics/Cargo.toml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[package]
2+
description = "A library with the primitive types shared by the Torrust tracker packages."
3+
keywords = ["api", "library", "metrics"]
4+
name = "torrust-tracker-metrics"
5+
readme = "README.md"
6+
7+
authors.workspace = true
8+
documentation.workspace = true
9+
edition.workspace = true
10+
homepage.workspace = true
11+
license.workspace = true
12+
publish.workspace = true
13+
repository.workspace = true
14+
rust-version.workspace = true
15+
version.workspace = true
16+
17+
[dependencies]
18+
chrono = { version = "0", default-features = false, features = ["clock"] }
19+
derive_more = { version = "2", features = ["constructor"] }
20+
serde = { version = "1", features = ["derive"] }
21+
serde_json = "1.0.140"
22+
torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
23+
24+
[dev-dependencies]
25+
approx = "0.5.1"
26+
formatjson = "0.3.1"
27+
pretty_assertions = "1.4.1"
28+
rstest = "0.25.0"

0 commit comments

Comments
 (0)