diff --git a/.cargo/config.toml b/.cargo/config.toml
index 28cde74ec..36a0b3d8c 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -7,20 +7,20 @@ time = "build --timings --all-targets"
 
 [build]
 rustflags = [
-    "-D",
-    "warnings",
-    "-D",
-    "future-incompatible",
-    "-D",
-    "let-underscore",
-    "-D",
-    "nonstandard-style",
-    "-D",
-    "rust-2018-compatibility",
-    "-D",
-    "rust-2018-idioms",
-    "-D",
-    "rust-2021-compatibility",
-    "-D",
-    "unused",
+  "-D",
+  "warnings",
+  "-D",
+  "future-incompatible",
+  "-D",
+  "let-underscore",
+  "-D",
+  "nonstandard-style",
+  "-D",
+  "rust-2018-compatibility",
+  "-D",
+  "rust-2018-idioms",
+  "-D",
+  "rust-2021-compatibility",
+  "-D",
+  "unused",
 ]
diff --git a/.github/workflows/container.yaml b/.github/workflows/container.yaml
index 9f51f3124..7e8ffa442 100644
--- a/.github/workflows/container.yaml
+++ b/.github/workflows/container.yaml
@@ -26,11 +26,11 @@ jobs:
     steps:
       - id: setup
         name: Setup Toolchain
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - id: build
         name: Build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           file: ./Containerfile
           push: false
@@ -46,7 +46,7 @@ jobs:
 
       - id: checkout
         name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - id: compose
         name: Compose
@@ -80,9 +80,15 @@ jobs:
                 echo "continue=true" >> $GITHUB_OUTPUT
                 echo "On \`develop\` Branch, Type: \`development\`"
 
-              elif [[ $(echo "${{ github.ref }}" | grep -P '^(refs\/heads\/releases\/)(v)(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$') ]]; then
+              elif [[ "${{ github.ref }}" =~ ^refs/heads/releases/ ]]; then
+                semver_regex='^v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)(\.(0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*))*))?(\+([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$'
+                version=$(echo "${{ github.ref }}" | sed -n -E 's#^refs/heads/releases/##p')
+
+                if [[ ! "$version" =~ $semver_regex ]]; then
+                  echo "Not a valid release branch semver. Will Not Continue"
+                  exit 0
+                fi
 
-                version=$(echo "${{ github.ref }}" | sed -n -E 's/^(refs\/heads\/releases\/)//p')
                 echo "version=$version" >> $GITHUB_OUTPUT
                 echo "type=release" >> $GITHUB_OUTPUT
                 echo "continue=true" >> $GITHUB_OUTPUT
@@ -108,7 +114,7 @@ jobs:
     steps:
       - id: meta
         name: Docker Meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             "${{ secrets.DOCKER_HUB_USERNAME }}/${{secrets.DOCKER_HUB_REPOSITORY_NAME }}"
@@ -117,17 +123,17 @@ jobs:
 
       - id: login
         name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - id: setup
         name: Setup Toolchain
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           file: ./Containerfile
           push: true
@@ -146,7 +152,7 @@ jobs:
     steps:
       - id: meta
         name: Docker Meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             "${{ secrets.DOCKER_HUB_USERNAME }}/${{secrets.DOCKER_HUB_REPOSITORY_NAME }}"
@@ -158,17 +164,17 @@ jobs:
 
       - id: login
         name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - id: setup
         name: Setup Toolchain
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           file: ./Containerfile
           push: true
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index e10c5ac66..ada96f77f 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install LLVM tools
         run: sudo apt-get update && sudo apt-get install -y llvm
@@ -44,14 +44,14 @@ jobs:
       - id: coverage
         name: Generate Coverage Report
         run: |
-          cargo clean 
+          cargo clean
           cargo llvm-cov --all-features --workspace --codecov --output-path ./codecov.json
 
       - id: upload
         name: Upload Coverage Report
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ${{ github.workspace }}/codecov.json
-          fail_ci_if_error: true
\ No newline at end of file
+          fail_ci_if_error: true
diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml
index d62b4bbcc..b544d1da2 100644
--- a/.github/workflows/deployment.yaml
+++ b/.github/workflows/deployment.yaml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - id: checkout
         name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - id: setup
         name: Setup Toolchain
@@ -42,7 +42,7 @@ jobs:
     steps:
       - id: checkout
         name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - id: setup
         name: Setup Toolchain
@@ -77,7 +77,7 @@ jobs:
           cargo publish -p torrust-tracker-located-error
           cargo publish -p torrust-tracker-metrics
           cargo publish -p torrust-tracker-primitives
+          cargo publish -p torrust-tracker-swarm-coordination-registry
           cargo publish -p torrust-tracker-test-helpers
           cargo publish -p torrust-tracker-torrent-benchmarking
-          cargo publish -p torrust-tracker-torrent-repository
           cargo publish -p torrust-udp-tracker-server
diff --git a/.github/workflows/generate_coverage_pr.yaml b/.github/workflows/generate_coverage_pr.yaml
index d1b241b9d..e07a5a755 100644
--- a/.github/workflows/generate_coverage_pr.yaml
+++ b/.github/workflows/generate_coverage_pr.yaml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install LLVM tools
         run: sudo apt-get update && sudo apt-get install -y llvm
@@ -44,7 +44,7 @@ jobs:
       - id: coverage
         name: Generate Coverage Report
         run: |
-          cargo clean 
+          cargo clean
           cargo llvm-cov --all-features --workspace --codecov --output-path ./codecov.json
 
       - name: Store PR number and commit SHA
@@ -59,13 +59,13 @@ jobs:
       # Triggered sub-workflow is not able to detect the original commit/PR which is available
       # in this workflow.
       - name: Store PR number
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: pr_number
           path: pr_number.txt
 
       - name: Store commit SHA
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: commit_sha
           path: commit_sha.txt
@@ -74,7 +74,7 @@ jobs:
       # is executed by a different workflow `upload_coverage.yml`. The reason for this
       # split is because `on.pull_request` workflows don't have access to secrets.
       - name: Store coverage report in artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: codecov_report
           path: ./codecov.json
diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml
index bb8283f30..a312c335f 100644
--- a/.github/workflows/labels.yaml
+++ b/.github/workflows/labels.yaml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - id: checkout
         name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - id: sync
         name: Apply Labels from File
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
index 671864fc9..83a290663 100644
--- a/.github/workflows/testing.yaml
+++ b/.github/workflows/testing.yaml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - id: checkout
         name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - id: setup
         name: Setup Toolchain
@@ -33,9 +33,10 @@ jobs:
         run: cargo fmt --check
 
   check:
-    name: Static Analysis
+    name: Linting
     runs-on: ubuntu-latest
     needs: format
+    timeout-minutes: 15
 
     strategy:
       matrix:
@@ -44,46 +45,32 @@ jobs:
     steps:
       - id: checkout
         name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - id: setup
         name: Setup Toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.toolchain }}
-          components: clippy
+          components: clippy, rustfmt
+
+      - id: node
+        name: Setup Node.js
+        uses: actions/setup-node@v5
+        with:
+          node-version: "20"
 
       - id: cache
         name: Enable Workflow Cache
         uses: Swatinem/rust-cache@v2
 
       - id: tools
-        name: Install Tools
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-machete
-
-      - id: check
-        name: Run Build Checks
-        run: cargo check --tests --benches --examples --workspace --all-targets --all-features
+        name: Install Internal Linter
+        run: cargo install --locked --git https://github.com/torrust/torrust-linting --bin linter
 
       - id: lint
-        name: Run Lint Checks
-        run: cargo clippy --tests --benches --examples --workspace --all-targets --all-features
-
-      - id: docs
-        name: Lint Documentation
-        env:
-          RUSTDOCFLAGS: "-D warnings"
-        run: cargo doc --no-deps --bins --examples --workspace --all-features
-
-      - id: clean
-        name: Clean Build Directory
-        run: cargo clean
-
-      - id: deps
-        name: Check Unused Dependencies
-        run: cargo machete
+        name: Run All Linters
+        run: linter all
 
   build:
     name: Build on ${{ matrix.os }} (${{ matrix.toolchain }})
@@ -96,7 +83,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - id: setup
         name: Setup Toolchain
@@ -119,7 +106,7 @@ jobs:
     steps:
       - id: checkout
         name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - id: setup
         name: Setup Toolchain
@@ -173,7 +160,7 @@ jobs:
 
       - id: checkout
         name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - id: test
         name: Run E2E Tests
diff --git a/.github/workflows/upload_coverage_pr.yaml b/.github/workflows/upload_coverage_pr.yaml
index 1ed2f7bcc..4a6c757a5 100644
--- a/.github/workflows/upload_coverage_pr.yaml
+++ b/.github/workflows/upload_coverage_pr.yaml
@@ -1,7 +1,7 @@
 name: Upload Coverage Report (PR)
 
 on:
-  # This workflow is triggered after every successfull execution
+  # This workflow is triggered after every successful execution
   # of `Generate Coverage Report` workflow.
   workflow_run:
     workflows: ["Generate Coverage Report (PR)"]
@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: "Download existing coverage report"
         id: prepare_report
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var fs = require('fs');
@@ -96,13 +96,13 @@ jobs:
           echo "override_commit=$(<commit_sha.txt)" >> "$GITHUB_OUTPUT"
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: ${{ steps.parse_previous_artifacts.outputs.override_commit || '' }}
           path: repo_root
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.markdownlint.json b/.markdownlint.json
new file mode 100644
index 000000000..19ec47c2e
--- /dev/null
+++ b/.markdownlint.json
@@ -0,0 +1,18 @@
+{
+    "default": true,
+    "MD013": false,
+    "MD031": true,
+    "MD032": true,
+    "MD040": true,
+    "MD022": true,
+    "MD009": true,
+    "MD007": {
+        "indent": 2
+    },
+    "MD026": false,
+    "MD041": false,
+    "MD034": false,
+    "MD024": false,
+    "MD033": false,
+    "MD060": false
+}
diff --git a/.taplo.toml b/.taplo.toml
new file mode 100644
index 000000000..0168711e8
--- /dev/null
+++ b/.taplo.toml
@@ -0,0 +1,27 @@
+# Taplo configuration file for TOML formatting
+# Used by the "Even Better TOML" VS Code extension
+
+# Exclude generated and runtime folders from linting
+exclude = [ ".coverage/**", "storage/**", "target/**" ]
+
+[formatting]
+# Preserve blank lines that exist
+allowed_blank_lines = 1
+# Don't reorder keys to maintain structure
+reorder_keys = false
+# Array formatting
+array_auto_collapse = false
+array_auto_expand = false
+array_trailing_comma = true
+# Inline table formatting
+compact_arrays = false
+compact_inline_tables = false
+inline_table_expand = false
+# Alignment
+align_comments = true
+align_entries = false
+# Indentation
+indent_entries = false
+indent_tables = false
+# Other
+trailing_newline = true
diff --git a/.vscode/mcp.json b/.vscode/mcp.json
new file mode 100644
index 000000000..506a52259
--- /dev/null
+++ b/.vscode/mcp.json
@@ -0,0 +1,26 @@
+{
+    "inputs": [
+        {
+            "type": "promptString",
+            "id": "github_token",
+            "description": "GitHub Personal Access Token",
+            "password": true
+        }
+    ],
+    "servers": {
+        "github": {
+            "command": "docker",
+            "args": [
+                "run",
+                "-i",
+                "--rm",
+                "-e",
+                "GITHUB_PERSONAL_ACCESS_TOKEN",
+                "ghcr.io/github/github-mcp-server"
+            ],
+            "env": {
+                "GITHUB_PERSONAL_ACCESS_TOKEN": "${input:github_token}"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/.yamllint-ci.yml b/.yamllint-ci.yml
new file mode 100644
index 000000000..9380b592a
--- /dev/null
+++ b/.yamllint-ci.yml
@@ -0,0 +1,16 @@
+extends: default
+
+rules:
+  line-length:
+    max: 200 # More reasonable for infrastructure code
+  comments:
+    min-spaces-from-content: 1 # Allow single space before comments
+  document-start: disable # Most project YAML files don't require ---
+  truthy:
+    allowed-values: ["true", "false", "yes", "no", "on", "off"] # Allow common GitHub Actions values
+
+# Ignore generated/runtime directories
+ignore: |
+  target/**
+  storage/**
+  .coverage/**
diff --git a/Cargo.lock b/Cargo.lock
index eea957f88..03138f718 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "ahash"
@@ -23,16 +23,16 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -53,16 +53,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "allocator-api2"
-version = "0.2.21"
+name = "alloca"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4"
+dependencies = [
+ "cc",
+]
 
 [[package]]
-name = "android-tzdata"
-version = "0.1.1"
+name = "allocator-api2"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "android_system_properties"
@@ -81,9 +84,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -96,44 +99,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
- "once_cell",
- "windows-sys 0.59.0",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "approx"
@@ -172,9 +175,12 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "1.7.1"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "arrayvec"
@@ -182,6 +188,22 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "astral-tokio-tar"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c23f3af104b40a3430ccb90ed5f7bd877a8dc5c26fc92fde51a22b40890dcf9"
+dependencies = [
+ "filetime",
+ "futures-core",
+ "libc",
+ "portable-atomic",
+ "rustc-hash",
+ "tokio",
+ "tokio-stream",
+ "xattr",
+]
+
 [[package]]
 name = "async-attributes"
 version = "1.1.2"
@@ -205,9 +227,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.3.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
 dependencies = [
  "concurrent-queue",
  "event-listener-strategy",
@@ -217,25 +239,21 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.23"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07"
+checksum = "d0f9ee0f6e02ffd7ad5816e9464499fba7b3effd01123b515c41d1697c43dad1"
 dependencies = [
- "brotli",
- "flate2",
- "futures-core",
- "memchr",
+ "compression-codecs",
+ "compression-core",
  "pin-project-lite",
  "tokio",
- "zstd",
- "zstd-safe",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
+checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -251,7 +269,7 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.5.0",
  "async-executor",
  "async-io",
  "async-lock",
@@ -263,39 +281,38 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.4.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
 dependencies = [
- "async-lock",
+ "autocfg",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
  "futures-lite",
  "parking",
  "polling",
- "rustix 0.38.44",
+ "rustix",
  "slab",
- "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "async-lock"
-version = "3.4.0"
+version = "3.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
 dependencies = [
- "event-listener 5.4.0",
+ "event-listener 5.4.1",
  "event-listener-strategy",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-std"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24"
+checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
 dependencies = [
  "async-attributes",
  "async-channel 1.9.0",
@@ -318,6 +335,28 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "async-task"
 version = "4.7.1"
@@ -326,20 +365,20 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.88"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "atomic"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
+checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340"
 dependencies = [
  "bytemuck",
 ]
@@ -352,15 +391,37 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "aws-lc-rs"
+version = "1.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7"
+dependencies = [
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
 
 [[package]]
 name = "axum"
-version = "0.8.4"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
+checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
 dependencies = [
  "axum-core",
  "axum-macros",
@@ -378,8 +439,7 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rustversion",
- "serde",
+ "serde_core",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
@@ -404,9 +464,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.5.2"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
+checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
 dependencies = [
  "bytes",
  "futures-core",
@@ -415,7 +475,6 @@ dependencies = [
  "http-body-util",
  "mime",
  "pin-project-lite",
- "rustversion",
  "sync_wrapper",
  "tower-layer",
  "tower-service",
@@ -424,48 +483,49 @@ dependencies = [
 
 [[package]]
 name = "axum-extra"
-version = "0.10.1"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45bf463831f5131b7d3c756525b305d40f1185b688565648a92e1392ca35713d"
+checksum = "be44683b41ccb9ab2d23a5230015c9c3c55be97a25e4428366de8873103f7970"
 dependencies = [
  "axum",
  "axum-core",
  "bytes",
  "form_urlencoded",
+ "futures-core",
  "futures-util",
  "http",
  "http-body",
  "http-body-util",
  "mime",
  "pin-project-lite",
- "rustversion",
- "serde",
+ "serde_core",
  "serde_html_form",
  "serde_path_to_error",
- "tower",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
 name = "axum-macros"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c"
+checksum = "7aa268c23bfbbd2c4363b9cd302a4f504fb2a9dfe7e3451d66f35dd392e20aca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "axum-server"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "495c05f60d6df0093e8fb6e74aa5846a0ad06abaf96d76166283720bf740f8ab"
+checksum = "b1df331683d982a0b9492b38127151e6453639cd34926eb9c07d4cd8c6d22bfc"
 dependencies = [
  "arc-swap",
  "bytes",
+ "either",
  "fs-err",
  "http",
  "http-body",
@@ -473,7 +533,6 @@ dependencies = [
  "hyper-util",
  "pin-project-lite",
  "rustls",
- "rustls-pemfile",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
@@ -482,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -492,7 +551,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -518,9 +577,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bigdecimal"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a22f228ab7a1b23027ccc6c350b72868017af7ea8356fbdf19f8d991c690013"
+checksum = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695"
 dependencies = [
  "autocfg",
  "libm",
@@ -537,11 +596,11 @@ checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
 
 [[package]]
 name = "bindgen"
-version = "0.71.1"
+version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -550,7 +609,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -561,15 +620,9 @@ checksum = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.9.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
 [[package]]
 name = "bittorrent-http-tracker-core"
@@ -579,19 +632,21 @@ dependencies = [
  "bittorrent-http-tracker-protocol",
  "bittorrent-primitives",
  "bittorrent-tracker-core",
- "criterion",
+ "criterion 0.5.1",
  "formatjson",
  "futures",
  "mockall",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
+ "tokio-util",
  "torrust-tracker-clock",
  "torrust-tracker-configuration",
  "torrust-tracker-events",
  "torrust-tracker-metrics",
  "torrust-tracker-primitives",
+ "torrust-tracker-swarm-coordination-registry",
  "torrust-tracker-test-helpers",
  "tracing",
 ]
@@ -608,7 +663,7 @@ dependencies = [
  "percent-encoding",
  "serde",
  "serde_bencode",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "torrust-tracker-clock",
  "torrust-tracker-configuration",
  "torrust-tracker-contrib-bencode",
@@ -644,7 +699,7 @@ dependencies = [
  "serde_bencode",
  "serde_bytes",
  "serde_repr",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "torrust-tracker-configuration",
  "torrust-tracker-located-error",
@@ -666,19 +721,22 @@ dependencies = [
  "r2d2",
  "r2d2_mysql",
  "r2d2_sqlite",
- "rand 0.9.1",
+ "rand 0.10.1",
  "serde",
  "serde_json",
  "testcontainers",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
+ "tokio-util",
  "torrust-rest-tracker-api-client",
  "torrust-tracker-clock",
  "torrust-tracker-configuration",
+ "torrust-tracker-events",
  "torrust-tracker-located-error",
+ "torrust-tracker-metrics",
  "torrust-tracker-primitives",
+ "torrust-tracker-swarm-coordination-registry",
  "torrust-tracker-test-helpers",
- "torrust-tracker-torrent-repository",
  "tracing",
  "url",
 ]
@@ -694,19 +752,21 @@ dependencies = [
  "bloom",
  "blowfish",
  "cipher",
- "criterion",
+ "criterion 0.5.1",
  "futures",
  "lazy_static",
  "mockall",
- "rand 0.9.1",
+ "rand 0.10.1",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
+ "tokio-util",
  "torrust-tracker-clock",
  "torrust-tracker-configuration",
  "torrust-tracker-events",
  "torrust-tracker-metrics",
  "torrust-tracker-primitives",
+ "torrust-tracker-swarm-coordination-registry",
  "torrust-tracker-test-helpers",
  "tracing",
  "zerocopy 0.7.35",
@@ -744,11 +804,11 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.6.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.5.0",
  "async-task",
  "futures-io",
  "futures-lite",
@@ -766,9 +826,9 @@ dependencies = [
 
 [[package]]
 name = "blowfish"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7"
+checksum = "62ce3946557b35e71d1bbe07ec385073ce9eda05043f95de134eb578fcf1a298"
 dependencies = [
  "byteorder",
  "cipher",
@@ -776,11 +836,14 @@ dependencies = [
 
 [[package]]
 name = "bollard"
-version = "0.18.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97ccca1260af6a459d75994ad5acc1651bcabcbdbc41467cc9786519ab854c30"
+checksum = "ee04c4c84f1f811b017f2fbb7dd8815c976e7ca98593de9c1e2afad0f636bff4"
 dependencies = [
+ "async-stream",
  "base64 0.22.1",
+ "bitflags",
+ "bollard-buildkit-proto",
  "bollard-stubs",
  "bytes",
  "futures-core",
@@ -795,63 +858,85 @@ dependencies = [
  "hyper-util",
  "hyperlocal",
  "log",
+ "num",
  "pin-project-lite",
+ "rand 0.9.4",
  "rustls",
  "rustls-native-certs",
- "rustls-pemfile",
  "rustls-pki-types",
  "serde",
  "serde_derive",
  "serde_json",
- "serde_repr",
  "serde_urlencoded",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
+ "time",
  "tokio",
+ "tokio-stream",
  "tokio-util",
+ "tonic",
  "tower-service",
  "url",
  "winapi",
 ]
 
+[[package]]
+name = "bollard-buildkit-proto"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85a885520bf6249ab931a764ffdb87b0ceef48e6e7d807cfdb21b751e086e1ad"
+dependencies = [
+ "prost",
+ "prost-types",
+ "tonic",
+ "tonic-prost",
+ "ureq",
+]
+
 [[package]]
 name = "bollard-stubs"
-version = "1.47.1-rc.27.3.1"
+version = "1.52.1-rc.29.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f179cfbddb6e77a5472703d4b30436bff32929c0aa8a9008ecf23d1d3cdd0da"
+checksum = "0f0a8ca8799131c1837d1282c3f81f31e76ceb0ce426e04a7fe1ccee3287c066"
 dependencies = [
+ "base64 0.22.1",
+ "bollard-buildkit-proto",
+ "bytes",
+ "prost",
  "serde",
+ "serde_json",
  "serde_repr",
- "serde_with",
+ "time",
 ]
 
 [[package]]
 name = "borsh"
-version = "1.5.7"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a"
 dependencies = [
  "borsh-derive",
+ "bytes",
  "cfg_aliases",
 ]
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.7"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
+checksum = "bfcfdc083699101d5a7965e49925975f2f55060f94f9a05e7187be95d530ca59"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "brotli"
-version = "8.0.0"
+version = "8.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf19e729cdbd51af9a397fb9ef8ac8378007b797f8273cfbfdf45dcaa316167b"
+checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -885,9 +970,9 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 
 [[package]]
 name = "bytecheck"
@@ -913,9 +998,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.23.0"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
 
 [[package]]
 name = "byteorder"
@@ -925,15 +1010,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
 [[package]]
 name = "camino"
-version = "1.1.9"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+checksum = "dd0b03af37dad7a14518b7691d81acb0f8222604ad3d1b02f6b4bed5188c0cd5"
 dependencies = [
  "serde",
 ]
@@ -946,24 +1031,31 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "castaway"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
+checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
 dependencies = [
  "rustversion",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.21"
+version = "1.2.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
 ]
 
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
 [[package]]
 name = "cexpr"
 version = "0.6.0"
@@ -975,9 +1067,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
@@ -985,13 +1077,23 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "num-traits",
  "serde",
@@ -1027,11 +1129,11 @@ dependencies = [
 
 [[package]]
 name = "cipher"
-version = "0.4.4"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+checksum = "e34d8227fe1ba289043aeb13792056ff80fd6de1a9f49137a5f499de8e8c78ea"
 dependencies = [
- "crypto-common",
+ "crypto-common 0.2.1",
  "inout",
 ]
 
@@ -1048,9 +1150,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.37"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1058,9 +1160,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.37"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1070,36 +1172,46 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.32"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
 [[package]]
 name = "cmake"
-version = "0.1.54"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
 
 [[package]]
 name = "compact_str"
@@ -1114,6 +1226,26 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "compression-codecs"
+version = "0.4.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb7b51a7d9c967fc26773061ba86150f19c50c0d65c887cb1fbe295fd16619b7"
+dependencies = [
+ "brotli",
+ "compression-core",
+ "flate2",
+ "memchr",
+ "zstd",
+ "zstd-safe",
+]
+
+[[package]]
+name = "compression-core"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d"
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -1123,6 +1255,15 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1135,9 +1276,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1158,11 +1299,20 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -1177,7 +1327,7 @@ dependencies = [
  "cast",
  "ciborium",
  "clap",
- "criterion-plot",
+ "criterion-plot 0.5.0",
  "futures",
  "is-terminal",
  "itertools 0.10.5",
@@ -1195,6 +1345,32 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "criterion"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "950046b2aa2492f9a536f5f4f9a3de7b9e2476e575e05bd6c333371add4d98f3"
+dependencies = [
+ "alloca",
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot 0.8.2",
+ "itertools 0.13.0",
+ "num-traits",
+ "oorandom",
+ "page_size",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_json",
+ "tinytemplate",
+ "tokio",
+ "walkdir",
+]
+
 [[package]]
 name = "criterion-plot"
 version = "0.5.0"
@@ -1205,6 +1381,16 @@ dependencies = [
  "itertools 0.10.5",
 ]
 
+[[package]]
+name = "criterion-plot"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8d80a2f4f5b554395e47b5d8305bc3d27813bacb73493eb1001e8f76dae29ea"
+dependencies = [
+ "cast",
+ "itertools 0.13.0",
+]
+
 [[package]]
 name = "crossbeam"
 version = "0.8.4"
@@ -1273,28 +1459,47 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
  "typenum",
 ]
 
+[[package]]
+name = "crypto-common"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
+dependencies = [
+ "hybrid-array",
+]
+
 [[package]]
 name = "darling"
 version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.11",
+ "darling_macro 0.20.11",
+]
+
+[[package]]
+name = "darling"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
+dependencies = [
+ "darling_core 0.23.0",
+ "darling_macro 0.23.0",
 ]
 
 [[package]]
@@ -1308,7 +1513,20 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.101",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
+dependencies = [
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1317,9 +1535,20 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
- "darling_core",
+ "darling_core 0.20.11",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
+dependencies = [
+ "darling_core 0.23.0",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1338,44 +1567,77 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
  "powerfmt",
- "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "derive_builder"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
+dependencies = [
+ "darling 0.20.11",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
+dependencies = [
+ "derive_builder_core",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "derive_more"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
 dependencies = [
+ "convert_case",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "rustc_version",
+ "syn 2.0.117",
  "unicode-xid",
 ]
 
 [[package]]
 name = "derive_utils"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccfae181bab5ab6c5478b2ccb69e4c68a02f8c3ec72f6616bfec9dbc599d2ee0"
+checksum = "362f47930db19fe7735f527e6595e4900316b893ebf6d48ad3d31be928d57dd6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1391,7 +1653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
- "crypto-common",
+ "crypto-common 0.1.7",
 ]
 
 [[package]]
@@ -1402,14 +1664,14 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "docker_credential"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31951f49556e34d90ed28342e1df7e1cb7a229c4cab0aecc627b5d91edd41d07"
+checksum = "1d89dfcba45b4afad7450a99b39e751590463e45c04728cf555d36bb66940de8"
 dependencies = [
  "base64 0.21.7",
  "serde",
@@ -1422,6 +1684,18 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -1438,15 +1712,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "env_logger"
-version = "0.8.4"
+name = "env_filter"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
+checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef"
 dependencies = [
  "log",
  "regex",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.11.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a"
+dependencies = [
+ "env_filter",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -1455,23 +1739,22 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.11"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "etcetera"
-version = "0.8.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"
 dependencies = [
  "cfg-if",
- "home",
- "windows-sys 0.48.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1482,9 +1765,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "5.4.0"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1497,7 +1780,7 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
- "event-listener 5.4.0",
+ "event-listener 5.4.1",
  "pin-project-lite",
 ]
 
@@ -1515,9 +1798,20 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
+[[package]]
+name = "ferroid"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee93edf3c501f0035bbeffeccfed0b79e14c311f12195ec0e661e114a0f60da4"
+dependencies = [
+ "portable-atomic",
+ "rand 0.10.1",
+ "web-time",
+]
 
 [[package]]
 name = "figment"
@@ -1530,28 +1824,33 @@ dependencies = [
  "pear",
  "serde",
  "tempfile",
- "toml",
+ "toml 0.8.23",
  "uncased",
  "version_check",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.25"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db"
 dependencies = [
  "cfg-if",
  "libc",
  "libredox",
- "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
  "libz-sys",
@@ -1570,6 +1869,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1587,9 +1892,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -1616,15 +1921,18 @@ dependencies = [
 
 [[package]]
 name = "fragile"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
+checksum = "8878864ba14bb86e818a412bfd6f18f9eabd4ec0f008a28e8f7eb61db532fcf9"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "frunk"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874b6a17738fc273ec753618bac60ddaeac48cb1d7684c3e7bd472e57a28b817"
+checksum = "28aef0f9aa070bce60767c12ba9cb41efeaf1a2bc6427f87b7d83f11239a16d7"
 dependencies = [
  "frunk_core",
  "frunk_derives",
@@ -1634,58 +1942,64 @@ dependencies = [
 
 [[package]]
 name = "frunk_core"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3529a07095650187788833d585c219761114005d5976185760cf794d265b6a5c"
+checksum = "476eeaa382e3462b84da5d6ba3da97b5786823c2d0d3a0d04ef088d073da225c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "frunk_derives"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e99b8b3c28ae0e84b604c75f721c21dc77afb3706076af5e8216d15fd1deaae3"
+checksum = "a0b4095fc99e1d858e5b8c7125d2638372ec85aa0fe6c807105cf10b0265ca6c"
 dependencies = [
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "frunk_proc_macro_helpers"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05a956ef36c377977e512e227dcad20f68c2786ac7a54dacece3746046fea5ce"
+checksum = "1952b802269f2db12ab7c0bd328d0ae8feaabf19f352a7b0af7bb0c5693abfce"
 dependencies = [
  "frunk_core",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "frunk_proc_macros"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e86c2c9183662713fea27ea527aad20fb15fee635a71081ff91bf93df4dc51"
+checksum = "3462f590fa236005bd7ca4847f81438bd6fe0febd4d04e11968d4c2e96437e78"
 dependencies = [
  "frunk_core",
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "fs-err"
-version = "3.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f89bda4c2a21204059a977ed3bfe746677dfd137b83c339e702b0ac91d482aa"
+checksum = "73fde052dbfc920003cfd2c8e2c6e6d4cc7c1091538c3a24226cec0665ab08c0"
 dependencies = [
  "autocfg",
  "tokio",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1694,9 +2008,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1709,9 +2023,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1719,15 +2033,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1736,15 +2050,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
 
 [[package]]
 name = "futures-lite"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -1755,26 +2069,26 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-timer"
@@ -1784,9 +2098,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1796,7 +2110,6 @@ dependencies = [
  "futures-task",
  "memchr",
  "pin-project-lite",
- "pin-utils",
  "slab",
 ]
 
@@ -1812,38 +2125,68 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.2"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "r-efi 5.3.0",
+ "wasip2",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
  "cfg-if",
  "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "r-efi 6.0.0",
+ "rand_core 0.10.1",
+ "wasip2",
+ "wasip3",
+]
+
+[[package]]
+name = "getset"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf0fc11e47561d47397154977bc219f4cf809b2974facc3ccb3b89e2436f912"
+dependencies = [
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.31.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "glob"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "gloo-timers"
@@ -1859,9 +2202,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633"
+checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1869,7 +2212,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.9.0",
+ "indexmap 2.14.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1878,12 +2221,13 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.6.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
  "cfg-if",
  "crunchy",
+ "zerocopy 0.8.48",
 ]
 
 [[package]]
@@ -1903,22 +2247,37 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.3"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
  "allocator-api2",
  "equivalent",
- "foldhash",
+ "foldhash 0.1.5",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "foldhash 0.2.0",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+
 [[package]]
 name = "hashlink"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+checksum = "ea0b22561a9c04a7cb1a302c013e0259cd3b4bb619f145b32f72b8b4bcbed230"
 dependencies = [
- "hashbrown 0.15.3",
+ "hashbrown 0.16.1",
 ]
 
 [[package]]
@@ -1929,15 +2288,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hermit-abi"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hex"
@@ -1947,27 +2300,26 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcaaec4551594c969335c98c903c1397853d4198408ea609190f420500f6be71"
+checksum = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1"
 
 [[package]]
 name = "home"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
 dependencies = [
  "bytes",
- "fnv",
  "itoa",
 ]
 
@@ -2006,15 +2358,25 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "hybrid-array"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214"
+dependencies = [
+ "typenum",
+]
+
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
+ "futures-core",
  "h2",
  "http",
  "http-body",
@@ -2044,55 +2406,55 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.5"
+version = "0.27.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f"
 dependencies = [
- "futures-util",
  "http",
  "hyper",
  "hyper-util",
  "rustls",
- "rustls-pki-types",
  "tokio",
  "tokio-rustls",
  "tower-service",
 ]
 
 [[package]]
-name = "hyper-tls"
-version = "0.6.0"
+name = "hyper-timeout"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
 dependencies = [
- "bytes",
- "http-body-util",
  "hyper",
  "hyper-util",
- "native-tls",
+ "pin-project-lite",
  "tokio",
- "tokio-native-tls",
  "tower-service",
 ]
 
 [[package]]
 name = "hyper-util"
-version = "0.1.11"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "futures-channel",
  "futures-util",
  "http",
  "http-body",
  "hyper",
+ "ipnet",
  "libc",
+ "percent-encoding",
  "pin-project-lite",
- "socket2",
+ "socket2 0.6.3",
+ "system-configuration",
  "tokio",
  "tower-service",
  "tracing",
+ "windows-registry",
 ]
 
 [[package]]
@@ -2112,9 +2474,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -2136,21 +2498,23 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
  "displaydoc",
+ "potential_utf",
+ "utf8_iter",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -2159,98 +2523,66 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
- "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
+ "icu_locale_core",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
+name = "id-arena"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.101",
-]
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
 [[package]]
 name = "ident_case"
@@ -2260,9 +2592,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -2271,9 +2603,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -2292,13 +2624,14 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.3",
+ "hashbrown 0.17.0",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -2309,37 +2642,47 @@ checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 
 [[package]]
 name = "inout"
-version = "0.1.4"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7"
 dependencies = [
- "generic-array",
+ "hybrid-array",
 ]
 
 [[package]]
 name = "io-enum"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d197db2f7ebf90507296df3aebaf65d69f5dce8559d8dbd82776a6cadab61bbf"
+checksum = "7de9008599afe8527a8c9d70423437363b321649161e98473f433de802d76107"
 dependencies = [
  "derive_utils",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
+
+[[package]]
+name = "iri-string"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20"
+dependencies = [
+ "memchr",
+ "serde",
+]
 
 [[package]]
 name = "is-terminal"
-version = "0.4.16"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
- "hermit-abi 0.5.0",
+ "hermit-abi",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2350,9 +2693,9 @@ checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "itertools"
@@ -2372,28 +2715,83 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys 0.3.1",
+ "log",
+ "thiserror 1.0.69",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
+]
 
 [[package]]
 name = "jobserver"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
 dependencies = [
+ "cfg-if",
+ "futures-util",
  "once_cell",
  "wasm-bindgen",
 ]
@@ -2413,44 +2811,51 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
 name = "libloading"
-version = "0.8.6"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "libc",
- "redox_syscall 0.5.11",
+ "plain",
+ "redox_syscall 0.7.4",
 ]
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.33.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "947e6816f7825b2b45027c2c32e7085da9934defa535de4a6a46b10a4d5257fa"
+checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1"
 dependencies = [
  "cc",
  "pkg-config",
@@ -2459,9 +2864,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.22"
+version = "1.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
+checksum = "fc3a226e576f50782b3305c5ccf458698f92798987f551c6a02efe8276721e22"
 dependencies = [
  "cc",
  "pkg-config",
@@ -2470,49 +2875,41 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
 
 [[package]]
 name = "local-ip-address"
-version = "0.6.4"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c986b1747bbd3666abe4d57c64e60e6a82c2216140d8b12d5ceb33feb9de44b3"
+checksum = "d4a59a0cb1c7f84471ad5cd38d768c2a29390d17f1ff2827cdf49bc53e8ac70b"
 dependencies = [
  "libc",
  "neli",
- "thiserror 2.0.12",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 dependencies = [
  "value-bag",
 ]
@@ -2523,9 +2920,15 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.15.3",
+ "hashbrown 0.15.5",
 ]
 
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
 [[package]]
 name = "matchit"
 version = "0.8.4"
@@ -2534,9 +2937,9 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "miette"
@@ -2565,7 +2968,7 @@ checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2582,29 +2985,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "mockall"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2"
+checksum = "f58d964098a5f9c6b63d0798e5372fd04708193510a7af313c22e9f29b7b620b"
 dependencies = [
  "cfg-if",
  "downcast",
@@ -2616,21 +3020,21 @@ dependencies = [
 
 [[package]]
 name = "mockall_derive"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898"
+checksum = "ca41ce716dda6a9be188b385aa78ee5260fc25cd3802cb2a8afdc6afbe6b6dbf"
 dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "multimap"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 dependencies = [
  "serde",
 ]
@@ -2655,7 +3059,7 @@ dependencies = [
  "percent-encoding",
  "serde",
  "serde_json",
- "socket2",
+ "socket2 0.5.10",
  "twox-hash",
  "url",
 ]
@@ -2666,14 +3070,14 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63c3512cf11487168e0e9db7157801bf5273be13055a9cc95356dc9e0035e49c"
 dependencies = [
- "darling",
+ "darling 0.20.11",
  "heck",
  "num-bigint",
  "proc-macro-crate",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
  "termcolor",
  "thiserror 1.0.69",
 ]
@@ -2687,7 +3091,7 @@ dependencies = [
  "base64 0.21.7",
  "bigdecimal",
  "bindgen",
- "bitflags 2.9.0",
+ "bitflags",
  "bitvec",
  "btoi",
  "byteorder",
@@ -2728,9 +3132,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.14"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
 dependencies = [
  "libc",
  "log",
@@ -2738,34 +3142,38 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.11.1",
+ "security-framework",
  "security-framework-sys",
  "tempfile",
 ]
 
 [[package]]
 name = "neli"
-version = "0.6.5"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93062a0dce6da2517ea35f301dfc88184ce18d3601ec786a727a87bf535deca9"
+checksum = "22f9786d56d972959e1408b6a93be6af13b9c1392036c5c1fafa08a1b0c6ee87"
 dependencies = [
+ "bitflags",
  "byteorder",
+ "derive_builder",
+ "getset",
  "libc",
  "log",
  "neli-proc-macros",
+ "parking_lot",
 ]
 
 [[package]]
 name = "neli-proc-macros"
-version = "0.1.4"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8034b7fbb6f9455b2a96c19e6edf8dc9fc34c70449938d8ee3b4df363f61fe"
+checksum = "05d8d08c6e98f20a62417478ebf7be8e1425ec9acecc6f63e22da633f6b71609"
 dependencies = [
  "either",
  "proc-macro2",
  "quote",
  "serde",
- "syn 1.0.109",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2786,12 +3194,25 @@ checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7"
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
 ]
 
 [[package]]
@@ -2804,11 +3225,20 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967"
 
 [[package]]
 name = "num-integer"
@@ -2819,6 +3249,28 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -2830,18 +3282,24 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.37.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "oorandom"
@@ -2851,11 +3309,11 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "bfe4646e360ec77dff7dde40ed3d6c5fee52d156ef4a62f53973d38294dad87f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2872,20 +3330,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.6"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.108"
+version = "0.9.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+checksum = "ad2f2c0eba47118757e4c6d2bff2838f3e0523380021356e7875e858372ce644"
 dependencies = [
  "cc",
  "libc",
@@ -2894,16 +3352,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "overload"
-version = "0.1.1"
+name = "owo-colors"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d"
 
 [[package]]
-name = "owo-colors"
-version = "4.2.0"
+name = "page_size"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564"
+checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
+dependencies = [
+ "libc",
+ "winapi",
+]
 
 [[package]]
 name = "parking"
@@ -2913,9 +3375,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2923,15 +3385,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.11",
+ "redox_syscall 0.5.18",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -2956,7 +3418,7 @@ dependencies = [
  "regex",
  "regex-syntax",
  "structmeta",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -2979,24 +3441,24 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "pem"
-version = "3.0.5"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
 dependencies = [
  "base64 0.22.1",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "phf"
@@ -3036,11 +3498,31 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "pin-project"
+version = "1.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pin-utils"
@@ -3050,9 +3532,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "piper"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
 dependencies = [
  "atomic-waker",
  "fastrand",
@@ -3061,9 +3543,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "plotters"
@@ -3095,34 +3583,42 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.7.4"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.4.0",
+ "hermit-abi",
  "pin-project-lite",
- "rustix 0.38.44",
- "tracing",
- "windows-sys 0.59.0",
+ "rustix",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "portable-atomic-util"
-version = "0.2.4"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
 dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -3135,14 +3631,14 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.8.25",
+ "zerocopy 0.8.48",
 ]
 
 [[package]]
 name = "predicates"
-version = "3.1.3"
+version = "3.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
+checksum = "ada8f2932f28a27ee7b70dd6c1c39ea0675c55a36879ab92f3a715eaa1e63cfe"
 dependencies = [
  "anstyle",
  "predicates-core",
@@ -3150,15 +3646,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
+checksum = "cad38746f3166b4031b1a0d39ad9f954dd291e7854fcc0eed52ee41a0b50d144"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
+checksum = "d0de1b847b39c8131db0467e9df1ff60e6d0562ab8e9a16e568ad0fdb372e2f2"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -3174,13 +3670,23 @@ dependencies = [
  "yansi",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.25.11+spec-1.1.0",
 ]
 
 [[package]]
@@ -3202,14 +3708,14 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -3222,11 +3728,43 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
  "version_check",
  "yansi",
 ]
 
+[[package]]
+name = "prost"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
+dependencies = [
+ "anyhow",
+ "itertools 0.14.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7"
+dependencies = [
+ "prost",
+]
+
 [[package]]
 name = "ptr_meta"
 version = "0.1.4"
@@ -3249,29 +3787,91 @@ dependencies = [
 
 [[package]]
 name = "quickcheck"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
+checksum = "95c589f335db0f6aaa168a7cd27b1fc6920f5e1470c804f814d9cd6e62a0f70b"
 dependencies = [
  "env_logger",
  "log",
- "rand 0.8.5",
+ "rand 0.10.1",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2 0.6.3",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
+dependencies = [
+ "aws-lc-rs",
+ "bytes",
+ "getrandom 0.3.4",
+ "lru-slab",
+ "rand 0.9.4",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.18",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2 0.6.3",
+ "tracing",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "r2d2"
@@ -3296,9 +3896,9 @@ dependencies = [
 
 [[package]]
 name = "r2d2_sqlite"
-version = "0.28.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8998443b32daee2ad6f528afb19ad77c4a8acc4d8d55b3e5072ed42862fe261a"
+checksum = "5576df16239e4e422c4835c8ed00be806d4491855c7847dba60b7aa8408b469b"
 dependencies = [
  "r2d2",
  "rusqlite",
@@ -3324,12 +3924,23 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
  "rand_chacha 0.9.0",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -3349,7 +3960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -3358,23 +3969,29 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.4",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -3382,37 +3999,57 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a"
 dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
+ "bitflags",
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.3.5"
+name = "ref-cast"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
 dependencies = [
- "bitflags 1.3.2",
+ "ref-cast-impl",
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.5.11"
+name = "ref-cast-impl"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
+checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
- "bitflags 2.9.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3422,9 +4059,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3433,9 +4070,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "relative-path"
@@ -3454,46 +4091,43 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.15"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-core",
- "futures-util",
  "h2",
  "http",
  "http-body",
  "http-body-util",
  "hyper",
  "hyper-rustls",
- "hyper-tls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "quinn",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
- "system-configuration",
  "tokio",
- "tokio-native-tls",
+ "tokio-rustls",
  "tower",
+ "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows-registry",
 ]
 
 [[package]]
@@ -3504,7 +4138,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -3523,9 +4157,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv"
-version = "0.7.45"
+version = "0.7.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
+checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1"
 dependencies = [
  "bitvec",
  "bytecheck",
@@ -3541,15 +4175,25 @@ dependencies = [
 
 [[package]]
 name = "rkyv_derive"
-version = "0.7.45"
+version = "0.7.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
+checksum = "84d7b42d4b8d06048d3ac8db0eb31bcb942cbeb709f0b5f2b2ebde398d3038f5"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "rsqlite-vfs"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8a1f2315036ef6b1fbacd1972e8ee7688030b0a2121edfc2a6550febd41574d"
+dependencies = [
+ "hashbrown 0.16.1",
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "rstest"
 version = "0.25.0"
@@ -3558,10 +4202,21 @@ checksum = "6fc39292f8613e913f7df8fa892b8944ceb47c247b78e1b1ae2f09e019be789d"
 dependencies = [
  "futures-timer",
  "futures-util",
- "rstest_macros",
+ "rstest_macros 0.25.0",
  "rustc_version",
 ]
 
+[[package]]
+name = "rstest"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49"
+dependencies = [
+ "futures-timer",
+ "futures-util",
+ "rstest_macros 0.26.1",
+]
+
 [[package]]
 name = "rstest_macros"
 version = "0.25.0"
@@ -3576,29 +4231,48 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.101",
+ "syn 2.0.117",
+ "unicode-ident",
+]
+
+[[package]]
+name = "rstest_macros"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0"
+dependencies = [
+ "cfg-if",
+ "glob",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "relative-path",
+ "rustc_version",
+ "syn 2.0.117",
  "unicode-ident",
 ]
 
 [[package]]
 name = "rusqlite"
-version = "0.35.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a22715a5d6deef63c637207afbe68d0c72c3f8d0022d7cf9714c442d6157606b"
+checksum = "a0d2b0146dd9661bf67bb107c0bb2a55064d556eeb3fc314151b957f313bcd4e"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
  "libsqlite3-sys",
  "smallvec",
+ "sqlite-wasm-rs",
 ]
 
 [[package]]
 name = "rust_decimal"
-version = "1.37.1"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50"
+checksum = "2ce901f9a19d251159075a4c37af514c3b8ef99c22e02dd8c19161cf397ee94a"
 dependencies = [
  "arrayvec",
  "borsh",
@@ -3608,19 +4282,20 @@ dependencies = [
  "rkyv",
  "serde",
  "serde_json",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 
 [[package]]
 name = "rustc_version"
@@ -3633,36 +4308,25 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.9.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustix"
-version = "1.0.7"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "errno",
  "libc",
- "linux-raw-sys 0.9.4",
- "windows-sys 0.59.0",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.26"
+version = "0.23.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0"
+checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21"
 dependencies = [
+ "aws-lc-rs",
+ "log",
  "once_cell",
  "ring",
  "rustls-pki-types",
@@ -3673,37 +4337,60 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
 dependencies = [
  "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.2.0",
+ "security-framework",
 ]
 
 [[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
+name = "rustls-pki-types"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
 dependencies = [
- "rustls-pki-types",
+ "web-time",
+ "zeroize",
 ]
 
 [[package]]
-name = "rustls-pki-types"
-version = "1.11.0"
+name = "rustls-platform-verifier"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.1"
+version = "0.103.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
+checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06"
 dependencies = [
+ "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
@@ -3711,15 +4398,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
 [[package]]
 name = "same-file"
@@ -3738,11 +4425,11 @@ checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71"
 
 [[package]]
 name = "schannel"
-version = "0.1.27"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3754,6 +4441,30 @@ dependencies = [
  "parking_lot",
 ]
 
+[[package]]
+name = "schemars"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -3768,25 +4479,12 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.9.0",
- "core-foundation 0.9.4",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework"
-version = "3.2.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.9.0",
- "core-foundation 0.10.0",
+ "bitflags",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -3794,9 +4492,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.14.0"
+version = "2.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3804,16 +4502,17 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
@@ -3829,58 +4528,70 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.17"
+version = "0.11.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
 dependencies = [
  "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "serde_html_form"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d2de91cf02bbc07cde38891769ccd5d4f073d22a40683aa4bc7a95781aaa2c4"
+checksum = "b2f2d7ff8a2140333718bb329f5c40fc5f0865b84c426183ce14c97d2ab8154f"
 dependencies = [
  "form_urlencoded",
- "indexmap 2.9.0",
+ "indexmap 2.14.0",
  "itoa",
  "ryu",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.14.0",
  "itoa",
  "memchr",
- "ryu",
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.17"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
 dependencies = [
  "itoa",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -3891,18 +4602,27 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -3917,17 +4637,18 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.12.0"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.9.0",
- "serde",
- "serde_derive",
+ "indexmap 2.14.0",
+ "schemars 0.9.0",
+ "schemars 1.2.1",
+ "serde_core",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -3935,14 +4656,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.12.0"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65"
 dependencies = [
- "darling",
+ "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -3952,7 +4673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
  "digest",
 ]
 
@@ -3963,7 +4684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
  "digest",
 ]
 
@@ -3984,13 +4705,20 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.5"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
 dependencies = [
+ "errno",
  "libc",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
 [[package]]
 name = "simdutf8"
 version = "0.1.5"
@@ -3999,40 +4727,59 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "siphasher"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "sqlite-wasm-rs"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f4206ed3a67690b9c29b77d728f6acc3ce78f16bf846d83c94f76400320181b"
+dependencies = [
+ "cc",
+ "js-sys",
+ "rsqlite-vfs",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "static_assertions"
@@ -4055,7 +4802,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -4066,14 +4813,14 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "subprocess"
-version = "0.2.9"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086"
+checksum = "2c56e8662b206b9892d7a5a3f2ecdbcb455d3d6b259111373b7e08b8055158a8"
 dependencies = [
  "libc",
  "winapi",
@@ -4096,9 +4843,9 @@ dependencies = [
 
 [[package]]
 name = "supports-hyperlinks"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b"
+checksum = "e396b6523b11ccb83120b115a0b7366de372751aa6edf19844dfb13a6af97e91"
 
 [[package]]
 name = "supports-unicode"
@@ -4119,9 +4866,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.101"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4145,16 +4892,16 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "system-configuration"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -4194,15 +4941,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.19.1"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.2",
+ "getrandom 0.4.2",
  "once_cell",
- "rustix 1.0.7",
- "windows-sys 0.59.0",
+ "rustix",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4216,12 +4963,12 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
+checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874"
 dependencies = [
- "rustix 1.0.7",
- "windows-sys 0.59.0",
+ "rustix",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4232,18 +4979,21 @@ checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
 
 [[package]]
 name = "testcontainers"
-version = "0.23.3"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a4f01f39bb10fc2a5ab23eb0d888b1e2bb168c157f61a1b98e6c501c639c74"
+checksum = "bfd5785b5483672915ed5fe3cddf9f546802779fc1eceff0a6fb7321fac81c1e"
 dependencies = [
+ "astral-tokio-tar",
  "async-trait",
  "bollard",
- "bollard-stubs",
  "bytes",
  "docker_credential",
  "either",
  "etcetera",
+ "ferroid",
  "futures",
+ "http",
+ "itertools 0.14.0",
  "log",
  "memchr",
  "parse-display",
@@ -4251,10 +5001,9 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
- "tokio-tar",
  "tokio-util",
  "url",
 ]
@@ -4266,7 +5015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 dependencies = [
  "unicode-linebreak",
- "unicode-width 0.2.0",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -4280,11 +5029,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -4295,56 +5044,55 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
  "num-conv",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4352,9 +5100,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -4372,9 +5120,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4387,47 +5135,36 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "a91135f59b1cbf38c91e73cf3386fca9bb77915c45ce2771460c9d92f0f3d776"
 dependencies = [
- "backtrace",
  "bytes",
  "libc",
  "mio",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.6.3",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -4435,9 +5172,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -4445,73 +5182,158 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-tar"
-version = "0.3.1"
+name = "tokio-util"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
 dependencies = [
- "filetime",
+ "bytes",
  "futures-core",
- "libc",
- "redox_syscall 0.3.5",
+ "futures-sink",
+ "pin-project-lite",
  "tokio",
- "tokio-stream",
- "xattr",
 ]
 
 [[package]]
-name = "tokio-util"
-version = "0.7.15"
+name = "toml"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
 name = "toml"
-version = "0.8.22"
+version = "0.9.12+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
+dependencies = [
+ "indexmap 2.14.0",
+ "serde_core",
+ "serde_spanned 1.1.1",
+ "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 0.7.15",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
+ "indexmap 2.14.0",
  "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_write",
+ "winnow 0.7.15",
 ]
 
 [[package]]
-name = "toml_datetime"
-version = "0.6.9"
+name = "toml_edit"
+version = "0.25.11+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b"
+dependencies = [
+ "indexmap 2.14.0",
+ "toml_datetime 1.1.1+spec-1.1.0",
+ "toml_parser",
+ "winnow 1.0.1",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
+dependencies = [
+ "winnow 1.0.1",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
+[[package]]
+name = "toml_writer"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
-dependencies = [
- "serde",
-]
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 
 [[package]]
-name = "toml_edit"
-version = "0.22.26"
+name = "tonic"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
+checksum = "fec7c61a0695dc1887c1b53952990f3ad2e3a31453e1f49f10e75424943a93ec"
 dependencies = [
- "indexmap 2.9.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_write",
- "winnow",
+ "async-trait",
+ "axum",
+ "base64 0.22.1",
+ "bytes",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-timeout",
+ "hyper-util",
+ "percent-encoding",
+ "pin-project",
+ "socket2 0.6.3",
+ "sync_wrapper",
+ "tokio",
+ "tokio-stream",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
-name = "toml_write"
-version = "0.1.1"
+name = "tonic-prost"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
+checksum = "a55376a0bbaa4975a3f10d009ad763d8f4108f067c7c2e74f3001fb49778d309"
+dependencies = [
+ "bytes",
+ "prost",
+ "tonic",
+]
 
 [[package]]
 name = "torrust-axum-health-check-api-server"
@@ -4558,19 +5380,21 @@ dependencies = [
  "hyper",
  "local-ip-address",
  "percent-encoding",
- "rand 0.9.1",
+ "rand 0.10.1",
  "reqwest",
  "serde",
  "serde_bencode",
  "serde_bytes",
  "serde_repr",
  "tokio",
+ "tokio-util",
  "torrust-axum-server",
  "torrust-server-lib",
  "torrust-tracker-clock",
  "torrust-tracker-configuration",
  "torrust-tracker-events",
  "torrust-tracker-primitives",
+ "torrust-tracker-swarm-coordination-registry",
  "torrust-tracker-test-helpers",
  "tower",
  "tower-http",
@@ -4600,7 +5424,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "torrust-axum-server",
  "torrust-rest-tracker-api-client",
@@ -4610,6 +5434,7 @@ dependencies = [
  "torrust-tracker-configuration",
  "torrust-tracker-metrics",
  "torrust-tracker-primitives",
+ "torrust-tracker-swarm-coordination-registry",
  "torrust-tracker-test-helpers",
  "torrust-udp-tracker-server",
  "tower",
@@ -4630,7 +5455,7 @@ dependencies = [
  "hyper",
  "hyper-util",
  "pin-project-lite",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "torrust-server-lib",
  "torrust-tracker-configuration",
@@ -4646,7 +5471,7 @@ dependencies = [
  "hyper",
  "reqwest",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "url",
  "uuid",
 ]
@@ -4659,9 +5484,12 @@ dependencies = [
  "bittorrent-tracker-core",
  "bittorrent-udp-tracker-core",
  "tokio",
+ "tokio-util",
  "torrust-tracker-configuration",
+ "torrust-tracker-events",
  "torrust-tracker-metrics",
  "torrust-tracker-primitives",
+ "torrust-tracker-swarm-coordination-registry",
  "torrust-tracker-test-helpers",
  "torrust-udp-tracker-server",
 ]
@@ -4671,7 +5499,7 @@ name = "torrust-server-lib"
 version = "3.0.0-develop"
 dependencies = [
  "derive_more",
- "rstest",
+ "rstest 0.25.0",
  "tokio",
  "torrust-tracker-primitives",
  "tower-http",
@@ -4693,13 +5521,14 @@ dependencies = [
  "clap",
  "local-ip-address",
  "mockall",
- "rand 0.9.1",
+ "rand 0.10.1",
  "regex",
  "reqwest",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
+ "tokio-util",
  "torrust-axum-health-check-api-server",
  "torrust-axum-http-tracker-server",
  "torrust-axum-rest-tracker-api-server",
@@ -4709,6 +5538,7 @@ dependencies = [
  "torrust-server-lib",
  "torrust-tracker-clock",
  "torrust-tracker-configuration",
+ "torrust-tracker-swarm-coordination-registry",
  "torrust-tracker-test-helpers",
  "torrust-udp-tracker-server",
  "tracing",
@@ -4732,7 +5562,7 @@ dependencies = [
  "serde_bencode",
  "serde_bytes",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "torrust-tracker-configuration",
  "tracing",
@@ -4760,8 +5590,8 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "thiserror 2.0.12",
- "toml",
+ "thiserror 2.0.18",
+ "toml 0.9.12+spec-1.1.0",
  "torrust-tracker-located-error",
  "tracing",
  "tracing-subscriber",
@@ -4773,8 +5603,8 @@ dependencies = [
 name = "torrust-tracker-contrib-bencode"
 version = "3.0.0-develop"
 dependencies = [
- "criterion",
- "thiserror 2.0.12",
+ "criterion 0.8.2",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -4790,7 +5620,7 @@ dependencies = [
 name = "torrust-tracker-located-error"
 version = "3.0.0-develop"
 dependencies = [
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -4803,10 +5633,10 @@ dependencies = [
  "derive_more",
  "formatjson",
  "pretty_assertions",
- "rstest",
+ "rstest 0.25.0",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "torrust-tracker-primitives",
  "tracing",
 ]
@@ -4819,45 +5649,53 @@ dependencies = [
  "binascii",
  "bittorrent-primitives",
  "derive_more",
- "rstest",
+ "rstest 0.25.0",
  "serde",
  "tdyne-peer-id",
  "tdyne-peer-id-registry",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "torrust-tracker-configuration",
  "url",
  "zerocopy 0.7.35",
 ]
 
 [[package]]
-name = "torrust-tracker-test-helpers"
-version = "3.0.0-develop"
-dependencies = [
- "rand 0.9.1",
- "torrust-tracker-configuration",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "torrust-tracker-torrent-repository"
+name = "torrust-tracker-swarm-coordination-registry"
 version = "3.0.0-develop"
 dependencies = [
  "aquatic_udp_protocol",
  "async-std",
  "bittorrent-primitives",
- "criterion",
+ "chrono",
+ "criterion 0.8.2",
  "crossbeam-skiplist",
- "rand 0.9.1",
- "rstest",
+ "futures",
+ "mockall",
+ "rand 0.10.1",
+ "rstest 0.26.1",
+ "serde",
+ "thiserror 2.0.18",
  "tokio",
+ "tokio-util",
  "torrust-tracker-clock",
  "torrust-tracker-configuration",
+ "torrust-tracker-events",
+ "torrust-tracker-metrics",
  "torrust-tracker-primitives",
  "torrust-tracker-test-helpers",
  "tracing",
 ]
 
+[[package]]
+name = "torrust-tracker-test-helpers"
+version = "3.0.0-develop"
+dependencies = [
+ "rand 0.10.1",
+ "torrust-tracker-configuration",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "torrust-tracker-torrent-repository-benchmarking"
 version = "3.0.0-develop"
@@ -4865,12 +5703,12 @@ dependencies = [
  "aquatic_udp_protocol",
  "async-std",
  "bittorrent-primitives",
- "criterion",
+ "criterion 0.8.2",
  "crossbeam-skiplist",
  "dashmap",
  "futures",
  "parking_lot",
- "rstest",
+ "rstest 0.26.1",
  "tokio",
  "torrust-tracker-clock",
  "torrust-tracker-configuration",
@@ -4892,18 +5730,19 @@ dependencies = [
  "futures-util",
  "local-ip-address",
  "mockall",
- "rand 0.9.1",
+ "rand 0.10.1",
  "ringbuf",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
+ "tokio-util",
  "torrust-server-lib",
  "torrust-tracker-clock",
  "torrust-tracker-configuration",
  "torrust-tracker-events",
- "torrust-tracker-located-error",
  "torrust-tracker-metrics",
  "torrust-tracker-primitives",
+ "torrust-tracker-swarm-coordination-registry",
  "torrust-tracker-test-helpers",
  "tracing",
  "url",
@@ -4913,15 +5752,18 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
  "futures-core",
  "futures-util",
+ "indexmap 2.14.0",
  "pin-project-lite",
+ "slab",
  "sync_wrapper",
  "tokio",
+ "tokio-util",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -4929,19 +5771,22 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.2"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
+checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
  "async-compression",
- "bitflags 2.9.0",
+ "bitflags",
  "bytes",
  "futures-core",
+ "futures-util",
  "http",
  "http-body",
+ "iri-string",
  "pin-project-lite",
  "tokio",
  "tokio-util",
+ "tower",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -4962,9 +5807,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -4974,20 +5819,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -5016,9 +5861,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "nu-ansi-term",
  "serde",
@@ -5050,9 +5895,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "uncased"
@@ -5065,9 +5910,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-linebreak"
@@ -5075,6 +5920,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.14"
@@ -5083,9 +5934,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unicode-xid"
@@ -5099,23 +5950,51 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
+[[package]]
+name = "ureq"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0"
+dependencies = [
+ "base64 0.22.1",
+ "log",
+ "percent-encoding",
+ "rustls",
+ "rustls-pki-types",
+ "ureq-proto",
+ "utf8-zero",
+]
+
+[[package]]
+name = "ureq-proto"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e994ba84b0bd1b1b0cf92878b7ef898a5c1760108fe7b6010327e274917a808c"
+dependencies = [
+ "base64 0.22.1",
+ "http",
+ "httparse",
+ "log",
+]
+
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
-name = "utf16_iter"
-version = "1.0.5"
+name = "utf8-zero"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"
 
 [[package]]
 name = "utf8_iter"
@@ -5131,12 +6010,14 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.16.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
 dependencies = [
- "getrandom 0.3.2",
- "rand 0.9.1",
+ "getrandom 0.4.2",
+ "js-sys",
+ "rand 0.10.1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -5147,9 +6028,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "value-bag"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0"
 
 [[package]]
 name = "vcpkg"
@@ -5184,63 +6065,57 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
+ "wit-bindgen",
 ]
 
 [[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
+name = "wasm-bindgen"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
 dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.101",
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "serde",
+ "wasm-bindgen-macro",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8"
 dependencies = [
- "cfg-if",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5248,36 +6123,89 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
- "wasm-bindgen-backend",
+ "syn 2.0.117",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap 2.14.0",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags",
+ "hashbrown 0.15.5",
+ "indexmap 2.14.0",
+ "semver",
+]
+
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -5296,11 +6224,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5311,123 +6239,123 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.61.0"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
  "windows-link",
  "windows-result",
- "windows-strings 0.4.0",
+ "windows-strings",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-registry"
-version = "0.4.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
 dependencies = [
+ "windows-link",
  "windows-result",
- "windows-strings 0.3.1",
- "windows-targets 0.53.0",
+ "windows-strings",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.3.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.3.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
-name = "windows-strings"
-version = "0.4.0"
+name = "windows-sys"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-link",
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets 0.53.5",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.59.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
 ]
 
 [[package]]
@@ -5448,25 +6376,26 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.0"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
@@ -5476,15 +6405,15 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5494,15 +6423,15 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5512,9 +6441,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -5524,15 +6453,15 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5542,15 +6471,15 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5560,15 +6489,15 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5578,15 +6507,15 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5596,39 +6525,121 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.7.8"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e27d6ad3dac991091e4d35de9ba2d2d00647c5d0fc26c5496dee55984ae111b"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "winnow"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5"
 dependencies = [
- "bitflags 2.9.0",
+ "memchr",
 ]
 
 [[package]]
-name = "write16"
-version = "1.0.0"
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap 2.14.0",
+ "prettyplease",
+ "syn 2.0.117",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags",
+ "indexmap 2.14.0",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap 2.14.0",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
 
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "wyz"
@@ -5641,12 +6652,12 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.5.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
+checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
 dependencies = [
  "libc",
- "rustix 1.0.7",
+ "rustix",
 ]
 
 [[package]]
@@ -5657,11 +6668,10 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -5669,13 +6679,13 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
  "synstructure",
 ]
 
@@ -5691,11 +6701,11 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.25"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
 dependencies = [
- "zerocopy-derive 0.8.25",
+ "zerocopy-derive 0.8.48",
 ]
 
 [[package]]
@@ -5706,52 +6716,63 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.25"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
  "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
 
 [[package]]
 name = "zerovec"
-version = "0.10.4"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -5760,15 +6781,21 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.101",
+ "syn 2.0.117",
 ]
 
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+
 [[package]]
 name = "zstd"
 version = "0.13.3"
@@ -5789,9 +6816,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.15+zstd.1.5.7"
+version = "2.0.16+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index a15ff78df..1eb5f0d35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,13 +19,13 @@ version.workspace = true
 name = "torrust_tracker_lib"
 
 [workspace.package]
-authors = ["Nautilus Cyberneering <info@nautilus-cyberneering.de>, Mick van Dijke <mick@dutchbits.nl>"]
-categories = ["network-programming", "web-programming"]
+authors = [ "Nautilus Cyberneering <info@nautilus-cyberneering.de>, Mick van Dijke <mick@dutchbits.nl>" ]
+categories = [ "network-programming", "web-programming" ]
 description = "A feature rich BitTorrent tracker."
 documentation = "https://docs.rs/crate/torrust-tracker/"
 edition = "2021"
 homepage = "https://torrust.com/"
-keywords = ["bittorrent", "file-sharing", "peer-to-peer", "torrent", "tracker"]
+keywords = [ "bittorrent", "file-sharing", "peer-to-peer", "torrent", "tracker" ]
 license = "AGPL-3.0-only"
 publish = true
 repository = "https://github.com/torrust/torrust-tracker"
@@ -34,19 +34,20 @@ version = "3.0.0-develop"
 
 [dependencies]
 anyhow = "1"
-axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
+axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
 bittorrent-http-tracker-core = { version = "3.0.0-develop", path = "packages/http-tracker-core" }
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "packages/tracker-core" }
 bittorrent-udp-tracker-core = { version = "3.0.0-develop", path = "packages/udp-tracker-core" }
-chrono = { version = "0", default-features = false, features = ["clock"] }
-clap = { version = "4", features = ["derive", "env"] }
+chrono = { version = "0", default-features = false, features = [ "clock" ] }
+clap = { version = "4", features = [ "derive", "env" ] }
 rand = "0"
 regex = "1"
-reqwest = { version = "0", features = ["json"] }
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1", features = ["preserve_order"] }
+reqwest = { version = "0", features = [ "json" ] }
+serde = { version = "1", features = [ "derive" ] }
+serde_json = { version = "1", features = [ "preserve_order" ] }
 thiserror = "2.0.12"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
+tokio-util = "0.7.15"
 torrust-axum-health-check-api-server = { version = "3.0.0-develop", path = "packages/axum-health-check-api-server" }
 torrust-axum-http-tracker-server = { version = "3.0.0-develop", path = "packages/axum-http-tracker-server" }
 torrust-axum-rest-tracker-api-server = { version = "3.0.0-develop", path = "packages/axum-rest-tracker-api-server" }
@@ -55,9 +56,10 @@ torrust-rest-tracker-api-core = { version = "3.0.0-develop", path = "packages/re
 torrust-server-lib = { version = "3.0.0-develop", path = "packages/server-lib" }
 torrust-tracker-clock = { version = "3.0.0-develop", path = "packages/clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "packages/configuration" }
+torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "packages/swarm-coordination-registry" }
 torrust-udp-tracker-server = { version = "3.0.0-develop", path = "packages/udp-tracker-server" }
 tracing = "0"
-tracing-subscriber = { version = "0", features = ["json"] }
+tracing-subscriber = { version = "0", features = [ "json" ] }
 
 [dev-dependencies]
 bittorrent-primitives = "0.1.0"
@@ -68,7 +70,7 @@ torrust-rest-tracker-api-client = { version = "3.0.0-develop", path = "packages/
 torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "packages/test-helpers" }
 
 [workspace]
-members = ["console/tracker-client", "packages/torrent-repository-benchmarking"]
+members = [ "console/tracker-client", "packages/torrent-repository-benchmarking" ]
 
 [profile.dev]
 debug = 1
diff --git a/Containerfile b/Containerfile
index 263053390..e926a5202 100644
--- a/Containerfile
+++ b/Containerfile
@@ -3,13 +3,13 @@
 # Torrust Tracker
 
 ## Builder Image
-FROM docker.io/library/rust:bookworm AS chef
+FROM docker.io/library/rust:trixie AS chef
 WORKDIR /tmp
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
 RUN cargo binstall --no-confirm cargo-chef cargo-nextest
 
 ## Tester Image
-FROM docker.io/library/rust:slim-bookworm AS tester
+FROM docker.io/library/rust:slim-trixie AS tester
 WORKDIR /tmp
 
 RUN apt-get update; apt-get install -y curl sqlite3; apt-get autoclean
@@ -21,7 +21,7 @@ RUN mkdir -p /app/share/torrust/default/database/; \
     sqlite3 /app/share/torrust/default/database/tracker.sqlite3.db  "VACUUM;"
 
 ## Su Exe Compile
-FROM docker.io/library/gcc:bookworm AS gcc
+FROM docker.io/library/gcc:trixie AS gcc
 COPY ./contrib/dev-tools/su-exec/ /usr/local/src/su-exec/
 RUN cc -Wall -Werror -g /usr/local/src/su-exec/su-exec.c -o /usr/local/bin/su-exec; chmod +x /usr/local/bin/su-exec
 
@@ -91,7 +91,7 @@ RUN chown -R root:root /app; chmod -R u=rw,go=r,a+X /app; chmod -R a+x /app/bin
 
 
 ## Runtime
-FROM gcr.io/distroless/cc-debian12:debug AS runtime
+FROM gcr.io/distroless/cc-debian13:debug AS runtime
 RUN ["/busybox/cp", "-sp", "/busybox/sh","/busybox/cat","/busybox/ls","/busybox/env", "/bin/"]
 COPY --from=gcc --chmod=0555 /usr/local/bin/su-exec /bin/su-exec
 
diff --git a/README.md b/README.md
index 33fc4a028..2fe28db08 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,24 @@
 - [x] Support [newTrackon][newtrackon] checks.
 - [x] Persistent `SQLite3` or `MySQL` Databases.
 
+## Tracker Demo
+
+Experience the **Torrust Tracker** in action with our comprehensive demo environment! The [Torrust Demo][torrust-demo] repository provides a complete setup showcasing the tracker's capabilities in a real-world scenario.
+
+The demo takes full advantage of the tracker's powerful metrics system and seamless integration with [Prometheus][prometheus]. This allows you to monitor tracker performance, peer statistics, and system health in real-time. You can build sophisticated Grafana dashboards to visualize all aspects of your tracker's operation.
+
+![Sample Grafana Dashboard](./docs/media/demo/torrust-tracker-grafana-dashboard.png)
+
+**Demo Features:**
+
+- Complete Docker Compose setup.
+- Pre-configured Prometheus metrics collection.
+- Sample Grafana dashboards for monitoring.
+- Real-time tracker statistics and performance metrics.
+- Easy deployment for testing and evaluation.
+
+Visit the [Torrust Demo repository][torrust-demo] to get started with your own tracker instance and explore the monitoring capabilities.
+
 ## Roadmap
 
 Core:
@@ -49,13 +67,13 @@ Utils:
 
 Others:
 
-- [ ] Support for Windows.
+- [ ] Intensive testing for Windows.
 - [ ] Docker images for other architectures.
 
 <https://github.com/orgs/torrust/projects/10/views/6>
 
 ## Implemented BitTorrent Enhancement Proposals (BEPs)
->
+
 > _[Learn more about BitTorrent Enhancement Proposals][BEP 00]_
 
 - [BEP 03]: The BitTorrent Protocol.
@@ -95,8 +113,8 @@ podman run -it docker.io/torrust/tracker:develop
 
 ### Development Version
 
-- Please ensure you have the _**[latest stable (or nightly) version of rust][rust]___.
-- Please ensure that your computer has enough RAM. _**Recommended 16GB.___
+- Please ensure you have the \_\*\*[latest stable (or nightly) version of rust][rust]\_\_\_.
+- Please ensure that your computer has enough RAM. \_\*\*Recommended 16GB.\_\_\_
 
 #### Checkout, Test and Run
 
@@ -199,7 +217,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the [GNU Affero General Public License][AGPL_3_0] for more details.
 
-You should have received a copy of the *GNU Affero General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.
+You should have received a copy of the _GNU Affero General Public License_ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 Some files include explicit copyright notices and/or license notices.
 
@@ -232,18 +250,14 @@ This project was a joint effort by [Nautilus Cyberneering GmbH][nautilus] and [D
 [deployment_wf_b]: ../../actions/workflows/deployment.yaml/badge.svg
 [testing_wf]: ../../actions/workflows/testing.yaml
 [testing_wf_b]: ../../actions/workflows/testing.yaml/badge.svg
-
 [bittorrent]: http://bittorrent.org/
 [rust]: https://www.rust-lang.org/
 [axum]: https://github.com/tokio-rs/axum
 [newtrackon]: https://newtrackon.com/
 [coverage]: https://app.codecov.io/gh/torrust/torrust-tracker
 [torrust]: https://torrust.com/
-
 [dockerhub]: https://hub.docker.com/r/torrust/tracker/tags
-
 [torrent_source_felid]: https://github.com/qbittorrent/qBittorrent/discussions/19406
-
 [BEP 00]: https://www.bittorrent.org/beps/bep_0000.html
 [BEP 03]: https://www.bittorrent.org/beps/bep_0003.html
 [BEP 07]: https://www.bittorrent.org/beps/bep_0007.html
@@ -251,26 +265,22 @@ This project was a joint effort by [Nautilus Cyberneering GmbH][nautilus] and [D
 [BEP 23]: https://www.bittorrent.org/beps/bep_0023.html
 [BEP 27]: https://www.bittorrent.org/beps/bep_0027.html
 [BEP 48]: https://www.bittorrent.org/beps/bep_0048.html
-
 [containers.md]: ./docs/containers.md
-
 [docs]: https://docs.rs/torrust-tracker/latest/
 [api]: https://docs.rs/torrust-tracker/latest/torrust_tracker/servers/apis/v1
 [http]: https://docs.rs/torrust-tracker/latest/torrust_tracker/servers/http
 [udp]: https://docs.rs/torrust-tracker/latest/torrust_tracker/servers/udp
-
 [good first issues]: https://github.com/torrust/torrust-tracker/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
 [discussions]: https://github.com/torrust/torrust-tracker/discussions
-
 [guide.md]: https://github.com/torrust/.github/blob/main/info/contributing.md
 [agreement.md]: https://github.com/torrust/.github/blob/main/info/licensing/contributor_agreement_v01.md
-
 [AGPL_3_0]: ./docs/licenses/LICENSE-AGPL_3_0
 [MIT_0]: ./docs/licenses/LICENSE-MIT_0
 [FSF]: https://www.fsf.org/
-
 [nautilus]: https://github.com/orgs/Nautilus-Cyberneering/
 [Dutch Bits]: https://dutchbits.nl
 [Naim A.]: https://github.com/naim94a/udpt
 [greatest-ape]: https://github.com/greatest-ape/aquatic
 [Power2All]: https://github.com/power2all
+[torrust-demo]: https://github.com/torrust/torrust-demo
+[prometheus]: https://prometheus.io/
diff --git a/cSpell.json b/cSpell.json
index e384a08d9..43eb391d3 100644
--- a/cSpell.json
+++ b/cSpell.json
@@ -1,204 +1,23 @@
 {
-    "words": [
-        "Addrs",
-        "adduser",
-        "alekitto",
-        "appuser",
-        "Arvid",
-        "ASMS",
-        "asyn",
-        "autoclean",
-        "AUTOINCREMENT",
-        "automock",
-        "Avicora",
-        "Azureus",
-        "bdecode",
-        "bencode",
-        "bencoded",
-        "bencoding",
-        "beps",
-        "binascii",
-        "binstall",
-        "Bitflu",
-        "bools",
-        "Bragilevsky",
-        "bufs",
-        "buildid",
-        "Buildx",
-        "byteorder",
-        "callgrind",
-        "camino",
-        "canonicalize",
-        "canonicalized",
-        "certbot",
-        "chrono",
-        "ciphertext",
-        "clippy",
-        "codecov",
-        "codegen",
-        "completei",
-        "Condvar",
-        "connectionless",
-        "Containerfile",
-        "conv",
-        "curr",
-        "cvar",
-        "Cyberneering",
-        "dashmap",
-        "datagram",
-        "datetime",
-        "debuginfo",
-        "Deque",
-        "Dijke",
-        "distroless",
-        "dockerhub",
-        "downloadedi",
-        "dtolnay",
-        "elif",
-        "endianness",
-        "Eray",
-        "filesd",
-        "flamegraph",
-        "formatjson",
-        "Freebox",
-        "Frostegård",
-        "gecos",
-        "Gibibytes",
-        "Grcov",
-        "hasher",
-        "healthcheck",
-        "heaptrack",
-        "hexlify",
-        "hlocalhost",
-        "Hydranode",
-        "hyperthread",
-        "Icelake",
-        "iiiiiiiiiiiiiiiiiiiid",
-        "imdl",
-        "impls",
-        "incompletei",
-        "infohash",
-        "infohashes",
-        "infoschema",
-        "Intermodal",
-        "intervali",
-        "Joakim",
-        "kallsyms",
-        "Karatay",
-        "kcachegrind",
-        "kexec",
-        "keyout",
-        "Kibibytes",
-        "kptr",
-        "lcov",
-        "leecher",
-        "leechers",
-        "libsqlite",
-        "libtorrent",
-        "libz",
-        "LOGNAME",
-        "Lphant",
-        "matchmakes",
-        "Mebibytes",
-        "metainfo",
-        "middlewares",
-        "misresolved",
-        "mockall",
-        "multimap",
-        "myacicontext",
-        "ñaca",
-        "Naim",
-        "nanos",
-        "newkey",
-        "nextest",
-        "nocapture",
-        "nologin",
-        "nonroot",
-        "Norberg",
-        "numwant",
-        "nvCFlJCq7fz7Qx6KoKTDiMZvns8l5Kw7",
-        "oneshot",
-        "ostr",
-        "Pando",
-        "peekable",
-        "peerlist",
-        "programatik",
-        "proot",
-        "proto",
-        "Quickstart",
-        "Radeon",
-        "Rasterbar",
-        "realpath",
-        "reannounce",
-        "Registar",
-        "repr",
-        "reqs",
-        "reqwest",
-        "rerequests",
-        "ringbuf",
-        "ringsize",
-        "rngs",
-        "rosegment",
-        "routable",
-        "rstest",
-        "rusqlite",
-        "rustc",
-        "RUSTDOCFLAGS",
-        "RUSTFLAGS",
-        "rustfmt",
-        "Rustls",
-        "Ryzen",
-        "Seedable",
-        "serde",
-        "Shareaza",
-        "sharktorrent",
-        "SHLVL",
-        "skiplist",
-        "slowloris",
-        "socketaddr",
-        "sqllite",
-        "subsec",
-        "Swatinem",
-        "Swiftbit",
-        "taiki",
-        "tdyne",
-        "Tebibytes",
-        "tempfile",
-        "testcontainers",
-        "thiserror",
-        "tlsv",
-        "Torrentstorm",
-        "torrust",
-        "torrustracker",
-        "trackerid",
-        "Trackon",
-        "typenum",
-        "Unamed",
-        "underflows",
-        "Unsendable",
-        "untuple",
-        "uroot",
-        "Vagaa",
-        "valgrind",
-        "Vitaly",
-        "vmlinux",
-        "Vuze",
-        "Weidendorfer",
-        "Werror",
-        "whitespaces",
-        "Xacrimon",
-        "XBTT",
-        "Xdebug",
-        "Xeon",
-        "Xtorrent",
-        "Xunlei",
-        "xxxxxxxxxxxxxxxxxxxxd",
-        "yyyyyyyyyyyyyyyyyyyyd",
-        "zerocopy"
+    "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
+    "version": "0.2",
+    "dictionaryDefinitions": [
+        {
+            "name": "project-words",
+            "path": "./project-words.txt",
+            "addWords": true
+        }
+    ],
+    "dictionaries": [
+        "project-words"
     ],
     "enableFiletypes": [
         "dockerfile",
         "shellscript",
         "toml"
+    ],
+    "ignorePaths": [
+        "target",
+        "/project-words.txt"
     ]
-}
+}
\ No newline at end of file
diff --git a/console/tracker-client/Cargo.toml b/console/tracker-client/Cargo.toml
index d4ab7c9e3..8c12227e9 100644
--- a/console/tracker-client/Cargo.toml
+++ b/console/tracker-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A collection of console clients to make requests to BitTorrent trackers."
-keywords = ["bittorrent", "client", "tracker"]
+keywords = [ "bittorrent", "client", "tracker" ]
 license = "LGPL-3.0"
 name = "torrust-tracker-client"
 readme = "README.md"
@@ -19,21 +19,21 @@ anyhow = "1"
 aquatic_udp_protocol = "0"
 bittorrent-primitives = "0.1.0"
 bittorrent-tracker-client = { version = "3.0.0-develop", path = "../../packages/tracker-client" }
-clap = { version = "4", features = ["derive", "env"] }
+clap = { version = "4", features = [ "derive", "env" ] }
 futures = "0"
 hex-literal = "1"
 hyper = "1"
-reqwest = { version = "0", features = ["json"] }
-serde = { version = "1", features = ["derive"] }
+reqwest = { version = "0", features = [ "json" ] }
+serde = { version = "1", features = [ "derive" ] }
 serde_bencode = "0"
 serde_bytes = "0"
-serde_json = { version = "1", features = ["preserve_order"] }
+serde_json = { version = "1", features = [ "preserve_order" ] }
 thiserror = "2"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../../packages/configuration" }
 tracing = "0"
-tracing-subscriber = { version = "0", features = ["json"] }
-url = { version = "2", features = ["serde"] }
+tracing-subscriber = { version = "0", features = [ "json" ] }
+url = { version = "2", features = [ "serde" ] }
 
 [package.metadata.cargo-machete]
-ignored = ["serde_bytes"]
+ignored = [ "serde_bytes" ]
diff --git a/console/tracker-client/src/console/clients/checker/checks/udp.rs b/console/tracker-client/src/console/clients/checker/checks/udp.rs
index b4edb2e2c..611afafc4 100644
--- a/console/tracker-client/src/console/clients/checker/checks/udp.rs
+++ b/console/tracker-client/src/console/clients/checker/checks/udp.rs
@@ -29,6 +29,7 @@ pub async fn run(udp_trackers: Vec<Url>, timeout: Duration) -> Vec<Result<Checks
 
     tracing::debug!("UDP trackers ...");
 
+    #[allow(clippy::incompatible_msrv)]
     let info_hash = aquatic_udp_protocol::InfoHash(hex!("9c38422213e30bff212b30c360d26f9a02136422")); // DevSkim: ignore DS173237
 
     for remote_url in udp_trackers {
@@ -117,8 +118,8 @@ mod tests {
         let socket_addr = resolve_socket_addr(&Url::parse("udp://localhost:8080").unwrap());
 
         assert!(
-            socket_addr == SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080)
-                || socket_addr == SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)), 8080)
+            socket_addr == SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080)
+                || socket_addr == SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 8080)
         );
     }
 
@@ -127,8 +128,8 @@ mod tests {
         let socket_addr = resolve_socket_addr(&Url::parse("udp://localhost:8080").unwrap());
 
         assert!(
-            socket_addr == SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080)
-                || socket_addr == SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)), 8080)
+            socket_addr == SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080)
+                || socket_addr == SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 8080)
         );
     }
 }
diff --git a/console/tracker-client/src/console/clients/udp/app.rs b/console/tracker-client/src/console/clients/udp/app.rs
index a2736c365..527f46e78 100644
--- a/console/tracker-client/src/console/clients/udp/app.rs
+++ b/console/tracker-client/src/console/clients/udp/app.rs
@@ -176,8 +176,7 @@ fn parse_socket_addr(tracker_socket_addr_str: &str) -> anyhow::Result<SocketAddr
 
         if parts.len() != 2 {
             return Err(anyhow::anyhow!(
-                "invalid address format: `{}`. Expected format is host:port",
-                tracker_socket_addr_str
+                "invalid address format: `{tracker_socket_addr_str}`. Expected format is host:port"
             ));
         }
 
@@ -196,7 +195,7 @@ fn parse_socket_addr(tracker_socket_addr_str: &str) -> anyhow::Result<SocketAddr
     // Perform DNS resolution.
     let socket_addrs: Vec<_> = resolved_addr.to_socket_addrs()?.collect();
     if socket_addrs.is_empty() {
-        Err(anyhow::anyhow!("DNS resolution failed for `{}`", tracker_socket_addr_str))
+        Err(anyhow::anyhow!("DNS resolution failed for `{tracker_socket_addr_str}`"))
     } else {
         Ok(socket_addrs[0])
     }
diff --git a/console/tracker-client/src/console/clients/udp/checker.rs b/console/tracker-client/src/console/clients/udp/checker.rs
index bf6b49782..ded5c107e 100644
--- a/console/tracker-client/src/console/clients/udp/checker.rs
+++ b/console/tracker-client/src/console/clients/udp/checker.rs
@@ -116,7 +116,7 @@ impl Client {
             bytes_uploaded: NumberOfBytes(0i64.into()),
             bytes_left: NumberOfBytes(0i64.into()),
             event: AnnounceEvent::Started.into(),
-            ip_address: Ipv4Addr::new(0, 0, 0, 0).into(),
+            ip_address: Ipv4Addr::UNSPECIFIED.into(),
             key: PeerKey::new(0i32),
             peers_wanted: NumberOfPeers(1i32.into()),
             port: Port::new(port),
diff --git a/contrib/bencode/Cargo.toml b/contrib/bencode/Cargo.toml
index f6355b6fc..5fab1792d 100644
--- a/contrib/bencode/Cargo.toml
+++ b/contrib/bencode/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 description = "(contrib) Efficient decoding and encoding for bencode."
-keywords = ["bencode", "contrib", "library"]
+keywords = [ "bencode", "contrib", "library" ]
 name = "torrust-tracker-contrib-bencode"
 readme = "README.md"
 
-authors = ["Nautilus Cyberneering <info@nautilus-cyberneering.de>, Andrew <amiller4421@gmail.com>"]
+authors = [ "Nautilus Cyberneering <info@nautilus-cyberneering.de>, Andrew <amiller4421@gmail.com>" ]
 license = "Apache-2.0"
 repository = "https://github.com/torrust/bittorrent-infrastructure-project"
 
diff --git a/contrib/bencode/README.md b/contrib/bencode/README.md
index 7a203082b..81c09f691 100644
--- a/contrib/bencode/README.md
+++ b/contrib/bencode/README.md
@@ -1,4 +1,5 @@
 # Bencode
+
 This library allows for the creation and parsing of bencode encodings.
 
-Bencode is the binary encoding used throughout bittorrent technologies from metainfo files to DHT messages. Bencode types include integers, byte arrays, lists, and dictionaries, of which the last two can hold any bencode type (they could be recursively constructed).
\ No newline at end of file
+Bencode is the binary encoding used throughout bittorrent technologies from metainfo files to DHT messages. Bencode types include integers, byte arrays, lists, and dictionaries, of which the last two can hold any bencode type (they could be recursively constructed).
diff --git a/contrib/bencode/benches/bencode_benchmark.rs b/contrib/bencode/benches/bencode_benchmark.rs
index b79bb0999..b22b286a5 100644
--- a/contrib/bencode/benches/bencode_benchmark.rs
+++ b/contrib/bencode/benches/bencode_benchmark.rs
@@ -1,4 +1,6 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use std::hint::black_box;
+
+use criterion::{criterion_group, criterion_main, Criterion};
 use torrust_tracker_contrib_bencode::{BDecodeOpt, BencodeRef};
 
 const B_NESTED_LISTS: &[u8; 100] =
diff --git a/contrib/dev-tools/su-exec/README.md b/contrib/dev-tools/su-exec/README.md
index 2b0517377..1dd4108ac 100644
--- a/contrib/dev-tools/su-exec/README.md
+++ b/contrib/dev-tools/su-exec/README.md
@@ -1,4 +1,5 @@
 # su-exec
+
 switch user and group id, setgroups and exec
 
 ## Purpose
@@ -21,7 +22,7 @@ name separated with colon (e.g. `nobody:ftp`). Numeric uid/gid values
 can be used instead of names. Example:
 
 ```shell
-$ su-exec apache:1000 /usr/sbin/httpd -f /opt/www/httpd.conf
+su-exec apache:1000 /usr/sbin/httpd -f /opt/www/httpd.conf
 ```
 
 ## TTY & parent/child handling
@@ -43,4 +44,3 @@ PID   USER     TIME   COMMAND
 
 This does more or less exactly the same thing as [gosu](https://github.com/tianon/gosu)
 but it is only 10kb instead of 1.8MB.
-
diff --git a/cspell.json b/cspell.json
new file mode 100644
index 000000000..02f29f7f9
--- /dev/null
+++ b/cspell.json
@@ -0,0 +1,27 @@
+{
+    "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
+    "version": "0.2",
+    "dictionaryDefinitions": [
+        {
+            "name": "project-words",
+            "path": "./project-words.txt",
+            "addWords": true
+        }
+    ],
+    "dictionaries": [
+        "project-words"
+    ],
+    "enableFiletypes": [
+        "dockerfile",
+        "shellscript",
+        "toml"
+    ],
+    "ignorePaths": [
+        "target",
+        "docs/media/*.svg",
+        "contrib/bencode/benches/*.bencode",
+        "contrib/dev-tools/su-exec/**",
+        ".github/labels.json",
+        "/project-words.txt"
+    ]
+}
\ No newline at end of file
diff --git a/docs/containers.md b/docs/containers.md
index cddd2ba98..a7754d8aa 100644
--- a/docs/containers.md
+++ b/docs/containers.md
@@ -248,6 +248,10 @@ driver = "mysql"
 path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker"
 ```
 
+Important: if the MySQL password contains reserved URL characters (for example `+`, `/`, `@`, or `:`), it must be percent-encoded in the DSN password component. For example, if the raw password is `a+b/c`, use `a%2Bb%2Fc` in the DSN.
+
+When generating secrets automatically, prefer URL-safe passwords (`A-Z`, `a-z`, `0-9`, `-`, `_`) to avoid DSN parsing issues.
+
 ### Build and Run:
 
 ```sh
@@ -292,7 +296,7 @@ These are some useful commands for MySQL.
 Open a shell in the MySQL container using docker or docker-compose.
 
 ```s
-docker exec -it torrust-mysql-1 /bin/bash 
+docker exec -it torrust-mysql-1 /bin/bash
 docker compose exec mysql /bin/bash
 ```
 
diff --git a/docs/issues/523-internal-linting-tool.md b/docs/issues/523-internal-linting-tool.md
new file mode 100644
index 000000000..14593e190
--- /dev/null
+++ b/docs/issues/523-internal-linting-tool.md
@@ -0,0 +1,141 @@
+# Issue #523 Implementation Plan (Internal Linting Tool)
+
+## Goal
+
+Replace the MegaLinter idea with Torrust internal linting tooling and integrate it into CI for this repository.
+
+## Scope
+
+- Target issue: https://github.com/torrust/torrust-tracker/issues/523
+- CI workflow to modify: .github/workflows/testing.yaml
+- External reference workflow: https://raw.githubusercontent.com/torrust/torrust-tracker-deployer/refs/heads/main/.github/workflows/linting.yml
+
+## Tasks
+
+### 0) Create a local branch following GitHub branch naming conventions
+
+- Approved branch name: `523-internal-linting-tool`
+- Commands:
+  - `git fetch --all --prune`
+  - `git checkout develop`
+  - `git pull --ff-only`
+  - `git checkout -b 523-internal-linting-tool`
+- Checkpoint:
+  - `git branch --show-current` should output `523-internal-linting-tool`.
+
+### 1) Install and run the linting tool locally; verify it passes in this repo
+
+- Identify/install internal linting package/tool used by Torrust (likely `torrust-linting` or equivalent wrapper).
+- Ensure local runtime dependencies are present (if any).
+- Note: linter config files (step 2) must exist in the repo root before a full suite run; it is fine to do a first exploratory run first to discover which linters are active.
+- Run the internal linting command against this repository.
+- Capture the exact command and output summary for reproducibility.
+- Checkpoint:
+  - Linting command exits with code `0`.
+
+### 2) Add and adapt linter configuration files
+
+Some linters require a config file in the repo root. Use the deployer configs as reference and adapt values to this repository.
+
+| File                 | Linter           | Reference                                                                                             |
+| -------------------- | ---------------- | ----------------------------------------------------------------------------------------------------- |
+| `.markdownlint.json` | markdownlint     | https://raw.githubusercontent.com/torrust/torrust-tracker-deployer/refs/heads/main/.markdownlint.json |
+| `.taplo.toml`        | taplo (TOML fmt) | https://raw.githubusercontent.com/torrust/torrust-tracker-deployer/refs/heads/main/.taplo.toml        |
+| `.yamllint-ci.yml`   | yamllint         | https://raw.githubusercontent.com/torrust/torrust-tracker-deployer/refs/heads/main/.yamllint-ci.yml   |
+
+Key adaptations to make per file:
+
+- `.markdownlint.json`: review line-length rules and Markdown conventions used in this repo's docs.
+- `.taplo.toml`: update `exclude` list to match this repo's generated/runtime folders (e.g. `target/**`, `storage/**`) instead of the deployer-specific ones (`build/**`, `data/**`, `envs/**`).
+- `.yamllint-ci.yml`: update `ignore` block to reflect this repo's generated/runtime directories instead of cloud-init and deployer folders.
+
+Commit message: `ci(lint): add linter config files (.markdownlint.json, .taplo.toml, .yamllint-ci.yml)`
+
+Checkpoint:
+
+- Config files are present in the repo root.
+- Running each individual linter against the repo with the config produces expected/controlled output.
+
+### 3) If local linting fails, fix all lint errors; commit fixes independently per linter
+
+- If the linting suite reports failures:
+  - Group findings by linter (for example: formatting, clippy, docs, spelling, yaml, etc.).
+  - Fix only one linter category at a time.
+  - Create one commit per linter category.
+- Commit style proposal:
+  - `fix(lint/<linter-name>): resolve <brief issue summary>`
+- Constraints:
+  - Do not mix workflow/tooling changes with source lint fixes in the same commit.
+  - Keep each commit minimal and reviewable.
+- Checkpoint:
+  - Re-run linting suite; all checks pass before moving to workflow integration.
+
+### 4) Review existing workflow example using internal linting
+
+- Read and analyze:
+  - https://raw.githubusercontent.com/torrust/torrust-tracker-deployer/refs/heads/main/.github/workflows/linting.yml
+- Extract and adapt:
+  - Trigger strategy.
+  - Tool setup/install method.
+  - Cache strategy.
+  - Invocation command and CI fail behavior.
+- Checkpoint:
+  - Document a short mapping from deployer workflow pattern to this repo’s `testing.yaml` job structure.
+
+### 5) Modify `.github/workflows/testing.yaml` to use the internal linting tool
+
+- Update the current `check`/lint-related section to run the internal linting command.
+- Replace existing lint/check execution path with the internal linting tool in this migration (no parallel transition mode).
+- Ensure matrix/toolchain compatibility is explicit (nightly/stable behavior decided and documented).
+- Validate workflow syntax before commit.
+- Checkpoint:
+  - Workflow is valid and executes linting through internal tool.
+
+### 6) Commit workflow changes
+
+- Commit only workflow-related changes in a dedicated commit.
+- Commit message proposal:
+  - `ci(lint): switch testing workflow to internal linting tool`
+- Checkpoint:
+  - `git show --name-only --stat HEAD` includes only expected workflow files (and any required supporting CI files if intentionally added).
+
+### 7) Push to remote `josecelano` and open PR into `develop`
+
+- Verify remote exists:
+  - `git remote -v`
+- Push branch:
+  - `git push -u josecelano 523-internal-linting-tool`
+- Open PR targeting `torrust/torrust-tracker:develop` with head `josecelano:523-internal-linting-tool`.
+- PR content should include:
+  - Why internal linting over MegaLinter.
+  - Summary of lint-fix commits by linter.
+  - Summary of workflow change.
+  - Evidence (local run + CI status).
+- Checkpoint:
+  - PR is open, linked to issue #523, and ready for review.
+
+## Execution Notes
+
+- Keep PR review-friendly by separating commits by concern:
+  1. Linter config files (step 2)
+  2. Per-linter source fixes (step 3, only if needed)
+  3. CI workflow migration (step 6)
+- Use Conventional Commits for all commits in this implementation.
+- If lint checks differ between local and CI, align tool versions and execution flags before merging.
+- Avoid broad refactors unrelated to lint failures.
+
+## Decisions Confirmed
+
+1. Branch name: `523-internal-linting-tool`.
+2. CI strategy: replace existing lint/check path with internal linting.
+3. Commit convention: yes, use Conventional Commits.
+4. PR target: base `torrust/torrust-tracker:develop`, head `josecelano:523-internal-linting-tool`.
+
+## Risks and Mitigations
+
+- Risk: Internal linting wrapper may not be version-pinned and may produce unstable CI behavior.
+  - Mitigation: Pin tool version in workflow installation step.
+- Risk: Internal linting may overlap with existing checks, increasing CI time.
+  - Mitigation: Remove redundant jobs only after verifying coverage parity.
+- Risk: Tool may require secrets or environment assumptions not available in CI.
+  - Mitigation: Run dry-run in GitHub Actions on branch before requesting review.
diff --git a/docs/media/demo/torrust-tracker-grafana-dashboard.png b/docs/media/demo/torrust-tracker-grafana-dashboard.png
new file mode 100644
index 000000000..090932a8c
Binary files /dev/null and b/docs/media/demo/torrust-tracker-grafana-dashboard.png differ
diff --git a/packages/axum-health-check-api-server/Cargo.toml b/packages/axum-health-check-api-server/Cargo.toml
index e0504f7df..cf9d8d9a3 100644
--- a/packages/axum-health-check-api-server/Cargo.toml
+++ b/packages/axum-health-check-api-server/Cargo.toml
@@ -4,7 +4,7 @@ description = "The Torrust Bittorrent HTTP tracker."
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["axum", "bittorrent", "healthcheck", "http", "server", "torrust", "tracker"]
+keywords = [ "axum", "bittorrent", "healthcheck", "http", "server", "torrust", "tracker" ]
 license.workspace = true
 name = "torrust-axum-health-check-api-server"
 publish.workspace = true
@@ -14,27 +14,27 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-axum = { version = "0", features = ["macros"] }
-axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
+axum = { version = "0", features = [ "macros" ] }
+axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
 futures = "0"
 hyper = "1"
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1", features = ["preserve_order"] }
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+serde = { version = "1", features = [ "derive" ] }
+serde_json = { version = "1", features = [ "preserve_order" ] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
 torrust-axum-server = { version = "3.0.0-develop", path = "../axum-server" }
 torrust-server-lib = { version = "3.0.0-develop", path = "../server-lib" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
-tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
+tower-http = { version = "0", features = [ "compression-full", "cors", "propagate-header", "request-id", "trace" ] }
 tracing = "0"
 url = "2.5.4"
 
 [dev-dependencies]
-reqwest = { version = "0", features = ["json"] }
+reqwest = { version = "0", features = [ "json" ] }
 torrust-axum-health-check-api-server = { version = "3.0.0-develop", path = "../axum-health-check-api-server" }
 torrust-axum-http-tracker-server = { version = "3.0.0-develop", path = "../axum-http-tracker-server" }
 torrust-axum-rest-tracker-api-server = { version = "3.0.0-develop", path = "../axum-rest-tracker-api-server" }
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
 torrust-udp-tracker-server = { version = "3.0.0-develop", path = "../udp-tracker-server" }
-tracing-subscriber = { version = "0", features = ["json"] }
+tracing-subscriber = { version = "0", features = [ "json" ] }
diff --git a/packages/axum-health-check-api-server/src/server.rs b/packages/axum-health-check-api-server/src/server.rs
index 3eeb1b054..a371f146e 100644
--- a/packages/axum-health-check-api-server/src/server.rs
+++ b/packages/axum-health-check-api-server/src/server.rs
@@ -101,6 +101,9 @@ pub fn start(
         .layer(SetRequestIdLayer::x_request_id(MakeRequestUuid));
 
     let socket = std::net::TcpListener::bind(bind_to).expect("Could not bind tcp_listener to address.");
+    socket
+        .set_nonblocking(true)
+        .expect("Failed to set socket to non-blocking mode");
     let address = socket.local_addr().expect("Could not get local_addr from tcp_listener.");
     let protocol = Protocol::HTTP; // The health check API only supports HTTP directly now. Use a reverse proxy for HTTPS.
     let service_binding = ServiceBinding::new(protocol.clone(), address).expect("Service binding creation failed");
@@ -117,6 +120,7 @@ pub fn start(
     ));
 
     let running = axum_server::from_tcp(socket)
+        .expect("Failed to create server from TCP socket")
         .handle(handle)
         .serve(router.into_make_service_with_connect_info::<SocketAddr>());
 
diff --git a/packages/axum-health-check-api-server/tests/server/contract.rs b/packages/axum-health-check-api-server/tests/server/contract.rs
index 0e0d26b83..af1c0cff9 100644
--- a/packages/axum-health-check-api-server/tests/server/contract.rs
+++ b/packages/axum-health-check-api-server/tests/server/contract.rs
@@ -119,11 +119,8 @@ mod api {
 
             assert_eq!(details.binding, binding);
             assert!(
-                details
-                    .result
-                    .as_ref()
-                    .is_err_and(|e| e.contains("error sending request for url")),
-                "Expected to contain, \"error sending request for url\", but have message \"{:?}\".",
+                details.result.as_ref().is_err_and(|e| e.contains("error sending request")),
+                "Expected to contain, \"error sending request\", but have message \"{:?}\".",
                 details.result
             );
             assert_eq!(
@@ -205,6 +202,9 @@ mod http {
 
         service.server.stop().await.expect("it should stop udp server");
 
+        // Give the OS a moment to fully release the TCP port after the server stops.
+        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+
         {
             let config = configuration.health_check_api.clone();
             let env = Started::new(&config.into(), registar).await;
@@ -226,11 +226,8 @@ mod http {
 
             assert_eq!(details.binding, binding);
             assert!(
-                details
-                    .result
-                    .as_ref()
-                    .is_err_and(|e| e.contains("error sending request for url")),
-                "Expected to contain, \"error sending request for url\", but have message \"{:?}\".",
+                details.result.as_ref().is_err_and(|e| e.contains("error sending request")),
+                "Expected to contain, \"error sending request\", but have message \"{:?}\".",
                 details.result
             );
             assert_eq!(
diff --git a/packages/axum-http-tracker-server/Cargo.toml b/packages/axum-http-tracker-server/Cargo.toml
index 1b4627d41..88d073527 100644
--- a/packages/axum-http-tracker-server/Cargo.toml
+++ b/packages/axum-http-tracker-server/Cargo.toml
@@ -4,7 +4,7 @@ description = "The Torrust Bittorrent HTTP tracker."
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["axum", "bittorrent", "http", "server", "torrust", "tracker"]
+keywords = [ "axum", "bittorrent", "http", "server", "torrust", "tracker" ]
 license.workspace = true
 name = "torrust-axum-http-tracker-server"
 publish.workspace = true
@@ -15,26 +15,28 @@ version.workspace = true
 
 [dependencies]
 aquatic_udp_protocol = "0"
-axum = { version = "0", features = ["macros"] }
+axum = { version = "0", features = [ "macros" ] }
 axum-client-ip = "0"
-axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
+axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
 bittorrent-http-tracker-core = { version = "3.0.0-develop", path = "../http-tracker-core" }
 bittorrent-http-tracker-protocol = { version = "3.0.0-develop", path = "../http-protocol" }
 bittorrent-primitives = "0.1.0"
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
-derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = [ "as_ref", "constructor", "from" ] }
 futures = "0"
 hyper = "1"
-reqwest = { version = "0", features = ["json"] }
-serde = { version = "1", features = ["derive"] }
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+reqwest = { version = "0", features = [ "json" ] }
+serde = { version = "1", features = [ "derive" ] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
+tokio-util = "0.7.15"
 torrust-axum-server = { version = "3.0.0-develop", path = "../axum-server" }
 torrust-server-lib = { version = "3.0.0-develop", path = "../server-lib" }
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
-tower = { version = "0", features = ["timeout"] }
-tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
+torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "../swarm-coordination-registry" }
+tower = { version = "0", features = [ "timeout" ] }
+tower-http = { version = "0", features = [ "compression-full", "cors", "propagate-header", "request-id", "trace" ] }
 tracing = "0"
 
 [dev-dependencies]
@@ -47,5 +49,5 @@ serde_repr = "0"
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
 torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
-uuid = { version = "1", features = ["v4"] }
+uuid = { version = "1", features = [ "v4" ] }
 zerocopy = "0.7"
diff --git a/packages/axum-http-tracker-server/src/environment.rs b/packages/axum-http-tracker-server/src/environment.rs
index aeb53a710..616973a0f 100644
--- a/packages/axum-http-tracker-server/src/environment.rs
+++ b/packages/axum-http-tracker-server/src/environment.rs
@@ -6,10 +6,12 @@ use bittorrent_primitives::info_hash::InfoHash;
 use bittorrent_tracker_core::container::TrackerCoreContainer;
 use futures::executor::block_on;
 use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
 use torrust_axum_server::tsl::make_rust_tls;
 use torrust_server_lib::registar::Registar;
 use torrust_tracker_configuration::{logging, Configuration};
 use torrust_tracker_primitives::peer;
+use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
 
 use crate::server::{HttpServer, Launcher, Running, Stopped};
 
@@ -20,16 +22,17 @@ pub struct Environment<S> {
     pub registar: Registar,
     pub server: HttpServer<S>,
     pub event_listener_job: Option<JoinHandle<()>>,
+    pub cancellation_token: CancellationToken,
 }
 
 impl<S> Environment<S> {
     /// Add a torrent to the tracker
-    pub fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) {
-        let _number_of_downloads_increased = self
-            .container
+    pub async fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) {
+        self.container
             .tracker_core_container
             .in_memory_torrent_repository
-            .upsert_peer(info_hash, peer, None);
+            .handle_announcement(info_hash, peer, None)
+            .await;
     }
 }
 
@@ -58,6 +61,7 @@ impl Environment<Stopped> {
             registar: Registar::default(),
             server,
             event_listener_job: None,
+            cancellation_token: CancellationToken::new(),
         }
     }
 
@@ -71,6 +75,7 @@ impl Environment<Stopped> {
         // Start the event listener
         let event_listener_job = run_event_listener(
             self.container.http_tracker_core_container.event_bus.receiver(),
+            self.cancellation_token.clone(),
             &self.container.http_tracker_core_container.stats_repository,
         );
 
@@ -86,6 +91,7 @@ impl Environment<Stopped> {
             registar: self.registar.clone(),
             server,
             event_listener_job: Some(event_listener_job),
+            cancellation_token: self.cancellation_token,
         }
     }
 }
@@ -116,6 +122,7 @@ impl Environment<Running> {
             registar: Registar::default(),
             server,
             event_listener_job: None,
+            cancellation_token: self.cancellation_token,
         }
     }
 
@@ -143,7 +150,15 @@ impl EnvContainer {
             .expect("missing HTTP tracker configuration");
         let http_tracker_config = Arc::new(http_tracker_config[0].clone());
 
-        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
+        let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
+            configuration.core.tracker_usage_statistics.into(),
+        ));
+
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
+            &core_config,
+            &swarm_coordination_registry_container,
+        ));
+
         let http_tracker_container =
             HttpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, &http_tracker_config);
 
diff --git a/packages/axum-http-tracker-server/src/server.rs b/packages/axum-http-tracker-server/src/server.rs
index ff1650b9c..69f9cb72e 100644
--- a/packages/axum-http-tracker-server/src/server.rs
+++ b/packages/axum-http-tracker-server/src/server.rs
@@ -47,11 +47,14 @@ impl Launcher {
     #[instrument(skip(self, http_tracker_container, tx_start, rx_halt))]
     fn start(
         &self,
-        http_tracker_container: Arc<HttpTrackerCoreContainer>,
+        http_tracker_container: &Arc<HttpTrackerCoreContainer>,
         tx_start: Sender<Started>,
         rx_halt: Receiver<Halted>,
     ) -> BoxFuture<'static, ()> {
         let socket = std::net::TcpListener::bind(self.bind_to).expect("Could not bind tcp_listener to address.");
+        socket
+            .set_nonblocking(true)
+            .expect("Failed to set socket to non-blocking mode");
         let address = socket.local_addr().expect("Could not get local_addr from tcp_listener.");
 
         let handle = Handle::new();
@@ -69,11 +72,12 @@ impl Launcher {
 
         tracing::info!(target: HTTP_TRACKER_LOG_TARGET, "Starting on: {protocol}://{address}");
 
-        let app = router(http_tracker_container, service_binding.clone());
+        let app = router(http_tracker_container, &service_binding);
 
         let running = Box::pin(async {
             match tls {
                 Some(tls) => custom_axum_server::from_tcp_rustls_with_timeouts(socket, tls)
+                    .expect("Failed to create server from TCP socket with TLS")
                     .handle(handle)
                     // The TimeoutAcceptor is commented because TSL does not work with it.
                     // See: https://github.com/torrust/torrust-index/issues/204#issuecomment-2115529214
@@ -82,6 +86,7 @@ impl Launcher {
                     .await
                     .expect("Axum server crashed."),
                 None => custom_axum_server::from_tcp_with_timeouts(socket)
+                    .expect("Failed to create server from TCP socket")
                     .handle(handle)
                     .acceptor(TimeoutAcceptor)
                     .serve(app.into_make_service_with_connect_info::<std::net::SocketAddr>())
@@ -176,7 +181,7 @@ impl HttpServer<Stopped> {
         let launcher = self.state.launcher;
 
         let task = tokio::spawn(async move {
-            let server = launcher.start(http_tracker_container, tx_start, rx_halt);
+            let server = launcher.start(&http_tracker_container, tx_start, rx_halt);
 
             server.await;
 
@@ -256,14 +261,18 @@ mod tests {
     use bittorrent_http_tracker_core::statistics::event::listener::run_event_listener;
     use bittorrent_http_tracker_core::statistics::repository::Repository;
     use bittorrent_tracker_core::container::TrackerCoreContainer;
+    use tokio_util::sync::CancellationToken;
     use torrust_axum_server::tsl::make_rust_tls;
     use torrust_server_lib::registar::Registar;
     use torrust_tracker_configuration::{logging, Configuration};
+    use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
     use torrust_tracker_test_helpers::configuration::ephemeral_public;
 
     use crate::server::{HttpServer, Launcher};
 
     pub fn initialize_container(configuration: &Configuration) -> HttpTrackerCoreContainer {
+        let cancellation_token = CancellationToken::new();
+
         let core_config = Arc::new(configuration.core.clone());
 
         let http_trackers = configuration
@@ -279,17 +288,24 @@ mod tests {
         let http_core_broadcaster = Broadcaster::default();
         let http_stats_repository = Arc::new(Repository::new());
         let http_stats_event_bus = Arc::new(EventBus::new(
-            configuration.core.tracker_usage_statistics,
+            configuration.core.tracker_usage_statistics.into(),
             http_core_broadcaster.clone(),
         ));
 
         let http_stats_event_sender = http_stats_event_bus.sender();
 
         if configuration.core.tracker_usage_statistics {
-            let _unused = run_event_listener(http_stats_event_bus.receiver(), &http_stats_repository);
+            let _unused = run_event_listener(http_stats_event_bus.receiver(), cancellation_token, &http_stats_repository);
         }
 
-        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
+        let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
+            configuration.core.tracker_usage_statistics.into(),
+        ));
+
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
+            &core_config,
+            &swarm_coordination_registry_container,
+        ));
 
         let announce_service = Arc::new(AnnounceService::new(
             tracker_core_container.core_config.clone(),
diff --git a/packages/axum-http-tracker-server/src/v1/handlers/announce.rs b/packages/axum-http-tracker-server/src/v1/handlers/announce.rs
index 7489211a9..ce718cd30 100644
--- a/packages/axum-http-tracker-server/src/v1/handlers/announce.rs
+++ b/packages/axum-http-tracker-server/src/v1/handlers/announce.rs
@@ -119,10 +119,11 @@ mod tests {
     use bittorrent_tracker_core::authentication::key::repository::in_memory::InMemoryKeyRepository;
     use bittorrent_tracker_core::authentication::service::AuthenticationService;
     use bittorrent_tracker_core::databases::setup::initialize_database;
+    use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
     use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
     use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
+    use tokio_util::sync::CancellationToken;
     use torrust_tracker_configuration::Configuration;
     use torrust_tracker_test_helpers::configuration;
 
@@ -149,6 +150,9 @@ mod tests {
     }
 
     fn initialize_core_tracker_services(config: &Configuration) -> CoreHttpTrackerServices {
+        let cancellation_token = CancellationToken::new();
+
+        // Initialize the core tracker services with the provided configuration.
         let core_config = Arc::new(config.core.clone());
         let database = initialize_database(&config.core);
         let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
@@ -156,26 +160,26 @@ mod tests {
         let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
         let authentication_service = Arc::new(AuthenticationService::new(&config.core, &in_memory_key_repository));
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
         let announce_handler = Arc::new(AnnounceHandler::new(
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         // HTTP core stats
         let http_core_broadcaster = Broadcaster::default();
         let http_stats_repository = Arc::new(Repository::new());
         let http_stats_event_bus = Arc::new(EventBus::new(
-            config.core.tracker_usage_statistics,
+            config.core.tracker_usage_statistics.into(),
             http_core_broadcaster.clone(),
         ));
 
         let http_stats_event_sender = http_stats_event_bus.sender();
 
         if config.core.tracker_usage_statistics {
-            let _unused = run_event_listener(http_stats_event_bus.receiver(), &http_stats_repository);
+            let _unused = run_event_listener(http_stats_event_bus.receiver(), cancellation_token, &http_stats_repository);
         }
 
         let announce_service = Arc::new(AnnounceService::new(
@@ -234,7 +238,7 @@ mod tests {
         async fn it_should_fail_when_the_authentication_key_is_missing() {
             let http_core_tracker_services = initialize_private_tracker();
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let maybe_key = None;
@@ -265,7 +269,7 @@ mod tests {
 
             let unregistered_key = authentication::Key::from_str("YZSl4lMZupRuOpSRC3krIKR5BPB14nrJ").unwrap();
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let maybe_key = Some(unregistered_key);
@@ -308,7 +312,7 @@ mod tests {
 
             let announce_request = sample_announce_request();
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let response = handle_announce(
@@ -356,7 +360,7 @@ mod tests {
                 connection_info_socket_address: None,
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let response = handle_announce(
@@ -401,7 +405,7 @@ mod tests {
                 connection_info_socket_address: None,
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let response = handle_announce(
diff --git a/packages/axum-http-tracker-server/src/v1/handlers/scrape.rs b/packages/axum-http-tracker-server/src/v1/handlers/scrape.rs
index 330e7c13e..bdd4378f3 100644
--- a/packages/axum-http-tracker-server/src/v1/handlers/scrape.rs
+++ b/packages/axum-http-tracker-server/src/v1/handlers/scrape.rs
@@ -97,6 +97,7 @@ mod tests {
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
     use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
     use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
+    use tokio_util::sync::CancellationToken;
     use torrust_tracker_configuration::{Configuration, Core};
     use torrust_tracker_test_helpers::configuration;
 
@@ -127,6 +128,8 @@ mod tests {
     }
 
     fn initialize_core_tracker_services(config: &Configuration) -> (CoreTrackerServices, CoreHttpTrackerServices) {
+        let cancellation_token = CancellationToken::new();
+
         let core_config = Arc::new(config.core.clone());
         let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
         let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
@@ -139,14 +142,14 @@ mod tests {
         let http_core_broadcaster = Broadcaster::default();
         let http_stats_repository = Arc::new(Repository::new());
         let http_stats_event_bus = Arc::new(EventBus::new(
-            config.core.tracker_usage_statistics,
+            config.core.tracker_usage_statistics.into(),
             http_core_broadcaster.clone(),
         ));
 
         let http_stats_event_sender = http_stats_event_bus.sender();
 
         if config.core.tracker_usage_statistics {
-            let _unused = run_event_listener(http_stats_event_bus.receiver(), &http_stats_repository);
+            let _unused = run_event_listener(http_stats_event_bus.receiver(), cancellation_token, &http_stats_repository);
         }
 
         (
@@ -192,7 +195,7 @@ mod tests {
 
         #[tokio::test]
         async fn it_should_return_zeroed_swarm_metadata_when_the_authentication_key_is_missing() {
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let (core_tracker_services, core_http_tracker_services) = initialize_private_tracker();
@@ -224,7 +227,7 @@ mod tests {
 
         #[tokio::test]
         async fn it_should_return_zeroed_swarm_metadata_when_the_authentication_key_is_invalid() {
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let (core_tracker_services, core_http_tracker_services) = initialize_private_tracker();
@@ -272,7 +275,7 @@ mod tests {
 
             let scrape_request = sample_scrape_request();
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let scrape_service = ScrapeService::new(
@@ -314,7 +317,7 @@ mod tests {
                 connection_info_socket_address: None,
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let scrape_service = ScrapeService::new(
@@ -361,7 +364,7 @@ mod tests {
                 connection_info_socket_address: None,
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let scrape_service = ScrapeService::new(
diff --git a/packages/axum-http-tracker-server/src/v1/routes.rs b/packages/axum-http-tracker-server/src/v1/routes.rs
index 3fe467a0d..df395cd9a 100644
--- a/packages/axum-http-tracker-server/src/v1/routes.rs
+++ b/packages/axum-http-tracker-server/src/v1/routes.rs
@@ -31,7 +31,7 @@ use crate::HTTP_TRACKER_LOG_TARGET;
 /// > **NOTICE**: it's added a layer to get the client IP from the connection
 /// > info. The tracker could use the connection info to get the client IP.
 #[instrument(skip(http_tracker_container, server_service_binding))]
-pub fn router(http_tracker_container: Arc<HttpTrackerCoreContainer>, server_service_binding: ServiceBinding) -> Router {
+pub fn router(http_tracker_container: &Arc<HttpTrackerCoreContainer>, server_service_binding: &ServiceBinding) -> Router {
     let server_socket_addr = server_service_binding.bind_address();
 
     Router::new()
diff --git a/packages/axum-http-tracker-server/tests/server/asserts.rs b/packages/axum-http-tracker-server/tests/server/asserts.rs
index 7ab8d93e5..a82014e16 100644
--- a/packages/axum-http-tracker-server/tests/server/asserts.rs
+++ b/packages/axum-http-tracker-server/tests/server/asserts.rs
@@ -22,6 +22,7 @@ pub fn assert_bencoded_error(response_text: &String, expected_failure_reason: &s
     );
 }
 
+#[allow(dead_code)]
 pub async fn assert_empty_announce_response(response: Response) {
     assert_eq!(response.status(), 200);
     let announce_response: Announce = serde_bencode::from_str(&response.text().await.unwrap()).unwrap();
diff --git a/packages/axum-http-tracker-server/tests/server/requests/announce.rs b/packages/axum-http-tracker-server/tests/server/requests/announce.rs
index 0775de7e4..5a670b618 100644
--- a/packages/axum-http-tracker-server/tests/server/requests/announce.rs
+++ b/packages/axum-http-tracker-server/tests/server/requests/announce.rs
@@ -126,6 +126,11 @@ impl QueryBuilder {
         self
     }
 
+    pub fn with_port(mut self, port: u16) -> Self {
+        self.announce_query.port = port;
+        self
+    }
+
     pub fn without_compact(mut self) -> Self {
         self.announce_query.compact = None;
         self
diff --git a/packages/axum-http-tracker-server/tests/server/v1/contract.rs b/packages/axum-http-tracker-server/tests/server/v1/contract.rs
index 37d96052f..85792f922 100644
--- a/packages/axum-http-tracker-server/tests/server/v1/contract.rs
+++ b/packages/axum-http-tracker-server/tests/server/v1/contract.rs
@@ -105,8 +105,8 @@ mod for_all_config_modes {
         use crate::common::fixtures::invalid_info_hashes;
         use crate::server::asserts::{
             assert_announce_response, assert_bad_announce_request_error_response, assert_cannot_parse_query_param_error_response,
-            assert_cannot_parse_query_params_error_response, assert_compact_announce_response, assert_empty_announce_response,
-            assert_is_announce_response, assert_missing_query_params_for_announce_request_error_response,
+            assert_cannot_parse_query_params_error_response, assert_compact_announce_response, assert_is_announce_response,
+            assert_missing_query_params_for_announce_request_error_response,
         };
         use crate::server::client::Client;
         use crate::server::requests::announce::{Compact, QueryBuilder};
@@ -474,7 +474,7 @@ mod for_all_config_modes {
             let previously_announced_peer = PeerBuilder::default().with_peer_id(&PeerId(*b"-qB00000000000000001")).build();
 
             // Add the Peer 1
-            env.add_torrent_peer(&info_hash, &previously_announced_peer);
+            env.add_torrent_peer(&info_hash, &previously_announced_peer).await;
 
             // Announce the new Peer 2. This new peer is non included on the response peer list
             let response = Client::new(*env.bind_address())
@@ -517,7 +517,7 @@ mod for_all_config_modes {
                 .with_peer_id(&PeerId(*b"-qB00000000000000001"))
                 .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0x69, 0x69, 0x69, 0x69)), 8080))
                 .build();
-            env.add_torrent_peer(&info_hash, &peer_using_ipv4);
+            env.add_torrent_peer(&info_hash, &peer_using_ipv4).await;
 
             // Announce a peer using IPV6
             let peer_using_ipv6 = PeerBuilder::default()
@@ -527,7 +527,7 @@ mod for_all_config_modes {
                     8080,
                 ))
                 .build();
-            env.add_torrent_peer(&info_hash, &peer_using_ipv6);
+            env.add_torrent_peer(&info_hash, &peer_using_ipv6).await;
 
             // Announce the new Peer.
             let response = Client::new(*env.bind_address())
@@ -559,7 +559,8 @@ mod for_all_config_modes {
         }
 
         #[tokio::test]
-        async fn should_consider_two_peers_to_be_the_same_when_they_have_the_same_peer_id_even_if_the_ip_is_different() {
+        async fn should_consider_two_peers_to_be_the_same_when_they_have_the_same_socket_address_even_if_the_peer_id_is_different(
+        ) {
             logging::setup();
 
             let env = Started::new(&configuration::ephemeral_public().into()).await;
@@ -567,19 +568,44 @@ mod for_all_config_modes {
             let info_hash = InfoHash::from_str("9c38422213e30bff212b30c360d26f9a02136422").unwrap(); // DevSkim: ignore DS173237
             let peer = PeerBuilder::default().build();
 
-            // Add a peer
-            env.add_torrent_peer(&info_hash, &peer);
-
-            let announce_query = QueryBuilder::default()
+            let announce_query_1 = QueryBuilder::default()
                 .with_info_hash(&info_hash)
                 .with_peer_id(&peer.peer_id)
+                .with_peer_addr(&peer.peer_addr.ip())
+                .with_port(peer.peer_addr.port())
+                .query();
+
+            let announce_query_2 = QueryBuilder::default()
+                .with_info_hash(&info_hash)
+                .with_peer_id(&PeerId(*b"-qB00000000000000002")) // Different peer ID
+                .with_peer_addr(&peer.peer_addr.ip())
+                .with_port(peer.peer_addr.port())
                 .query();
 
-            assert_ne!(peer.peer_addr.ip(), announce_query.peer_addr);
+            // Same peer socket address
+            assert_eq!(announce_query_1.peer_addr, announce_query_2.peer_addr);
+            assert_eq!(announce_query_1.port, announce_query_2.port);
 
-            let response = Client::new(*env.bind_address()).announce(&announce_query).await;
+            // Different peer ID
+            assert_ne!(announce_query_1.peer_id, announce_query_2.peer_id);
 
-            assert_empty_announce_response(response).await;
+            let _response = Client::new(*env.bind_address()).announce(&announce_query_1).await;
+            let response = Client::new(*env.bind_address()).announce(&announce_query_2).await;
+
+            let announce_policy = env.container.tracker_core_container.core_config.announce_policy;
+
+            // The response should contain only the first peer.
+            assert_announce_response(
+                response,
+                &Announce {
+                    complete: 1,
+                    incomplete: 0,
+                    interval: announce_policy.interval,
+                    min_interval: announce_policy.interval_min,
+                    peers: vec![],
+                },
+            )
+            .await;
 
             env.stop().await;
         }
@@ -599,7 +625,7 @@ mod for_all_config_modes {
             let previously_announced_peer = PeerBuilder::default().with_peer_id(&PeerId(*b"-qB00000000000000001")).build();
 
             // Add the Peer 1
-            env.add_torrent_peer(&info_hash, &previously_announced_peer);
+            env.add_torrent_peer(&info_hash, &previously_announced_peer).await;
 
             // Announce the new Peer 2 accepting compact responses
             let response = Client::new(*env.bind_address())
@@ -640,7 +666,7 @@ mod for_all_config_modes {
             let previously_announced_peer = PeerBuilder::default().with_peer_id(&PeerId(*b"-qB00000000000000001")).build();
 
             // Add the Peer 1
-            env.add_torrent_peer(&info_hash, &previously_announced_peer);
+            env.add_torrent_peer(&info_hash, &previously_announced_peer).await;
 
             // Announce the new Peer 2 without passing the "compact" param
             // By default it should respond with the compact peer list
@@ -678,7 +704,7 @@ mod for_all_config_modes {
 
             let stats = env.container.http_tracker_core_container.stats_repository.get_stats().await;
 
-            assert_eq!(stats.tcp4_announces_handled, 1);
+            assert_eq!(stats.tcp4_announces_handled(), 1);
 
             drop(stats);
 
@@ -704,7 +730,7 @@ mod for_all_config_modes {
 
             let stats = env.container.http_tracker_core_container.stats_repository.get_stats().await;
 
-            assert_eq!(stats.tcp6_announces_handled, 1);
+            assert_eq!(stats.tcp6_announces_handled(), 1);
 
             drop(stats);
 
@@ -722,14 +748,14 @@ mod for_all_config_modes {
             Client::new(*env.bind_address())
                 .announce(
                     &QueryBuilder::default()
-                        .with_peer_addr(&IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)))
+                        .with_peer_addr(&IpAddr::V6(Ipv6Addr::LOCALHOST))
                         .query(),
                 )
                 .await;
 
             let stats = env.container.http_tracker_core_container.stats_repository.get_stats().await;
 
-            assert_eq!(stats.tcp6_announces_handled, 0);
+            assert_eq!(stats.tcp6_announces_handled(), 0);
 
             drop(stats);
 
@@ -761,7 +787,8 @@ mod for_all_config_modes {
                 .container
                 .tracker_core_container
                 .in_memory_torrent_repository
-                .get_torrent_peers(&info_hash);
+                .get_torrent_peers(&info_hash)
+                .await;
             let peer_addr = peers[0].peer_addr;
 
             assert_eq!(peer_addr.ip(), client_ip);
@@ -803,7 +830,8 @@ mod for_all_config_modes {
                 .container
                 .tracker_core_container
                 .in_memory_torrent_repository
-                .get_torrent_peers(&info_hash);
+                .get_torrent_peers(&info_hash)
+                .await;
             let peer_addr = peers[0].peer_addr;
 
             assert_eq!(
@@ -852,7 +880,8 @@ mod for_all_config_modes {
                 .container
                 .tracker_core_container
                 .in_memory_torrent_repository
-                .get_torrent_peers(&info_hash);
+                .get_torrent_peers(&info_hash)
+                .await;
             let peer_addr = peers[0].peer_addr;
 
             assert_eq!(
@@ -899,7 +928,8 @@ mod for_all_config_modes {
                 .container
                 .tracker_core_container
                 .in_memory_torrent_repository
-                .get_torrent_peers(&info_hash);
+                .get_torrent_peers(&info_hash)
+                .await;
             let peer_addr = peers[0].peer_addr;
 
             assert_eq!(peer_addr.ip(), IpAddr::from_str("150.172.238.178").unwrap());
@@ -982,9 +1012,10 @@ mod for_all_config_modes {
                 &info_hash,
                 &PeerBuilder::default()
                     .with_peer_id(&PeerId(*b"-qB00000000000000001"))
-                    .with_bytes_pending_to_download(1)
+                    .with_bytes_left_to_download(1)
                     .build(),
-            );
+            )
+            .await;
 
             let response = Client::new(*env.bind_address())
                 .scrape(
@@ -1022,9 +1053,10 @@ mod for_all_config_modes {
                 &info_hash,
                 &PeerBuilder::default()
                     .with_peer_id(&PeerId(*b"-qB00000000000000001"))
-                    .with_no_bytes_pending_to_download()
+                    .with_no_bytes_left_to_download()
                     .build(),
-            );
+            )
+            .await;
 
             let response = Client::new(*env.bind_address())
                 .scrape(
@@ -1117,7 +1149,7 @@ mod for_all_config_modes {
 
             let stats = env.container.http_tracker_core_container.stats_repository.get_stats().await;
 
-            assert_eq!(stats.tcp4_scrapes_handled, 1);
+            assert_eq!(stats.tcp4_scrapes_handled(), 1);
 
             drop(stats);
 
@@ -1149,7 +1181,7 @@ mod for_all_config_modes {
 
             let stats = env.container.http_tracker_core_container.stats_repository.get_stats().await;
 
-            assert_eq!(stats.tcp6_scrapes_handled, 1);
+            assert_eq!(stats.tcp6_scrapes_handled(), 1);
 
             drop(stats);
 
@@ -1254,9 +1286,10 @@ mod configured_as_whitelisted {
                 &info_hash,
                 &PeerBuilder::default()
                     .with_peer_id(&PeerId(*b"-qB00000000000000001"))
-                    .with_bytes_pending_to_download(1)
+                    .with_bytes_left_to_download(1)
                     .build(),
-            );
+            )
+            .await;
 
             let response = Client::new(*env.bind_address())
                 .scrape(
@@ -1290,9 +1323,10 @@ mod configured_as_whitelisted {
                 &info_hash,
                 &PeerBuilder::default()
                     .with_peer_id(&PeerId(*b"-qB00000000000000001"))
-                    .with_bytes_pending_to_download(1)
+                    .with_bytes_left_to_download(1)
                     .build(),
-            );
+            )
+            .await;
 
             env.container
                 .tracker_core_container
@@ -1466,9 +1500,10 @@ mod configured_as_private {
                 &info_hash,
                 &PeerBuilder::default()
                     .with_peer_id(&PeerId(*b"-qB00000000000000001"))
-                    .with_bytes_pending_to_download(1)
+                    .with_bytes_left_to_download(1)
                     .build(),
-            );
+            )
+            .await;
 
             let response = Client::new(*env.bind_address())
                 .scrape(
@@ -1497,9 +1532,10 @@ mod configured_as_private {
                 &info_hash,
                 &PeerBuilder::default()
                     .with_peer_id(&PeerId(*b"-qB00000000000000001"))
-                    .with_bytes_pending_to_download(1)
+                    .with_bytes_left_to_download(1)
                     .build(),
-            );
+            )
+            .await;
 
             let expiring_key = env
                 .container
@@ -1548,9 +1584,10 @@ mod configured_as_private {
                 &info_hash,
                 &PeerBuilder::default()
                     .with_peer_id(&PeerId(*b"-qB00000000000000001"))
-                    .with_bytes_pending_to_download(1)
+                    .with_bytes_left_to_download(1)
                     .build(),
-            );
+            )
+            .await;
 
             let false_key: Key = "YZSl4lMZupRuOpSRC3krIKR5BPB14nrJ".parse().unwrap();
 
diff --git a/packages/axum-rest-tracker-api-server/Cargo.toml b/packages/axum-rest-tracker-api-server/Cargo.toml
index d1491c96e..7353e66e8 100644
--- a/packages/axum-rest-tracker-api-server/Cargo.toml
+++ b/packages/axum-rest-tracker-api-server/Cargo.toml
@@ -4,7 +4,7 @@ description = "The Torrust Tracker API."
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["axum", "bittorrent", "http", "server", "torrust", "tracker"]
+keywords = [ "axum", "bittorrent", "http", "server", "torrust", "tracker" ]
 license.workspace = true
 name = "torrust-axum-rest-tracker-api-server"
 publish.workspace = true
@@ -15,22 +15,22 @@ version.workspace = true
 
 [dependencies]
 aquatic_udp_protocol = "0"
-axum = { version = "0", features = ["macros"] }
-axum-extra = { version = "0", features = ["query"] }
-axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
+axum = { version = "0", features = [ "macros" ] }
+axum-extra = { version = "0", features = [ "query" ] }
+axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
 bittorrent-http-tracker-core = { version = "3.0.0-develop", path = "../http-tracker-core" }
 bittorrent-primitives = "0.1.0"
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
 bittorrent-udp-tracker-core = { version = "3.0.0-develop", path = "../udp-tracker-core" }
-derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = [ "as_ref", "constructor", "from" ] }
 futures = "0"
 hyper = "1"
-reqwest = { version = "0", features = ["json"] }
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1", features = ["preserve_order"] }
-serde_with = { version = "3", features = ["json"] }
+reqwest = { version = "0", features = [ "json" ] }
+serde = { version = "1", features = [ "derive" ] }
+serde_json = { version = "1", features = [ "preserve_order" ] }
+serde_with = { version = "3", features = [ "json" ] }
 thiserror = "2"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
 torrust-axum-server = { version = "3.0.0-develop", path = "../axum-server" }
 torrust-rest-tracker-api-client = { version = "3.0.0-develop", path = "../rest-tracker-api-client" }
 torrust-rest-tracker-api-core = { version = "3.0.0-develop", path = "../rest-tracker-api-core" }
@@ -39,9 +39,10 @@ torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
+torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "../swarm-coordination-registry" }
 torrust-udp-tracker-server = { version = "3.0.0-develop", path = "../udp-tracker-server" }
-tower = { version = "0", features = ["timeout"] }
-tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
+tower = { version = "0", features = [ "timeout" ] }
+tower-http = { version = "0", features = [ "compression-full", "cors", "propagate-header", "request-id", "trace" ] }
 tracing = "0"
 url = "2"
 
@@ -50,5 +51,5 @@ local-ip-address = "0"
 mockall = "0"
 torrust-rest-tracker-api-client = { version = "3.0.0-develop", path = "../rest-tracker-api-client" }
 torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
-url = { version = "2", features = ["serde"] }
-uuid = { version = "1", features = ["v4"] }
+url = { version = "2", features = [ "serde" ] }
+uuid = { version = "1", features = [ "v4" ] }
diff --git a/packages/axum-rest-tracker-api-server/src/environment.rs b/packages/axum-rest-tracker-api-server/src/environment.rs
index 275d72574..cddb45277 100644
--- a/packages/axum-rest-tracker-api-server/src/environment.rs
+++ b/packages/axum-rest-tracker-api-server/src/environment.rs
@@ -12,6 +12,7 @@ use torrust_rest_tracker_api_core::container::TrackerHttpApiCoreContainer;
 use torrust_server_lib::registar::Registar;
 use torrust_tracker_configuration::{logging, Configuration};
 use torrust_tracker_primitives::peer;
+use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
 use torrust_udp_tracker_server::container::UdpTrackerServerContainer;
 
 use crate::server::{ApiServer, Launcher, Running, Stopped};
@@ -32,12 +33,12 @@ where
     S: std::fmt::Debug + std::fmt::Display,
 {
     /// Add a torrent to the tracker
-    pub fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) {
-        let _number_of_downloads_increased = self
-            .container
+    pub async fn add_torrent_peer(&self, info_hash: &InfoHash, peer: &peer::Peer) {
+        self.container
             .tracker_core_container
             .in_memory_torrent_repository
-            .upsert_peer(info_hash, peer, None);
+            .handle_announcement(info_hash, peer, None)
+            .await;
     }
 }
 
@@ -172,14 +173,25 @@ impl EnvContainer {
                 .clone(),
         );
 
-        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
+        let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
+            core_config.tracker_usage_statistics.into(),
+        ));
+
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
+            &core_config,
+            &swarm_coordination_registry_container,
+        ));
+
         let http_tracker_core_container =
             HttpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, &http_tracker_config);
+
         let udp_tracker_core_container =
             UdpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, &udp_tracker_config);
+
         let udp_tracker_server_container = UdpTrackerServerContainer::initialize(&core_config);
 
         let tracker_http_api_core_container = TrackerHttpApiCoreContainer::initialize_from(
+            &swarm_coordination_registry_container,
             &tracker_core_container,
             &http_tracker_core_container,
             &udp_tracker_core_container,
diff --git a/packages/axum-rest-tracker-api-server/src/routes.rs b/packages/axum-rest-tracker-api-server/src/routes.rs
index c18451c89..78b7818d9 100644
--- a/packages/axum-rest-tracker-api-server/src/routes.rs
+++ b/packages/axum-rest-tracker-api-server/src/routes.rs
@@ -36,7 +36,7 @@ use crate::API_LOG_TARGET;
 /// Add all API routes to the router.
 #[instrument(skip(http_api_container, access_tokens))]
 pub fn router(
-    http_api_container: Arc<TrackerHttpApiCoreContainer>,
+    http_api_container: &Arc<TrackerHttpApiCoreContainer>,
     access_tokens: Arc<AccessTokens>,
     server_socket_addr: SocketAddr,
 ) -> Router {
@@ -44,7 +44,7 @@ pub fn router(
 
     let api_url_prefix = "/api";
 
-    let router = v1::routes::add(api_url_prefix, router, &http_api_container);
+    let router = v1::routes::add(api_url_prefix, router, http_api_container);
 
     let state = State { access_tokens };
 
diff --git a/packages/axum-rest-tracker-api-server/src/server.rs b/packages/axum-rest-tracker-api-server/src/server.rs
index 04c51d8fb..9eef6b71a 100644
--- a/packages/axum-rest-tracker-api-server/src/server.rs
+++ b/packages/axum-rest-tracker-api-server/src/server.rs
@@ -140,7 +140,7 @@ impl ApiServer<Stopped> {
         let task = tokio::spawn(async move {
             tracing::debug!(target: API_LOG_TARGET, "Starting with launcher in spawned task ...");
 
-            let _task = launcher.start(http_api_container, access_tokens, tx_start, rx_halt).await;
+            let _task = launcher.start(&http_api_container, access_tokens, tx_start, rx_halt).await;
 
             tracing::debug!(target: API_LOG_TARGET, "Started with launcher in spawned task");
 
@@ -220,9 +220,9 @@ pub struct Launcher {
 impl std::fmt::Display for Launcher {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if self.tls.is_some() {
-            write!(f, "(with socket): {}, using TLS", self.bind_to,)
+            write!(f, "(with socket): {}, using TLS", self.bind_to)
         } else {
-            write!(f, "(with socket): {}, without TLS", self.bind_to,)
+            write!(f, "(with socket): {}, without TLS", self.bind_to)
         }
     }
 }
@@ -241,12 +241,15 @@ impl Launcher {
     #[instrument(skip(self, http_api_container, access_tokens, tx_start, rx_halt))]
     pub fn start(
         &self,
-        http_api_container: Arc<TrackerHttpApiCoreContainer>,
+        http_api_container: &Arc<TrackerHttpApiCoreContainer>,
         access_tokens: Arc<AccessTokens>,
         tx_start: Sender<Started>,
         rx_halt: Receiver<Halted>,
     ) -> BoxFuture<'static, ()> {
         let socket = std::net::TcpListener::bind(self.bind_to).expect("Could not bind tcp_listener to address.");
+        socket
+            .set_nonblocking(true)
+            .expect("Failed to set socket to non-blocking mode");
         let address = socket.local_addr().expect("Could not get local_addr from tcp_listener.");
 
         let router = router(http_api_container, access_tokens, address);
@@ -269,6 +272,7 @@ impl Launcher {
         let running = Box::pin(async {
             match tls {
                 Some(tls) => custom_axum_server::from_tcp_rustls_with_timeouts(socket, tls)
+                    .expect("Failed to create server from TCP socket with TLS")
                     .handle(handle)
                     // The TimeoutAcceptor is commented because TSL does not work with it.
                     // See: https://github.com/torrust/torrust-index/issues/204#issuecomment-2115529214
@@ -277,6 +281,7 @@ impl Launcher {
                     .await
                     .expect("Axum server for tracker API crashed."),
                 None => custom_axum_server::from_tcp_with_timeouts(socket)
+                    .expect("Failed to create server from TCP socket")
                     .handle(handle)
                     .acceptor(TimeoutAcceptor)
                     .serve(router.into_make_service_with_connect_info::<std::net::SocketAddr>())
diff --git a/packages/axum-rest-tracker-api-server/src/v1/context/stats/handlers.rs b/packages/axum-rest-tracker-api-server/src/v1/context/stats/handlers.rs
index 17d3e4f2d..1b1f670a0 100644
--- a/packages/axum-rest-tracker-api-server/src/v1/context/stats/handlers.rs
+++ b/packages/axum-rest-tracker-api-server/src/v1/context/stats/handlers.rs
@@ -41,7 +41,7 @@ pub struct QueryParams {
 pub async fn get_stats_handler(
     State(state): State<(
         Arc<InMemoryTorrentRepository>,
-        Arc<RwLock<BanService>>,
+        Arc<bittorrent_tracker_core::statistics::repository::Repository>,
         Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
         Arc<torrust_udp_tracker_server::statistics::repository::Repository>,
     )>,
@@ -69,6 +69,8 @@ pub async fn get_metrics_handler(
     State(state): State<(
         Arc<InMemoryTorrentRepository>,
         Arc<RwLock<BanService>>,
+        Arc<torrust_tracker_swarm_coordination_registry::statistics::repository::Repository>,
+        Arc<bittorrent_tracker_core::statistics::repository::Repository>,
         Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
         Arc<bittorrent_udp_tracker_core::statistics::repository::Repository>,
         Arc<torrust_udp_tracker_server::statistics::repository::Repository>,
@@ -81,6 +83,8 @@ pub async fn get_metrics_handler(
         state.2.clone(),
         state.3.clone(),
         state.4.clone(),
+        state.5.clone(),
+        state.6.clone(),
     )
     .await;
 
diff --git a/packages/axum-rest-tracker-api-server/src/v1/context/stats/resources.rs b/packages/axum-rest-tracker-api-server/src/v1/context/stats/resources.rs
index 8fcfd1be0..ece50383b 100644
--- a/packages/axum-rest-tracker-api-server/src/v1/context/stats/resources.rs
+++ b/packages/axum-rest-tracker-api-server/src/v1/context/stats/resources.rs
@@ -134,9 +134,8 @@ impl From<TrackerLabeledMetrics> for LabeledStats {
 
 #[cfg(test)]
 mod tests {
-    use torrust_rest_tracker_api_core::statistics::metrics::Metrics;
+    use torrust_rest_tracker_api_core::statistics::metrics::{ProtocolMetrics, TorrentsMetrics};
     use torrust_rest_tracker_api_core::statistics::services::TrackerMetrics;
-    use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
 
     use super::Stats;
 
@@ -145,13 +144,13 @@ mod tests {
     fn stats_resource_should_be_converted_from_tracker_metrics() {
         assert_eq!(
             Stats::from(TrackerMetrics {
-                torrents_metrics: AggregateSwarmMetadata {
+                torrents_metrics: TorrentsMetrics {
                     total_complete: 1,
                     total_downloaded: 2,
                     total_incomplete: 3,
                     total_torrents: 4
                 },
-                protocol_metrics: Metrics {
+                protocol_metrics: ProtocolMetrics {
                     // TCP
                     tcp4_connections_handled: 5,
                     tcp4_announces_handled: 6,
diff --git a/packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs b/packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs
index c19f08b2a..2bf3776fd 100644
--- a/packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs
+++ b/packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs
@@ -18,7 +18,7 @@ pub fn add(prefix: &str, router: Router, http_api_container: &Arc<TrackerHttpApi
             &format!("{prefix}/stats"),
             get(get_stats_handler).with_state((
                 http_api_container.tracker_core_container.in_memory_torrent_repository.clone(),
-                http_api_container.ban_service.clone(),
+                http_api_container.tracker_core_container.stats_repository.clone(),
                 http_api_container.http_stats_repository.clone(),
                 http_api_container.udp_server_stats_repository.clone(),
             )),
@@ -28,6 +28,12 @@ pub fn add(prefix: &str, router: Router, http_api_container: &Arc<TrackerHttpApi
             get(get_metrics_handler).with_state((
                 http_api_container.tracker_core_container.in_memory_torrent_repository.clone(),
                 http_api_container.ban_service.clone(),
+                // Stats
+                http_api_container
+                    .swarm_coordination_registry_container
+                    .stats_repository
+                    .clone(),
+                http_api_container.tracker_core_container.stats_repository.clone(),
                 http_api_container.http_stats_repository.clone(),
                 http_api_container.udp_core_stats_repository.clone(),
                 http_api_container.udp_server_stats_repository.clone(),
diff --git a/packages/axum-rest-tracker-api-server/src/v1/context/torrent/handlers.rs b/packages/axum-rest-tracker-api-server/src/v1/context/torrent/handlers.rs
index 613abbdeb..eecbd9ac3 100644
--- a/packages/axum-rest-tracker-api-server/src/v1/context/torrent/handlers.rs
+++ b/packages/axum-rest-tracker-api-server/src/v1/context/torrent/handlers.rs
@@ -33,7 +33,7 @@ pub async fn get_torrent_handler(
 ) -> Response {
     match InfoHash::from_str(&info_hash.0) {
         Err(_) => invalid_info_hash_param_response(&info_hash.0),
-        Ok(info_hash) => match get_torrent_info(&in_memory_torrent_repository, &info_hash) {
+        Ok(info_hash) => match get_torrent_info(&in_memory_torrent_repository, &info_hash).await {
             Some(info) => torrent_info_response(info).into_response(),
             None => torrent_not_known_response(),
         },
@@ -85,14 +85,19 @@ pub async fn get_torrents_handler(
     tracing::debug!("pagination: {:?}", pagination);
 
     if pagination.0.info_hashes.is_empty() {
-        torrent_list_response(&get_torrents_page(
-            &in_memory_torrent_repository,
-            Some(&Pagination::new_with_options(pagination.0.offset, pagination.0.limit)),
-        ))
+        torrent_list_response(
+            &get_torrents_page(
+                &in_memory_torrent_repository,
+                Some(&Pagination::new_with_options(pagination.0.offset, pagination.0.limit)),
+            )
+            .await,
+        )
         .into_response()
     } else {
         match parse_info_hashes(pagination.0.info_hashes) {
-            Ok(info_hashes) => torrent_list_response(&get_torrents(&in_memory_torrent_repository, &info_hashes)).into_response(),
+            Ok(info_hashes) => {
+                torrent_list_response(&get_torrents(&in_memory_torrent_repository, &info_hashes).await).into_response()
+            }
             Err(err) => match err {
                 QueryParamError::InvalidInfoHash { info_hash } => invalid_info_hash_param_response(&info_hash),
             },
diff --git a/packages/axum-rest-tracker-api-server/tests/server/v1/contract/context/stats.rs b/packages/axum-rest-tracker-api-server/tests/server/v1/contract/context/stats.rs
index 51a4804e7..7cae0abbf 100644
--- a/packages/axum-rest-tracker-api-server/tests/server/v1/contract/context/stats.rs
+++ b/packages/axum-rest-tracker-api-server/tests/server/v1/contract/context/stats.rs
@@ -21,7 +21,8 @@ async fn should_allow_getting_tracker_statistics() {
     env.add_torrent_peer(
         &InfoHash::from_str("9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d").unwrap(), // DevSkim: ignore DS173237
         &PeerBuilder::default().into(),
-    );
+    )
+    .await;
 
     let request_id = Uuid::new_v4();
 
diff --git a/packages/axum-rest-tracker-api-server/tests/server/v1/contract/context/torrent.rs b/packages/axum-rest-tracker-api-server/tests/server/v1/contract/context/torrent.rs
index 42421db99..ae9819785 100644
--- a/packages/axum-rest-tracker-api-server/tests/server/v1/contract/context/torrent.rs
+++ b/packages/axum-rest-tracker-api-server/tests/server/v1/contract/context/torrent.rs
@@ -26,7 +26,7 @@ async fn should_allow_getting_all_torrents() {
 
     let info_hash = InfoHash::from_str("9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d").unwrap(); // DevSkim: ignore DS173237
 
-    env.add_torrent_peer(&info_hash, &PeerBuilder::default().into());
+    env.add_torrent_peer(&info_hash, &PeerBuilder::default().into()).await;
 
     let request_id = Uuid::new_v4();
 
@@ -59,8 +59,8 @@ async fn should_allow_limiting_the_torrents_in_the_result() {
     let info_hash_1 = InfoHash::from_str("9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d").unwrap(); // DevSkim: ignore DS173237
     let info_hash_2 = InfoHash::from_str("0b3aea4adc213ce32295be85d3883a63bca25446").unwrap(); // DevSkim: ignore DS173237
 
-    env.add_torrent_peer(&info_hash_1, &PeerBuilder::default().into());
-    env.add_torrent_peer(&info_hash_2, &PeerBuilder::default().into());
+    env.add_torrent_peer(&info_hash_1, &PeerBuilder::default().into()).await;
+    env.add_torrent_peer(&info_hash_2, &PeerBuilder::default().into()).await;
 
     let request_id = Uuid::new_v4();
 
@@ -96,8 +96,8 @@ async fn should_allow_the_torrents_result_pagination() {
     let info_hash_1 = InfoHash::from_str("9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d").unwrap(); // DevSkim: ignore DS173237
     let info_hash_2 = InfoHash::from_str("0b3aea4adc213ce32295be85d3883a63bca25446").unwrap(); // DevSkim: ignore DS173237
 
-    env.add_torrent_peer(&info_hash_1, &PeerBuilder::default().into());
-    env.add_torrent_peer(&info_hash_2, &PeerBuilder::default().into());
+    env.add_torrent_peer(&info_hash_1, &PeerBuilder::default().into()).await;
+    env.add_torrent_peer(&info_hash_2, &PeerBuilder::default().into()).await;
 
     let request_id = Uuid::new_v4();
 
@@ -132,8 +132,8 @@ async fn should_allow_getting_a_list_of_torrents_providing_infohashes() {
     let info_hash_1 = InfoHash::from_str("9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d").unwrap(); // DevSkim: ignore DS173237
     let info_hash_2 = InfoHash::from_str("0b3aea4adc213ce32295be85d3883a63bca25446").unwrap(); // DevSkim: ignore DS173237
 
-    env.add_torrent_peer(&info_hash_1, &PeerBuilder::default().into());
-    env.add_torrent_peer(&info_hash_2, &PeerBuilder::default().into());
+    env.add_torrent_peer(&info_hash_1, &PeerBuilder::default().into()).await;
+    env.add_torrent_peer(&info_hash_2, &PeerBuilder::default().into()).await;
 
     let request_id = Uuid::new_v4();
 
@@ -307,7 +307,7 @@ async fn should_allow_getting_a_torrent_info() {
 
     let peer = PeerBuilder::default().into();
 
-    env.add_torrent_peer(&info_hash, &peer);
+    env.add_torrent_peer(&info_hash, &peer).await;
 
     let request_id = Uuid::new_v4();
 
@@ -389,7 +389,7 @@ async fn should_not_allow_getting_a_torrent_info_for_unauthenticated_users() {
 
     let info_hash = InfoHash::from_str("9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d").unwrap(); // DevSkim: ignore DS173237
 
-    env.add_torrent_peer(&info_hash, &PeerBuilder::default().into());
+    env.add_torrent_peer(&info_hash, &PeerBuilder::default().into()).await;
 
     let request_id = Uuid::new_v4();
 
diff --git a/packages/axum-server/Cargo.toml b/packages/axum-server/Cargo.toml
index a60bab885..45eddd3b0 100644
--- a/packages/axum-server/Cargo.toml
+++ b/packages/axum-server/Cargo.toml
@@ -4,7 +4,7 @@ description = "A wrapper for the Axum server for Torrust HTTP servers to add tim
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["axum", "server", "torrust", "wrapper"]
+keywords = [ "axum", "server", "torrust", "wrapper" ]
 license.workspace = true
 name = "torrust-axum-server"
 publish.workspace = true
@@ -14,19 +14,19 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-axum-server = { version = "0", features = ["tls-rustls-no-provider"] }
-camino = { version = "1", features = ["serde", "serde1"] }
+axum-server = { version = "0", features = [ "tls-rustls-no-provider" ] }
+camino = { version = "1", features = [ "serde", "serde1" ] }
 futures-util = "0"
 http-body = "1"
 hyper = "1"
-hyper-util = { version = "0", features = ["http1", "http2", "tokio"] }
+hyper-util = { version = "0", features = [ "http1", "http2", "tokio" ] }
 pin-project-lite = "0"
 thiserror = "2"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
 torrust-server-lib = { version = "3.0.0-develop", path = "../server-lib" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-located-error = { version = "3.0.0-develop", path = "../located-error" }
-tower = { version = "0", features = ["timeout"] }
+tower = { version = "0", features = [ "timeout" ] }
 tracing = "0"
 
 [dev-dependencies]
diff --git a/packages/axum-server/src/custom_axum_server.rs b/packages/axum-server/src/custom_axum_server.rs
index 5705ef24e..0328198ec 100644
--- a/packages/axum-server/src/custom_axum_server.rs
+++ b/packages/axum-server/src/custom_axum_server.rs
@@ -18,7 +18,7 @@
 //! If you want to know more about Axum and timeouts see <https://github.com/josecelano/axum-server-timeout>.
 use std::future::Ready;
 use std::io::ErrorKind;
-use std::net::TcpListener;
+use std::net::{SocketAddr, TcpListener};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::time::Duration;
@@ -36,21 +36,32 @@ use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
 use tokio::time::{Instant, Sleep};
 use tower::Service;
 
+type RustlsServerResult = Result<Server<SocketAddr, RustlsAcceptor>, std::io::Error>;
+type ServerResult = Result<Server<SocketAddr>, std::io::Error>;
+
 const HTTP1_HEADER_READ_TIMEOUT: Duration = Duration::from_secs(5);
 const HTTP2_KEEP_ALIVE_TIMEOUT: Duration = Duration::from_secs(5);
 const HTTP2_KEEP_ALIVE_INTERVAL: Duration = Duration::from_secs(5);
 
-#[must_use]
-pub fn from_tcp_with_timeouts(socket: TcpListener) -> Server {
-    add_timeouts(axum_server::from_tcp(socket))
+/// Creates an Axum server from a TCP listener with configured timeouts.
+///
+/// # Errors
+///
+/// Returns an error if the server cannot be created from the TCP socket.
+pub fn from_tcp_with_timeouts(socket: TcpListener) -> ServerResult {
+    axum_server::from_tcp(socket).map(add_timeouts)
 }
 
-#[must_use]
-pub fn from_tcp_rustls_with_timeouts(socket: TcpListener, tls: RustlsConfig) -> Server<RustlsAcceptor> {
-    add_timeouts(axum_server::from_tcp_rustls(socket, tls))
+/// Creates an Axum server from a TCP listener with TLS and configured timeouts.
+///
+/// # Errors
+///
+/// Returns an error if the server cannot be created from the TCP socket or if TLS configuration fails.
+pub fn from_tcp_rustls_with_timeouts(socket: TcpListener, tls: RustlsConfig) -> RustlsServerResult {
+    axum_server::from_tcp_rustls(socket, tls).map(add_timeouts)
 }
 
-fn add_timeouts<A>(mut server: Server<A>) -> Server<A> {
+fn add_timeouts<Addr: axum_server::Address, Acc>(mut server: Server<Addr, Acc>) -> Server<Addr, Acc> {
     server.http_builder().http1().timer(TokioTimer::new());
     server.http_builder().http2().timer(TokioTimer::new());
 
diff --git a/packages/axum-server/src/signals.rs b/packages/axum-server/src/signals.rs
index 268ff79fa..360879e32 100644
--- a/packages/axum-server/src/signals.rs
+++ b/packages/axum-server/src/signals.rs
@@ -7,7 +7,7 @@ use tracing::instrument;
 
 #[instrument(skip(handle, rx_halt, message))]
 pub async fn graceful_shutdown(
-    handle: axum_server::Handle,
+    handle: axum_server::Handle<SocketAddr>,
     rx_halt: tokio::sync::oneshot::Receiver<Halted>,
     message: String,
     address: SocketAddr,
diff --git a/packages/clock/Cargo.toml b/packages/clock/Cargo.toml
index 3bd00d2b0..c0cafff0a 100644
--- a/packages/clock/Cargo.toml
+++ b/packages/clock/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library to a clock for the torrust tracker."
-keywords = ["clock", "library", "torrents"]
+keywords = [ "clock", "library", "torrents" ]
 name = "torrust-tracker-clock"
 readme = "README.md"
 
@@ -16,7 +16,7 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-chrono = { version = "0", default-features = false, features = ["clock"] }
+chrono = { version = "0", default-features = false, features = [ "clock" ] }
 lazy_static = "1"
 tracing = "0"
 
diff --git a/packages/configuration/Cargo.toml b/packages/configuration/Cargo.toml
index e213f7c0c..1155ba417 100644
--- a/packages/configuration/Cargo.toml
+++ b/packages/configuration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library to provide configuration to the Torrust Tracker."
-keywords = ["config", "library", "settings"]
+keywords = [ "config", "library", "settings" ]
 name = "torrust-tracker-configuration"
 readme = "README.md"
 
@@ -15,18 +15,18 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-camino = { version = "1", features = ["serde", "serde1"] }
-derive_more = { version = "2", features = ["constructor", "display"] }
-figment = { version = "0", features = ["env", "test", "toml"] }
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1", features = ["preserve_order"] }
+camino = { version = "1", features = [ "serde", "serde1" ] }
+derive_more = { version = "2", features = [ "constructor", "display" ] }
+figment = { version = "0", features = [ "env", "test", "toml" ] }
+serde = { version = "1", features = [ "derive" ] }
+serde_json = { version = "1", features = [ "preserve_order" ] }
 serde_with = "3"
 thiserror = "2"
 toml = "0"
 torrust-tracker-located-error = { version = "3.0.0-develop", path = "../located-error" }
 tracing = "0"
-tracing-subscriber = { version = "0", features = ["json"] }
+tracing-subscriber = { version = "0", features = [ "json" ] }
 url = "2"
 
 [dev-dependencies]
-uuid = { version = "1", features = ["v4"] }
+uuid = { version = "1", features = [ "v4" ] }
diff --git a/packages/configuration/src/v2_0_0/database.rs b/packages/configuration/src/v2_0_0/database.rs
index c2b24d809..457b3c925 100644
--- a/packages/configuration/src/v2_0_0/database.rs
+++ b/packages/configuration/src/v2_0_0/database.rs
@@ -12,8 +12,10 @@ pub struct Database {
     /// Database connection string. The format depends on the database driver.
     /// For `sqlite3`, the format is `path/to/database.db`, for example:
     /// `./storage/tracker/lib/database/sqlite3.db`.
-    /// For `Mysql`, the format is `mysql://db_user:db_user_password:port/db_name`, for
+    /// For `mysql`, the format is `mysql://db_user:db_user_password@host:port/db_name`, for
     /// example: `mysql://root:password@localhost:3306/torrust`.
+    /// If the password contains reserved URL characters (for example `+` or `/`),
+    /// percent-encode it in the URL.
     #[serde(default = "Database::default_path")]
     pub path: String,
 }
diff --git a/packages/configuration/src/v2_0_0/health_check_api.rs b/packages/configuration/src/v2_0_0/health_check_api.rs
index 61178fa80..368f26c42 100644
--- a/packages/configuration/src/v2_0_0/health_check_api.rs
+++ b/packages/configuration/src/v2_0_0/health_check_api.rs
@@ -25,6 +25,6 @@ impl Default for HealthCheckApi {
 
 impl HealthCheckApi {
     fn default_bind_address() -> SocketAddr {
-        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1313)
+        SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 1313)
     }
 }
diff --git a/packages/configuration/src/v2_0_0/http_tracker.rs b/packages/configuration/src/v2_0_0/http_tracker.rs
index b3b21bda8..ae00257d8 100644
--- a/packages/configuration/src/v2_0_0/http_tracker.rs
+++ b/packages/configuration/src/v2_0_0/http_tracker.rs
@@ -37,7 +37,7 @@ impl Default for HttpTracker {
 
 impl HttpTracker {
     fn default_bind_address() -> SocketAddr {
-        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 7070)
+        SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), 7070)
     }
 
     fn default_tsl_config() -> Option<TslConfig> {
diff --git a/packages/configuration/src/v2_0_0/mod.rs b/packages/configuration/src/v2_0_0/mod.rs
index fd742d8d2..b3fbc881e 100644
--- a/packages/configuration/src/v2_0_0/mod.rs
+++ b/packages/configuration/src/v2_0_0/mod.rs
@@ -492,10 +492,7 @@ mod tests {
     fn configuration_should_contain_the_external_ip() {
         let configuration = Configuration::default();
 
-        assert_eq!(
-            configuration.core.net.external_ip,
-            Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)))
-        );
+        assert_eq!(configuration.core.net.external_ip, Some(IpAddr::V4(Ipv4Addr::UNSPECIFIED)));
     }
 
     #[test]
@@ -524,6 +521,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::result_large_err)]
     fn configuration_should_use_the_default_values_when_only_the_mandatory_options_are_provided_by_the_user_via_toml_file() {
         figment::Jail::expect_with(|jail| {
             jail.create_file(
@@ -555,6 +553,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::result_large_err)]
     fn configuration_should_use_the_default_values_when_only_the_mandatory_options_are_provided_by_the_user_via_toml_content() {
         figment::Jail::expect_with(|_jail| {
             let config_toml = r#"
@@ -584,6 +583,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::result_large_err)]
     fn default_configuration_could_be_overwritten_from_a_single_env_var_with_toml_contents() {
         figment::Jail::expect_with(|_jail| {
             let config_toml = r#"
@@ -616,6 +616,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::result_large_err)]
     fn default_configuration_could_be_overwritten_from_a_toml_config_file() {
         figment::Jail::expect_with(|jail| {
             jail.create_file(
@@ -649,6 +650,7 @@ mod tests {
         });
     }
 
+    #[allow(clippy::result_large_err)]
     #[test]
     fn configuration_should_allow_to_overwrite_the_default_tracker_api_token_for_admin_with_an_env_var() {
         figment::Jail::expect_with(|jail| {
diff --git a/packages/configuration/src/v2_0_0/network.rs b/packages/configuration/src/v2_0_0/network.rs
index 8e53d419c..7a4668727 100644
--- a/packages/configuration/src/v2_0_0/network.rs
+++ b/packages/configuration/src/v2_0_0/network.rs
@@ -32,7 +32,7 @@ impl Default for Network {
 impl Network {
     #[allow(clippy::unnecessary_wraps)]
     fn default_external_ip() -> Option<IpAddr> {
-        Some(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)))
+        Some(IpAddr::V4(Ipv4Addr::UNSPECIFIED))
     }
 
     fn default_on_reverse_proxy() -> bool {
diff --git a/packages/configuration/src/v2_0_0/tracker_api.rs b/packages/configuration/src/v2_0_0/tracker_api.rs
index 2da21758b..9433c8c8c 100644
--- a/packages/configuration/src/v2_0_0/tracker_api.rs
+++ b/packages/configuration/src/v2_0_0/tracker_api.rs
@@ -43,7 +43,7 @@ impl Default for HttpApi {
 
 impl HttpApi {
     fn default_bind_address() -> SocketAddr {
-        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 1212)
+        SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 1212)
     }
 
     #[allow(clippy::unnecessary_wraps)]
diff --git a/packages/configuration/src/v2_0_0/udp_tracker.rs b/packages/configuration/src/v2_0_0/udp_tracker.rs
index 9918bc1fa..133018e86 100644
--- a/packages/configuration/src/v2_0_0/udp_tracker.rs
+++ b/packages/configuration/src/v2_0_0/udp_tracker.rs
@@ -33,7 +33,7 @@ impl Default for UdpTracker {
 
 impl UdpTracker {
     fn default_bind_address() -> SocketAddr {
-        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 6969)
+        SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), 6969)
     }
 
     fn default_cookie_lifetime() -> Duration {
diff --git a/packages/events/Cargo.toml b/packages/events/Cargo.toml
index 1d183cddb..165ecca68 100644
--- a/packages/events/Cargo.toml
+++ b/packages/events/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library with functionality to handle events in Torrust tracker packages."
-keywords = ["events", "library", "rust", "torrust", "tracker"]
+keywords = [ "events", "library", "rust", "torrust", "tracker" ]
 name = "torrust-tracker-events"
 readme = "README.md"
 
@@ -16,7 +16,7 @@ version.workspace = true
 
 [dependencies]
 futures = "0"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync", "time"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync", "time" ] }
 
 [dev-dependencies]
 mockall = "0"
diff --git a/packages/events/src/broadcaster.rs b/packages/events/src/broadcaster.rs
index d0a511cd4..79c83df8a 100644
--- a/packages/events/src/broadcaster.rs
+++ b/packages/events/src/broadcaster.rs
@@ -5,7 +5,7 @@ use tokio::sync::broadcast::{self};
 use crate::receiver::{Receiver, RecvError};
 use crate::sender::{SendError, Sender};
 
-const CHANNEL_CAPACITY: usize = 32768;
+const CHANNEL_CAPACITY: usize = 65536;
 
 /// An event sender and receiver implementation using a broadcast channel.
 #[derive(Clone, Debug)]
diff --git a/packages/events/src/bus.rs b/packages/events/src/bus.rs
index d53f29b8d..b42fb4fc5 100644
--- a/packages/events/src/bus.rs
+++ b/packages/events/src/bus.rs
@@ -3,36 +3,60 @@ use std::sync::Arc;
 use crate::broadcaster::Broadcaster;
 use crate::{receiver, sender};
 
+#[derive(Clone, Debug)]
+pub enum SenderStatus {
+    Enabled,
+    Disabled,
+}
+
+impl From<bool> for SenderStatus {
+    fn from(enabled: bool) -> Self {
+        if enabled {
+            Self::Enabled
+        } else {
+            Self::Disabled
+        }
+    }
+}
+
+impl From<SenderStatus> for bool {
+    fn from(sender_status: SenderStatus) -> Self {
+        match sender_status {
+            SenderStatus::Enabled => true,
+            SenderStatus::Disabled => false,
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct EventBus<Event: Sync + Send + Clone + 'static> {
-    pub enable_sender: bool,
+    pub sender_status: SenderStatus,
     pub broadcaster: Broadcaster<Event>,
 }
 
 impl<Event: Sync + Send + Clone + 'static> Default for EventBus<Event> {
     fn default() -> Self {
-        let enable_sender = true;
+        let sender_status = SenderStatus::Enabled;
         let broadcaster = Broadcaster::<Event>::default();
 
-        Self::new(enable_sender, broadcaster)
+        Self::new(sender_status, broadcaster)
     }
 }
 
 impl<Event: Sync + Send + Clone + 'static> EventBus<Event> {
     #[must_use]
-    pub fn new(enable_sender: bool, broadcaster: Broadcaster<Event>) -> Self {
+    pub fn new(sender_status: SenderStatus, broadcaster: Broadcaster<Event>) -> Self {
         Self {
-            enable_sender,
+            sender_status,
             broadcaster,
         }
     }
 
     #[must_use]
     pub fn sender(&self) -> Option<Arc<dyn sender::Sender<Event = Event>>> {
-        if self.enable_sender {
-            Some(Arc::new(self.broadcaster.clone()))
-        } else {
-            None
+        match self.sender_status {
+            SenderStatus::Enabled => Some(Arc::new(self.broadcaster.clone())),
+            SenderStatus::Disabled => None,
         }
     }
 
@@ -50,14 +74,14 @@ mod tests {
 
     #[tokio::test]
     async fn it_should_provide_an_event_sender_when_enabled() {
-        let bus = EventBus::<String>::new(true, Broadcaster::default());
+        let bus = EventBus::<String>::new(SenderStatus::Enabled, Broadcaster::default());
 
         assert!(bus.sender().is_some());
     }
 
     #[tokio::test]
     async fn it_should_not_provide_event_sender_when_disabled() {
-        let bus = EventBus::<String>::new(false, Broadcaster::default());
+        let bus = EventBus::<String>::new(SenderStatus::Disabled, Broadcaster::default());
 
         assert!(bus.sender().is_none());
     }
diff --git a/packages/events/src/sender.rs b/packages/events/src/sender.rs
index 9fc77f650..3dccade4c 100644
--- a/packages/events/src/sender.rs
+++ b/packages/events/src/sender.rs
@@ -1,4 +1,5 @@
 use std::fmt;
+use std::fmt::Debug;
 
 use futures::future::BoxFuture;
 #[cfg(test)]
diff --git a/packages/events/src/shutdown.rs b/packages/events/src/shutdown.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/http-protocol/Cargo.toml b/packages/http-protocol/Cargo.toml
index 7803fe78e..78a037b18 100644
--- a/packages/http-protocol/Cargo.toml
+++ b/packages/http-protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library with the primitive types and functions for the BitTorrent HTTP tracker protocol."
-keywords = ["api", "library", "primitives"]
+keywords = [ "api", "library", "primitives" ]
 name = "bittorrent-http-tracker-protocol"
 readme = "README.md"
 
@@ -18,10 +18,10 @@ version.workspace = true
 aquatic_udp_protocol = "0"
 bittorrent-primitives = "0.1.0"
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
-derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = [ "as_ref", "constructor", "from" ] }
 multimap = "0"
 percent-encoding = "2"
-serde = { version = "1", features = ["derive"] }
+serde = { version = "1", features = [ "derive" ] }
 serde_bencode = "0"
 thiserror = "2"
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
diff --git a/packages/http-protocol/src/v1/query.rs b/packages/http-protocol/src/v1/query.rs
index b329b787e..9f53ef54f 100644
--- a/packages/http-protocol/src/v1/query.rs
+++ b/packages/http-protocol/src/v1/query.rs
@@ -86,7 +86,7 @@ impl Query {
         self.params.get_vec(name).map(|pairs| {
             let mut param_values = vec![];
             for pair in pairs {
-                param_values.push(pair.value.to_string());
+                param_values.push(pair.value.clone());
             }
             param_values
         })
diff --git a/packages/http-tracker-core/Cargo.toml b/packages/http-tracker-core/Cargo.toml
index 5473c5a25..c419052f9 100644
--- a/packages/http-tracker-core/Cargo.toml
+++ b/packages/http-tracker-core/Cargo.toml
@@ -4,7 +4,7 @@ description = "A library with the core functionality needed to implement a BitTo
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["api", "bittorrent", "core", "library", "tracker"]
+keywords = [ "api", "bittorrent", "core", "library", "tracker" ]
 license.workspace = true
 name = "bittorrent-http-tracker-core"
 publish.workspace = true
@@ -18,16 +18,18 @@ aquatic_udp_protocol = "0"
 bittorrent-http-tracker-protocol = { version = "3.0.0-develop", path = "../http-protocol" }
 bittorrent-primitives = "0.1.0"
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
-criterion = { version = "0.5.1", features = ["async_tokio"] }
+criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 futures = "0"
 serde = "1.0.219"
 thiserror = "2"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
+tokio-util = "0.7.15"
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
 torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
+torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "../swarm-coordination-registry" }
 tracing = "0"
 
 [dev-dependencies]
diff --git a/packages/http-tracker-core/benches/helpers/sync.rs b/packages/http-tracker-core/benches/helpers/sync.rs
index e0f022108..dbf0dac83 100644
--- a/packages/http-tracker-core/benches/helpers/sync.rs
+++ b/packages/http-tracker-core/benches/helpers/sync.rs
@@ -22,7 +22,7 @@ pub async fn return_announce_data_once(samples: u64) -> Duration {
         core_http_tracker_services.http_stats_event_sender.clone(),
     );
 
-    let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+    let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
     let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
     let start = Instant::now();
diff --git a/packages/http-tracker-core/benches/helpers/util.rs b/packages/http-tracker-core/benches/helpers/util.rs
index 7ee91a2c4..028d7c535 100644
--- a/packages/http-tracker-core/benches/helpers/util.rs
+++ b/packages/http-tracker-core/benches/helpers/util.rs
@@ -14,12 +14,13 @@ use bittorrent_tracker_core::announce_handler::AnnounceHandler;
 use bittorrent_tracker_core::authentication::key::repository::in_memory::InMemoryKeyRepository;
 use bittorrent_tracker_core::authentication::service::AuthenticationService;
 use bittorrent_tracker_core::databases::setup::initialize_database;
+use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
 use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
 use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
 use futures::future::BoxFuture;
 use mockall::mock;
+use tokio_util::sync::CancellationToken;
 use torrust_tracker_configuration::{Configuration, Core};
 use torrust_tracker_events::sender::SendError;
 use torrust_tracker_primitives::peer::Peer;
@@ -42,10 +43,12 @@ pub fn initialize_core_tracker_services() -> (CoreTrackerServices, CoreHttpTrack
 }
 
 pub fn initialize_core_tracker_services_with_config(config: &Configuration) -> (CoreTrackerServices, CoreHttpTrackerServices) {
+    let cancellation_token = CancellationToken::new();
+
     let core_config = Arc::new(config.core.clone());
     let database = initialize_database(&config.core);
     let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-    let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
+    let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
     let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
     let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
     let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
@@ -55,21 +58,21 @@ pub fn initialize_core_tracker_services_with_config(config: &Configuration) -> (
         &config.core,
         &whitelist_authorization,
         &in_memory_torrent_repository,
-        &db_torrent_repository,
+        &db_downloads_metric_repository,
     ));
 
     // HTTP core stats
     let http_core_broadcaster = Broadcaster::default();
     let http_stats_repository = Arc::new(Repository::new());
     let http_stats_event_bus = Arc::new(EventBus::new(
-        config.core.tracker_usage_statistics,
+        config.core.tracker_usage_statistics.into(),
         http_core_broadcaster.clone(),
     ));
 
     let http_stats_event_sender = http_stats_event_bus.sender();
 
     if config.core.tracker_usage_statistics {
-        let _unused = run_event_listener(http_stats_event_bus.receiver(), &http_stats_repository);
+        let _unused = run_event_listener(http_stats_event_bus.receiver(), cancellation_token, &http_stats_repository);
     }
 
     (
diff --git a/packages/http-tracker-core/benches/http_tracker_core_benchmark.rs b/packages/http-tracker-core/benches/http_tracker_core_benchmark.rs
index aa50ceeb9..c193c5124 100644
--- a/packages/http-tracker-core/benches/http_tracker_core_benchmark.rs
+++ b/packages/http-tracker-core/benches/http_tracker_core_benchmark.rs
@@ -12,7 +12,7 @@ fn announce_once(c: &mut Criterion) {
     let mut group = c.benchmark_group("http_tracker_handle_announce_once");
 
     group.warm_up_time(Duration::from_millis(500));
-    group.measurement_time(Duration::from_millis(1000));
+    group.measurement_time(Duration::from_secs(1));
 
     group.bench_function("handle_announce_data", |b| {
         b.iter(|| sync::return_announce_data_once(100));
diff --git a/packages/http-tracker-core/src/container.rs b/packages/http-tracker-core/src/container.rs
index 681d4a4f4..ed0aaf8b0 100644
--- a/packages/http-tracker-core/src/container.rs
+++ b/packages/http-tracker-core/src/container.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use bittorrent_tracker_core::container::TrackerCoreContainer;
 use torrust_tracker_configuration::{Core, HttpTracker};
+use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
 
 use crate::event::bus::EventBus;
 use crate::event::sender::Broadcaster;
@@ -26,7 +27,15 @@ pub struct HttpTrackerCoreContainer {
 impl HttpTrackerCoreContainer {
     #[must_use]
     pub fn initialize(core_config: &Arc<Core>, http_tracker_config: &Arc<HttpTracker>) -> Arc<Self> {
-        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(core_config));
+        let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
+            core_config.tracker_usage_statistics.into(),
+        ));
+
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
+            core_config,
+            &swarm_coordination_registry_container,
+        ));
+
         Self::initialize_from_tracker_core(&tracker_core_container, http_tracker_config)
     }
 
@@ -36,6 +45,7 @@ impl HttpTrackerCoreContainer {
         http_tracker_config: &Arc<HttpTracker>,
     ) -> Arc<Self> {
         let http_tracker_core_services = HttpTrackerCoreServices::initialize_from(tracker_core_container);
+
         Self::initialize_from_services(tracker_core_container, &http_tracker_core_services, http_tracker_config)
     }
 
@@ -72,7 +82,7 @@ impl HttpTrackerCoreServices {
         let http_core_broadcaster = Broadcaster::default();
         let http_stats_repository = Arc::new(Repository::new());
         let http_stats_event_bus = Arc::new(EventBus::new(
-            tracker_core_container.core_config.tracker_usage_statistics,
+            tracker_core_container.core_config.tracker_usage_statistics.into(),
             http_core_broadcaster.clone(),
         ));
 
diff --git a/packages/http-tracker-core/src/event.rs b/packages/http-tracker-core/src/event.rs
index 681f4bbfe..2a4734bfd 100644
--- a/packages/http-tracker-core/src/event.rs
+++ b/packages/http-tracker-core/src/event.rs
@@ -86,6 +86,14 @@ impl From<ConnectionContext> for LabelSet {
                 label_name!("server_binding_ip"),
                 LabelValue::new(&connection_context.server.service_binding.bind_address().ip().to_string()),
             ),
+            (
+                label_name!("server_binding_address_ip_type"),
+                LabelValue::new(&connection_context.server.service_binding.bind_address_ip_type().to_string()),
+            ),
+            (
+                label_name!("server_binding_address_ip_family"),
+                LabelValue::new(&connection_context.server.service_binding.bind_address_ip_family().to_string()),
+            ),
             (
                 label_name!("server_binding_port"),
                 LabelValue::new(&connection_context.server.service_binding.bind_address().port().to_string()),
@@ -166,13 +174,13 @@ pub mod test {
 
         use crate::event::{ConnectionContext, Event};
 
-        let remote_client_ip = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
+        let remote_client_ip = IpAddr::V4(Ipv4Addr::LOCALHOST);
         let info_hash = sample_info_hash();
 
         let event1 = Event::TcpAnnounce {
             connection: ConnectionContext::new(
                 RemoteClientAddr::new(ResolvedIp::FromSocketAddr(remote_client_ip), Some(8080)),
-                ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070)).unwrap(),
+                ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070)).unwrap(),
             ),
             info_hash,
             announcement: Peer::default(),
@@ -184,7 +192,7 @@ pub mod test {
                     ResolvedIp::FromSocketAddr(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2))),
                     Some(8080),
                 ),
-                ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070)).unwrap(),
+                ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070)).unwrap(),
             ),
             info_hash,
             announcement: Peer::default(),
diff --git a/packages/http-tracker-core/src/services/announce.rs b/packages/http-tracker-core/src/services/announce.rs
index e0f387273..766f08c12 100644
--- a/packages/http-tracker-core/src/services/announce.rs
+++ b/packages/http-tracker-core/src/services/announce.rs
@@ -87,7 +87,7 @@ impl AnnounceService {
 
         let announce_data = self
             .announce_handler
-            .announce(
+            .handle_announcement(
                 &announce_request.info_hash,
                 &mut peer,
                 &remote_client_addr.ip(),
@@ -212,10 +212,11 @@ mod tests {
     use bittorrent_tracker_core::authentication::key::repository::in_memory::InMemoryKeyRepository;
     use bittorrent_tracker_core::authentication::service::AuthenticationService;
     use bittorrent_tracker_core::databases::setup::initialize_database;
+    use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
     use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
     use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
+    use tokio_util::sync::CancellationToken;
     use torrust_tracker_configuration::{Configuration, Core};
     use torrust_tracker_primitives::peer::Peer;
     use torrust_tracker_test_helpers::configuration;
@@ -236,10 +237,12 @@ mod tests {
     }
 
     fn initialize_core_tracker_services_with_config(config: &Configuration) -> (CoreTrackerServices, CoreHttpTrackerServices) {
+        let cancellation_token = CancellationToken::new();
+
         let core_config = Arc::new(config.core.clone());
         let database = initialize_database(&config.core);
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
         let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
         let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
         let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
@@ -249,21 +252,21 @@ mod tests {
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         // HTTP core stats
         let http_core_broadcaster = Broadcaster::default();
         let http_stats_repository = Arc::new(Repository::new());
         let http_stats_event_bus = Arc::new(EventBus::new(
-            config.core.tracker_usage_statistics,
+            config.core.tracker_usage_statistics.into(),
             http_core_broadcaster.clone(),
         ));
 
         let http_stats_event_sender = http_stats_event_bus.sender();
 
         if config.core.tracker_usage_statistics {
-            let _unused = run_event_listener(http_stats_event_bus.receiver(), &http_stats_repository);
+            let _unused = run_event_listener(http_stats_event_bus.receiver(), cancellation_token, &http_stats_repository);
         }
 
         (
@@ -349,7 +352,7 @@ mod tests {
 
             let (announce_request, client_ip_sources) = sample_announce_request_for_peer(peer);
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let announce_service = AnnounceService::new(
@@ -380,21 +383,17 @@ mod tests {
 
         #[tokio::test]
         async fn it_should_send_the_tcp_4_announce_event_when_the_peer_uses_ipv4() {
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
             let peer = sample_peer_using_ipv4();
             let remote_client_ip = IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1));
 
             let server_service_binding_clone = server_service_binding.clone();
-            let peer_copy = peer;
 
             let mut http_stats_event_sender_mock = MockHttpStatsEventSender::new();
             http_stats_event_sender_mock
                 .expect_send()
                 .with(predicate::function(move |event| {
-                    let mut announced_peer = peer_copy;
-                    announced_peer.peer_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1)), 8080);
-
                     let mut announcement = peer;
                     announcement.peer_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1)), 8080);
 
@@ -442,7 +441,7 @@ mod tests {
         }
 
         fn peer_with_the_ipv4_loopback_ip() -> peer::Peer {
-            let loopback_ip = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
+            let loopback_ip = IpAddr::V4(Ipv4Addr::LOCALHOST);
             let mut peer = sample_peer();
             peer.peer_addr = SocketAddr::new(loopback_ip, 8080);
             peer
@@ -453,21 +452,17 @@ mod tests {
         {
             // Tracker changes the peer IP to the tracker external IP when the peer is using the loopback IP.
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
             let peer = peer_with_the_ipv4_loopback_ip();
-            let remote_client_ip = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
+            let remote_client_ip = IpAddr::V4(Ipv4Addr::LOCALHOST);
 
             let server_service_binding_clone = server_service_binding.clone();
-            let peer_copy = peer;
 
             let mut http_stats_event_sender_mock = MockHttpStatsEventSender::new();
             http_stats_event_sender_mock
                 .expect_send()
                 .with(predicate::function(move |event| {
-                    let mut announced_peer = peer_copy;
-                    announced_peer.peer_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080);
-
                     let mut peer_announcement = peer;
                     peer_announcement.peer_addr = SocketAddr::new(
                         IpAddr::V6(Ipv6Addr::new(0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969)),
@@ -514,7 +509,7 @@ mod tests {
         #[tokio::test]
         async fn it_should_send_the_tcp_6_announce_event_when_the_peer_uses_ipv6_even_if_the_tracker_changes_the_peer_ip_to_ipv4()
         {
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
             let peer = sample_peer_using_ipv6();
             let remote_client_ip = IpAddr::V6(Ipv6Addr::new(0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969, 0x6969));
@@ -550,7 +545,7 @@ mod tests {
                 core_http_tracker_services.http_stats_event_sender.clone(),
             );
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let _announce_data = announce_service
diff --git a/packages/http-tracker-core/src/services/scrape.rs b/packages/http-tracker-core/src/services/scrape.rs
index 70e30099c..4587bc90a 100644
--- a/packages/http-tracker-core/src/services/scrape.rs
+++ b/packages/http-tracker-core/src/services/scrape.rs
@@ -78,7 +78,7 @@ impl ScrapeService {
         let scrape_data = if self.authentication_is_required() && !self.is_authenticated(maybe_key).await {
             ScrapeData::zeroed(&scrape_request.info_hashes)
         } else {
-            self.scrape_handler.scrape(&scrape_request.info_hashes).await?
+            self.scrape_handler.handle_scrape(&scrape_request.info_hashes).await?
         };
 
         let remote_client_addr = resolve_remote_client_addr(&self.core_config.net.on_reverse_proxy.into(), client_ip_sources)?;
@@ -176,8 +176,8 @@ mod tests {
     use bittorrent_tracker_core::authentication::service::AuthenticationService;
     use bittorrent_tracker_core::databases::setup::initialize_database;
     use bittorrent_tracker_core::scrape_handler::ScrapeHandler;
+    use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
     use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
     use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
     use futures::future::BoxFuture;
@@ -200,7 +200,7 @@ mod tests {
         let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
         let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
         let in_memory_key_repository = Arc::new(InMemoryKeyRepository::default());
         let authentication_service = Arc::new(AuthenticationService::new(&config.core, &in_memory_key_repository));
 
@@ -208,7 +208,7 @@ mod tests {
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
@@ -255,6 +255,7 @@ mod tests {
         use bittorrent_http_tracker_protocol::v1::services::peer_ip_resolver::{ClientIpSources, RemoteClientAddr, ResolvedIp};
         use bittorrent_tracker_core::announce_handler::PeersWanted;
         use mockall::predicate::eq;
+        use torrust_tracker_events::bus::SenderStatus;
         use torrust_tracker_primitives::core::ScrapeData;
         use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
         use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
@@ -276,7 +277,7 @@ mod tests {
 
             // HTTP core stats
             let http_core_broadcaster = Broadcaster::default();
-            let http_stats_event_bus = Arc::new(EventBus::new(false, http_core_broadcaster.clone()));
+            let http_stats_event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, http_core_broadcaster.clone()));
 
             let http_stats_event_sender = http_stats_event_bus.sender();
 
@@ -290,7 +291,7 @@ mod tests {
             let original_peer_ip = peer.ip();
             container
                 .announce_handler
-                .announce(&info_hash, &mut peer, &original_peer_ip, &PeersWanted::AsManyAsPossible)
+                .handle_announcement(&info_hash, &mut peer, &original_peer_ip, &PeersWanted::AsManyAsPossible)
                 .await
                 .unwrap();
 
@@ -303,7 +304,7 @@ mod tests {
                 connection_info_socket_address: Some(SocketAddr::new(original_peer_ip, 8080)),
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let scrape_service = Arc::new(ScrapeService::new(
@@ -344,8 +345,7 @@ mod tests {
                             ResolvedIp::FromSocketAddr(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1))),
                             Some(8080),
                         ),
-                        ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070))
-                            .unwrap(),
+                        ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070)).unwrap(),
                     ),
                 }))
                 .times(1)
@@ -365,7 +365,7 @@ mod tests {
                 connection_info_socket_address: Some(SocketAddr::new(peer_ip, 8080)),
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let scrape_service = Arc::new(ScrapeService::new(
@@ -383,7 +383,7 @@ mod tests {
 
         #[tokio::test]
         async fn it_should_send_the_tcp_6_scrape_event_when_the_peer_uses_ipv6() {
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let config = configuration::ephemeral();
@@ -419,7 +419,7 @@ mod tests {
                 connection_info_socket_address: Some(SocketAddr::new(peer_ip, 8080)),
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let scrape_service = Arc::new(ScrapeService::new(
@@ -446,6 +446,7 @@ mod tests {
         use bittorrent_http_tracker_protocol::v1::services::peer_ip_resolver::{ClientIpSources, RemoteClientAddr, ResolvedIp};
         use bittorrent_tracker_core::announce_handler::PeersWanted;
         use mockall::predicate::eq;
+        use torrust_tracker_events::bus::SenderStatus;
         use torrust_tracker_primitives::core::ScrapeData;
         use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
         use torrust_tracker_test_helpers::configuration;
@@ -468,7 +469,7 @@ mod tests {
 
             // HTTP core stats
             let http_core_broadcaster = Broadcaster::default();
-            let http_stats_event_bus = Arc::new(EventBus::new(false, http_core_broadcaster.clone()));
+            let http_stats_event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, http_core_broadcaster.clone()));
 
             let http_stats_event_sender = http_stats_event_bus.sender();
 
@@ -480,7 +481,7 @@ mod tests {
             let original_peer_ip = peer.ip();
             container
                 .announce_handler
-                .announce(&info_hash, &mut peer, &original_peer_ip, &PeersWanted::AsManyAsPossible)
+                .handle_announcement(&info_hash, &mut peer, &original_peer_ip, &PeersWanted::AsManyAsPossible)
                 .await
                 .unwrap();
 
@@ -493,7 +494,7 @@ mod tests {
                 connection_info_socket_address: Some(SocketAddr::new(original_peer_ip, 8080)),
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let scrape_service = Arc::new(ScrapeService::new(
@@ -528,8 +529,7 @@ mod tests {
                             ResolvedIp::FromSocketAddr(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1))),
                             Some(8080),
                         ),
-                        ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070))
-                            .unwrap(),
+                        ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070)).unwrap(),
                     ),
                 }))
                 .times(1)
@@ -547,7 +547,7 @@ mod tests {
                 connection_info_socket_address: Some(SocketAddr::new(peer_ip, 8080)),
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let scrape_service = Arc::new(ScrapeService::new(
@@ -565,7 +565,7 @@ mod tests {
 
         #[tokio::test]
         async fn it_should_send_the_tcp_6_scrape_event_when_the_peer_uses_ipv6() {
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let config = configuration::ephemeral();
@@ -601,7 +601,7 @@ mod tests {
                 connection_info_socket_address: Some(SocketAddr::new(peer_ip, 8080)),
             };
 
-            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070);
+            let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070);
             let server_service_binding = ServiceBinding::new(Protocol::HTTP, server_socket_addr).unwrap();
 
             let scrape_service = Arc::new(ScrapeService::new(
diff --git a/packages/http-tracker-core/src/statistics/event/handler.rs b/packages/http-tracker-core/src/statistics/event/handler.rs
index 8d2ad1aa2..37c7a26b5 100644
--- a/packages/http-tracker-core/src/statistics/event/handler.rs
+++ b/packages/http-tracker-core/src/statistics/event/handler.rs
@@ -1,4 +1,3 @@
-use std::net::IpAddr;
 use std::sync::Arc;
 
 use torrust_tracker_metrics::label::{LabelSet, LabelValue};
@@ -9,26 +8,9 @@ use crate::event::Event;
 use crate::statistics::repository::Repository;
 use crate::statistics::HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL;
 
-/// # Panics
-///
-/// This function panics if the client IP address is not the same as the IP
-/// version of the event.
 pub async fn handle_event(event: Event, stats_repository: &Arc<Repository>, now: DurationSinceUnixEpoch) {
     match event {
         Event::TcpAnnounce { connection, .. } => {
-            // Global fixed metrics
-
-            match connection.client_ip_addr() {
-                IpAddr::V4(_) => {
-                    stats_repository.increase_tcp4_announces().await;
-                }
-                IpAddr::V6(_) => {
-                    stats_repository.increase_tcp6_announces().await;
-                }
-            }
-
-            // Extendable metrics
-
             let mut label_set = LabelSet::from(connection);
             label_set.upsert(label_name!("request_kind"), LabelValue::new("announce"));
 
@@ -36,24 +18,16 @@ pub async fn handle_event(event: Event, stats_repository: &Arc<Repository>, now:
                 .increase_counter(&metric_name!(HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL), &label_set, now)
                 .await
             {
-                Ok(()) => {}
+                Ok(()) => {
+                    tracing::debug!(
+                        "Successfully increased the counter for HTTP announce requests received: {}",
+                        label_set
+                    );
+                }
                 Err(err) => tracing::error!("Failed to increase the counter: {}", err),
             };
         }
         Event::TcpScrape { connection } => {
-            // Global fixed metrics
-
-            match connection.client_ip_addr() {
-                IpAddr::V4(_) => {
-                    stats_repository.increase_tcp4_scrapes().await;
-                }
-                IpAddr::V6(_) => {
-                    stats_repository.increase_tcp6_scrapes().await;
-                }
-            }
-
-            // Extendable metrics
-
             let mut label_set = LabelSet::from(connection);
             label_set.upsert(label_name!("request_kind"), LabelValue::new("scrape"));
 
@@ -61,7 +35,12 @@ pub async fn handle_event(event: Event, stats_repository: &Arc<Repository>, now:
                 .increase_counter(&metric_name!(HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL), &label_set, now)
                 .await
             {
-                Ok(()) => {}
+                Ok(()) => {
+                    tracing::debug!(
+                        "Successfully increased the counter for HTTP scrape requests received: {}",
+                        label_set
+                    );
+                }
                 Err(err) => tracing::error!("Failed to increase the counter: {}", err),
             };
         }
@@ -95,7 +74,7 @@ mod tests {
             Event::TcpAnnounce {
                 connection: ConnectionContext::new(
                     RemoteClientAddr::new(ResolvedIp::FromSocketAddr(remote_client_ip), Some(8080)),
-                    ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070)).unwrap(),
+                    ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070)).unwrap(),
                 ),
                 info_hash: sample_info_hash(),
                 announcement: peer,
@@ -107,7 +86,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.tcp4_announces_handled, 1);
+        assert_eq!(stats.tcp4_announces_handled(), 1);
     }
 
     #[tokio::test]
@@ -121,7 +100,7 @@ mod tests {
                         ResolvedIp::FromSocketAddr(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2))),
                         Some(8080),
                     ),
-                    ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070)).unwrap(),
+                    ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070)).unwrap(),
                 ),
             },
             &stats_repository,
@@ -131,7 +110,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.tcp4_scrapes_handled, 1);
+        assert_eq!(stats.tcp4_scrapes_handled(), 1);
     }
 
     #[tokio::test]
@@ -144,7 +123,7 @@ mod tests {
             Event::TcpAnnounce {
                 connection: ConnectionContext::new(
                     RemoteClientAddr::new(ResolvedIp::FromSocketAddr(remote_client_ip), Some(8080)),
-                    ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070)).unwrap(),
+                    ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 7070)).unwrap(),
                 ),
                 info_hash: sample_info_hash(),
                 announcement: peer,
@@ -156,7 +135,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.tcp6_announces_handled, 1);
+        assert_eq!(stats.tcp6_announces_handled(), 1);
     }
 
     #[tokio::test]
@@ -172,7 +151,7 @@ mod tests {
                         ))),
                         Some(8080),
                     ),
-                    ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070)).unwrap(),
+                    ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 7070)).unwrap(),
                 ),
             },
             &stats_repository,
@@ -182,6 +161,6 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.tcp6_scrapes_handled, 1);
+        assert_eq!(stats.tcp6_scrapes_handled(), 1);
     }
 }
diff --git a/packages/http-tracker-core/src/statistics/event/listener.rs b/packages/http-tracker-core/src/statistics/event/listener.rs
index 6730d4c70..ff2937a59 100644
--- a/packages/http-tracker-core/src/statistics/event/listener.rs
+++ b/packages/http-tracker-core/src/statistics/event/listener.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
 use torrust_tracker_clock::clock::Time;
 use torrust_tracker_events::receiver::RecvError;
 
@@ -10,29 +11,29 @@ use crate::statistics::repository::Repository;
 use crate::{CurrentClock, HTTP_TRACKER_LOG_TARGET};
 
 #[must_use]
-pub fn run_event_listener(receiver: Receiver, repository: &Arc<Repository>) -> JoinHandle<()> {
+pub fn run_event_listener(
+    receiver: Receiver,
+    cancellation_token: CancellationToken,
+    repository: &Arc<Repository>,
+) -> JoinHandle<()> {
     let stats_repository = repository.clone();
 
     tracing::info!(target: HTTP_TRACKER_LOG_TARGET, "Starting HTTP tracker core event listener");
 
     tokio::spawn(async move {
-        dispatch_events(receiver, stats_repository).await;
+        dispatch_events(receiver, cancellation_token, stats_repository).await;
 
         tracing::info!(target: HTTP_TRACKER_LOG_TARGET, "HTTP tracker core event listener finished");
     })
 }
 
-async fn dispatch_events(mut receiver: Receiver, stats_repository: Arc<Repository>) {
-    let shutdown_signal = tokio::signal::ctrl_c();
-
-    tokio::pin!(shutdown_signal);
-
+async fn dispatch_events(mut receiver: Receiver, cancellation_token: CancellationToken, stats_repository: Arc<Repository>) {
     loop {
         tokio::select! {
             biased;
 
-            _ = &mut shutdown_signal => {
-                tracing::info!(target: HTTP_TRACKER_LOG_TARGET, "Received Ctrl+C, shutting down HTTP tracker core event listener.");
+            () = cancellation_token.cancelled() => {
+                tracing::info!(target: HTTP_TRACKER_LOG_TARGET, "Received cancellation request, shutting down HTTP tracker core event listener.");
                 break;
             }
 
@@ -42,11 +43,11 @@ async fn dispatch_events(mut receiver: Receiver, stats_repository: Arc<Repositor
                     Err(e) => {
                         match e {
                             RecvError::Closed => {
-                                tracing::info!(target: HTTP_TRACKER_LOG_TARGET, "Http core statistics receiver closed.");
+                                tracing::info!(target: HTTP_TRACKER_LOG_TARGET, "Http tracker core statistics receiver closed.");
                                 break;
                             }
                             RecvError::Lagged(n) => {
-                                tracing::warn!(target: HTTP_TRACKER_LOG_TARGET, "Http core statistics receiver lagged by {} events.", n);
+                                tracing::warn!(target: HTTP_TRACKER_LOG_TARGET, "Http tracker core statistics receiver lagged by {} events.", n);
                             }
                         }
                     }
diff --git a/packages/http-tracker-core/src/statistics/metrics.rs b/packages/http-tracker-core/src/statistics/metrics.rs
index bf053b04e..00d09b803 100644
--- a/packages/http-tracker-core/src/statistics/metrics.rs
+++ b/packages/http-tracker-core/src/statistics/metrics.rs
@@ -1,24 +1,16 @@
 use serde::Serialize;
 use torrust_tracker_metrics::label::LabelSet;
 use torrust_tracker_metrics::metric::MetricName;
+use torrust_tracker_metrics::metric_collection::aggregate::sum::Sum;
 use torrust_tracker_metrics::metric_collection::{Error, MetricCollection};
+use torrust_tracker_metrics::metric_name;
 use torrust_tracker_primitives::DurationSinceUnixEpoch;
 
+use crate::statistics::HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL;
+
 /// Metrics collected by the tracker.
 #[derive(Debug, Clone, PartialEq, Default, Serialize)]
 pub struct Metrics {
-    /// Total number of TCP (HTTP tracker) `announce` requests from IPv4 peers.
-    pub tcp4_announces_handled: u64,
-
-    /// Total number of TCP (HTTP tracker) `scrape` requests from IPv4 peers.
-    pub tcp4_scrapes_handled: u64,
-
-    /// Total number of TCP (HTTP tracker) `announce` requests from IPv6 peers.
-    pub tcp6_announces_handled: u64,
-
-    /// Total number of TCP (HTTP tracker) `scrape` requests from IPv6 peers.
-    pub tcp6_scrapes_handled: u64,
-
     /// A collection of metrics.
     pub metric_collection: MetricCollection,
 }
@@ -33,7 +25,7 @@ impl Metrics {
         labels: &LabelSet,
         now: DurationSinceUnixEpoch,
     ) -> Result<(), Error> {
-        self.metric_collection.increase_counter(metric_name, labels, now)
+        self.metric_collection.increment_counter(metric_name, labels, now)
     }
 
     /// # Errors
@@ -49,3 +41,57 @@ impl Metrics {
         self.metric_collection.set_gauge(metric_name, labels, value, now)
     }
 }
+
+impl Metrics {
+    /// Total number of TCP (HTTP tracker) `announce` requests from IPv4 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn tcp4_announces_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet"), ("request_kind", "announce")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+
+    /// Total number of TCP (HTTP tracker) `scrape` requests from IPv4 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn tcp4_scrapes_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet"), ("request_kind", "scrape")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+
+    /// Total number of TCP (HTTP tracker) `announce` requests from IPv6 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn tcp6_announces_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet6"), ("request_kind", "announce")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+
+    /// Total number of TCP (HTTP tracker) `scrape` requests from IPv6 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn tcp6_scrapes_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet6"), ("request_kind", "scrape")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+}
diff --git a/packages/http-tracker-core/src/statistics/mod.rs b/packages/http-tracker-core/src/statistics/mod.rs
index f949babbd..3ae355471 100644
--- a/packages/http-tracker-core/src/statistics/mod.rs
+++ b/packages/http-tracker-core/src/statistics/mod.rs
@@ -1,14 +1,13 @@
 pub mod event;
 pub mod metrics;
 pub mod repository;
-pub mod services;
 
 use metrics::Metrics;
 use torrust_tracker_metrics::metric::description::MetricDescription;
 use torrust_tracker_metrics::metric_name;
 use torrust_tracker_metrics::unit::Unit;
 
-const HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL: &str = "http_tracker_core_requests_received_total";
+pub const HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL: &str = "http_tracker_core_requests_received_total";
 
 #[must_use]
 pub fn describe_metrics() -> Metrics {
@@ -17,7 +16,7 @@ pub fn describe_metrics() -> Metrics {
     metrics.metric_collection.describe_counter(
         &metric_name!(HTTP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
         Some(Unit::Count),
-        Some(&MetricDescription::new("Total number of HTTP requests received")),
+        Some(MetricDescription::new("Total number of HTTP requests received")),
     );
 
     metrics
diff --git a/packages/http-tracker-core/src/statistics/repository.rs b/packages/http-tracker-core/src/statistics/repository.rs
index d5e718821..ea027f5c6 100644
--- a/packages/http-tracker-core/src/statistics/repository.rs
+++ b/packages/http-tracker-core/src/statistics/repository.rs
@@ -33,30 +33,6 @@ impl Repository {
         self.stats.read().await
     }
 
-    pub async fn increase_tcp4_announces(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.tcp4_announces_handled += 1;
-        drop(stats_lock);
-    }
-
-    pub async fn increase_tcp4_scrapes(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.tcp4_scrapes_handled += 1;
-        drop(stats_lock);
-    }
-
-    pub async fn increase_tcp6_announces(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.tcp6_announces_handled += 1;
-        drop(stats_lock);
-    }
-
-    pub async fn increase_tcp6_scrapes(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.tcp6_scrapes_handled += 1;
-        drop(stats_lock);
-    }
-
     /// # Errors
     ///
     /// This function will return an error if the metric collection fails to
diff --git a/packages/http-tracker-core/src/statistics/services.rs b/packages/http-tracker-core/src/statistics/services.rs
deleted file mode 100644
index 1c5890ea8..000000000
--- a/packages/http-tracker-core/src/statistics/services.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-//! Statistics services.
-//!
-//! It includes:
-//!
-//! - A [`factory`](crate::statistics::setup::factory) function to build the structs needed to collect the tracker metrics.
-//! - A [`get_metrics`] service to get the tracker [`metrics`](crate::statistics::metrics::Metrics).
-//!
-//! Tracker metrics are collected using a Publisher-Subscribe pattern.
-//!
-//! The factory function builds two structs:
-//!
-//! - An statistics event [`Sender`](torrust_tracker_events::sender::Sender)
-//! - An statistics [`Repository`]
-//!
-//! ```text
-//! let (stats_event_sender, stats_repository) = factory(tracker_usage_statistics);
-//! ```
-//!
-//! The statistics repository is responsible for storing the metrics in memory.
-//! The statistics event sender allows sending events related to metrics.
-//! There is an event listener that is receiving all the events and processing them with an event handler.
-//! Then, the event handler updates the metrics depending on the received event.
-use std::sync::Arc;
-
-use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
-
-use crate::statistics::metrics::Metrics;
-use crate::statistics::repository::Repository;
-
-/// All the metrics collected by the tracker.
-#[derive(Debug, PartialEq)]
-pub struct TrackerMetrics {
-    /// Domain level metrics.
-    ///
-    /// General metrics for all torrents (number of seeders, leechers, etcetera)
-    pub torrents_metrics: AggregateSwarmMetadata,
-
-    /// Application level metrics. Usage statistics/metrics.
-    ///
-    /// Metrics about how the tracker is been used (number of  number of http scrape requests, etcetera)
-    pub protocol_metrics: Metrics,
-}
-
-/// It returns all the [`TrackerMetrics`]
-pub async fn get_metrics(
-    in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
-    stats_repository: Arc<Repository>,
-) -> TrackerMetrics {
-    let torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata();
-    let stats = stats_repository.get_stats().await;
-
-    TrackerMetrics {
-        torrents_metrics,
-        protocol_metrics: Metrics {
-            // TCPv4
-            tcp4_announces_handled: stats.tcp4_announces_handled,
-            tcp4_scrapes_handled: stats.tcp4_scrapes_handled,
-            // TCPv6
-            tcp6_announces_handled: stats.tcp6_announces_handled,
-            tcp6_scrapes_handled: stats.tcp6_scrapes_handled,
-            // Samples
-            metric_collection: stats.metric_collection.clone(),
-        },
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use bittorrent_tracker_core::{self};
-    use torrust_tracker_configuration::Configuration;
-    use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
-    use torrust_tracker_test_helpers::configuration;
-
-    use crate::event::bus::EventBus;
-    use crate::event::sender::Broadcaster;
-    use crate::statistics::describe_metrics;
-    use crate::statistics::event::listener::run_event_listener;
-    use crate::statistics::repository::Repository;
-    use crate::statistics::services::{get_metrics, TrackerMetrics};
-
-    pub fn tracker_configuration() -> Configuration {
-        configuration::ephemeral()
-    }
-
-    #[tokio::test]
-    async fn the_statistics_service_should_return_the_tracker_metrics() {
-        let config = tracker_configuration();
-
-        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-
-        // HTTP core stats
-        let http_core_broadcaster = Broadcaster::default();
-        let http_stats_repository = Arc::new(Repository::new());
-        let http_stats_event_bus = Arc::new(EventBus::new(
-            config.core.tracker_usage_statistics,
-            http_core_broadcaster.clone(),
-        ));
-
-        if config.core.tracker_usage_statistics {
-            let _unused = run_event_listener(http_stats_event_bus.receiver(), &http_stats_repository);
-        }
-
-        let tracker_metrics = get_metrics(in_memory_torrent_repository.clone(), http_stats_repository).await;
-
-        assert_eq!(
-            tracker_metrics,
-            TrackerMetrics {
-                torrents_metrics: AggregateSwarmMetadata::default(),
-                protocol_metrics: describe_metrics(),
-            }
-        );
-    }
-}
diff --git a/packages/located-error/Cargo.toml b/packages/located-error/Cargo.toml
index 29b0dfb2c..232a6113f 100644
--- a/packages/located-error/Cargo.toml
+++ b/packages/located-error/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library to provide error decorator with the location and the source of the original error."
-keywords = ["errors", "helper", "library"]
+keywords = [ "errors", "helper", "library" ]
 name = "torrust-tracker-located-error"
 readme = "README.md"
 
diff --git a/packages/metrics/.gitignore b/packages/metrics/.gitignore
index 0b1372e5c..6350e9868 100644
--- a/packages/metrics/.gitignore
+++ b/packages/metrics/.gitignore
@@ -1 +1 @@
-./.coverage
+.coverage
diff --git a/packages/metrics/Cargo.toml b/packages/metrics/Cargo.toml
index 0597785f4..b6d327d70 100644
--- a/packages/metrics/Cargo.toml
+++ b/packages/metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library with the primitive types shared by the Torrust tracker packages."
-keywords = ["api", "library", "metrics"]
+keywords = [ "api", "library", "metrics" ]
 name = "torrust-tracker-metrics"
 readme = "README.md"
 
@@ -15,9 +15,9 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-chrono = { version = "0", default-features = false, features = ["clock"] }
-derive_more = { version = "2", features = ["constructor"] }
-serde = { version = "1", features = ["derive"] }
+chrono = { version = "0", default-features = false, features = [ "clock" ] }
+derive_more = { version = "2", features = [ "constructor" ] }
+serde = { version = "1", features = [ "derive" ] }
 serde_json = "1.0.140"
 thiserror = "2"
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
diff --git a/packages/metrics/README.md b/packages/metrics/README.md
index 627640eec..3d1d94c5f 100644
--- a/packages/metrics/README.md
+++ b/packages/metrics/README.md
@@ -1,15 +1,210 @@
 # Torrust Tracker Metrics
 
-A library with the metrics types used by the [Torrust Tracker](https://github.com/torrust/torrust-tracker) packages.
+A comprehensive metrics library providing type-safe metric collection, aggregation, and Prometheus export functionality for the [Torrust Tracker](https://github.com/torrust/torrust-tracker) ecosystem.
+
+## Overview
+
+This library offers a robust metrics system designed specifically for tracking and monitoring BitTorrent tracker performance. It provides type-safe metric collection with support for labels, time-series data, and multiple export formats including Prometheus.
+
+## Key Features
+
+- **Type-Safe Metrics**: Strongly typed `Counter` and `Gauge` metrics with compile-time guarantees
+- **Label Support**: Rich labeling system for multi-dimensional metrics
+- **Time-Series Data**: Built-in support for timestamped samples
+- **Prometheus Export**: Native Prometheus format serialization
+- **Aggregation Functions**: Sum operations with mathematically appropriate return types
+- **JSON Serialization**: Full serde support for all metric types
+- **Memory Efficient**: Optimized data structures for high-performance scenarios
+
+## Quick Start
+
+Add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+torrust-tracker-metrics = "3.0.0"
+```
+
+### Basic Usage
+
+```rust
+use torrust_tracker_metrics::{
+    metric_collection::MetricCollection,
+    label::{LabelSet, LabelValue},
+    metric_name, label_name,
+};
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+// Create a metric collection
+let mut metrics = MetricCollection::default();
+
+// Define labels
+let labels: LabelSet = [
+    (label_name!("server"), LabelValue::new("tracker-01")),
+    (label_name!("protocol"), LabelValue::new("http")),
+].into();
+
+// Record metrics
+let time = DurationSinceUnixEpoch::from_secs(1234567890);
+metrics.increment_counter(
+    &metric_name!("requests_total"),
+    &labels,
+    time,
+)?;
+
+metrics.set_gauge(
+    &metric_name!("active_connections"),
+    &labels,
+    42.0,
+    time,
+)?;
+
+// Export to Prometheus format
+let prometheus_output = metrics.to_prometheus();
+println!("{}", prometheus_output);
+```
+
+### Metric Aggregation
+
+```rust
+use torrust_tracker_metrics::metric_collection::aggregate::{Sum, Avg};
+
+// Sum all counter values matching specific labels
+let total_requests = metrics.sum(
+    &metric_name!("requests_total"),
+    &[("server", "tracker-01")].into(),
+);
+
+println!("Total requests: {:?}", total_requests);
+
+// Calculate average of gauge values matching specific labels
+let avg_response_time = metrics.avg(
+    &metric_name!("response_time_seconds"),
+    &[("endpoint", "/announce")].into(),
+);
+
+println!("Average response time: {:?}", avg_response_time);
+```
+
+## Architecture
+
+### Core Components
+
+- **`Counter`**: Monotonically increasing integer values (u64)
+- **`Gauge`**: Arbitrary floating-point values that can increase or decrease (f64)
+- **`Metric<T>`**: Generic metric container with metadata (name, description, unit)
+- **`MetricCollection`**: Type-safe collection managing both counters and gauges
+- **`LabelSet`**: Key-value pairs for metric dimensionality
+- **`Sample`**: Timestamped metric values with associated labels
+
+### Type System
+
+The library uses Rust's type system to ensure metric safety:
+
+```rust
+// Counter operations return u64
+let counter_sum: Option<u64> = counter_collection.sum(&name, &labels);
+
+// Gauge operations return f64  
+let gauge_sum: Option<f64> = gauge_collection.sum(&name, &labels);
+
+// Mixed collections convert to f64 for compatibility
+let mixed_sum: Option<f64> = metric_collection.sum(&name, &labels);
+```
+
+### Module Structure
+
+```output
+src/
+├── counter.rs             # Counter metric type
+├── gauge.rs               # Gauge metric type  
+├── metric/                # Generic metric container
+│   ├── mod.rs
+│   ├── name.rs            # Metric naming
+│   ├── description.rs     # Metric descriptions
+│   └── aggregate/         # Metric-level aggregations
+├── metric_collection/     # Collection management
+│   ├── mod.rs
+│   └── aggregate/         # Collection-level aggregations
+├── label/                 # Label system
+│   ├── name.rs            # Label names
+│   ├── value.rs           # Label values
+│   └── set.rs             # Label collections
+├── sample.rs              # Timestamped values
+├── sample_collection.rs   # Sample management
+├── prometheus.rs          # Prometheus export
+└── unit.rs                # Measurement units
+```
 
 ## Documentation
 
-[Crate documentation](https://docs.rs/torrust-tracker-metrics).
+- [Crate documentation](https://docs.rs/torrust-tracker-metrics)
+- [API Reference](https://docs.rs/torrust-tracker-metrics/latest/torrust_tracker_metrics/)
+
+## Development
+
+### Code Coverage
+
+Run basic coverage report:
+
+```console
+cargo llvm-cov --package torrust-tracker-metrics 
+```
+
+Generate LCOV report (for IDE integration):
+
+```console
+mkdir -p ./.coverage
+cargo llvm-cov --package torrust-tracker-metrics --lcov --output-path=./.coverage/lcov.info
+```
+
+Generate detailed HTML coverage report:
+
+Generate detailed HTML coverage report:
+
+```console
+mkdir -p ./.coverage
+cargo llvm-cov --package torrust-tracker-metrics --html --output-dir ./.coverage
+```
+
+Open the coverage report in your browser:
+
+```console
+open ./.coverage/index.html  # macOS
+xdg-open ./.coverage/index.html  # Linux
+```
+
+## Performance Considerations
+
+- **Memory Usage**: Metrics are stored in-memory with efficient HashMap-based collections
+- **Label Cardinality**: Be mindful of label combinations as they create separate time series
+- **Aggregation**: Sum operations are optimized for both single-type and mixed collections
+
+## Compatibility
+
+This library is designed to be compatible with the standard Rust [metrics](https://crates.io/crates/metrics) crate ecosystem where possible.
+
+## Contributing
+
+We welcome contributions! Please see the main [Torrust Tracker repository](https://github.com/torrust/torrust-tracker) for contribution guidelines.
+
+### Reporting Issues
+
+- [Bug Reports](https://github.com/torrust/torrust-tracker/issues/new?template=bug_report.md)
+- [Feature Requests](https://github.com/torrust/torrust-tracker/issues/new?template=feature_request.md)
 
 ## Acknowledgements
 
-We copied some parts like units or function names and signatures from the crate [metrics](https://crates.io/crates/metrics) because we wanted to make it compatible as much as possible with it. In the future, we may consider using the `metrics` crate directly instead of maintaining our own version.
+This library draws inspiration from the Rust [metrics](https://crates.io/crates/metrics) crate, incorporating compatible APIs and naming conventions where possible. We may consider migrating to the standard metrics crate in future versions while maintaining our specialized functionality.
+
+Special thanks to the Rust metrics ecosystem contributors for establishing excellent patterns for metrics collection and export.
 
 ## License
 
-The project is licensed under the terms of the [GNU AFFERO GENERAL PUBLIC LICENSE](./LICENSE).
+This project is licensed under the [GNU AFFERO GENERAL PUBLIC LICENSE v3.0](./LICENSE).
+
+## Related Projects
+
+- [Torrust Tracker](https://github.com/torrust/torrust-tracker) - The main BitTorrent tracker
+- [metrics](https://crates.io/crates/metrics) - Standard Rust metrics facade
+- [prometheus](https://crates.io/crates/prometheus) - Prometheus client library
diff --git a/packages/metrics/cSpell.json b/packages/metrics/cSpell.json
new file mode 100644
index 000000000..8f5002833
--- /dev/null
+++ b/packages/metrics/cSpell.json
@@ -0,0 +1,21 @@
+{
+    "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
+    "version": "0.2",
+    "dictionaryDefinitions": [
+        {
+            "name": "project-words",
+            "path": "../../project-words.txt",
+            "addWords": true
+        }
+    ],
+    "dictionaries": ["project-words"],
+    "enableFiletypes": [
+        "dockerfile",
+        "shellscript",
+        "toml"
+    ],
+    "ignorePaths": [
+        "target",
+        "/project-words.txt"
+    ]
+}
diff --git a/packages/metrics/src/counter.rs b/packages/metrics/src/counter.rs
index 3a816c75b..0e2002181 100644
--- a/packages/metrics/src/counter.rs
+++ b/packages/metrics/src/counter.rs
@@ -17,9 +17,24 @@ impl Counter {
         self.0
     }
 
+    #[must_use]
+    pub fn primitive(&self) -> u64 {
+        self.value()
+    }
+
     pub fn increment(&mut self, value: u64) {
         self.0 += value;
     }
+
+    pub fn absolute(&mut self, value: u64) {
+        self.0 = value;
+    }
+}
+
+impl From<u32> for Counter {
+    fn from(value: u32) -> Self {
+        Self(u64::from(value))
+    }
 }
 
 impl From<u64> for Counter {
@@ -28,6 +43,13 @@ impl From<u64> for Counter {
     }
 }
 
+impl From<i32> for Counter {
+    fn from(value: i32) -> Self {
+        #[allow(clippy::cast_sign_loss)]
+        Self(value as u64)
+    }
+}
+
 impl From<Counter> for u64 {
     fn from(counter: Counter) -> Self {
         counter.value()
@@ -73,9 +95,172 @@ mod tests {
         assert_eq!(counter.value(), 3);
     }
 
+    #[test]
+    fn it_could_set_to_an_absolute_value() {
+        let mut counter = Counter::new(0);
+        counter.absolute(1);
+        assert_eq!(counter.value(), 1);
+    }
+
     #[test]
     fn it_serializes_to_prometheus() {
         let counter = Counter::new(42);
         assert_eq!(counter.to_prometheus(), "42");
     }
+
+    #[test]
+    fn it_could_be_converted_from_u32() {
+        let counter: Counter = 42u32.into();
+        assert_eq!(counter.value(), 42);
+    }
+
+    #[test]
+    fn it_could_be_converted_from_i32() {
+        let counter: Counter = 42i32.into();
+        assert_eq!(counter.value(), 42);
+    }
+
+    #[test]
+    fn it_should_return_primitive_value() {
+        let counter = Counter::new(123);
+        assert_eq!(counter.primitive(), 123);
+    }
+
+    #[test]
+    fn it_should_handle_zero_value() {
+        let counter = Counter::new(0);
+        assert_eq!(counter.value(), 0);
+        assert_eq!(counter.primitive(), 0);
+    }
+
+    #[test]
+    fn it_should_handle_large_values() {
+        let counter = Counter::new(u64::MAX);
+        assert_eq!(counter.value(), u64::MAX);
+    }
+
+    #[test]
+    fn it_should_handle_u32_max_conversion() {
+        let counter: Counter = u32::MAX.into();
+        assert_eq!(counter.value(), u64::from(u32::MAX));
+    }
+
+    #[test]
+    fn it_should_handle_i32_max_conversion() {
+        let counter: Counter = i32::MAX.into();
+        assert_eq!(counter.value(), i32::MAX as u64);
+    }
+
+    #[test]
+    fn it_should_handle_negative_i32_conversion() {
+        let counter: Counter = (-42i32).into();
+        #[allow(clippy::cast_sign_loss)]
+        let expected = (-42i32) as u64;
+        assert_eq!(counter.value(), expected);
+    }
+
+    #[test]
+    fn it_should_handle_i32_min_conversion() {
+        let counter: Counter = i32::MIN.into();
+        #[allow(clippy::cast_sign_loss)]
+        let expected = i32::MIN as u64;
+        assert_eq!(counter.value(), expected);
+    }
+
+    #[test]
+    fn it_should_handle_large_increments() {
+        let mut counter = Counter::new(100);
+        counter.increment(1000);
+        assert_eq!(counter.value(), 1100);
+
+        counter.increment(u64::MAX - 1100);
+        assert_eq!(counter.value(), u64::MAX);
+    }
+
+    #[test]
+    fn it_should_support_multiple_absolute_operations() {
+        let mut counter = Counter::new(0);
+
+        counter.absolute(100);
+        assert_eq!(counter.value(), 100);
+
+        counter.absolute(50);
+        assert_eq!(counter.value(), 50);
+
+        counter.absolute(0);
+        assert_eq!(counter.value(), 0);
+    }
+
+    #[test]
+    fn it_should_be_displayable() {
+        let counter = Counter::new(42);
+        assert_eq!(counter.to_string(), "42");
+
+        let counter = Counter::new(0);
+        assert_eq!(counter.to_string(), "0");
+    }
+
+    #[test]
+    fn it_should_be_debuggable() {
+        let counter = Counter::new(42);
+        let debug_string = format!("{counter:?}");
+        assert_eq!(debug_string, "Counter(42)");
+    }
+
+    #[test]
+    fn it_should_be_cloneable() {
+        let counter = Counter::new(42);
+        let cloned_counter = counter.clone();
+        assert_eq!(counter, cloned_counter);
+        assert_eq!(counter.value(), cloned_counter.value());
+    }
+
+    #[test]
+    fn it_should_support_equality_comparison() {
+        let counter1 = Counter::new(42);
+        let counter2 = Counter::new(42);
+        let counter3 = Counter::new(43);
+
+        assert_eq!(counter1, counter2);
+        assert_ne!(counter1, counter3);
+    }
+
+    #[test]
+    fn it_should_have_default_value() {
+        let counter = Counter::default();
+        assert_eq!(counter.value(), 0);
+    }
+
+    #[test]
+    fn it_should_handle_conversion_roundtrip() {
+        let original_value = 12345u64;
+        let counter = Counter::from(original_value);
+        let converted_back: u64 = counter.into();
+        assert_eq!(original_value, converted_back);
+    }
+
+    #[test]
+    fn it_should_handle_u32_conversion_roundtrip() {
+        let original_value = 12345u32;
+        let counter = Counter::from(original_value);
+        assert_eq!(counter.value(), u64::from(original_value));
+    }
+
+    #[test]
+    fn it_should_handle_i32_conversion_roundtrip() {
+        let original_value = 12345i32;
+        let counter = Counter::from(original_value);
+        #[allow(clippy::cast_sign_loss)]
+        let expected = original_value as u64;
+        assert_eq!(counter.value(), expected);
+    }
+
+    #[test]
+    fn it_should_serialize_large_values_to_prometheus() {
+        let counter = Counter::new(u64::MAX);
+        assert_eq!(counter.to_prometheus(), u64::MAX.to_string());
+
+        let counter = Counter::new(0);
+        assert_eq!(counter.to_prometheus(), "0");
+    }
 }
diff --git a/packages/metrics/src/gauge.rs b/packages/metrics/src/gauge.rs
index 61ff3024c..d0883715b 100644
--- a/packages/metrics/src/gauge.rs
+++ b/packages/metrics/src/gauge.rs
@@ -17,9 +17,28 @@ impl Gauge {
         self.0
     }
 
+    #[must_use]
+    pub fn primitive(&self) -> f64 {
+        self.value()
+    }
+
     pub fn set(&mut self, value: f64) {
         self.0 = value;
     }
+
+    pub fn increment(&mut self, value: f64) {
+        self.0 += value;
+    }
+
+    pub fn decrement(&mut self, value: f64) {
+        self.0 -= value;
+    }
+}
+
+impl From<f32> for Gauge {
+    fn from(value: f32) -> Self {
+        Self(f64::from(value))
+    }
 }
 
 impl From<f64> for Gauge {
@@ -72,6 +91,20 @@ mod tests {
         assert_relative_eq!(gauge.value(), 1.0);
     }
 
+    #[test]
+    fn it_could_be_incremented() {
+        let mut gauge = Gauge::new(0.0);
+        gauge.increment(1.0);
+        assert_relative_eq!(gauge.value(), 1.0);
+    }
+
+    #[test]
+    fn it_could_be_decremented() {
+        let mut gauge = Gauge::new(1.0);
+        gauge.decrement(1.0);
+        assert_relative_eq!(gauge.value(), 0.0);
+    }
+
     #[test]
     fn it_serializes_to_prometheus() {
         let counter = Gauge::new(42.0);
@@ -80,4 +113,128 @@ mod tests {
         let counter = Gauge::new(42.1);
         assert_eq!(counter.to_prometheus(), "42.1");
     }
+
+    #[test]
+    fn it_could_be_converted_from_f32() {
+        let gauge: Gauge = 42.5f32.into();
+        assert_relative_eq!(gauge.value(), 42.5);
+    }
+
+    #[test]
+    fn it_should_return_primitive_value() {
+        let gauge = Gauge::new(123.456);
+        assert_relative_eq!(gauge.primitive(), 123.456);
+    }
+
+    #[test]
+    fn it_should_handle_zero_value() {
+        let gauge = Gauge::new(0.0);
+        assert_relative_eq!(gauge.value(), 0.0);
+        assert_relative_eq!(gauge.primitive(), 0.0);
+    }
+
+    #[test]
+    fn it_should_handle_negative_values() {
+        let gauge = Gauge::new(-42.5);
+        assert_relative_eq!(gauge.value(), -42.5);
+    }
+
+    #[test]
+    fn it_should_handle_large_values() {
+        let gauge = Gauge::new(f64::MAX);
+        assert_relative_eq!(gauge.value(), f64::MAX);
+    }
+
+    #[test]
+    fn it_should_handle_infinity() {
+        let gauge = Gauge::new(f64::INFINITY);
+        assert_relative_eq!(gauge.value(), f64::INFINITY);
+    }
+
+    #[test]
+    fn it_should_handle_nan() {
+        let gauge = Gauge::new(f64::NAN);
+        assert!(gauge.value().is_nan());
+    }
+
+    #[test]
+    fn it_should_be_displayable() {
+        let gauge = Gauge::new(42.5);
+        assert_eq!(gauge.to_string(), "42.5");
+
+        let gauge = Gauge::new(0.0);
+        assert_eq!(gauge.to_string(), "0");
+    }
+
+    #[test]
+    fn it_should_be_debuggable() {
+        let gauge = Gauge::new(42.5);
+        let debug_string = format!("{gauge:?}");
+        assert_eq!(debug_string, "Gauge(42.5)");
+    }
+
+    #[test]
+    fn it_should_be_cloneable() {
+        let gauge = Gauge::new(42.5);
+        let cloned_gauge = gauge.clone();
+        assert_eq!(gauge, cloned_gauge);
+        assert_relative_eq!(gauge.value(), cloned_gauge.value());
+    }
+
+    #[test]
+    fn it_should_support_equality_comparison() {
+        let gauge1 = Gauge::new(42.5);
+        let gauge2 = Gauge::new(42.5);
+        let gauge3 = Gauge::new(43.0);
+
+        assert_eq!(gauge1, gauge2);
+        assert_ne!(gauge1, gauge3);
+    }
+
+    #[test]
+    fn it_should_have_default_value() {
+        let gauge = Gauge::default();
+        assert_relative_eq!(gauge.value(), 0.0);
+    }
+
+    #[test]
+    fn it_should_handle_conversion_roundtrip() {
+        let original_value = 12345.678;
+        let gauge = Gauge::from(original_value);
+        let converted_back: f64 = gauge.into();
+        assert_relative_eq!(original_value, converted_back);
+    }
+
+    #[test]
+    fn it_should_handle_f32_conversion_roundtrip() {
+        let original_value = 12345.5f32;
+        let gauge = Gauge::from(original_value);
+        assert_relative_eq!(gauge.value(), f64::from(original_value));
+    }
+
+    #[test]
+    fn it_should_handle_multiple_operations() {
+        let mut gauge = Gauge::new(100.0);
+
+        gauge.increment(50.0);
+        assert_relative_eq!(gauge.value(), 150.0);
+
+        gauge.decrement(25.0);
+        assert_relative_eq!(gauge.value(), 125.0);
+
+        gauge.set(200.0);
+        assert_relative_eq!(gauge.value(), 200.0);
+    }
+
+    #[test]
+    fn it_should_serialize_special_values_to_prometheus() {
+        let gauge = Gauge::new(f64::INFINITY);
+        assert_eq!(gauge.to_prometheus(), "inf");
+
+        let gauge = Gauge::new(f64::NEG_INFINITY);
+        assert_eq!(gauge.to_prometheus(), "-inf");
+
+        let gauge = Gauge::new(f64::NAN);
+        assert_eq!(gauge.to_prometheus(), "NaN");
+    }
 }
diff --git a/packages/metrics/src/label/set.rs b/packages/metrics/src/label/set.rs
index 2b6334fc7..46256e4d5 100644
--- a/packages/metrics/src/label/set.rs
+++ b/packages/metrics/src/label/set.rs
@@ -1,3 +1,4 @@
+use std::collections::btree_map::Iter;
 use std::collections::BTreeMap;
 use std::fmt::Display;
 
@@ -12,9 +13,33 @@ pub struct LabelSet {
 }
 
 impl LabelSet {
+    #[must_use]
+    pub fn empty() -> Self {
+        Self { items: BTreeMap::new() }
+    }
+
     /// Insert a new label pair or update the value of an existing label.
-    pub fn upsert(&mut self, key: LabelName, value: LabelValue) {
-        self.items.insert(key, value);
+    pub fn upsert(&mut self, name: LabelName, value: LabelValue) {
+        self.items.insert(name, value);
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.items.is_empty()
+    }
+
+    pub fn contains_pair(&self, name: &LabelName, value: &LabelValue) -> bool {
+        match self.items.get(name) {
+            Some(existing_value) => existing_value == value,
+            None => false,
+        }
+    }
+
+    pub fn matches(&self, criteria: &LabelSet) -> bool {
+        criteria.iter().all(|(name, value)| self.contains_pair(name, value))
+    }
+
+    pub fn iter(&self) -> Iter<'_, LabelName, LabelValue> {
+        self.items.iter()
     }
 }
 
@@ -23,7 +48,7 @@ impl Display for LabelSet {
         let items = self
             .items
             .iter()
-            .map(|(key, value)| format!("{key}=\"{value}\""))
+            .map(|(name, value)| format!("{name}=\"{value}\""))
             .collect::<Vec<_>>()
             .join(",");
 
@@ -65,8 +90,8 @@ impl From<Vec<LabelPair>> for LabelSet {
     fn from(vec: Vec<LabelPair>) -> Self {
         let mut items = BTreeMap::new();
 
-        for (key, value) in vec {
-            items.insert(key, value);
+        for (name, value) in vec {
+            items.insert(name, value);
         }
 
         Self { items }
@@ -135,8 +160,8 @@ impl Serialize for LabelSet {
     {
         self.items
             .iter()
-            .map(|(key, value)| SerializedLabel {
-                name: key.clone(),
+            .map(|(name, value)| SerializedLabel {
+                name: name.clone(),
                 value: value.clone(),
             })
             .collect::<Vec<_>>()
@@ -157,6 +182,10 @@ impl<'de> Deserialize<'de> for LabelSet {
 
 impl PrometheusSerializable for LabelSet {
     fn to_prometheus(&self) -> String {
+        if self.is_empty() {
+            return String::new();
+        }
+
         let items = self.items.iter().fold(String::new(), |mut output, label_pair| {
             if !output.is_empty() {
                 output.push(',');
@@ -175,6 +204,7 @@ impl PrometheusSerializable for LabelSet {
 mod tests {
 
     use std::collections::BTreeMap;
+    use std::hash::{DefaultHasher, Hash};
 
     use pretty_assertions::assert_eq;
 
@@ -195,54 +225,6 @@ mod tests {
         ]
     }
 
-    #[test]
-    fn it_should_allow_instantiation_from_an_array_of_label_pairs() {
-        let label_set: LabelSet = sample_array_of_label_pairs().into();
-
-        assert_eq!(
-            label_set,
-            LabelSet {
-                items: BTreeMap::from(sample_array_of_label_pairs())
-            }
-        );
-    }
-
-    #[test]
-    fn it_should_allow_instantiation_from_a_vec_of_label_pairs() {
-        let label_set: LabelSet = sample_vec_of_label_pairs().into();
-
-        assert_eq!(
-            label_set,
-            LabelSet {
-                items: BTreeMap::from(sample_array_of_label_pairs())
-            }
-        );
-    }
-
-    #[test]
-    fn it_should_allow_instantiation_from_a_b_tree_map() {
-        let label_set: LabelSet = BTreeMap::from(sample_array_of_label_pairs()).into();
-
-        assert_eq!(
-            label_set,
-            LabelSet {
-                items: BTreeMap::from(sample_array_of_label_pairs())
-            }
-        );
-    }
-
-    #[test]
-    fn it_should_allow_instantiation_from_a_label_pair() {
-        let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
-
-        assert_eq!(
-            label_set,
-            LabelSet {
-                items: BTreeMap::from([(label_name!("label_name"), LabelValue::new("value"))])
-            }
-        );
-    }
-
     #[test]
     fn it_should_allow_inserting_a_new_label_pair() {
         let mut label_set = LabelSet::default();
@@ -315,10 +297,18 @@ mod tests {
     #[test]
     fn it_should_allow_serializing_to_prometheus_format() {
         let label_set = LabelSet::from((label_name!("label_name"), LabelValue::new("label value")));
-
         assert_eq!(label_set.to_prometheus(), r#"{label_name="label value"}"#);
     }
 
+    #[test]
+    fn it_should_handle_prometheus_format_with_special_characters() {
+        let label_set: LabelSet = vec![("label_with_underscores", "value_with_underscores")].into();
+        assert_eq!(
+            label_set.to_prometheus(),
+            r#"{label_with_underscores="value_with_underscores"}"#
+        );
+    }
+
     #[test]
     fn it_should_alphabetically_order_labels_in_prometheus_format() {
         let label_set = LabelSet::from([
@@ -338,4 +328,257 @@ mod tests {
 
         assert_eq!(label_set.to_string(), r#"{label_name="label value"}"#);
     }
+
+    #[test]
+    fn it_should_allow_instantiation_from_an_array_of_label_pairs() {
+        let label_set: LabelSet = sample_array_of_label_pairs().into();
+
+        assert_eq!(
+            label_set,
+            LabelSet {
+                items: BTreeMap::from(sample_array_of_label_pairs())
+            }
+        );
+    }
+
+    #[test]
+    fn it_should_allow_instantiation_from_a_vec_of_label_pairs() {
+        let label_set: LabelSet = sample_vec_of_label_pairs().into();
+
+        assert_eq!(
+            label_set,
+            LabelSet {
+                items: BTreeMap::from(sample_array_of_label_pairs())
+            }
+        );
+    }
+
+    #[test]
+    fn it_should_allow_instantiation_from_a_b_tree_map() {
+        let label_set: LabelSet = BTreeMap::from(sample_array_of_label_pairs()).into();
+
+        assert_eq!(
+            label_set,
+            LabelSet {
+                items: BTreeMap::from(sample_array_of_label_pairs())
+            }
+        );
+    }
+
+    #[test]
+    fn it_should_allow_instantiation_from_a_label_pair() {
+        let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
+        assert_eq!(
+            label_set,
+            LabelSet {
+                items: BTreeMap::from([(label_name!("label_name"), LabelValue::new("value"))])
+            }
+        );
+    }
+
+    #[test]
+    fn it_should_allow_instantiation_from_vec_of_str_tuples() {
+        let label_set: LabelSet = vec![("foo", "bar"), ("baz", "qux")].into();
+
+        let mut expected = BTreeMap::new();
+        expected.insert(LabelName::new("foo"), LabelValue::new("bar"));
+        expected.insert(LabelName::new("baz"), LabelValue::new("qux"));
+
+        assert_eq!(label_set, LabelSet { items: expected });
+    }
+
+    #[test]
+    fn it_should_allow_instantiation_from_vec_of_string_tuples() {
+        let label_set: LabelSet = vec![("foo".to_string(), "bar".to_string()), ("baz".to_string(), "qux".to_string())].into();
+
+        let mut expected = BTreeMap::new();
+        expected.insert(LabelName::new("foo"), LabelValue::new("bar"));
+        expected.insert(LabelName::new("baz"), LabelValue::new("qux"));
+
+        assert_eq!(label_set, LabelSet { items: expected });
+    }
+
+    #[test]
+    fn it_should_allow_instantiation_from_vec_of_serialized_label() {
+        use super::SerializedLabel;
+        let label_set: LabelSet = vec![
+            SerializedLabel {
+                name: LabelName::new("foo"),
+                value: LabelValue::new("bar"),
+            },
+            SerializedLabel {
+                name: LabelName::new("baz"),
+                value: LabelValue::new("qux"),
+            },
+        ]
+        .into();
+
+        let mut expected = BTreeMap::new();
+        expected.insert(LabelName::new("foo"), LabelValue::new("bar"));
+        expected.insert(LabelName::new("baz"), LabelValue::new("qux"));
+
+        assert_eq!(label_set, LabelSet { items: expected });
+    }
+
+    #[test]
+    fn it_should_allow_instantiation_from_array_of_string_tuples() {
+        let arr: [(String, String); 2] = [("foo".to_string(), "bar".to_string()), ("baz".to_string(), "qux".to_string())];
+        let label_set: LabelSet = arr.into();
+
+        let mut expected = BTreeMap::new();
+
+        expected.insert(LabelName::new("foo"), LabelValue::new("bar"));
+        expected.insert(LabelName::new("baz"), LabelValue::new("qux"));
+
+        assert_eq!(label_set, LabelSet { items: expected });
+    }
+
+    #[test]
+    fn it_should_allow_instantiation_from_array_of_str_tuples() {
+        let arr: [(&str, &str); 2] = [("foo", "bar"), ("baz", "qux")];
+        let label_set: LabelSet = arr.into();
+
+        let mut expected = BTreeMap::new();
+
+        expected.insert(LabelName::new("foo"), LabelValue::new("bar"));
+        expected.insert(LabelName::new("baz"), LabelValue::new("qux"));
+
+        assert_eq!(label_set, LabelSet { items: expected });
+    }
+
+    #[test]
+    fn it_should_be_comparable() {
+        let a: LabelSet = (label_name!("x"), LabelValue::new("1")).into();
+        let b: LabelSet = (label_name!("x"), LabelValue::new("1")).into();
+        let c: LabelSet = (label_name!("y"), LabelValue::new("2")).into();
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+    }
+
+    #[test]
+    fn it_should_be_allow_ordering() {
+        let a: LabelSet = (label_name!("x"), LabelValue::new("1")).into();
+        let b: LabelSet = (label_name!("y"), LabelValue::new("2")).into();
+
+        assert!(a < b);
+    }
+
+    #[test]
+    fn it_should_be_hashable() {
+        let a: LabelSet = (label_name!("x"), LabelValue::new("1")).into();
+
+        let mut hasher = DefaultHasher::new();
+
+        a.hash(&mut hasher);
+    }
+
+    #[test]
+    fn it_should_implement_clone() {
+        let a: LabelSet = (label_name!("x"), LabelValue::new("1")).into();
+        let _unused = a.clone();
+    }
+
+    #[test]
+    fn it_should_check_if_empty() {
+        let empty_set = LabelSet::empty();
+        assert!(empty_set.is_empty());
+    }
+
+    #[test]
+    fn it_should_check_if_non_empty() {
+        let non_empty_set: LabelSet = (label_name!("label"), LabelValue::new("value")).into();
+        assert!(!non_empty_set.is_empty());
+    }
+
+    #[test]
+    fn it_should_create_an_empty_label_set() {
+        let empty_set = LabelSet::empty();
+        assert!(empty_set.is_empty());
+    }
+
+    #[test]
+    fn it_should_check_if_contains_specific_label_pair() {
+        let label_set: LabelSet = vec![("service", "tracker"), ("protocol", "http")].into();
+
+        // Test existing pair
+        assert!(label_set.contains_pair(&LabelName::new("service"), &LabelValue::new("tracker")));
+        assert!(label_set.contains_pair(&LabelName::new("protocol"), &LabelValue::new("http")));
+
+        // Test non-existing name
+        assert!(!label_set.contains_pair(&LabelName::new("missing"), &LabelValue::new("value")));
+
+        // Test existing name with wrong value
+        assert!(!label_set.contains_pair(&LabelName::new("service"), &LabelValue::new("wrong")));
+    }
+
+    #[test]
+    fn it_should_match_against_criteria() {
+        let label_set: LabelSet = vec![("service", "tracker"), ("protocol", "http"), ("version", "v1")].into();
+
+        // Empty criteria should match any label set
+        assert!(label_set.matches(&LabelSet::empty()));
+
+        // Single matching criterion
+        let single_criteria: LabelSet = vec![("service", "tracker")].into();
+        assert!(label_set.matches(&single_criteria));
+
+        // Multiple matching criteria
+        let multiple_criteria: LabelSet = vec![("service", "tracker"), ("protocol", "http")].into();
+        assert!(label_set.matches(&multiple_criteria));
+
+        // Non-matching criterion
+        let non_matching: LabelSet = vec![("service", "wrong")].into();
+        assert!(!label_set.matches(&non_matching));
+
+        // Partially matching criteria (one matches, one doesn't)
+        let partial_matching: LabelSet = vec![("service", "tracker"), ("missing", "value")].into();
+        assert!(!label_set.matches(&partial_matching));
+
+        // Criteria with label not in original set
+        let missing_label: LabelSet = vec![("missing_label", "value")].into();
+        assert!(!label_set.matches(&missing_label));
+    }
+
+    #[test]
+    fn it_should_allow_iteration_over_label_pairs() {
+        let label_set: LabelSet = vec![("service", "tracker"), ("protocol", "http")].into();
+
+        let mut count = 0;
+
+        for (name, value) in label_set.iter() {
+            count += 1;
+            // Verify we can access name and value
+            assert!(!name.to_string().is_empty());
+            assert!(!value.to_string().is_empty());
+        }
+
+        assert_eq!(count, 2);
+    }
+
+    #[test]
+    fn it_should_display_empty_label_set() {
+        let empty_set = LabelSet::empty();
+        assert_eq!(empty_set.to_string(), "{}");
+    }
+
+    #[test]
+    fn it_should_serialize_empty_label_set_to_prometheus_format() {
+        let empty_set = LabelSet::empty();
+        assert_eq!(empty_set.to_prometheus(), "");
+    }
+
+    #[test]
+    fn it_should_maintain_order_in_iteration() {
+        let label_set: LabelSet = vec![("z_label", "z_value"), ("a_label", "a_value"), ("m_label", "m_value")].into();
+
+        let mut labels: Vec<String> = vec![];
+        for (name, _) in label_set.iter() {
+            labels.push(name.to_string());
+        }
+
+        // Should be in alphabetical order
+        assert_eq!(labels, vec!["a_label", "m_label", "z_label"]);
+    }
 }
diff --git a/packages/metrics/src/label/value.rs b/packages/metrics/src/label/value.rs
index ffdbce333..4f25844a8 100644
--- a/packages/metrics/src/label/value.rs
+++ b/packages/metrics/src/label/value.rs
@@ -33,6 +33,9 @@ impl From<String> for LabelValue {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::hash_map::DefaultHasher;
+    use std::hash::Hash;
+
     use crate::label::value::LabelValue;
     use crate::prometheus::PrometheusSerializable;
 
@@ -41,4 +44,60 @@ mod tests {
         let label_value = LabelValue::new("value");
         assert_eq!(label_value.to_prometheus(), "value");
     }
+
+    #[test]
+    fn it_could_be_initialized_from_str() {
+        let lv = LabelValue::new("abc");
+        assert_eq!(lv.0, "abc");
+    }
+
+    #[test]
+    fn it_should_allow_to_create_an_ignored_label_value() {
+        let lv = LabelValue::ignore();
+        assert_eq!(lv.0, "");
+    }
+
+    #[test]
+    fn it_should_be_converted_from_string() {
+        let s = String::from("foo");
+        let lv: LabelValue = s.clone().into();
+        assert_eq!(lv.0, s);
+    }
+
+    #[test]
+    fn it_should_be_comparable() {
+        let a = LabelValue::new("x");
+        let b = LabelValue::new("x");
+        let c = LabelValue::new("y");
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+    }
+
+    #[test]
+    fn it_should_be_allow_ordering() {
+        let a = LabelValue::new("x");
+        let b = LabelValue::new("y");
+
+        assert!(a < b);
+    }
+
+    #[test]
+    fn it_should_be_hashable() {
+        let a = LabelValue::new("x");
+        let mut hasher = DefaultHasher::new();
+        a.hash(&mut hasher);
+    }
+
+    #[test]
+    fn it_should_implement_clone() {
+        let a = LabelValue::new("x");
+        let _unused = a.clone();
+    }
+
+    #[test]
+    fn it_should_implement_display() {
+        let a = LabelValue::new("x");
+        assert_eq!(format!("{a}"), "x");
+    }
 }
diff --git a/packages/metrics/src/lib.rs b/packages/metrics/src/lib.rs
index 95d70bf6c..997cd3c8c 100644
--- a/packages/metrics/src/lib.rs
+++ b/packages/metrics/src/lib.rs
@@ -12,12 +12,12 @@ pub const METRICS_TARGET: &str = "METRICS";
 
 #[cfg(test)]
 mod tests {
-    /// It removes leading and trailing whitespace from each line, and empty lines.
+    /// It removes leading and trailing whitespace from each line.
     pub fn format_prometheus_output(output: &str) -> String {
         output
             .lines()
-            .map(str::trim)
-            .filter(|line| !line.is_empty())
+            .map(str::trim_start)
+            .map(str::trim_end)
             .collect::<Vec<_>>()
             .join("\n")
     }
diff --git a/packages/metrics/src/metric/aggregate/avg.rs b/packages/metrics/src/metric/aggregate/avg.rs
new file mode 100644
index 000000000..95628450b
--- /dev/null
+++ b/packages/metrics/src/metric/aggregate/avg.rs
@@ -0,0 +1,294 @@
+use crate::counter::Counter;
+use crate::gauge::Gauge;
+use crate::label::LabelSet;
+use crate::metric::aggregate::sum::Sum;
+use crate::metric::Metric;
+
+pub trait Avg {
+    type Output;
+    fn avg(&self, label_set_criteria: &LabelSet) -> Self::Output;
+}
+
+impl Avg for Metric<Counter> {
+    type Output = f64;
+
+    fn avg(&self, label_set_criteria: &LabelSet) -> Self::Output {
+        let matching_samples = self.collect_matching_samples(label_set_criteria);
+
+        if matching_samples.is_empty() {
+            return 0.0;
+        }
+
+        let sum = self.sum(label_set_criteria);
+
+        #[allow(clippy::cast_precision_loss)]
+        (sum as f64 / matching_samples.len() as f64)
+    }
+}
+
+impl Avg for Metric<Gauge> {
+    type Output = f64;
+
+    fn avg(&self, label_set_criteria: &LabelSet) -> Self::Output {
+        let matching_samples = self.collect_matching_samples(label_set_criteria);
+
+        if matching_samples.is_empty() {
+            return 0.0;
+        }
+
+        let sum = self.sum(label_set_criteria);
+
+        #[allow(clippy::cast_precision_loss)]
+        (sum / matching_samples.len() as f64)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+    use crate::counter::Counter;
+    use crate::gauge::Gauge;
+    use crate::label::LabelSet;
+    use crate::metric::aggregate::avg::Avg;
+    use crate::metric::{Metric, MetricName};
+    use crate::metric_name;
+    use crate::sample::Sample;
+    use crate::sample_collection::SampleCollection;
+
+    struct MetricBuilder<T> {
+        sample_time: DurationSinceUnixEpoch,
+        name: MetricName,
+        samples: Vec<Sample<T>>,
+    }
+
+    impl<T> Default for MetricBuilder<T> {
+        fn default() -> Self {
+            Self {
+                sample_time: DurationSinceUnixEpoch::from_secs(1_743_552_000),
+                name: metric_name!("test_metric"),
+                samples: vec![],
+            }
+        }
+    }
+
+    impl<T> MetricBuilder<T> {
+        fn with_sample(mut self, value: T, label_set: &LabelSet) -> Self {
+            let sample = Sample::new(value, self.sample_time, label_set.clone());
+            self.samples.push(sample);
+            self
+        }
+
+        fn build(self) -> Metric<T> {
+            Metric::new(
+                self.name,
+                None,
+                None,
+                SampleCollection::new(self.samples).expect("invalid samples"),
+            )
+        }
+    }
+
+    fn counter_cases() -> Vec<(Metric<Counter>, LabelSet, f64)> {
+        // (metric, label set criteria, expected_average_value)
+        vec![
+            // Metric with one sample without label set
+            (
+                MetricBuilder::default().with_sample(1.into(), &LabelSet::empty()).build(),
+                LabelSet::empty(),
+                1.0,
+            ),
+            // Metric with one sample with a label set
+            (
+                MetricBuilder::default()
+                    .with_sample(1.into(), &[("l1", "l1_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                1.0,
+            ),
+            // Metric with two samples, different label sets, average all
+            (
+                MetricBuilder::default()
+                    .with_sample(1.into(), &[("l1", "l1_value")].into())
+                    .with_sample(3.into(), &[("l2", "l2_value")].into())
+                    .build(),
+                LabelSet::empty(),
+                2.0, // (1 + 3) / 2 = 2.0
+            ),
+            // Metric with two samples, different label sets, average one
+            (
+                MetricBuilder::default()
+                    .with_sample(1.into(), &[("l1", "l1_value")].into())
+                    .with_sample(2.into(), &[("l2", "l2_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                1.0,
+            ),
+            // Metric with three samples, same label key, different label values, average by key
+            (
+                MetricBuilder::default()
+                    .with_sample(2.into(), &[("l1", "l1_value"), ("la", "la_value")].into())
+                    .with_sample(4.into(), &[("l1", "l1_value"), ("lb", "lb_value")].into())
+                    .with_sample(6.into(), &[("l1", "l1_value"), ("lc", "lc_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                4.0, // (2 + 4 + 6) / 3 = 4.0
+            ),
+            // Metric with two samples, different label values, average by subkey
+            (
+                MetricBuilder::default()
+                    .with_sample(5.into(), &[("l1", "l1_value"), ("la", "la_value")].into())
+                    .with_sample(7.into(), &[("l1", "l1_value"), ("lb", "lb_value")].into())
+                    .build(),
+                [("la", "la_value")].into(),
+                5.0,
+            ),
+            // Edge: Metric with no samples at all
+            (MetricBuilder::default().build(), LabelSet::empty(), 0.0),
+            // Edge: Metric with samples but no matching labels
+            (
+                MetricBuilder::default()
+                    .with_sample(5.into(), &[("foo", "bar")].into())
+                    .build(),
+                [("not", "present")].into(),
+                0.0,
+            ),
+            // Edge: Metric with zero value
+            (
+                MetricBuilder::default()
+                    .with_sample(0.into(), &[("l3", "l3_value")].into())
+                    .build(),
+                [("l3", "l3_value")].into(),
+                0.0,
+            ),
+            // Edge: Metric with a very large value
+            (
+                MetricBuilder::default()
+                    .with_sample((u64::MAX / 2).into(), &[("edge", "large1")].into())
+                    .with_sample((u64::MAX / 2).into(), &[("edge", "large2")].into())
+                    .build(),
+                LabelSet::empty(),
+                #[allow(clippy::cast_precision_loss)]
+                (u64::MAX as f64 / 2.0), // Average of (max/2) and (max/2)
+            ),
+        ]
+    }
+
+    fn gauge_cases() -> Vec<(Metric<Gauge>, LabelSet, f64)> {
+        // (metric, label set criteria, expected_average_value)
+        vec![
+            // Metric with one sample without label set
+            (
+                MetricBuilder::default().with_sample(1.0.into(), &LabelSet::empty()).build(),
+                LabelSet::empty(),
+                1.0,
+            ),
+            // Metric with one sample with a label set
+            (
+                MetricBuilder::default()
+                    .with_sample(1.0.into(), &[("l1", "l1_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                1.0,
+            ),
+            // Metric with two samples, different label sets, average all
+            (
+                MetricBuilder::default()
+                    .with_sample(1.0.into(), &[("l1", "l1_value")].into())
+                    .with_sample(3.0.into(), &[("l2", "l2_value")].into())
+                    .build(),
+                LabelSet::empty(),
+                2.0, // (1.0 + 3.0) / 2 = 2.0
+            ),
+            // Metric with two samples, different label sets, average one
+            (
+                MetricBuilder::default()
+                    .with_sample(1.0.into(), &[("l1", "l1_value")].into())
+                    .with_sample(2.0.into(), &[("l2", "l2_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                1.0,
+            ),
+            // Metric with three samples, same label key, different label values, average by key
+            (
+                MetricBuilder::default()
+                    .with_sample(2.0.into(), &[("l1", "l1_value"), ("la", "la_value")].into())
+                    .with_sample(4.0.into(), &[("l1", "l1_value"), ("lb", "lb_value")].into())
+                    .with_sample(6.0.into(), &[("l1", "l1_value"), ("lc", "lc_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                4.0, // (2.0 + 4.0 + 6.0) / 3 = 4.0
+            ),
+            // Metric with two samples, different label values, average by subkey
+            (
+                MetricBuilder::default()
+                    .with_sample(5.0.into(), &[("l1", "l1_value"), ("la", "la_value")].into())
+                    .with_sample(7.0.into(), &[("l1", "l1_value"), ("lb", "lb_value")].into())
+                    .build(),
+                [("la", "la_value")].into(),
+                5.0,
+            ),
+            // Edge: Metric with no samples at all
+            (MetricBuilder::default().build(), LabelSet::empty(), 0.0),
+            // Edge: Metric with samples but no matching labels
+            (
+                MetricBuilder::default()
+                    .with_sample(5.0.into(), &[("foo", "bar")].into())
+                    .build(),
+                [("not", "present")].into(),
+                0.0,
+            ),
+            // Edge: Metric with zero value
+            (
+                MetricBuilder::default()
+                    .with_sample(0.0.into(), &[("l3", "l3_value")].into())
+                    .build(),
+                [("l3", "l3_value")].into(),
+                0.0,
+            ),
+            // Edge: Metric with negative values
+            (
+                MetricBuilder::default()
+                    .with_sample((-2.0).into(), &[("l4", "l4_value")].into())
+                    .with_sample(4.0.into(), &[("l5", "l5_value")].into())
+                    .build(),
+                LabelSet::empty(),
+                1.0, // (-2.0 + 4.0) / 2 = 1.0
+            ),
+            // Edge: Metric with decimal values
+            (
+                MetricBuilder::default()
+                    .with_sample(1.5.into(), &[("l6", "l6_value")].into())
+                    .with_sample(2.5.into(), &[("l7", "l7_value")].into())
+                    .build(),
+                LabelSet::empty(),
+                2.0, // (1.5 + 2.5) / 2 = 2.0
+            ),
+        ]
+    }
+
+    #[test]
+    fn test_counter_cases() {
+        for (idx, (metric, criteria, expected_value)) in counter_cases().iter().enumerate() {
+            let avg = metric.avg(criteria);
+
+            assert!(
+                (avg - expected_value).abs() <= f64::EPSILON,
+                "at case {idx}, expected avg to be {expected_value}, got {avg}"
+            );
+        }
+    }
+
+    #[test]
+    fn test_gauge_cases() {
+        for (idx, (metric, criteria, expected_value)) in gauge_cases().iter().enumerate() {
+            let avg = metric.avg(criteria);
+
+            assert!(
+                (avg - expected_value).abs() <= f64::EPSILON,
+                "at case {idx}, expected avg to be {expected_value}, got {avg}"
+            );
+        }
+    }
+}
diff --git a/packages/metrics/src/metric/aggregate/mod.rs b/packages/metrics/src/metric/aggregate/mod.rs
new file mode 100644
index 000000000..1224a1f52
--- /dev/null
+++ b/packages/metrics/src/metric/aggregate/mod.rs
@@ -0,0 +1,2 @@
+pub mod avg;
+pub mod sum;
diff --git a/packages/metrics/src/metric/aggregate/sum.rs b/packages/metrics/src/metric/aggregate/sum.rs
new file mode 100644
index 000000000..30c2819b7
--- /dev/null
+++ b/packages/metrics/src/metric/aggregate/sum.rs
@@ -0,0 +1,278 @@
+use crate::counter::Counter;
+use crate::gauge::Gauge;
+use crate::label::LabelSet;
+use crate::metric::Metric;
+
+pub trait Sum {
+    type Output;
+    fn sum(&self, label_set_criteria: &LabelSet) -> Self::Output;
+}
+
+impl Sum for Metric<Counter> {
+    type Output = u64;
+
+    fn sum(&self, label_set_criteria: &LabelSet) -> Self::Output {
+        self.sample_collection
+            .iter()
+            .filter(|(label_set, _measurement)| label_set.matches(label_set_criteria))
+            .map(|(_label_set, measurement)| measurement.value().primitive())
+            .sum()
+    }
+}
+
+impl Sum for Metric<Gauge> {
+    type Output = f64;
+
+    fn sum(&self, label_set_criteria: &LabelSet) -> Self::Output {
+        self.sample_collection
+            .iter()
+            .filter(|(label_set, _measurement)| label_set.matches(label_set_criteria))
+            .map(|(_label_set, measurement)| measurement.value().primitive())
+            .sum()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+    use crate::counter::Counter;
+    use crate::gauge::Gauge;
+    use crate::label::LabelSet;
+    use crate::metric::aggregate::sum::Sum;
+    use crate::metric::{Metric, MetricName};
+    use crate::metric_name;
+    use crate::sample::Sample;
+    use crate::sample_collection::SampleCollection;
+
+    struct MetricBuilder<T> {
+        sample_time: DurationSinceUnixEpoch,
+        name: MetricName,
+        samples: Vec<Sample<T>>,
+    }
+
+    impl<T> Default for MetricBuilder<T> {
+        fn default() -> Self {
+            Self {
+                sample_time: DurationSinceUnixEpoch::from_secs(1_743_552_000),
+                name: metric_name!("test_metric"),
+                samples: vec![],
+            }
+        }
+    }
+
+    impl<T> MetricBuilder<T> {
+        fn with_sample(mut self, value: T, label_set: &LabelSet) -> Self {
+            let sample = Sample::new(value, self.sample_time, label_set.clone());
+            self.samples.push(sample);
+            self
+        }
+
+        fn build(self) -> Metric<T> {
+            Metric::new(
+                self.name,
+                None,
+                None,
+                SampleCollection::new(self.samples).expect("invalid samples"),
+            )
+        }
+    }
+
+    fn counter_cases() -> Vec<(Metric<Counter>, LabelSet, u64)> {
+        // (metric, label set criteria, expected_aggregate_value)
+        vec![
+            // Metric with one sample without label set
+            (
+                MetricBuilder::default().with_sample(1.into(), &LabelSet::empty()).build(),
+                LabelSet::empty(),
+                1,
+            ),
+            // Metric with one sample with a label set
+            (
+                MetricBuilder::default()
+                    .with_sample(1.into(), &[("l1", "l1_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                1,
+            ),
+            // Metric with two samples, different label sets, sum all
+            (
+                MetricBuilder::default()
+                    .with_sample(1.into(), &[("l1", "l1_value")].into())
+                    .with_sample(2.into(), &[("l2", "l2_value")].into())
+                    .build(),
+                LabelSet::empty(),
+                3,
+            ),
+            // Metric with two samples, different label sets, sum one
+            (
+                MetricBuilder::default()
+                    .with_sample(1.into(), &[("l1", "l1_value")].into())
+                    .with_sample(2.into(), &[("l2", "l2_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                1,
+            ),
+            // Metric with two samples, same label key, different label values, sum by key
+            (
+                MetricBuilder::default()
+                    .with_sample(1.into(), &[("l1", "l1_value"), ("la", "la_value")].into())
+                    .with_sample(2.into(), &[("l1", "l1_value"), ("lb", "lb_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                3,
+            ),
+            // Metric with two samples, different label values, sum by subkey
+            (
+                MetricBuilder::default()
+                    .with_sample(1.into(), &[("l1", "l1_value"), ("la", "la_value")].into())
+                    .with_sample(2.into(), &[("l1", "l1_value"), ("lb", "lb_value")].into())
+                    .build(),
+                [("la", "la_value")].into(),
+                1,
+            ),
+            // Edge: Metric with no samples at all
+            (MetricBuilder::default().build(), LabelSet::empty(), 0),
+            // Edge: Metric with samples but no matching labels
+            (
+                MetricBuilder::default()
+                    .with_sample(5.into(), &[("foo", "bar")].into())
+                    .build(),
+                [("not", "present")].into(),
+                0,
+            ),
+            // Edge: Metric with zero value
+            (
+                MetricBuilder::default()
+                    .with_sample(0.into(), &[("l3", "l3_value")].into())
+                    .build(),
+                [("l3", "l3_value")].into(),
+                0,
+            ),
+            // Edge: Metric with a very large value
+            (
+                MetricBuilder::default()
+                    .with_sample(u64::MAX.into(), &LabelSet::empty())
+                    .build(),
+                LabelSet::empty(),
+                u64::MAX,
+            ),
+        ]
+    }
+
+    fn gauge_cases() -> Vec<(Metric<Gauge>, LabelSet, f64)> {
+        // (metric, label set criteria, expected_aggregate_value)
+        vec![
+            // Metric with one sample without label set
+            (
+                MetricBuilder::default().with_sample(1.0.into(), &LabelSet::empty()).build(),
+                LabelSet::empty(),
+                1.0,
+            ),
+            // Metric with one sample with a label set
+            (
+                MetricBuilder::default()
+                    .with_sample(1.0.into(), &[("l1", "l1_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                1.0,
+            ),
+            // Metric with two samples, different label sets, sum all
+            (
+                MetricBuilder::default()
+                    .with_sample(1.0.into(), &[("l1", "l1_value")].into())
+                    .with_sample(2.0.into(), &[("l2", "l2_value")].into())
+                    .build(),
+                LabelSet::empty(),
+                3.0,
+            ),
+            // Metric with two samples, different label sets, sum one
+            (
+                MetricBuilder::default()
+                    .with_sample(1.0.into(), &[("l1", "l1_value")].into())
+                    .with_sample(2.0.into(), &[("l2", "l2_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                1.0,
+            ),
+            // Metric with two samples, same label key, different label values, sum by key
+            (
+                MetricBuilder::default()
+                    .with_sample(1.0.into(), &[("l1", "l1_value"), ("la", "la_value")].into())
+                    .with_sample(2.0.into(), &[("l1", "l1_value"), ("lb", "lb_value")].into())
+                    .build(),
+                [("l1", "l1_value")].into(),
+                3.0,
+            ),
+            // Metric with two samples, different label values, sum by subkey
+            (
+                MetricBuilder::default()
+                    .with_sample(1.0.into(), &[("l1", "l1_value"), ("la", "la_value")].into())
+                    .with_sample(2.0.into(), &[("l1", "l1_value"), ("lb", "lb_value")].into())
+                    .build(),
+                [("la", "la_value")].into(),
+                1.0,
+            ),
+            // Edge: Metric with no samples at all
+            (MetricBuilder::default().build(), LabelSet::empty(), 0.0),
+            // Edge: Metric with samples but no matching labels
+            (
+                MetricBuilder::default()
+                    .with_sample(5.0.into(), &[("foo", "bar")].into())
+                    .build(),
+                [("not", "present")].into(),
+                0.0,
+            ),
+            // Edge: Metric with zero value
+            (
+                MetricBuilder::default()
+                    .with_sample(0.0.into(), &[("l3", "l3_value")].into())
+                    .build(),
+                [("l3", "l3_value")].into(),
+                0.0,
+            ),
+            // Edge: Metric with negative values
+            (
+                MetricBuilder::default()
+                    .with_sample((-2.0).into(), &[("l4", "l4_value")].into())
+                    .with_sample(3.0.into(), &[("l5", "l5_value")].into())
+                    .build(),
+                LabelSet::empty(),
+                1.0,
+            ),
+            // Edge: Metric with a very large value
+            (
+                MetricBuilder::default()
+                    .with_sample(f64::MAX.into(), &LabelSet::empty())
+                    .build(),
+                LabelSet::empty(),
+                f64::MAX,
+            ),
+        ]
+    }
+
+    #[test]
+    fn test_counter_cases() {
+        for (idx, (metric, criteria, expected_value)) in counter_cases().iter().enumerate() {
+            let sum = metric.sum(criteria);
+
+            assert_eq!(
+                sum, *expected_value,
+                "at case {idx}, expected sum to be {expected_value}, got {sum}"
+            );
+        }
+    }
+
+    #[test]
+    fn test_gauge_cases() {
+        for (idx, (metric, criteria, expected_value)) in gauge_cases().iter().enumerate() {
+            let sum = metric.sum(criteria);
+
+            assert!(
+                (sum - expected_value).abs() <= f64::EPSILON,
+                "at case {idx}, expected sum to be {expected_value}, got {sum}"
+            );
+        }
+    }
+}
diff --git a/packages/metrics/src/metric/description.rs b/packages/metrics/src/metric/description.rs
index 8a50dee90..6a0ca3432 100644
--- a/packages/metrics/src/metric/description.rs
+++ b/packages/metrics/src/metric/description.rs
@@ -1,6 +1,8 @@
 use derive_more::Display;
 use serde::{Deserialize, Serialize};
 
+use crate::prometheus::PrometheusSerializable;
+
 #[derive(Debug, Display, Clone, Eq, PartialEq, Default, Deserialize, Serialize, Hash, Ord, PartialOrd)]
 pub struct MetricDescription(String);
 
@@ -11,6 +13,11 @@ impl MetricDescription {
     }
 }
 
+impl PrometheusSerializable for MetricDescription {
+    fn to_prometheus(&self) -> String {
+        self.0.clone()
+    }
+}
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -21,6 +28,12 @@ mod tests {
         assert_eq!(metric.0, "Metric description");
     }
 
+    #[test]
+    fn it_serializes_to_prometheus() {
+        let label_value = MetricDescription::new("name");
+        assert_eq!(label_value.to_prometheus(), "name");
+    }
+
     #[test]
     fn it_should_be_displayed() {
         let metric = MetricDescription::new("Metric description");
diff --git a/packages/metrics/src/metric/mod.rs b/packages/metrics/src/metric/mod.rs
index ecce90f18..6bc1a6075 100644
--- a/packages/metrics/src/metric/mod.rs
+++ b/packages/metrics/src/metric/mod.rs
@@ -1,3 +1,4 @@
+pub mod aggregate;
 pub mod description;
 pub mod name;
 
@@ -9,7 +10,9 @@ use super::label::LabelSet;
 use super::prometheus::PrometheusSerializable;
 use super::sample_collection::SampleCollection;
 use crate::gauge::Gauge;
+use crate::metric::description::MetricDescription;
 use crate::sample::Measurement;
+use crate::unit::Unit;
 
 pub type MetricName = name::MetricName;
 
@@ -17,19 +20,45 @@ pub type MetricName = name::MetricName;
 pub struct Metric<T> {
     name: MetricName,
 
+    #[serde(rename = "unit")]
+    opt_unit: Option<Unit>,
+
+    #[serde(rename = "description")]
+    opt_description: Option<MetricDescription>,
+
     #[serde(rename = "samples")]
     sample_collection: SampleCollection<T>,
 }
 
 impl<T> Metric<T> {
     #[must_use]
-    pub fn new(name: MetricName, samples: SampleCollection<T>) -> Self {
+    pub fn new(
+        name: MetricName,
+        opt_unit: Option<Unit>,
+        opt_description: Option<MetricDescription>,
+        samples: SampleCollection<T>,
+    ) -> Self {
         Self {
             name,
+            opt_unit,
+            opt_description,
             sample_collection: samples,
         }
     }
 
+    /// # Panics
+    ///
+    /// This function will panic if the empty sample collection cannot be created.
+    #[must_use]
+    pub fn new_empty_with_name(name: MetricName) -> Self {
+        Self {
+            name,
+            opt_unit: None,
+            opt_description: None,
+            sample_collection: SampleCollection::new(vec![]).expect("Empty sample collection creation should not fail"),
+        }
+    }
+
     #[must_use]
     pub fn name(&self) -> &MetricName {
         &self.name
@@ -49,35 +78,109 @@ impl<T> Metric<T> {
     pub fn is_empty(&self) -> bool {
         self.sample_collection.is_empty()
     }
+
+    #[must_use]
+    pub fn collect_matching_samples(
+        &self,
+        label_set_criteria: &LabelSet,
+    ) -> Vec<(&crate::label::LabelSet, &crate::sample::Measurement<T>)> {
+        self.sample_collection
+            .iter()
+            .filter(|(label_set, _measurement)| label_set.matches(label_set_criteria))
+            .collect()
+    }
 }
 
 impl Metric<Counter> {
     pub fn increment(&mut self, label_set: &LabelSet, time: DurationSinceUnixEpoch) {
         self.sample_collection.increment(label_set, time);
     }
+
+    pub fn absolute(&mut self, label_set: &LabelSet, value: u64, time: DurationSinceUnixEpoch) {
+        self.sample_collection.absolute(label_set, value, time);
+    }
 }
 
 impl Metric<Gauge> {
     pub fn set(&mut self, label_set: &LabelSet, value: f64, time: DurationSinceUnixEpoch) {
         self.sample_collection.set(label_set, value, time);
     }
+
+    pub fn increment(&mut self, label_set: &LabelSet, time: DurationSinceUnixEpoch) {
+        self.sample_collection.increment(label_set, time);
+    }
+
+    pub fn decrement(&mut self, label_set: &LabelSet, time: DurationSinceUnixEpoch) {
+        self.sample_collection.decrement(label_set, time);
+    }
+}
+
+enum PrometheusType {
+    Counter,
+    Gauge,
 }
 
-impl<T: PrometheusSerializable> PrometheusSerializable for Metric<T> {
+impl PrometheusSerializable for PrometheusType {
     fn to_prometheus(&self) -> String {
-        let samples: Vec<String> = self
-            .sample_collection
+        match self {
+            PrometheusType::Counter => "counter".to_string(),
+            PrometheusType::Gauge => "gauge".to_string(),
+        }
+    }
+}
+
+impl<T: PrometheusSerializable> Metric<T> {
+    #[must_use]
+    fn prometheus_help_line(&self) -> String {
+        if let Some(description) = &self.opt_description {
+            format!("# HELP {} {}", self.name.to_prometheus(), description.to_prometheus())
+        } else {
+            String::new()
+        }
+    }
+
+    #[must_use]
+    fn prometheus_type_line(&self, prometheus_type: &PrometheusType) -> String {
+        format!("# TYPE {} {}", self.name.to_prometheus(), prometheus_type.to_prometheus())
+    }
+
+    #[must_use]
+    fn prometheus_sample_line(&self, label_set: &LabelSet, measurement: &Measurement<T>) -> String {
+        format!(
+            "{}{} {}",
+            self.name.to_prometheus(),
+            label_set.to_prometheus(),
+            measurement.to_prometheus()
+        )
+    }
+
+    #[must_use]
+    fn prometheus_samples(&self) -> String {
+        self.sample_collection
             .iter()
-            .map(|(label_set, sample)| {
-                format!(
-                    "{}{} {}",
-                    self.name.to_prometheus(),
-                    label_set.to_prometheus(),
-                    sample.value().to_prometheus()
-                )
-            })
-            .collect();
-        samples.join("\n")
+            .map(|(label_set, measurement)| self.prometheus_sample_line(label_set, measurement))
+            .collect::<Vec<_>>()
+            .join("\n")
+    }
+
+    fn to_prometheus(&self, prometheus_type: &PrometheusType) -> String {
+        let help_line = self.prometheus_help_line();
+        let type_line = self.prometheus_type_line(prometheus_type);
+        let samples = self.prometheus_samples();
+
+        format!("{help_line}\n{type_line}\n{samples}")
+    }
+}
+
+impl PrometheusSerializable for Metric<Counter> {
+    fn to_prometheus(&self) -> String {
+        self.to_prometheus(&PrometheusType::Counter)
+    }
+}
+
+impl PrometheusSerializable for Metric<Gauge> {
+    fn to_prometheus(&self) -> String {
+        self.to_prometheus(&PrometheusType::Gauge)
     }
 }
 
@@ -96,7 +199,7 @@ mod tests {
 
             let samples = SampleCollection::<Gauge>::default();
 
-            let metric = Metric::<Gauge>::new(name.clone(), samples);
+            let metric = Metric::<Gauge>::new(name.clone(), None, None, samples);
 
             assert!(metric.is_empty());
         }
@@ -110,7 +213,7 @@ mod tests {
 
             let samples = SampleCollection::new(vec![Sample::new(Counter::new(1), time, label_set.clone())]).unwrap();
 
-            Metric::<Counter>::new(name.clone(), samples)
+            Metric::<Counter>::new(name.clone(), None, None, samples)
         }
 
         #[test]
@@ -124,7 +227,7 @@ mod tests {
 
             let samples = SampleCollection::<Gauge>::default();
 
-            let metric = Metric::<Gauge>::new(name.clone(), samples);
+            let metric = Metric::<Gauge>::new(name.clone(), None, None, samples);
 
             assert_eq!(metric.number_of_samples(), 0);
         }
@@ -143,20 +246,31 @@ mod tests {
 
             let samples = SampleCollection::<Counter>::default();
 
-            let _metric = Metric::<Counter>::new(name, samples);
+            let _metric = Metric::<Counter>::new(name, None, None, samples);
         }
 
         #[test]
         fn it_should_allow_incrementing_a_sample() {
             let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
-
             let name = metric_name!("test_metric");
-
             let label_set: LabelSet = [(label_name!("server_binding_protocol"), LabelValue::new("http"))].into();
+            let samples = SampleCollection::new(vec![Sample::new(Counter::new(0), time, label_set.clone())]).unwrap();
+            let mut metric = Metric::<Counter>::new(name.clone(), None, None, samples);
 
-            let samples = SampleCollection::new(vec![Sample::new(Counter::new(1), time, label_set.clone())]).unwrap();
+            metric.increment(&label_set, time);
 
-            let metric = Metric::<Counter>::new(name.clone(), samples);
+            assert_eq!(metric.get_sample_data(&label_set).unwrap().value().value(), 1);
+        }
+
+        #[test]
+        fn it_should_allow_setting_to_an_absolute_value() {
+            let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let name = metric_name!("test_metric");
+            let label_set: LabelSet = [(label_name!("server_binding_protocol"), LabelValue::new("http"))].into();
+            let samples = SampleCollection::new(vec![Sample::new(Counter::new(0), time, label_set.clone())]).unwrap();
+            let mut metric = Metric::<Counter>::new(name.clone(), None, None, samples);
+
+            metric.absolute(&label_set, 1, time);
 
             assert_eq!(metric.get_sample_data(&label_set).unwrap().value().value(), 1);
         }
@@ -177,22 +291,75 @@ mod tests {
 
             let samples = SampleCollection::<Gauge>::default();
 
-            let _metric = Metric::<Gauge>::new(name, samples);
+            let _metric = Metric::<Gauge>::new(name, None, None, samples);
         }
 
         #[test]
-        fn it_should_allow_setting_a_sample() {
+        fn it_should_allow_incrementing_a_sample() {
             let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
-
             let name = metric_name!("test_metric");
-
             let label_set: LabelSet = [(label_name!("server_binding_protocol"), LabelValue::new("http"))].into();
+            let samples = SampleCollection::new(vec![Sample::new(Gauge::new(0.0), time, label_set.clone())]).unwrap();
+            let mut metric = Metric::<Gauge>::new(name.clone(), None, None, samples);
+
+            metric.increment(&label_set, time);
+
+            assert_relative_eq!(metric.get_sample_data(&label_set).unwrap().value().value(), 1.0);
+        }
 
+        #[test]
+        fn it_should_allow_decrement_a_sample() {
+            let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let name = metric_name!("test_metric");
+            let label_set: LabelSet = [(label_name!("server_binding_protocol"), LabelValue::new("http"))].into();
             let samples = SampleCollection::new(vec![Sample::new(Gauge::new(1.0), time, label_set.clone())]).unwrap();
+            let mut metric = Metric::<Gauge>::new(name.clone(), None, None, samples);
 
-            let metric = Metric::<Gauge>::new(name.clone(), samples);
+            metric.decrement(&label_set, time);
+
+            assert_relative_eq!(metric.get_sample_data(&label_set).unwrap().value().value(), 0.0);
+        }
+
+        #[test]
+        fn it_should_allow_setting_a_sample() {
+            let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let name = metric_name!("test_metric");
+            let label_set: LabelSet = [(label_name!("server_binding_protocol"), LabelValue::new("http"))].into();
+            let samples = SampleCollection::new(vec![Sample::new(Gauge::new(0.0), time, label_set.clone())]).unwrap();
+            let mut metric = Metric::<Gauge>::new(name.clone(), None, None, samples);
+
+            metric.set(&label_set, 1.0, time);
 
             assert_relative_eq!(metric.get_sample_data(&label_set).unwrap().value().value(), 1.0);
         }
     }
+
+    mod for_prometheus_serialization {
+        use super::super::*;
+        use crate::counter::Counter;
+        use crate::metric_name;
+
+        #[test]
+        fn it_should_return_empty_string_for_prometheus_help_line_when_description_is_none() {
+            let name = metric_name!("test_metric");
+            let samples = SampleCollection::<Counter>::default();
+            let metric = Metric::<Counter>::new(name, None, None, samples);
+
+            let help_line = metric.prometheus_help_line();
+
+            assert_eq!(help_line, String::new());
+        }
+
+        #[test]
+        fn it_should_return_formatted_help_line_for_prometheus_when_description_is_some() {
+            let name = metric_name!("test_metric");
+            let description = MetricDescription::new("This is a test metric description");
+            let samples = SampleCollection::<Counter>::default();
+            let metric = Metric::<Counter>::new(name, None, Some(description), samples);
+
+            let help_line = metric.prometheus_help_line();
+
+            assert_eq!(help_line, "# HELP test_metric This is a test metric description");
+        }
+    }
 }
diff --git a/packages/metrics/src/metric_collection/aggregate/avg.rs b/packages/metrics/src/metric_collection/aggregate/avg.rs
new file mode 100644
index 000000000..0aef4e325
--- /dev/null
+++ b/packages/metrics/src/metric_collection/aggregate/avg.rs
@@ -0,0 +1,212 @@
+use crate::counter::Counter;
+use crate::gauge::Gauge;
+use crate::label::LabelSet;
+use crate::metric::aggregate::avg::Avg as MetricAvgTrait;
+use crate::metric::MetricName;
+use crate::metric_collection::{MetricCollection, MetricKindCollection};
+
+pub trait Avg {
+    fn avg(&self, metric_name: &MetricName, label_set_criteria: &LabelSet) -> Option<f64>;
+}
+
+impl Avg for MetricCollection {
+    fn avg(&self, metric_name: &MetricName, label_set_criteria: &LabelSet) -> Option<f64> {
+        if let Some(value) = self.counters.avg(metric_name, label_set_criteria) {
+            return Some(value);
+        }
+
+        if let Some(value) = self.gauges.avg(metric_name, label_set_criteria) {
+            return Some(value);
+        }
+
+        None
+    }
+}
+
+impl Avg for MetricKindCollection<Counter> {
+    fn avg(&self, metric_name: &MetricName, label_set_criteria: &LabelSet) -> Option<f64> {
+        self.metrics.get(metric_name).map(|metric| metric.avg(label_set_criteria))
+    }
+}
+
+impl Avg for MetricKindCollection<Gauge> {
+    fn avg(&self, metric_name: &MetricName, label_set_criteria: &LabelSet) -> Option<f64> {
+        self.metrics.get(metric_name).map(|metric| metric.avg(label_set_criteria))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    mod it_should_allow_averaging_all_metric_samples_containing_some_given_labels {
+
+        use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+        use crate::label::LabelValue;
+        use crate::label_name;
+        use crate::metric_collection::aggregate::avg::Avg;
+
+        #[test]
+        fn type_counter_with_two_samples() {
+            use crate::label::LabelSet;
+            use crate::metric_collection::MetricCollection;
+            use crate::metric_name;
+
+            let metric_name = metric_name!("test_counter");
+
+            let mut collection = MetricCollection::default();
+
+            collection
+                .increment_counter(
+                    &metric_name!("test_counter"),
+                    &(label_name!("label_1"), LabelValue::new("value_1")).into(),
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            collection
+                .increment_counter(
+                    &metric_name!("test_counter"),
+                    &(label_name!("label_2"), LabelValue::new("value_2")).into(),
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            // Two samples with value 1 each, average should be 1.0
+            assert_eq!(collection.avg(&metric_name, &LabelSet::empty()), Some(1.0));
+            assert_eq!(
+                collection.avg(&metric_name, &(label_name!("label_1"), LabelValue::new("value_1")).into()),
+                Some(1.0)
+            );
+        }
+
+        #[test]
+        fn type_counter_with_different_values() {
+            use crate::label::LabelSet;
+            use crate::metric_collection::MetricCollection;
+            use crate::metric_name;
+
+            let metric_name = metric_name!("test_counter");
+
+            let mut collection = MetricCollection::default();
+
+            // First increment: value goes from 0 to 1
+            collection
+                .increment_counter(
+                    &metric_name!("test_counter"),
+                    &(label_name!("label_1"), LabelValue::new("value_1")).into(),
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            // Second increment on the same label: value goes from 1 to 2
+            collection
+                .increment_counter(
+                    &metric_name!("test_counter"),
+                    &(label_name!("label_1"), LabelValue::new("value_1")).into(),
+                    DurationSinceUnixEpoch::from_secs(2),
+                )
+                .unwrap();
+
+            // Create another counter with a different value
+            collection
+                .set_counter(
+                    &metric_name!("test_counter"),
+                    &(label_name!("label_2"), LabelValue::new("value_2")).into(),
+                    4,
+                    DurationSinceUnixEpoch::from_secs(3),
+                )
+                .unwrap();
+
+            // Average of 2 and 4 should be 3.0
+            assert_eq!(collection.avg(&metric_name, &LabelSet::empty()), Some(3.0));
+            assert_eq!(
+                collection.avg(&metric_name, &(label_name!("label_1"), LabelValue::new("value_1")).into()),
+                Some(2.0)
+            );
+            assert_eq!(
+                collection.avg(&metric_name, &(label_name!("label_2"), LabelValue::new("value_2")).into()),
+                Some(4.0)
+            );
+        }
+
+        #[test]
+        fn type_gauge_with_two_samples() {
+            use crate::label::LabelSet;
+            use crate::metric_collection::MetricCollection;
+            use crate::metric_name;
+
+            let metric_name = metric_name!("test_gauge");
+
+            let mut collection = MetricCollection::default();
+
+            collection
+                .set_gauge(
+                    &metric_name!("test_gauge"),
+                    &(label_name!("label_1"), LabelValue::new("value_1")).into(),
+                    2.0,
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            collection
+                .set_gauge(
+                    &metric_name!("test_gauge"),
+                    &(label_name!("label_2"), LabelValue::new("value_2")).into(),
+                    4.0,
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            // Average of 2.0 and 4.0 should be 3.0
+            assert_eq!(collection.avg(&metric_name, &LabelSet::empty()), Some(3.0));
+            assert_eq!(
+                collection.avg(&metric_name, &(label_name!("label_1"), LabelValue::new("value_1")).into()),
+                Some(2.0)
+            );
+        }
+
+        #[test]
+        fn type_gauge_with_negative_values() {
+            use crate::label::LabelSet;
+            use crate::metric_collection::MetricCollection;
+            use crate::metric_name;
+
+            let metric_name = metric_name!("test_gauge");
+
+            let mut collection = MetricCollection::default();
+
+            collection
+                .set_gauge(
+                    &metric_name!("test_gauge"),
+                    &(label_name!("label_1"), LabelValue::new("value_1")).into(),
+                    -2.0,
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            collection
+                .set_gauge(
+                    &metric_name!("test_gauge"),
+                    &(label_name!("label_2"), LabelValue::new("value_2")).into(),
+                    6.0,
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            // Average of -2.0 and 6.0 should be 2.0
+            assert_eq!(collection.avg(&metric_name, &LabelSet::empty()), Some(2.0));
+        }
+
+        #[test]
+        fn nonexistent_metric() {
+            use crate::label::LabelSet;
+            use crate::metric_collection::MetricCollection;
+            use crate::metric_name;
+
+            let collection = MetricCollection::default();
+
+            assert_eq!(collection.avg(&metric_name!("nonexistent"), &LabelSet::empty()), None);
+        }
+    }
+}
diff --git a/packages/metrics/src/metric_collection/aggregate/mod.rs b/packages/metrics/src/metric_collection/aggregate/mod.rs
new file mode 100644
index 000000000..1224a1f52
--- /dev/null
+++ b/packages/metrics/src/metric_collection/aggregate/mod.rs
@@ -0,0 +1,2 @@
+pub mod avg;
+pub mod sum;
diff --git a/packages/metrics/src/metric_collection/aggregate/sum.rs b/packages/metrics/src/metric_collection/aggregate/sum.rs
new file mode 100644
index 000000000..3285fa8f1
--- /dev/null
+++ b/packages/metrics/src/metric_collection/aggregate/sum.rs
@@ -0,0 +1,118 @@
+use crate::counter::Counter;
+use crate::gauge::Gauge;
+use crate::label::LabelSet;
+use crate::metric::aggregate::sum::Sum as MetricSumTrait;
+use crate::metric::MetricName;
+use crate::metric_collection::{MetricCollection, MetricKindCollection};
+
+pub trait Sum {
+    fn sum(&self, metric_name: &MetricName, label_set_criteria: &LabelSet) -> Option<f64>;
+}
+
+impl Sum for MetricCollection {
+    fn sum(&self, metric_name: &MetricName, label_set_criteria: &LabelSet) -> Option<f64> {
+        if let Some(value) = self.counters.sum(metric_name, label_set_criteria) {
+            return Some(value);
+        }
+
+        if let Some(value) = self.gauges.sum(metric_name, label_set_criteria) {
+            return Some(value);
+        }
+
+        None
+    }
+}
+
+impl Sum for MetricKindCollection<Counter> {
+    fn sum(&self, metric_name: &MetricName, label_set_criteria: &LabelSet) -> Option<f64> {
+        #[allow(clippy::cast_precision_loss)]
+        self.metrics
+            .get(metric_name)
+            .map(|metric| metric.sum(label_set_criteria) as f64)
+    }
+}
+
+impl Sum for MetricKindCollection<Gauge> {
+    fn sum(&self, metric_name: &MetricName, label_set_criteria: &LabelSet) -> Option<f64> {
+        self.metrics.get(metric_name).map(|metric| metric.sum(label_set_criteria))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    mod it_should_allow_summing_all_metric_samples_containing_some_given_labels {
+
+        use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+        use crate::label::LabelValue;
+        use crate::label_name;
+        use crate::metric_collection::aggregate::sum::Sum;
+
+        #[test]
+        fn type_counter_with_two_samples() {
+            use crate::label::LabelSet;
+            use crate::metric_collection::MetricCollection;
+            use crate::metric_name;
+
+            let metric_name = metric_name!("test_counter");
+
+            let mut collection = MetricCollection::default();
+
+            collection
+                .increment_counter(
+                    &metric_name!("test_counter"),
+                    &(label_name!("label_1"), LabelValue::new("value_1")).into(),
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            collection
+                .increment_counter(
+                    &metric_name!("test_counter"),
+                    &(label_name!("label_2"), LabelValue::new("value_2")).into(),
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            assert_eq!(collection.sum(&metric_name, &LabelSet::empty()), Some(2.0));
+            assert_eq!(
+                collection.sum(&metric_name, &(label_name!("label_1"), LabelValue::new("value_1")).into()),
+                Some(1.0)
+            );
+        }
+
+        #[test]
+        fn type_gauge_with_two_samples() {
+            use crate::label::LabelSet;
+            use crate::metric_collection::MetricCollection;
+            use crate::metric_name;
+
+            let metric_name = metric_name!("test_gauge");
+
+            let mut collection = MetricCollection::default();
+
+            collection
+                .increment_gauge(
+                    &metric_name!("test_gauge"),
+                    &(label_name!("label_1"), LabelValue::new("value_1")).into(),
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            collection
+                .increment_gauge(
+                    &metric_name!("test_gauge"),
+                    &(label_name!("label_2"), LabelValue::new("value_2")).into(),
+                    DurationSinceUnixEpoch::from_secs(1),
+                )
+                .unwrap();
+
+            assert_eq!(collection.sum(&metric_name, &LabelSet::empty()), Some(2.0));
+            assert_eq!(
+                collection.sum(&metric_name, &(label_name!("label_1"), LabelValue::new("value_1")).into()),
+                Some(1.0)
+            );
+        }
+    }
+}
diff --git a/packages/metrics/src/metric_collection.rs b/packages/metrics/src/metric_collection/mod.rs
similarity index 56%
rename from packages/metrics/src/metric_collection.rs
rename to packages/metrics/src/metric_collection/mod.rs
index 9e89c3c4b..e183236aa 100644
--- a/packages/metrics/src/metric_collection.rs
+++ b/packages/metrics/src/metric_collection/mod.rs
@@ -1,3 +1,5 @@
+pub mod aggregate;
+
 use std::collections::{HashMap, HashSet};
 
 use serde::ser::{SerializeSeq, Serializer};
@@ -50,16 +52,41 @@ impl MetricCollection {
     ///
     /// Returns an error if a metric name already exists in the current collection.
     pub fn merge(&mut self, other: &Self) -> Result<(), Error> {
+        self.check_cross_type_collision(other)?;
         self.counters.merge(&other.counters)?;
         self.gauges.merge(&other.gauges)?;
         Ok(())
     }
 
+    /// Returns a set of all metric names in this collection.
+    fn collect_names(&self) -> HashSet<MetricName> {
+        self.counters.names().chain(self.gauges.names()).cloned().collect()
+    }
+
+    /// Checks for name collisions between this collection and another one.
+    fn check_cross_type_collision(&self, other: &Self) -> Result<(), Error> {
+        let self_names: HashSet<_> = self.collect_names();
+        let other_names: HashSet<_> = other.collect_names();
+
+        let cross_type_collisions = self_names.intersection(&other_names).next();
+
+        if let Some(name) = cross_type_collisions {
+            return Err(Error::MetricNameCollisionInMerge {
+                metric_name: (*name).clone(),
+            });
+        }
+
+        Ok(())
+    }
+
     // Counter-specific methods
 
-    pub fn describe_counter(&mut self, name: &MetricName, opt_unit: Option<Unit>, opt_description: Option<&MetricDescription>) {
+    pub fn describe_counter(&mut self, name: &MetricName, opt_unit: Option<Unit>, opt_description: Option<MetricDescription>) {
         tracing::info!(target: METRICS_TARGET, type = "counter", name = name.to_string(), unit = ?opt_unit, description = ?opt_description);
-        self.counters.ensure_metric_exists(name);
+
+        let metric = Metric::<Counter>::new(name.clone(), opt_unit, opt_description, SampleCollection::default());
+
+        self.counters.insert(metric);
     }
 
     #[must_use]
@@ -72,11 +99,13 @@ impl MetricCollection {
         self.counters.get_value(name, label_set)
     }
 
+    /// Increases the counter for the given metric name and labels.
+    ///
     /// # Errors
     ///
     /// Return an error if a metrics of a different type with the same name
     /// already exists.
-    pub fn increase_counter(
+    pub fn increment_counter(
         &mut self,
         name: &MetricName,
         label_set: &LabelSet,
@@ -93,15 +122,38 @@ impl MetricCollection {
         Ok(())
     }
 
-    pub fn ensure_counter_exists(&mut self, name: &MetricName) {
-        self.counters.ensure_metric_exists(name);
+    /// Sets the counter for the given metric name and labels.
+    ///
+    /// # Errors
+    ///
+    /// Return an error if a metrics of a different type with the same name
+    /// already exists.
+    pub fn set_counter(
+        &mut self,
+        name: &MetricName,
+        label_set: &LabelSet,
+        value: u64,
+        time: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        if self.gauges.metrics.contains_key(name) {
+            return Err(Error::MetricNameCollisionAdding {
+                metric_name: name.clone(),
+            });
+        }
+
+        self.counters.absolute(name, label_set, value, time);
+
+        Ok(())
     }
 
     // Gauge-specific methods
 
-    pub fn describe_gauge(&mut self, name: &MetricName, opt_unit: Option<Unit>, opt_description: Option<&MetricDescription>) {
+    pub fn describe_gauge(&mut self, name: &MetricName, opt_unit: Option<Unit>, opt_description: Option<MetricDescription>) {
         tracing::info!(target: METRICS_TARGET, type = "gauge", name = name.to_string(), unit = ?opt_unit, description = ?opt_description);
-        self.gauges.ensure_metric_exists(name);
+
+        let metric = Metric::<Gauge>::new(name.clone(), opt_unit, opt_description, SampleCollection::default());
+
+        self.gauges.insert(metric);
     }
 
     #[must_use]
@@ -136,8 +188,46 @@ impl MetricCollection {
         Ok(())
     }
 
-    pub fn ensure_gauge_exists(&mut self, name: &MetricName) {
-        self.gauges.ensure_metric_exists(name);
+    /// # Errors
+    ///
+    /// Return an error if a metrics of a different type with the same name
+    /// already exists.
+    pub fn increment_gauge(
+        &mut self,
+        name: &MetricName,
+        label_set: &LabelSet,
+        time: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        if self.counters.metrics.contains_key(name) {
+            return Err(Error::MetricNameCollisionAdding {
+                metric_name: name.clone(),
+            });
+        }
+
+        self.gauges.increment(name, label_set, time);
+
+        Ok(())
+    }
+
+    /// # Errors
+    ///
+    /// Return an error if a metrics of a different type with the same name
+    /// already exists.
+    pub fn decrement_gauge(
+        &mut self,
+        name: &MetricName,
+        label_set: &LabelSet,
+        time: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        if self.counters.metrics.contains_key(name) {
+            return Err(Error::MetricNameCollisionAdding {
+                metric_name: name.clone(),
+            });
+        }
+
+        self.gauges.decrement(name, label_set, time);
+
+        Ok(())
     }
 }
 
@@ -166,7 +256,7 @@ impl Serialize for MetricCollection {
         S: Serializer,
     {
         #[derive(Serialize)]
-        #[serde(tag = "kind", rename_all = "lowercase")]
+        #[serde(tag = "type", rename_all = "lowercase")]
         enum SerializableMetric<'a> {
             Counter(&'a Metric<Counter>),
             Gauge(&'a Metric<Gauge>),
@@ -192,7 +282,7 @@ impl<'de> Deserialize<'de> for MetricCollection {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
-        #[serde(tag = "kind", rename_all = "lowercase")]
+        #[serde(tag = "type", rename_all = "lowercase")]
         enum MetricPayload {
             Counter(Metric<Counter>),
             Gauge(Metric<Gauge>),
@@ -234,7 +324,7 @@ impl PrometheusSerializable for MetricCollection {
                     .map(Metric::<Gauge>::to_prometheus),
             )
             .collect::<Vec<String>>()
-            .join("\n")
+            .join("\n\n")
     }
 }
 
@@ -268,20 +358,15 @@ impl<T> MetricKindCollection<T> {
         self.metrics.keys()
     }
 
-    /// # Panics
-    ///
-    /// It should not panic as long as empty sample collections are allowed.
-    pub fn ensure_metric_exists(&mut self, name: &MetricName) {
-        if !self.metrics.contains_key(name) {
-            self.metrics.insert(
-                name.clone(),
-                Metric::new(
-                    name.clone(),
-                    SampleCollection::new(vec![]).expect("Empty sample collection creation should not fail"),
-                ),
-            );
+    pub fn insert_if_absent(&mut self, metric: Metric<T>) {
+        if !self.metrics.contains_key(metric.name()) {
+            self.insert(metric);
         }
     }
+
+    pub fn insert(&mut self, metric: Metric<T>) {
+        self.metrics.insert(metric.name().clone(), metric);
+    }
 }
 
 impl<T: Clone> MetricKindCollection<T> {
@@ -291,17 +376,18 @@ impl<T: Clone> MetricKindCollection<T> {
     ///
     /// Returns an error if a metric name already exists in the current collection.
     pub fn merge(&mut self, other: &Self) -> Result<(), Error> {
-        // Check for name collisions
-        for metric_name in other.metrics.keys() {
-            if self.metrics.contains_key(metric_name) {
-                return Err(Error::MetricNameCollisionInMerge {
-                    metric_name: metric_name.clone(),
-                });
-            }
-        }
+        self.check_for_name_collision(other)?;
 
         for (metric_name, metric) in &other.metrics {
-            if self.metrics.insert(metric_name.clone(), metric.clone()).is_some() {
+            self.metrics.insert(metric_name.clone(), metric.clone());
+        }
+
+        Ok(())
+    }
+
+    fn check_for_name_collision(&self, other: &Self) -> Result<(), Error> {
+        for metric_name in other.metrics.keys() {
+            if self.metrics.contains_key(metric_name) {
                 return Err(Error::MetricNameCollisionInMerge {
                     metric_name: metric_name.clone(),
                 });
@@ -319,15 +405,34 @@ impl MetricKindCollection<Counter> {
     ///
     /// # Panics
     ///
-    /// Panics if the metric does not exist and it could not be created.
+    /// Panics if the metric does not exist.
     pub fn increment(&mut self, name: &MetricName, label_set: &LabelSet, time: DurationSinceUnixEpoch) {
-        self.ensure_metric_exists(name);
+        let metric = Metric::<Counter>::new_empty_with_name(name.clone());
+
+        self.insert_if_absent(metric);
 
         let metric = self.metrics.get_mut(name).expect("Counter metric should exist");
 
         metric.increment(label_set, time);
     }
 
+    /// Sets the counter to an absolute value for the given metric name and labels.
+    ///
+    /// If the metric name does not exist, it will be created.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the metric does not exist.
+    pub fn absolute(&mut self, name: &MetricName, label_set: &LabelSet, value: u64, time: DurationSinceUnixEpoch) {
+        let metric = Metric::<Counter>::new_empty_with_name(name.clone());
+
+        self.insert_if_absent(metric);
+
+        let metric = self.metrics.get_mut(name).expect("Counter metric should exist");
+
+        metric.absolute(label_set, value, time);
+    }
+
     #[must_use]
     pub fn get_value(&self, name: &MetricName, label_set: &LabelSet) -> Option<Counter> {
         self.metrics
@@ -346,13 +451,49 @@ impl MetricKindCollection<Gauge> {
     ///
     /// Panics if the metric does not exist and it could not be created.
     pub fn set(&mut self, name: &MetricName, label_set: &LabelSet, value: f64, time: DurationSinceUnixEpoch) {
-        self.ensure_metric_exists(name);
+        let metric = Metric::<Gauge>::new_empty_with_name(name.clone());
+
+        self.insert_if_absent(metric);
 
         let metric = self.metrics.get_mut(name).expect("Gauge metric should exist");
 
         metric.set(label_set, value, time);
     }
 
+    /// Increments the gauge for the given metric name and labels.
+    ///
+    /// If the metric name does not exist, it will be created.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the metric does not exist and it could not be created.
+    pub fn increment(&mut self, name: &MetricName, label_set: &LabelSet, time: DurationSinceUnixEpoch) {
+        let metric = Metric::<Gauge>::new_empty_with_name(name.clone());
+
+        self.insert_if_absent(metric);
+
+        let metric = self.metrics.get_mut(name).expect("Gauge metric should exist");
+
+        metric.increment(label_set, time);
+    }
+
+    /// Decrements the gauge for the given metric name and labels.
+    ///
+    /// If the metric name does not exist, it will be created.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the metric does not exist and it could not be created.
+    pub fn decrement(&mut self, name: &MetricName, label_set: &LabelSet, time: DurationSinceUnixEpoch) {
+        let metric = Metric::<Gauge>::new_empty_with_name(name.clone());
+
+        self.insert_if_absent(metric);
+
+        let metric = self.metrics.get_mut(name).expect("Gauge metric should exist");
+
+        metric.decrement(label_set, time);
+    }
+
     #[must_use]
     pub fn get_value(&self, name: &MetricName, label_set: &LabelSet) -> Option<Gauge> {
         self.metrics
@@ -370,6 +511,7 @@ mod tests {
     use super::*;
     use crate::label::LabelValue;
     use crate::sample::Sample;
+    use crate::sample_collection::SampleCollection;
     use crate::tests::{format_prometheus_output, sort_lines};
     use crate::{label_name, metric_name};
 
@@ -411,11 +553,15 @@ mod tests {
             MetricCollection::new(
                 MetricKindCollection::new(vec![Metric::new(
                     metric_name!("http_tracker_core_announce_requests_received_total"),
+                    None,
+                    Some(MetricDescription::new("The number of announce requests received.")),
                     SampleCollection::new(vec![Sample::new(Counter::new(1), time, label_set_1.clone())]).unwrap(),
                 )])
                 .unwrap(),
                 MetricKindCollection::new(vec![Metric::new(
                     metric_name!("udp_tracker_server_performance_avg_announce_processing_time_ns"),
+                    None,
+                    Some(MetricDescription::new("The average announce processing time in nanoseconds.")),
                     SampleCollection::new(vec![Sample::new(Gauge::new(1.0), time, label_set_1.clone())]).unwrap(),
                 )])
                 .unwrap(),
@@ -427,8 +573,10 @@ mod tests {
             r#"
             [
                 {
-                    "kind":"counter",
+                    "type":"counter",
                     "name":"http_tracker_core_announce_requests_received_total",
+                    "unit": null,
+                    "description": "The number of announce requests received.",
                     "samples":[
                         {
                             "value":1,
@@ -451,8 +599,10 @@ mod tests {
                     ]
                 },
                 {
-                    "kind":"gauge",
+                    "type":"gauge",
                     "name":"udp_tracker_server_performance_avg_announce_processing_time_ns",
+                    "unit": null,
+                    "description": "The average announce processing time in nanoseconds.",
                     "samples":[
                         {
                             "value":1.0,
@@ -481,20 +631,34 @@ mod tests {
 
         fn prometheus() -> String {
             format_prometheus_output(
-                r#"
-                    http_tracker_core_announce_requests_received_total{server_binding_ip="0.0.0.0",server_binding_port="7070",server_binding_protocol="http"} 1
-                    udp_tracker_server_performance_avg_announce_processing_time_ns{server_binding_ip="0.0.0.0",server_binding_port="7070",server_binding_protocol="http"} 1
-                "#,
+                r#"# HELP http_tracker_core_announce_requests_received_total The number of announce requests received.
+# TYPE http_tracker_core_announce_requests_received_total counter
+http_tracker_core_announce_requests_received_total{server_binding_ip="0.0.0.0",server_binding_port="7070",server_binding_protocol="http"} 1
+
+# HELP udp_tracker_server_performance_avg_announce_processing_time_ns The average announce processing time in nanoseconds.
+# TYPE udp_tracker_server_performance_avg_announce_processing_time_ns gauge
+udp_tracker_server_performance_avg_announce_processing_time_ns{server_binding_ip="0.0.0.0",server_binding_port="7070",server_binding_protocol="http"} 1
+"#,
             )
         }
     }
 
     #[test]
     fn it_should_not_allow_duplicate_names_across_types() {
-        let counters =
-            MetricKindCollection::new(vec![Metric::new(metric_name!("test_metric"), SampleCollection::default())]).unwrap();
-        let gauges =
-            MetricKindCollection::new(vec![Metric::new(metric_name!("test_metric"), SampleCollection::default())]).unwrap();
+        let counters = MetricKindCollection::new(vec![Metric::new(
+            metric_name!("test_metric"),
+            None,
+            None,
+            SampleCollection::default(),
+        )])
+        .unwrap();
+        let gauges = MetricKindCollection::new(vec![Metric::new(
+            metric_name!("test_metric"),
+            None,
+            None,
+            SampleCollection::default(),
+        )])
+        .unwrap();
 
         assert!(MetricCollection::new(counters, gauges).is_err());
     }
@@ -507,7 +671,7 @@ mod tests {
 
         // First create a counter
         collection
-            .increase_counter(&metric_name!("test_metric"), &label_set, time)
+            .increment_counter(&metric_name!("test_metric"), &label_set, time)
             .unwrap();
 
         // Then try to create a gauge with the same name
@@ -528,7 +692,7 @@ mod tests {
             .unwrap();
 
         // Then try to create a counter with the same name
-        let result = collection.increase_counter(&metric_name!("test_metric"), &label_set, time);
+        let result = collection.increment_counter(&metric_name!("test_metric"), &label_set, time);
 
         assert!(result.is_err());
     }
@@ -587,6 +751,8 @@ mod tests {
         let metric_collection = MetricCollection::new(
             MetricKindCollection::new(vec![Metric::new(
                 metric_name!("http_tracker_core_announce_requests_received_total"),
+                None,
+                Some(MetricDescription::new("The number of announce requests received.")),
                 SampleCollection::new(vec![
                     Sample::new(Counter::new(1), time, label_set_1.clone()),
                     Sample::new(Counter::new(2), time, label_set_2.clone()),
@@ -601,10 +767,11 @@ mod tests {
         let prometheus_output = metric_collection.to_prometheus();
 
         let expected_prometheus_output = format_prometheus_output(
-            r#"
-            http_tracker_core_announce_requests_received_total{server_binding_ip="0.0.0.0",server_binding_port="7171",server_binding_protocol="http"} 2
-            http_tracker_core_announce_requests_received_total{server_binding_ip="0.0.0.0",server_binding_port="7070",server_binding_protocol="http"} 1
-            "#,
+            r#"# HELP http_tracker_core_announce_requests_received_total The number of announce requests received.
+# TYPE http_tracker_core_announce_requests_received_total counter
+http_tracker_core_announce_requests_received_total{server_binding_ip="0.0.0.0",server_binding_port="7070",server_binding_protocol="http"} 1
+http_tracker_core_announce_requests_received_total{server_binding_ip="0.0.0.0",server_binding_port="7171",server_binding_protocol="http"} 2
+"#,
         );
 
         // code-review: samples are not serialized in the same order as they are created.
@@ -618,8 +785,11 @@ mod tests {
         let mut counters = MetricKindCollection::default();
         let mut gauges = MetricKindCollection::default();
 
-        counters.ensure_metric_exists(&metric_name!("test_counter"));
-        gauges.ensure_metric_exists(&metric_name!("test_gauge"));
+        let counter = Metric::<Counter>::new_empty_with_name(metric_name!("test_counter"));
+        counters.insert_if_absent(counter);
+
+        let gauge = Metric::<Gauge>::new_empty_with_name(metric_name!("test_gauge"));
+        gauges.insert_if_absent(gauge);
 
         let metric_collection = MetricCollection::new(counters, gauges).unwrap();
 
@@ -628,6 +798,98 @@ mod tests {
         assert_eq!(prometheus_output, "");
     }
 
+    #[test]
+    fn it_should_allow_merging_metric_collections() {
+        let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+        let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
+        let mut collection1 = MetricCollection::default();
+        collection1
+            .increment_counter(&metric_name!("test_counter"), &label_set, time)
+            .unwrap();
+
+        let mut collection2 = MetricCollection::default();
+        collection2
+            .set_gauge(&metric_name!("test_gauge"), &label_set, 1.0, time)
+            .unwrap();
+
+        collection1.merge(&collection2).unwrap();
+
+        assert!(collection1.contains_counter(&metric_name!("test_counter")));
+        assert!(collection1.contains_gauge(&metric_name!("test_gauge")));
+    }
+
+    #[test]
+    fn it_should_not_allow_merging_metric_collections_with_name_collisions_for_the_same_metric_types() {
+        let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+        let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
+        let mut collection1 = MetricCollection::default();
+        collection1
+            .increment_counter(&metric_name!("test_metric"), &label_set, time)
+            .unwrap();
+
+        let mut collection2 = MetricCollection::default();
+        collection2
+            .increment_counter(&metric_name!("test_metric"), &label_set, time)
+            .unwrap();
+        let result = collection1.merge(&collection2);
+
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn it_should_not_allow_merging_metric_collections_with_name_collisions_for_different_metric_types() {
+        let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+        let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
+        let mut collection1 = MetricCollection::default();
+        collection1
+            .increment_counter(&metric_name!("test_metric"), &label_set, time)
+            .unwrap();
+
+        let mut collection2 = MetricCollection::default();
+        collection2
+            .set_gauge(&metric_name!("test_metric"), &label_set, 1.0, time)
+            .unwrap();
+
+        let result = collection1.merge(&collection2);
+
+        assert!(result.is_err());
+    }
+
+    fn collection_with_one_counter(metric_name: &MetricName, label_set: &LabelSet, counter: Counter) -> MetricCollection {
+        let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+
+        MetricCollection::new(
+            MetricKindCollection::new(vec![Metric::new(
+                metric_name.clone(),
+                None,
+                None,
+                SampleCollection::new(vec![Sample::new(counter, time, label_set.clone())]).unwrap(),
+            )])
+            .unwrap(),
+            MetricKindCollection::default(),
+        )
+        .unwrap()
+    }
+
+    fn collection_with_one_gauge(metric_name: &MetricName, label_set: &LabelSet, gauge: Gauge) -> MetricCollection {
+        let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+
+        MetricCollection::new(
+            MetricKindCollection::default(),
+            MetricKindCollection::new(vec![Metric::new(
+                metric_name.clone(),
+                None,
+                None,
+                SampleCollection::new(vec![Sample::new(gauge, time, label_set.clone())]).unwrap(),
+            )])
+            .unwrap(),
+        )
+        .unwrap()
+    }
+
     mod for_counters {
 
         use pretty_assertions::assert_eq;
@@ -635,32 +897,57 @@ mod tests {
         use super::*;
         use crate::label::LabelValue;
         use crate::sample::Sample;
+        use crate::sample_collection::SampleCollection;
 
         #[test]
-        fn it_should_increase_a_preexistent_counter() {
+        fn it_should_allow_setting_to_an_absolute_value() {
             let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let metric_name = metric_name!("test_counter");
             let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
 
-            let mut metric_collection = MetricCollection::new(
-                MetricKindCollection::new(vec![Metric::new(
-                    metric_name!("test_counter"),
-                    SampleCollection::new(vec![Sample::new(Counter::new(0), time, label_set.clone())]).unwrap(),
-                )])
-                .unwrap(),
-                MetricKindCollection::default(),
-            )
-            .unwrap();
+            let mut collection = collection_with_one_counter(&metric_name, &label_set, Counter::new(0));
 
-            metric_collection
-                .increase_counter(&metric_name!("test_counter"), &label_set, time)
+            collection
+                .set_counter(&metric_name!("test_counter"), &label_set, 1, time)
                 .unwrap();
-            metric_collection
-                .increase_counter(&metric_name!("test_counter"), &label_set, time)
+
+            assert_eq!(
+                collection.get_counter_value(&metric_name!("test_counter"), &label_set),
+                Some(Counter::new(1))
+            );
+        }
+
+        #[test]
+        fn it_should_fail_setting_to_an_absolute_value_if_a_gauge_with_the_same_name_exists() {
+            let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let metric_name = metric_name!("test_counter");
+            let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
+            let mut collection = collection_with_one_gauge(&metric_name, &label_set, Gauge::new(0.0));
+
+            let result = collection.set_counter(&metric_name!("test_counter"), &label_set, 1, time);
+
+            assert!(
+                result.is_err()
+                    && matches!(result, Err(Error::MetricNameCollisionAdding { metric_name }) if metric_name == metric_name!("test_counter"))
+            );
+        }
+
+        #[test]
+        fn it_should_increase_a_preexistent_counter() {
+            let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let metric_name = metric_name!("test_counter");
+            let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
+            let mut collection = collection_with_one_counter(&metric_name, &label_set, Counter::new(0));
+
+            collection
+                .increment_counter(&metric_name!("test_counter"), &label_set, time)
                 .unwrap();
 
             assert_eq!(
-                metric_collection.get_counter_value(&metric_name!("test_counter"), &label_set),
-                Some(Counter::new(2))
+                collection.get_counter_value(&metric_name!("test_counter"), &label_set),
+                Some(Counter::new(1))
             );
         }
 
@@ -673,10 +960,10 @@ mod tests {
                 MetricCollection::new(MetricKindCollection::default(), MetricKindCollection::default()).unwrap();
 
             metric_collection
-                .increase_counter(&metric_name!("test_counter"), &label_set, time)
+                .increment_counter(&metric_name!("test_counter"), &label_set, time)
                 .unwrap();
             metric_collection
-                .increase_counter(&metric_name!("test_counter"), &label_set, time)
+                .increment_counter(&metric_name!("test_counter"), &label_set, time)
                 .unwrap();
 
             assert_eq!(
@@ -685,16 +972,6 @@ mod tests {
             );
         }
 
-        #[test]
-        fn it_should_allow_making_sure_a_counter_exists_without_increasing_it() {
-            let mut metric_collection =
-                MetricCollection::new(MetricKindCollection::default(), MetricKindCollection::default()).unwrap();
-
-            metric_collection.ensure_counter_exists(&metric_name!("test_counter"));
-
-            assert!(metric_collection.contains_counter(&metric_name!("test_counter")));
-        }
-
         #[test]
         fn it_should_allow_describing_a_counter_before_using_it() {
             let mut metric_collection =
@@ -713,10 +990,14 @@ mod tests {
             let result = MetricKindCollection::new(vec![
                 Metric::new(
                     metric_name!("test_counter"),
+                    None,
+                    None,
                     SampleCollection::new(vec![Sample::new(Counter::new(0), time, label_set.clone())]).unwrap(),
                 ),
                 Metric::new(
                     metric_name!("test_counter"),
+                    None,
+                    None,
                     SampleCollection::new(vec![Sample::new(Counter::new(0), time, label_set.clone())]).unwrap(),
                 ),
             ]);
@@ -732,58 +1013,110 @@ mod tests {
         use super::*;
         use crate::label::LabelValue;
         use crate::sample::Sample;
+        use crate::sample_collection::SampleCollection;
 
         #[test]
         fn it_should_set_a_preexistent_gauge() {
             let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let metric_name = metric_name!("test_gauge");
             let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
 
-            let mut metric_collection = MetricCollection::new(
-                MetricKindCollection::default(),
-                MetricKindCollection::new(vec![Metric::new(
-                    metric_name!("test_gauge"),
-                    SampleCollection::new(vec![Sample::new(Gauge::new(0.0), time, label_set.clone())]).unwrap(),
-                )])
-                .unwrap(),
-            )
-            .unwrap();
+            let mut collection = collection_with_one_gauge(&metric_name, &label_set, Gauge::new(0.0));
 
-            metric_collection
+            collection
                 .set_gauge(&metric_name!("test_gauge"), &label_set, 1.0, time)
                 .unwrap();
 
             assert_eq!(
-                metric_collection.get_gauge_value(&metric_name!("test_gauge"), &label_set),
+                collection.get_gauge_value(&metric_name!("test_gauge"), &label_set),
                 Some(Gauge::new(1.0))
             );
         }
 
         #[test]
-        fn it_should_automatically_create_a_gauge_when_setting_if_it_does_not_exist() {
+        fn it_should_allow_incrementing_a_gauge() {
             let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let metric_name = metric_name!("test_gauge");
             let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
 
-            let mut metric_collection =
-                MetricCollection::new(MetricKindCollection::default(), MetricKindCollection::default()).unwrap();
+            let mut collection = collection_with_one_gauge(&metric_name, &label_set, Gauge::new(0.0));
 
-            metric_collection
-                .set_gauge(&metric_name!("test_gauge"), &label_set, 1.0, time)
+            collection
+                .increment_gauge(&metric_name!("test_gauge"), &label_set, time)
                 .unwrap();
 
             assert_eq!(
-                metric_collection.get_gauge_value(&metric_name!("test_gauge"), &label_set),
+                collection.get_gauge_value(&metric_name!("test_gauge"), &label_set),
                 Some(Gauge::new(1.0))
             );
         }
 
         #[test]
-        fn it_should_allow_making_sure_a_gauge_exists_without_setting_it() {
+        fn it_should_fail_incrementing_a_gauge_if_it_exists_a_counter_with_the_same_name() {
+            let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let metric_name = metric_name!("test_gauge");
+            let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
+            let mut collection = collection_with_one_counter(&metric_name, &label_set, Counter::new(0));
+
+            let result = collection.increment_gauge(&metric_name!("test_gauge"), &label_set, time);
+
+            assert!(
+                result.is_err()
+                    && matches!(result, Err(Error::MetricNameCollisionAdding { metric_name }) if metric_name == metric_name!("test_gauge"))
+            );
+        }
+
+        #[test]
+        fn it_should_allow_decrementing_a_gauge() {
+            let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let metric_name = metric_name!("test_gauge");
+            let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
+            let mut collection = collection_with_one_gauge(&metric_name, &label_set, Gauge::new(1.0));
+
+            collection
+                .decrement_gauge(&metric_name!("test_gauge"), &label_set, time)
+                .unwrap();
+
+            assert_eq!(
+                collection.get_gauge_value(&metric_name!("test_gauge"), &label_set),
+                Some(Gauge::new(0.0))
+            );
+        }
+
+        #[test]
+        fn it_should_fail_decrementing_a_gauge_if_it_exists_a_counter_with_the_same_name() {
+            let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let metric_name = metric_name!("test_gauge");
+            let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
+            let mut collection = collection_with_one_counter(&metric_name, &label_set, Counter::new(0));
+
+            let result = collection.decrement_gauge(&metric_name!("test_gauge"), &label_set, time);
+
+            assert!(
+                result.is_err()
+                    && matches!(result, Err(Error::MetricNameCollisionAdding { metric_name }) if metric_name == metric_name!("test_gauge"))
+            );
+        }
+
+        #[test]
+        fn it_should_automatically_create_a_gauge_when_setting_if_it_does_not_exist() {
+            let time = DurationSinceUnixEpoch::from_secs(1_743_552_000);
+            let label_set: LabelSet = (label_name!("label_name"), LabelValue::new("value")).into();
+
             let mut metric_collection =
                 MetricCollection::new(MetricKindCollection::default(), MetricKindCollection::default()).unwrap();
 
-            metric_collection.ensure_gauge_exists(&metric_name!("test_gauge"));
+            metric_collection
+                .set_gauge(&metric_name!("test_gauge"), &label_set, 1.0, time)
+                .unwrap();
 
-            assert!(metric_collection.contains_gauge(&metric_name!("test_gauge")));
+            assert_eq!(
+                metric_collection.get_gauge_value(&metric_name!("test_gauge"), &label_set),
+                Some(Gauge::new(1.0))
+            );
         }
 
         #[test]
@@ -804,10 +1137,14 @@ mod tests {
             let result = MetricKindCollection::new(vec![
                 Metric::new(
                     metric_name!("test_gauge"),
+                    None,
+                    None,
                     SampleCollection::new(vec![Sample::new(Gauge::new(0.0), time, label_set.clone())]).unwrap(),
                 ),
                 Metric::new(
                     metric_name!("test_gauge"),
+                    None,
+                    None,
                     SampleCollection::new(vec![Sample::new(Gauge::new(0.0), time, label_set.clone())]).unwrap(),
                 ),
             ]);
@@ -815,4 +1152,45 @@ mod tests {
             assert!(result.is_err());
         }
     }
+
+    mod metric_kind_collection {
+
+        use crate::counter::Counter;
+        use crate::gauge::Gauge;
+        use crate::metric::Metric;
+        use crate::metric_collection::{Error, MetricKindCollection};
+        use crate::metric_name;
+
+        #[test]
+        fn it_should_not_allow_merging_counter_metric_collections_with_name_collisions() {
+            let mut collection1 = MetricKindCollection::<Counter>::default();
+            collection1.insert(Metric::<Counter>::new_empty_with_name(metric_name!("test_metric")));
+
+            let mut collection2 = MetricKindCollection::<Counter>::default();
+            collection2.insert(Metric::<Counter>::new_empty_with_name(metric_name!("test_metric")));
+
+            let result = collection1.merge(&collection2);
+
+            assert!(
+                result.is_err()
+                    && matches!(result, Err(Error::MetricNameCollisionInMerge { metric_name }) if metric_name == metric_name!("test_metric"))
+            );
+        }
+
+        #[test]
+        fn it_should_not_allow_merging_gauge_metric_collections_with_name_collisions() {
+            let mut collection1 = MetricKindCollection::<Gauge>::default();
+            collection1.insert(Metric::<Gauge>::new_empty_with_name(metric_name!("test_metric")));
+
+            let mut collection2 = MetricKindCollection::<Gauge>::default();
+            collection2.insert(Metric::<Gauge>::new_empty_with_name(metric_name!("test_metric")));
+
+            let result = collection1.merge(&collection2);
+
+            assert!(
+                result.is_err()
+                    && matches!(result, Err(Error::MetricNameCollisionInMerge { metric_name }) if metric_name == metric_name!("test_metric"))
+            );
+        }
+    }
 }
diff --git a/packages/metrics/src/sample.rs b/packages/metrics/src/sample.rs
index 5567dffec..63f46b9b8 100644
--- a/packages/metrics/src/sample.rs
+++ b/packages/metrics/src/sample.rs
@@ -50,7 +50,11 @@ impl<T> Sample<T> {
 
 impl<T: PrometheusSerializable> PrometheusSerializable for Sample<T> {
     fn to_prometheus(&self) -> String {
-        format!("{} {}", self.label_set.to_prometheus(), self.measurement.to_prometheus())
+        if self.label_set.is_empty() {
+            format!(" {}", self.measurement.to_prometheus())
+        } else {
+            format!("{} {}", self.label_set.to_prometheus(), self.measurement.to_prometheus())
+        }
     }
 }
 
@@ -64,6 +68,14 @@ impl Sample<Gauge> {
     pub fn set(&mut self, value: f64, time: DurationSinceUnixEpoch) {
         self.measurement.set(value, time);
     }
+
+    pub fn increment(&mut self, time: DurationSinceUnixEpoch) {
+        self.measurement.increment(time);
+    }
+
+    pub fn decrement(&mut self, time: DurationSinceUnixEpoch) {
+        self.measurement.decrement(time);
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -114,6 +126,11 @@ impl Measurement<Counter> {
         self.value.increment(1);
         self.set_recorded_at(time);
     }
+
+    pub fn absolute(&mut self, value: u64, time: DurationSinceUnixEpoch) {
+        self.value.absolute(value);
+        self.set_recorded_at(time);
+    }
 }
 
 impl Measurement<Gauge> {
@@ -121,6 +138,16 @@ impl Measurement<Gauge> {
         self.value.set(value);
         self.set_recorded_at(time);
     }
+
+    pub fn increment(&mut self, time: DurationSinceUnixEpoch) {
+        self.value.increment(1.0);
+        self.set_recorded_at(time);
+    }
+
+    pub fn decrement(&mut self, time: DurationSinceUnixEpoch) {
+        self.value.decrement(1.0);
+        self.set_recorded_at(time);
+    }
 }
 
 /// Serializes the `recorded_at` field as a string in ISO 8601 format (RFC 3339).
@@ -252,6 +279,15 @@ mod tests {
 
             assert_eq!(sample.to_prometheus(), r#"{label_name="label_value",method="GET"} 42"#);
         }
+
+        #[test]
+        fn it_should_allow_exporting_to_prometheus_format_with_empty_label_set() {
+            let counter = Counter::new(42);
+
+            let sample = Sample::new(counter, DurationSinceUnixEpoch::default(), LabelSet::default());
+
+            assert_eq!(sample.to_prometheus(), " 42");
+        }
     }
     mod for_gauge_type_sample {
         use torrust_tracker_primitives::DurationSinceUnixEpoch;
@@ -273,7 +309,7 @@ mod tests {
         }
 
         #[test]
-        fn it_should_allow_incrementing_the_counter() {
+        fn it_should_allow_setting_a_value() {
             let mut sample = Sample::new(Gauge::default(), DurationSinceUnixEpoch::default(), LabelSet::default());
 
             sample.set(1.0, updated_at_time());
@@ -281,6 +317,24 @@ mod tests {
             assert_eq!(sample.value(), &Gauge::new(1.0));
         }
 
+        #[test]
+        fn it_should_allow_incrementing_the_value() {
+            let mut sample = Sample::new(Gauge::new(0.0), DurationSinceUnixEpoch::default(), LabelSet::default());
+
+            sample.increment(updated_at_time());
+
+            assert_eq!(sample.value(), &Gauge::new(1.0));
+        }
+
+        #[test]
+        fn it_should_allow_decrementing_the_value() {
+            let mut sample = Sample::new(Gauge::new(1.0), DurationSinceUnixEpoch::default(), LabelSet::default());
+
+            sample.decrement(updated_at_time());
+
+            assert_eq!(sample.value(), &Gauge::new(0.0));
+        }
+
         #[test]
         fn it_should_record_the_latest_update_time_when_the_counter_is_incremented() {
             let mut sample = Sample::new(Gauge::default(), DurationSinceUnixEpoch::default(), LabelSet::default());
@@ -302,6 +356,15 @@ mod tests {
 
             assert_eq!(sample.to_prometheus(), r#"{label_name="label_value",method="GET"} 42"#);
         }
+
+        #[test]
+        fn it_should_allow_exporting_to_prometheus_format_with_empty_label_set() {
+            let gauge = Gauge::new(42.0);
+
+            let sample = Sample::new(gauge, DurationSinceUnixEpoch::default(), LabelSet::default());
+
+            assert_eq!(sample.to_prometheus(), " 42");
+        }
     }
 
     mod serialization_to_json {
diff --git a/packages/metrics/src/sample_collection.rs b/packages/metrics/src/sample_collection.rs
index 49c839673..e520d7310 100644
--- a/packages/metrics/src/sample_collection.rs
+++ b/packages/metrics/src/sample_collection.rs
@@ -79,6 +79,15 @@ impl SampleCollection<Counter> {
 
         sample.increment(time);
     }
+
+    pub fn absolute(&mut self, label_set: &LabelSet, value: u64, time: DurationSinceUnixEpoch) {
+        let sample = self
+            .samples
+            .entry(label_set.clone())
+            .or_insert_with(|| Measurement::new(Counter::default(), time));
+
+        sample.absolute(value, time);
+    }
 }
 
 impl SampleCollection<Gauge> {
@@ -90,6 +99,24 @@ impl SampleCollection<Gauge> {
 
         sample.set(value, time);
     }
+
+    pub fn increment(&mut self, label_set: &LabelSet, time: DurationSinceUnixEpoch) {
+        let sample = self
+            .samples
+            .entry(label_set.clone())
+            .or_insert_with(|| Measurement::new(Gauge::default(), time));
+
+        sample.increment(time);
+    }
+
+    pub fn decrement(&mut self, label_set: &LabelSet, time: DurationSinceUnixEpoch) {
+        let sample = self
+            .samples
+            .entry(label_set.clone())
+            .or_insert_with(|| Measurement::new(Gauge::default(), time));
+
+        sample.decrement(time);
+    }
 }
 
 impl<T: Serialize> Serialize for SampleCollection<T> {
@@ -128,7 +155,11 @@ impl<T: PrometheusSerializable> PrometheusSerializable for SampleCollection<T> {
         let mut output = String::new();
 
         for (label_set, sample_data) in &self.samples {
-            let _ = write!(output, "{} {}", label_set.to_prometheus(), sample_data.to_prometheus());
+            if label_set.is_empty() {
+                let _ = write!(output, "{}", sample_data.to_prometheus());
+            } else {
+                let _ = write!(output, "{} {}", label_set.to_prometheus(), sample_data.to_prometheus());
+            }
         }
 
         output
@@ -141,10 +172,8 @@ mod tests {
 
     use crate::counter::Counter;
     use crate::label::LabelSet;
-    use crate::prometheus::PrometheusSerializable;
     use crate::sample::Sample;
     use crate::sample_collection::SampleCollection;
-    use crate::tests::format_prometheus_output;
 
     fn sample_update_time() -> DurationSinceUnixEpoch {
         DurationSinceUnixEpoch::from_secs(1_743_552_000)
@@ -215,56 +244,74 @@ mod tests {
         assert!(!collection.is_empty());
     }
 
-    #[test]
-    fn it_should_be_serializable_and_deserializable_for_json_format() {
-        let sample = Sample::new(Counter::default(), sample_update_time(), LabelSet::default());
-        let collection = SampleCollection::new(vec![sample]).unwrap();
+    mod json_serialization {
+        use crate::counter::Counter;
+        use crate::label::LabelSet;
+        use crate::sample::Sample;
+        use crate::sample_collection::tests::sample_update_time;
+        use crate::sample_collection::SampleCollection;
 
-        let serialized = serde_json::to_string(&collection).unwrap();
-        let deserialized: SampleCollection<Counter> = serde_json::from_str(&serialized).unwrap();
+        #[test]
+        fn it_should_be_serializable_and_deserializable_for_json_format() {
+            let sample = Sample::new(Counter::default(), sample_update_time(), LabelSet::default());
+            let collection = SampleCollection::new(vec![sample]).unwrap();
 
-        assert_eq!(deserialized, collection);
-    }
+            let serialized = serde_json::to_string(&collection).unwrap();
+            let deserialized: SampleCollection<Counter> = serde_json::from_str(&serialized).unwrap();
 
-    #[test]
-    fn it_should_fail_deserializing_from_json_with_duplicate_label_sets() {
-        let samples = vec![
-            Sample::new(Counter::default(), sample_update_time(), LabelSet::default()),
-            Sample::new(Counter::default(), sample_update_time(), LabelSet::default()),
-        ];
+            assert_eq!(deserialized, collection);
+        }
+
+        #[test]
+        fn it_should_fail_deserializing_from_json_with_duplicate_label_sets() {
+            let samples = vec![
+                Sample::new(Counter::default(), sample_update_time(), LabelSet::default()),
+                Sample::new(Counter::default(), sample_update_time(), LabelSet::default()),
+            ];
 
-        let serialized = serde_json::to_string(&samples).unwrap();
+            let serialized = serde_json::to_string(&samples).unwrap();
 
-        let result: Result<SampleCollection<Counter>, _> = serde_json::from_str(&serialized);
+            let result: Result<SampleCollection<Counter>, _> = serde_json::from_str(&serialized);
 
-        assert!(result.is_err());
+            assert!(result.is_err());
+        }
     }
 
-    #[test]
-    fn it_should_be_exportable_to_prometheus_format_when_empty() {
-        let sample = Sample::new(Counter::default(), sample_update_time(), LabelSet::default());
-        let collection = SampleCollection::new(vec![sample]).unwrap();
+    mod prometheus_serialization {
+        use crate::counter::Counter;
+        use crate::label::LabelSet;
+        use crate::prometheus::PrometheusSerializable;
+        use crate::sample::Sample;
+        use crate::sample_collection::tests::sample_update_time;
+        use crate::sample_collection::SampleCollection;
+        use crate::tests::format_prometheus_output;
 
-        let prometheus_output = collection.to_prometheus();
+        #[test]
+        fn it_should_be_exportable_to_prometheus_format_when_empty() {
+            let sample = Sample::new(Counter::default(), sample_update_time(), LabelSet::default());
+            let collection = SampleCollection::new(vec![sample]).unwrap();
 
-        assert!(!prometheus_output.is_empty());
-    }
+            let prometheus_output = collection.to_prometheus();
 
-    #[test]
-    fn it_should_be_exportable_to_prometheus_format() {
-        let sample = Sample::new(
-            Counter::new(1),
-            sample_update_time(),
-            LabelSet::from(vec![("labe_name_1", "label value value 1")]),
-        );
+            assert!(!prometheus_output.is_empty());
+        }
+
+        #[test]
+        fn it_should_be_exportable_to_prometheus_format() {
+            let sample = Sample::new(
+                Counter::new(1),
+                sample_update_time(),
+                LabelSet::from(vec![("labe_name_1", "label value value 1")]),
+            );
 
-        let collection = SampleCollection::new(vec![sample]).unwrap();
+            let collection = SampleCollection::new(vec![sample]).unwrap();
 
-        let prometheus_output = collection.to_prometheus();
+            let prometheus_output = collection.to_prometheus();
 
-        let expected_prometheus_output = format_prometheus_output("{labe_name_1=\"label value value 1\"} 1");
+            let expected_prometheus_output = format_prometheus_output("{labe_name_1=\"label value value 1\"} 1");
 
-        assert_eq!(prometheus_output, expected_prometheus_output);
+            assert_eq!(prometheus_output, expected_prometheus_output);
+        }
     }
 
     #[cfg(test)]
@@ -278,7 +325,7 @@ mod tests {
         #[test]
         fn it_should_increment_the_counter_for_a_preexisting_label_set() {
             let label_set = LabelSet::default();
-            let mut collection = SampleCollection::default();
+            let mut collection = SampleCollection::<Counter>::default();
 
             // Initialize the sample
             collection.increment(&label_set, sample_update_time());
@@ -296,7 +343,7 @@ mod tests {
         #[test]
         fn it_should_allow_increment_the_counter_for_a_non_existent_label_set() {
             let label_set = LabelSet::default();
-            let mut collection = SampleCollection::default();
+            let mut collection = SampleCollection::<Counter>::default();
 
             // Increment a non-existent label
             collection.increment(&label_set, sample_update_time());
@@ -312,7 +359,7 @@ mod tests {
             let label_set = LabelSet::default();
             let initial_time = sample_update_time();
 
-            let mut collection = SampleCollection::default();
+            let mut collection = SampleCollection::<Counter>::default();
             collection.increment(&label_set, initial_time);
 
             // Increment with a new time
@@ -330,7 +377,7 @@ mod tests {
             let label2 = LabelSet::from([("name", "value2")]);
             let now = sample_update_time();
 
-            let mut collection = SampleCollection::default();
+            let mut collection = SampleCollection::<Counter>::default();
 
             collection.increment(&label1, now);
             collection.increment(&label2, now);
@@ -339,6 +386,56 @@ mod tests {
             assert_eq!(collection.get(&label2).unwrap().value(), &Counter::new(1));
             assert_eq!(collection.len(), 2);
         }
+
+        #[test]
+        fn it_should_allow_setting_absolute_value_for_a_counter() {
+            let label_set = LabelSet::default();
+            let mut collection = SampleCollection::<Counter>::default();
+
+            // Set absolute value for a non-existent label
+            collection.absolute(&label_set, 42, sample_update_time());
+
+            // Verify the label exists and has the absolute value
+            assert!(collection.get(&label_set).is_some());
+            let sample = collection.get(&label_set).unwrap();
+            assert_eq!(*sample.value(), Counter::new(42));
+        }
+
+        #[test]
+        fn it_should_allow_setting_absolute_value_for_existing_counter() {
+            let label_set = LabelSet::default();
+            let mut collection = SampleCollection::<Counter>::default();
+
+            // Initialize the sample with increment
+            collection.increment(&label_set, sample_update_time());
+
+            // Verify initial state
+            let sample = collection.get(&label_set).unwrap();
+            assert_eq!(sample.value(), &Counter::new(1));
+
+            // Set absolute value
+            collection.absolute(&label_set, 100, sample_update_time());
+            let sample = collection.get(&label_set).unwrap();
+            assert_eq!(*sample.value(), Counter::new(100));
+        }
+
+        #[test]
+        fn it_should_update_time_when_setting_absolute_value() {
+            let label_set = LabelSet::default();
+            let initial_time = sample_update_time();
+            let mut collection = SampleCollection::<Counter>::default();
+
+            // Set absolute value with initial time
+            collection.absolute(&label_set, 50, initial_time);
+
+            // Set absolute value with a new time
+            let new_time = initial_time.add(DurationSinceUnixEpoch::from_secs(1));
+            collection.absolute(&label_set, 75, new_time);
+
+            let sample = collection.get(&label_set).unwrap();
+            assert_eq!(sample.recorded_at(), new_time);
+            assert_eq!(*sample.value(), Counter::new(75));
+        }
     }
 
     #[cfg(test)]
@@ -351,9 +448,9 @@ mod tests {
         use crate::gauge::Gauge;
 
         #[test]
-        fn it_should_increment_the_gauge_for_a_preexisting_label_set() {
+        fn it_should_allow_setting_the_gauge_for_a_preexisting_label_set() {
             let label_set = LabelSet::default();
-            let mut collection = SampleCollection::default();
+            let mut collection = SampleCollection::<Gauge>::default();
 
             // Initialize the sample
             collection.set(&label_set, 1.0, sample_update_time());
@@ -369,9 +466,9 @@ mod tests {
         }
 
         #[test]
-        fn it_should_allow_increment_the_gauge_for_a_non_existent_label_set() {
+        fn it_should_allow_setting_the_gauge_for_a_non_existent_label_set() {
             let label_set = LabelSet::default();
-            let mut collection = SampleCollection::default();
+            let mut collection = SampleCollection::<Gauge>::default();
 
             // Set a non-existent label
             collection.set(&label_set, 1.0, sample_update_time());
@@ -383,11 +480,11 @@ mod tests {
         }
 
         #[test]
-        fn it_should_update_the_latest_update_time_when_incremented() {
+        fn it_should_update_the_latest_update_time_when_setting() {
             let label_set = LabelSet::default();
             let initial_time = sample_update_time();
 
-            let mut collection = SampleCollection::default();
+            let mut collection = SampleCollection::<Gauge>::default();
             collection.set(&label_set, 1.0, initial_time);
 
             // Set with a new time
@@ -400,12 +497,12 @@ mod tests {
         }
 
         #[test]
-        fn it_should_increment_the_gauge_for_multiple_labels() {
+        fn it_should_allow_setting_the_gauge_for_multiple_labels() {
             let label1 = LabelSet::from([("name", "value1")]);
             let label2 = LabelSet::from([("name", "value2")]);
             let now = sample_update_time();
 
-            let mut collection = SampleCollection::default();
+            let mut collection = SampleCollection::<Gauge>::default();
 
             collection.set(&label1, 1.0, now);
             collection.set(&label2, 2.0, now);
@@ -414,5 +511,33 @@ mod tests {
             assert_eq!(collection.get(&label2).unwrap().value(), &Gauge::new(2.0));
             assert_eq!(collection.len(), 2);
         }
+
+        #[test]
+        fn it_should_allow_incrementing_the_gauge() {
+            let label_set = LabelSet::default();
+            let mut collection = SampleCollection::<Gauge>::default();
+
+            // Initialize the sample
+            collection.set(&label_set, 1.0, sample_update_time());
+
+            // Increment
+            collection.increment(&label_set, sample_update_time());
+            let sample = collection.get(&label_set).unwrap();
+            assert_eq!(*sample.value(), Gauge::new(2.0));
+        }
+
+        #[test]
+        fn it_should_allow_decrementing_the_gauge() {
+            let label_set = LabelSet::default();
+            let mut collection = SampleCollection::<Gauge>::default();
+
+            // Initialize the sample
+            collection.set(&label_set, 1.0, sample_update_time());
+
+            // Increment
+            collection.decrement(&label_set, sample_update_time());
+            let sample = collection.get(&label_set).unwrap();
+            assert_eq!(*sample.value(), Gauge::new(0.0));
+        }
     }
 }
diff --git a/packages/metrics/src/unit.rs b/packages/metrics/src/unit.rs
index f7a528bed..43b42bf79 100644
--- a/packages/metrics/src/unit.rs
+++ b/packages/metrics/src/unit.rs
@@ -4,7 +4,11 @@
 //! The `Unit` enum is used to specify the unit of measurement for metrics.
 //!
 //! They were copied from the `metrics` crate, to allow future compatibility.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
 pub enum Unit {
     Count,
     Percent,
diff --git a/packages/primitives/Cargo.toml b/packages/primitives/Cargo.toml
index 21fab09bf..c9ce64177 100644
--- a/packages/primitives/Cargo.toml
+++ b/packages/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library with the primitive types shared by the Torrust tracker packages."
-keywords = ["api", "library", "primitives"]
+keywords = [ "api", "library", "primitives" ]
 name = "torrust-tracker-primitives"
 readme = "README.md"
 
@@ -18,8 +18,8 @@ version.workspace = true
 aquatic_udp_protocol = "0"
 binascii = "0"
 bittorrent-primitives = "0.1.0"
-derive_more = { version = "2", features = ["constructor"] }
-serde = { version = "1", features = ["derive"] }
+derive_more = { version = "2", features = [ "constructor" ] }
+serde = { version = "1", features = [ "derive" ] }
 tdyne-peer-id = "1"
 tdyne-peer-id-registry = "0"
 thiserror = "2"
diff --git a/packages/primitives/src/lib.rs b/packages/primitives/src/lib.rs
index c901e5276..ec2edda97 100644
--- a/packages/primitives/src/lib.rs
+++ b/packages/primitives/src/lib.rs
@@ -18,5 +18,5 @@ use bittorrent_primitives::info_hash::InfoHash;
 /// Duration since the Unix Epoch.
 pub type DurationSinceUnixEpoch = Duration;
 
-pub type PersistentTorrent = u32;
-pub type PersistentTorrents = BTreeMap<InfoHash, PersistentTorrent>;
+pub type NumberOfDownloads = u32;
+pub type NumberOfDownloadsBTreeMap = BTreeMap<InfoHash, NumberOfDownloads>;
diff --git a/packages/primitives/src/peer.rs b/packages/primitives/src/peer.rs
index bd753b220..ef47f28f8 100644
--- a/packages/primitives/src/peer.rs
+++ b/packages/primitives/src/peer.rs
@@ -22,8 +22,10 @@
 //! };
 //! ```
 
+use std::fmt;
 use std::net::{IpAddr, SocketAddr};
 use std::ops::{Deref, DerefMut};
+use std::str::FromStr;
 use std::sync::Arc;
 
 use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
@@ -34,6 +36,57 @@ use crate::DurationSinceUnixEpoch;
 
 pub type PeerAnnouncement = Peer;
 
+#[derive(Debug, Serialize, Copy, Clone, PartialEq, Eq, Hash)]
+#[serde(rename_all_fields = "lowercase")]
+pub enum PeerRole {
+    Seeder,
+    Leecher,
+}
+
+impl PeerRole {
+    /// Returns the opposite role: Seeder becomes Leecher, and vice versa.
+    #[must_use]
+    pub fn opposite(self) -> Self {
+        match self {
+            PeerRole::Seeder => PeerRole::Leecher,
+            PeerRole::Leecher => PeerRole::Seeder,
+        }
+    }
+}
+
+impl fmt::Display for PeerRole {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            PeerRole::Seeder => write!(f, "seeder"),
+            PeerRole::Leecher => write!(f, "leecher"),
+        }
+    }
+}
+
+impl FromStr for PeerRole {
+    type Err = ParsePeerRoleError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "seeder" => Ok(PeerRole::Seeder),
+            "leecher" => Ok(PeerRole::Leecher),
+            _ => Err(ParsePeerRoleError::InvalidPeerRole {
+                location: Location::caller(),
+                raw_param: s.to_string(),
+            }),
+        }
+    }
+}
+
+#[derive(Error, Debug)]
+pub enum ParsePeerRoleError {
+    #[error("invalid param {raw_param} in {location}")]
+    InvalidPeerRole {
+        location: &'static Location<'static>,
+        raw_param: String,
+    },
+}
+
 /// Peer struct used by the core `Tracker`.
 ///
 /// A sample peer:
@@ -141,12 +194,13 @@ impl Ord for Peer {
 
 impl PartialOrd for Peer {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.peer_id.cmp(&other.peer_id))
+        Some(self.cmp(other))
     }
 }
 
 pub trait ReadInfo {
     fn is_seeder(&self) -> bool;
+    fn is_leecher(&self) -> bool;
     fn get_event(&self) -> AnnounceEvent;
     fn get_id(&self) -> PeerId;
     fn get_updated(&self) -> DurationSinceUnixEpoch;
@@ -158,6 +212,10 @@ impl ReadInfo for Peer {
         self.left.0.get() <= 0 && self.event != AnnounceEvent::Stopped
     }
 
+    fn is_leecher(&self) -> bool {
+        !self.is_seeder()
+    }
+
     fn get_event(&self) -> AnnounceEvent {
         self.event
     }
@@ -180,6 +238,10 @@ impl ReadInfo for Arc<Peer> {
         self.left.0.get() <= 0 && self.event != AnnounceEvent::Stopped
     }
 
+    fn is_leecher(&self) -> bool {
+        !self.is_seeder()
+    }
+
     fn get_event(&self) -> AnnounceEvent {
         self.event
     }
@@ -203,6 +265,25 @@ impl Peer {
         self.left.0.get() <= 0 && self.event != AnnounceEvent::Stopped
     }
 
+    #[must_use]
+    pub fn is_leecher(&self) -> bool {
+        !self.is_seeder()
+    }
+
+    #[must_use]
+    pub fn is_completed(&self) -> bool {
+        self.event == AnnounceEvent::Completed
+    }
+
+    #[must_use]
+    pub fn role(&self) -> PeerRole {
+        if self.is_seeder() {
+            PeerRole::Seeder
+        } else {
+            PeerRole::Leecher
+        }
+    }
+
     pub fn ip(&mut self) -> IpAddr {
         self.peer_addr.ip()
     }
@@ -210,6 +291,26 @@ impl Peer {
     pub fn change_ip(&mut self, new_ip: &IpAddr) {
         self.peer_addr = SocketAddr::new(*new_ip, self.peer_addr.port());
     }
+
+    pub fn mark_as_completed(&mut self) {
+        self.event = AnnounceEvent::Completed;
+    }
+
+    #[must_use]
+    pub fn into_completed(self) -> Self {
+        Self {
+            event: AnnounceEvent::Completed,
+            ..self
+        }
+    }
+
+    #[must_use]
+    pub fn into_seeder(self) -> Self {
+        Self {
+            left: NumberOfBytes::new(0),
+            ..self
+        }
+    }
 }
 
 use std::panic::Location;
@@ -416,7 +517,7 @@ pub mod fixture {
         pub fn seeder() -> Self {
             let peer = Peer {
                 peer_id: PeerId(*b"-qB00000000000000001"),
-                peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080),
+                peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080),
                 updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
                 uploaded: NumberOfBytes::new(0),
                 downloaded: NumberOfBytes::new(0),
@@ -457,34 +558,59 @@ pub mod fixture {
             self
         }
 
-        #[allow(dead_code)]
         #[must_use]
-        pub fn with_bytes_pending_to_download(mut self, left: i64) -> Self {
+        pub fn with_peer_address(mut self, peer_addr: SocketAddr) -> Self {
+            self.peer.peer_addr = peer_addr;
+            self
+        }
+
+        #[must_use]
+        pub fn updated_on(mut self, updated: DurationSinceUnixEpoch) -> Self {
+            self.peer.updated = updated;
+            self
+        }
+
+        #[must_use]
+        pub fn with_bytes_left_to_download(mut self, left: i64) -> Self {
             self.peer.left = NumberOfBytes::new(left);
             self
         }
 
-        #[allow(dead_code)]
         #[must_use]
-        pub fn with_no_bytes_pending_to_download(mut self) -> Self {
+        pub fn with_no_bytes_left_to_download(mut self) -> Self {
             self.peer.left = NumberOfBytes::new(0);
             self
         }
 
-        #[allow(dead_code)]
         #[must_use]
         pub fn last_updated_on(mut self, updated: DurationSinceUnixEpoch) -> Self {
             self.peer.updated = updated;
             self
         }
 
-        #[allow(dead_code)]
+        #[must_use]
+        pub fn with_event(mut self, event: AnnounceEvent) -> Self {
+            self.peer.event = event;
+            self
+        }
+
+        #[must_use]
+        pub fn with_event_started(mut self) -> Self {
+            self.peer.event = AnnounceEvent::Started;
+            self
+        }
+
+        #[must_use]
+        pub fn with_event_completed(mut self) -> Self {
+            self.peer.event = AnnounceEvent::Completed;
+            self
+        }
+
         #[must_use]
         pub fn build(self) -> Peer {
             self.into()
         }
 
-        #[allow(dead_code)]
         #[must_use]
         pub fn into(self) -> Peer {
             self.peer
@@ -495,7 +621,7 @@ pub mod fixture {
         fn default() -> Self {
             Self {
                 peer_id: PeerId(*b"-qB00000000000000000"),
-                peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080),
+                peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080),
                 updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
                 uploaded: NumberOfBytes::new(0),
                 downloaded: NumberOfBytes::new(0),
diff --git a/packages/primitives/src/service_binding.rs b/packages/primitives/src/service_binding.rs
index 30eb1aa9e..c1ec308c8 100644
--- a/packages/primitives/src/service_binding.rs
+++ b/packages/primitives/src/service_binding.rs
@@ -1,9 +1,11 @@
 use std::fmt;
-use std::net::SocketAddr;
+use std::net::{IpAddr, SocketAddr};
 
 use serde::{Deserialize, Serialize};
 use url::Url;
 
+const DUAL_STACK_IP_V4_MAPPED_V6_PREFIX: &str = "::ffff:";
+
 /// Represents the supported network protocols.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
 pub enum Protocol {
@@ -23,6 +25,61 @@ impl fmt::Display for Protocol {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
+pub enum IpType {
+    /// Represents a plain IPv4 or IPv6 address.
+    Plain,
+
+    /// Represents an IPv6 address that is a mapped IPv4 address.
+    ///
+    /// This is used for IPv6 addresses that represent an IPv4 address in a dual-stack network.
+    ///
+    /// For example: `[::ffff:192.0.2.33]`
+    V4MappedV6,
+}
+
+impl fmt::Display for IpType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let ip_type_str = match self {
+            Self::Plain => "plain",
+            Self::V4MappedV6 => "v4_mapped_v6",
+        };
+        write!(f, "{ip_type_str}")
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
+pub enum IpFamily {
+    // IPv4
+    Inet,
+    // IPv6
+    Inet6,
+}
+
+impl fmt::Display for IpFamily {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let ip_family_str = match self {
+            Self::Inet => "inet",
+            Self::Inet6 => "inet6",
+        };
+        write!(f, "{ip_family_str}")
+    }
+}
+
+impl From<IpAddr> for IpFamily {
+    fn from(ip: IpAddr) -> Self {
+        if ip.is_ipv4() {
+            return IpFamily::Inet;
+        }
+
+        if ip.is_ipv6() {
+            return IpFamily::Inet6;
+        }
+
+        panic!("Unsupported IP address type: {ip}");
+    }
+}
+
 #[derive(thiserror::Error, Debug, Clone)]
 pub enum Error {
     #[error("The port number cannot be zero. It must be an assigned valid port.")]
@@ -58,7 +115,7 @@ pub enum Error {
 /// use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 /// use torrust_tracker_primitives::service_binding::{ServiceBinding, Protocol};
 ///
-/// let service_binding = ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 7070)).unwrap();
+/// let service_binding = ServiceBinding::new(Protocol::HTTP, SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 7070)).unwrap();
 ///
 /// assert_eq!(service_binding.url().to_string(), "http://127.0.0.1:7070/".to_string());
 /// ```
@@ -94,6 +151,20 @@ impl ServiceBinding {
         self.bind_address
     }
 
+    #[must_use]
+    pub fn bind_address_ip_type(&self) -> IpType {
+        if self.is_v4_mapped_v6() {
+            return IpType::V4MappedV6;
+        }
+
+        IpType::Plain
+    }
+
+    #[must_use]
+    pub fn bind_address_ip_family(&self) -> IpFamily {
+        self.bind_address.ip().into()
+    }
+
     /// # Panics
     ///
     /// It never panics because the URL is always valid.
@@ -102,6 +173,15 @@ impl ServiceBinding {
         Url::parse(&format!("{}://{}", self.protocol, self.bind_address))
             .expect("Service binding can always be parsed into a URL")
     }
+
+    fn is_v4_mapped_v6(&self) -> bool {
+        self.bind_address.ip().is_ipv6()
+            && self
+                .bind_address
+                .ip()
+                .to_string()
+                .starts_with(DUAL_STACK_IP_V4_MAPPED_V6_PREFIX)
+    }
 }
 
 impl From<ServiceBinding> for Url {
@@ -126,7 +206,7 @@ mod tests {
         use rstest::rstest;
         use url::Url;
 
-        use crate::service_binding::{Error, Protocol, ServiceBinding};
+        use crate::service_binding::{Error, IpType, Protocol, ServiceBinding};
 
         #[rstest]
         #[case("wildcard_ip", Protocol::UDP, SocketAddr::from_str("0.0.0.0:6969").unwrap())]
@@ -156,6 +236,29 @@ mod tests {
             );
         }
 
+        #[test]
+        fn should_return_the_bind_address_plain_type_for_ipv4_ips() {
+            let service_binding = ServiceBinding::new(Protocol::UDP, SocketAddr::from_str("127.0.0.1:6969").unwrap()).unwrap();
+
+            assert_eq!(service_binding.bind_address_ip_type(), IpType::Plain);
+        }
+
+        #[test]
+        fn should_return_the_bind_address_plain_type_for_ipv6_ips() {
+            let service_binding =
+                ServiceBinding::new(Protocol::UDP, SocketAddr::from_str("[0:0:0:0:0:0:0:1]:6969").unwrap()).unwrap();
+
+            assert_eq!(service_binding.bind_address_ip_type(), IpType::Plain);
+        }
+
+        #[test]
+        fn should_return_the_bind_address_v4_mapped_v7_type_for_ipv4_ips_mapped_to_ipv6() {
+            let service_binding =
+                ServiceBinding::new(Protocol::UDP, SocketAddr::from_str("[::ffff:192.0.2.33]:6969").unwrap()).unwrap();
+
+            assert_eq!(service_binding.bind_address_ip_type(), IpType::V4MappedV6);
+        }
+
         #[test]
         fn should_return_the_corresponding_url() {
             let service_binding = ServiceBinding::new(Protocol::UDP, SocketAddr::from_str("127.0.0.1:6969").unwrap()).unwrap();
diff --git a/packages/primitives/src/swarm_metadata.rs b/packages/primitives/src/swarm_metadata.rs
index 792eff632..57ba816d3 100644
--- a/packages/primitives/src/swarm_metadata.rs
+++ b/packages/primitives/src/swarm_metadata.rs
@@ -7,7 +7,7 @@ use derive_more::Constructor;
 /// Swarm metadata dictionary in the scrape response.
 ///
 /// See [BEP 48: Tracker Protocol Extension: Scrape](https://www.bittorrent.org/beps/bep_0048.html)
-#[derive(Copy, Clone, Debug, PartialEq, Default, Constructor)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Constructor)]
 pub struct SwarmMetadata {
     /// (i.e `completed`): The number of peers that have ever completed
     /// downloading a given torrent.
@@ -27,28 +27,42 @@ impl SwarmMetadata {
     pub fn zeroed() -> Self {
         Self::default()
     }
+
+    #[must_use]
+    pub fn downloads(&self) -> u32 {
+        self.downloaded
+    }
+
+    #[must_use]
+    pub fn seeders(&self) -> u32 {
+        self.complete
+    }
+
+    #[must_use]
+    pub fn leechers(&self) -> u32 {
+        self.incomplete
+    }
 }
 
 /// Structure that holds aggregate swarm metadata.
 ///
-/// Metrics are aggregate values for all torrents.
+/// Metrics are aggregate values for all active torrents/swarms.
 #[derive(Copy, Clone, Debug, PartialEq, Default)]
-pub struct AggregateSwarmMetadata {
-    /// Total number of peers that have ever completed downloading for all
-    /// torrents.
+pub struct AggregateActiveSwarmMetadata {
+    /// Total number of peers that have ever completed downloading.
     pub total_downloaded: u64,
 
-    /// Total number of seeders for all torrents.
+    /// Total number of seeders.
     pub total_complete: u64,
 
-    /// Total number of leechers for all torrents.
+    /// Total number of leechers.
     pub total_incomplete: u64,
 
     /// Total number of torrents.
     pub total_torrents: u64,
 }
 
-impl AddAssign for AggregateSwarmMetadata {
+impl AddAssign for AggregateActiveSwarmMetadata {
     fn add_assign(&mut self, rhs: Self) {
         self.total_complete += rhs.total_complete;
         self.total_downloaded += rhs.total_downloaded;
diff --git a/packages/rest-tracker-api-client/Cargo.toml b/packages/rest-tracker-api-client/Cargo.toml
index cba580e18..47307df9a 100644
--- a/packages/rest-tracker-api-client/Cargo.toml
+++ b/packages/rest-tracker-api-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library to interact with the Torrust Tracker REST API."
-keywords = ["bittorrent", "client", "tracker"]
+keywords = [ "bittorrent", "client", "tracker" ]
 license = "LGPL-3.0"
 name = "torrust-rest-tracker-api-client"
 readme = "README.md"
@@ -16,8 +16,8 @@ version.workspace = true
 
 [dependencies]
 hyper = "1"
-reqwest = { version = "0", features = ["json"] }
-serde = { version = "1", features = ["derive"] }
+reqwest = { version = "0", features = [ "json", "query" ] }
+serde = { version = "1", features = [ "derive" ] }
 thiserror = "2"
-url = { version = "2", features = ["serde"] }
-uuid = { version = "1", features = ["v4"] }
+url = { version = "2", features = [ "serde" ] }
+uuid = { version = "1", features = [ "v4" ] }
diff --git a/packages/rest-tracker-api-client/src/v1/client.rs b/packages/rest-tracker-api-client/src/v1/client.rs
index 3137b8b41..02a5b0d9c 100644
--- a/packages/rest-tracker-api-client/src/v1/client.rs
+++ b/packages/rest-tracker-api-client/src/v1/client.rs
@@ -204,22 +204,22 @@ impl Client {
 ///
 /// Will panic if the request can't be sent
 pub async fn get(path: Url, query: Option<Query>, headers: Option<HeaderMap>) -> Response {
-    let builder = reqwest::Client::builder()
+    let client = reqwest::Client::builder()
         .timeout(Duration::from_secs(DEFAULT_REQUEST_TIMEOUT_IN_SECS))
         .build()
         .unwrap();
 
-    let builder = match query {
-        Some(params) => builder.get(path).query(&ReqwestQuery::from(params)),
-        None => builder.get(path),
-    };
+    let mut request_builder = client.get(path);
 
-    let builder = match headers {
-        Some(headers) => builder.headers(headers),
-        None => builder,
-    };
+    if let Some(params) = query {
+        request_builder = request_builder.query(&ReqwestQuery::from(params));
+    }
+
+    if let Some(headers) = headers {
+        request_builder = request_builder.headers(headers);
+    }
 
-    builder.send().await.unwrap()
+    request_builder.send().await.unwrap()
 }
 
 /// Returns a `HeaderMap` with a request id header.
diff --git a/packages/rest-tracker-api-core/Cargo.toml b/packages/rest-tracker-api-core/Cargo.toml
index 0077572fb..0808c2dd6 100644
--- a/packages/rest-tracker-api-core/Cargo.toml
+++ b/packages/rest-tracker-api-core/Cargo.toml
@@ -4,7 +4,7 @@ description = "A library with the core functionality needed to implement a BitTo
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["api", "bittorrent", "core", "library", "tracker"]
+keywords = [ "api", "bittorrent", "core", "library", "tracker" ]
 license.workspace = true
 name = "torrust-rest-tracker-api-core"
 publish.workspace = true
@@ -17,11 +17,14 @@ version.workspace = true
 bittorrent-http-tracker-core = { version = "3.0.0-develop", path = "../http-tracker-core" }
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
 bittorrent-udp-tracker-core = { version = "3.0.0-develop", path = "../udp-tracker-core" }
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
+tokio-util = "0.7.15"
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
+torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "../swarm-coordination-registry" }
 torrust-udp-tracker-server = { version = "3.0.0-develop", path = "../udp-tracker-server" }
 
 [dev-dependencies]
+torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
 torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
diff --git a/packages/rest-tracker-api-core/src/container.rs b/packages/rest-tracker-api-core/src/container.rs
index ec3786dfb..bcc5a0186 100644
--- a/packages/rest-tracker-api-core/src/container.rs
+++ b/packages/rest-tracker-api-core/src/container.rs
@@ -7,12 +7,22 @@ use bittorrent_udp_tracker_core::services::banning::BanService;
 use bittorrent_udp_tracker_core::{self};
 use tokio::sync::RwLock;
 use torrust_tracker_configuration::{Core, HttpApi, HttpTracker, UdpTracker};
+use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
 use torrust_udp_tracker_server::container::UdpTrackerServerContainer;
 
 pub struct TrackerHttpApiCoreContainer {
     pub http_api_config: Arc<HttpApi>,
+
+    // Swarm Coordination Registry Container
+    pub swarm_coordination_registry_container: Arc<SwarmCoordinationRegistryContainer>,
+
+    // Tracker core
     pub tracker_core_container: Arc<TrackerCoreContainer>,
+
+    // HTTP tracker core
     pub http_stats_repository: Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
+
+    // UDP tracker core
     pub ban_service: Arc<RwLock<BanService>>,
     pub udp_core_stats_repository: Arc<bittorrent_udp_tracker_core::statistics::repository::Repository>,
     pub udp_server_stats_repository: Arc<torrust_udp_tracker_server::statistics::repository::Repository>,
@@ -26,14 +36,25 @@ impl TrackerHttpApiCoreContainer {
         udp_tracker_config: &Arc<UdpTracker>,
         http_api_config: &Arc<HttpApi>,
     ) -> Arc<TrackerHttpApiCoreContainer> {
-        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(core_config));
+        let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
+            core_config.tracker_usage_statistics.into(),
+        ));
+
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
+            core_config,
+            &swarm_coordination_registry_container,
+        ));
+
         let http_tracker_core_container =
             HttpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, http_tracker_config);
+
         let udp_tracker_core_container =
             UdpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, udp_tracker_config);
+
         let udp_tracker_server_container = UdpTrackerServerContainer::initialize(core_config);
 
         Self::initialize_from(
+            &swarm_coordination_registry_container,
             &tracker_core_container,
             &http_tracker_core_container,
             &udp_tracker_core_container,
@@ -44,6 +65,7 @@ impl TrackerHttpApiCoreContainer {
 
     #[must_use]
     pub fn initialize_from(
+        swarm_coordination_registry_container: &Arc<SwarmCoordinationRegistryContainer>,
         tracker_core_container: &Arc<TrackerCoreContainer>,
         http_tracker_core_container: &Arc<HttpTrackerCoreContainer>,
         udp_tracker_core_container: &Arc<UdpTrackerCoreContainer>,
@@ -51,16 +73,21 @@ impl TrackerHttpApiCoreContainer {
         http_api_config: &Arc<HttpApi>,
     ) -> Arc<TrackerHttpApiCoreContainer> {
         Arc::new(TrackerHttpApiCoreContainer {
+            http_api_config: http_api_config.clone(),
+
+            // Swarm Coordination Registry Container
+            swarm_coordination_registry_container: swarm_coordination_registry_container.clone(),
+
+            // Tracker core
             tracker_core_container: tracker_core_container.clone(),
 
+            // HTTP tracker core
             http_stats_repository: http_tracker_core_container.stats_repository.clone(),
 
+            // UDP tracker core
             ban_service: udp_tracker_core_container.ban_service.clone(),
             udp_core_stats_repository: udp_tracker_core_container.stats_repository.clone(),
-
             udp_server_stats_repository: udp_tracker_server_container.stats_repository.clone(),
-
-            http_api_config: http_api_config.clone(),
         })
     }
 }
diff --git a/packages/rest-tracker-api-core/src/statistics/metrics.rs b/packages/rest-tracker-api-core/src/statistics/metrics.rs
index 7e41cf713..ecdecd130 100644
--- a/packages/rest-tracker-api-core/src/statistics/metrics.rs
+++ b/packages/rest-tracker-api-core/src/statistics/metrics.rs
@@ -1,4 +1,33 @@
-/// Metrics collected by the tracker.
+use torrust_tracker_primitives::swarm_metadata::AggregateActiveSwarmMetadata;
+
+/// Metrics collected by the tracker at the swarm layer.
+#[derive(Copy, Clone, Debug, PartialEq, Default)]
+pub struct TorrentsMetrics {
+    /// Total number of peers that have ever completed downloading.
+    pub total_downloaded: u64,
+
+    /// Total number of seeders.
+    pub total_complete: u64,
+
+    /// Total number of leechers.
+    pub total_incomplete: u64,
+
+    /// Total number of torrents.
+    pub total_torrents: u64,
+}
+
+impl From<AggregateActiveSwarmMetadata> for TorrentsMetrics {
+    fn from(value: AggregateActiveSwarmMetadata) -> Self {
+        Self {
+            total_downloaded: value.total_downloaded,
+            total_complete: value.total_complete,
+            total_incomplete: value.total_incomplete,
+            total_torrents: value.total_torrents,
+        }
+    }
+}
+
+/// Metrics collected by the tracker at the delivery layer.
 ///
 /// - Number of connections handled
 /// - Number of `announce` requests handled
@@ -7,7 +36,7 @@
 /// These metrics are collected for each connection type: UDP and HTTP
 /// and also for each IP version used by the peers: IPv4 and IPv6.
 #[derive(Debug, PartialEq, Default)]
-pub struct Metrics {
+pub struct ProtocolMetrics {
     /// Total number of TCP (HTTP tracker) connections from IPv4 peers.
     /// Since the HTTP tracker spec does not require a handshake, this metric
     /// increases for every HTTP request.
diff --git a/packages/rest-tracker-api-core/src/statistics/services.rs b/packages/rest-tracker-api-core/src/statistics/services.rs
index 8d5b7514a..f87cb8c76 100644
--- a/packages/rest-tracker-api-core/src/statistics/services.rs
+++ b/packages/rest-tracker-api-core/src/statistics/services.rs
@@ -5,10 +5,10 @@ use bittorrent_udp_tracker_core::services::banning::BanService;
 use bittorrent_udp_tracker_core::{self};
 use tokio::sync::RwLock;
 use torrust_tracker_metrics::metric_collection::MetricCollection;
-use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
-use torrust_udp_tracker_server::statistics as udp_server_statistics;
+use torrust_udp_tracker_server::statistics::{self as udp_server_statistics};
 
-use crate::statistics::metrics::Metrics;
+use super::metrics::TorrentsMetrics;
+use crate::statistics::metrics::ProtocolMetrics;
 
 /// All the metrics collected by the tracker.
 #[derive(Debug, PartialEq)]
@@ -16,65 +16,121 @@ pub struct TrackerMetrics {
     /// Domain level metrics.
     ///
     /// General metrics for all torrents (number of seeders, leechers, etcetera)
-    pub torrents_metrics: AggregateSwarmMetadata,
+    pub torrents_metrics: TorrentsMetrics,
 
     /// Application level metrics. Usage statistics/metrics.
     ///
     /// Metrics about how the tracker is been used (number of udp announce requests, number of http scrape requests, etcetera)
-    pub protocol_metrics: Metrics,
+    pub protocol_metrics: ProtocolMetrics,
 }
 
 /// It returns all the [`TrackerMetrics`]
-#[allow(deprecated)]
 pub async fn get_metrics(
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
-    ban_service: Arc<RwLock<BanService>>,
+    tracker_core_stats_repository: Arc<bittorrent_tracker_core::statistics::repository::Repository>,
     http_stats_repository: Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
     udp_server_stats_repository: Arc<udp_server_statistics::repository::Repository>,
 ) -> TrackerMetrics {
-    let torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata();
-    let udp_banned_ips_total = ban_service.read().await.get_banned_ips_total();
+    TrackerMetrics {
+        torrents_metrics: get_torrents_metrics(in_memory_torrent_repository, tracker_core_stats_repository).await,
+        protocol_metrics: get_protocol_metrics(http_stats_repository.clone(), udp_server_stats_repository.clone()).await,
+    }
+}
+
+async fn get_torrents_metrics(
+    in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
+
+    tracker_core_stats_repository: Arc<bittorrent_tracker_core::statistics::repository::Repository>,
+) -> TorrentsMetrics {
+    let aggregate_active_swarm_metadata = in_memory_torrent_repository.get_aggregate_swarm_metadata().await;
+
+    let mut torrents_metrics: TorrentsMetrics = aggregate_active_swarm_metadata.into();
+    torrents_metrics.total_downloaded = tracker_core_stats_repository.get_torrents_downloads_total().await;
+
+    torrents_metrics
+}
+
+#[allow(deprecated)]
+#[allow(clippy::too_many_lines)]
+async fn get_protocol_metrics(
+    http_stats_repository: Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
+    udp_server_stats_repository: Arc<udp_server_statistics::repository::Repository>,
+) -> ProtocolMetrics {
     let http_stats = http_stats_repository.get_stats().await;
     let udp_server_stats = udp_server_stats_repository.get_stats().await;
 
+    // TCPv4
+
+    let tcp4_announces_handled = http_stats.tcp4_announces_handled();
+    let tcp4_scrapes_handled = http_stats.tcp4_scrapes_handled();
+
+    // TCPv6
+
+    let tcp6_announces_handled = http_stats.tcp6_announces_handled();
+    let tcp6_scrapes_handled = http_stats.tcp6_scrapes_handled();
+
+    // UDP
+
+    let udp_requests_aborted = udp_server_stats.udp_requests_aborted_total();
+    let udp_requests_banned = udp_server_stats.udp_requests_banned_total();
+    let udp_banned_ips_total = udp_server_stats.udp_banned_ips_total();
+    let udp_avg_connect_processing_time_ns = udp_server_stats.udp_avg_connect_processing_time_ns_averaged();
+    let udp_avg_announce_processing_time_ns = udp_server_stats.udp_avg_announce_processing_time_ns_averaged();
+    let udp_avg_scrape_processing_time_ns = udp_server_stats.udp_avg_scrape_processing_time_ns_averaged();
+
+    // UDPv4
+
+    let udp4_requests = udp_server_stats.udp4_requests_received_total();
+    let udp4_connections_handled = udp_server_stats.udp4_connect_requests_accepted_total();
+    let udp4_announces_handled = udp_server_stats.udp4_announce_requests_accepted_total();
+    let udp4_scrapes_handled = udp_server_stats.udp4_scrape_requests_accepted_total();
+    let udp4_responses = udp_server_stats.udp4_responses_sent_total();
+    let udp4_errors_handled = udp_server_stats.udp4_errors_total();
+
+    // UDPv6
+
+    let udp6_requests = udp_server_stats.udp6_requests_received_total();
+    let udp6_connections_handled = udp_server_stats.udp6_connect_requests_accepted_total();
+    let udp6_announces_handled = udp_server_stats.udp6_announce_requests_accepted_total();
+    let udp6_scrapes_handled = udp_server_stats.udp6_scrape_requests_accepted_total();
+    let udp6_responses = udp_server_stats.udp6_responses_sent_total();
+    let udp6_errors_handled = udp_server_stats.udp6_errors_total();
+
     // For backward compatibility we keep the `tcp4_connections_handled` and
     // `tcp6_connections_handled` metrics. They don't make sense for the HTTP
     // tracker, but we keep them for now. In new major versions we should remove
     // them.
 
-    TrackerMetrics {
-        torrents_metrics,
-        protocol_metrics: Metrics {
-            // TCPv4
-            tcp4_connections_handled: http_stats.tcp4_announces_handled + http_stats.tcp4_scrapes_handled,
-            tcp4_announces_handled: http_stats.tcp4_announces_handled,
-            tcp4_scrapes_handled: http_stats.tcp4_scrapes_handled,
-            // TCPv6
-            tcp6_connections_handled: http_stats.tcp6_announces_handled + http_stats.tcp6_scrapes_handled,
-            tcp6_announces_handled: http_stats.tcp6_announces_handled,
-            tcp6_scrapes_handled: http_stats.tcp6_scrapes_handled,
-            // UDP
-            udp_requests_aborted: udp_server_stats.udp_requests_aborted,
-            udp_requests_banned: udp_server_stats.udp_requests_banned,
-            udp_banned_ips_total: udp_banned_ips_total as u64,
-            udp_avg_connect_processing_time_ns: udp_server_stats.udp_avg_connect_processing_time_ns,
-            udp_avg_announce_processing_time_ns: udp_server_stats.udp_avg_announce_processing_time_ns,
-            udp_avg_scrape_processing_time_ns: udp_server_stats.udp_avg_scrape_processing_time_ns,
-            // UDPv4
-            udp4_requests: udp_server_stats.udp4_requests,
-            udp4_connections_handled: udp_server_stats.udp4_connections_handled,
-            udp4_announces_handled: udp_server_stats.udp4_announces_handled,
-            udp4_scrapes_handled: udp_server_stats.udp4_scrapes_handled,
-            udp4_responses: udp_server_stats.udp4_responses,
-            udp4_errors_handled: udp_server_stats.udp4_errors_handled,
-            // UDPv6
-            udp6_requests: udp_server_stats.udp6_requests,
-            udp6_connections_handled: udp_server_stats.udp6_connections_handled,
-            udp6_announces_handled: udp_server_stats.udp6_announces_handled,
-            udp6_scrapes_handled: udp_server_stats.udp6_scrapes_handled,
-            udp6_responses: udp_server_stats.udp6_responses,
-            udp6_errors_handled: udp_server_stats.udp6_errors_handled,
-        },
+    ProtocolMetrics {
+        // TCPv4
+        tcp4_connections_handled: tcp4_announces_handled + tcp4_scrapes_handled,
+        tcp4_announces_handled,
+        tcp4_scrapes_handled,
+        // TCPv6
+        tcp6_connections_handled: tcp6_announces_handled + tcp6_scrapes_handled,
+        tcp6_announces_handled,
+        tcp6_scrapes_handled,
+        // UDP
+        udp_requests_aborted,
+        udp_requests_banned,
+        udp_banned_ips_total,
+        udp_avg_connect_processing_time_ns,
+        udp_avg_announce_processing_time_ns,
+        udp_avg_scrape_processing_time_ns,
+        // UDPv4
+        udp4_requests,
+        udp4_connections_handled,
+        udp4_announces_handled,
+        udp4_scrapes_handled,
+        udp4_responses,
+        udp4_errors_handled,
+        // UDPv6
+        udp6_requests,
+        udp6_connections_handled,
+        udp6_announces_handled,
+        udp6_scrapes_handled,
+        udp6_responses,
+        udp6_errors_handled,
     }
 }
 
@@ -89,10 +145,11 @@ pub struct TrackerLabeledMetrics {
 ///
 /// Will panic if the metrics cannot be merged. This could happen if the
 /// packages are producing duplicate metric names, for example.
-#[allow(deprecated)]
 pub async fn get_labeled_metrics(
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     ban_service: Arc<RwLock<BanService>>,
+    swarms_stats_repository: Arc<torrust_tracker_swarm_coordination_registry::statistics::repository::Repository>,
+    tracker_core_stats_repository: Arc<bittorrent_tracker_core::statistics::repository::Repository>,
     http_stats_repository: Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
     udp_stats_repository: Arc<bittorrent_udp_tracker_core::statistics::repository::Repository>,
     udp_server_stats_repository: Arc<udp_server_statistics::repository::Repository>,
@@ -100,12 +157,21 @@ pub async fn get_labeled_metrics(
     let _torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata();
     let _udp_banned_ips_total = ban_service.read().await.get_banned_ips_total();
 
+    let swarms_stats = swarms_stats_repository.get_metrics().await;
+    let tracker_core_stats = tracker_core_stats_repository.get_metrics().await;
     let http_stats = http_stats_repository.get_stats().await;
     let udp_stats_repository = udp_stats_repository.get_stats().await;
     let udp_server_stats = udp_server_stats_repository.get_stats().await;
 
     // Merge all the metrics into a single collection
     let mut metrics = MetricCollection::default();
+
+    metrics
+        .merge(&swarms_stats.metric_collection)
+        .expect("msg: failed to merge torrent repository metrics");
+    metrics
+        .merge(&tracker_core_stats.metric_collection)
+        .expect("msg: failed to merge tracker core metrics");
     metrics
         .merge(&http_stats.metric_collection)
         .expect("msg: failed to merge HTTP core metrics");
@@ -127,16 +193,18 @@ mod tests {
     use bittorrent_http_tracker_core::event::sender::Broadcaster;
     use bittorrent_http_tracker_core::statistics::event::listener::run_event_listener;
     use bittorrent_http_tracker_core::statistics::repository::Repository;
-    use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
+    use bittorrent_tracker_core::container::TrackerCoreContainer;
     use bittorrent_tracker_core::{self};
     use bittorrent_udp_tracker_core::services::banning::BanService;
     use bittorrent_udp_tracker_core::MAX_CONNECTION_ID_ERRORS_PER_IP;
     use tokio::sync::RwLock;
+    use tokio_util::sync::CancellationToken;
     use torrust_tracker_configuration::Configuration;
-    use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
+    use torrust_tracker_events::bus::SenderStatus;
+    use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
     use torrust_tracker_test_helpers::configuration;
 
-    use crate::statistics::metrics::Metrics;
+    use crate::statistics::metrics::{ProtocolMetrics, TorrentsMetrics};
     use crate::statistics::services::{get_metrics, TrackerMetrics};
 
     pub fn tracker_configuration() -> Configuration {
@@ -145,29 +213,37 @@ mod tests {
 
     #[tokio::test]
     async fn the_statistics_service_should_return_the_tracker_metrics() {
+        let cancellation_token = CancellationToken::new();
+
         let config = tracker_configuration();
+        let core_config = Arc::new(config.core.clone());
+
+        let swarm_coordination_registry_container =
+            Arc::new(SwarmCoordinationRegistryContainer::initialize(SenderStatus::Enabled));
+
+        let tracker_core_container =
+            TrackerCoreContainer::initialize_from(&core_config, &swarm_coordination_registry_container.clone());
 
-        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
+        let _ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
         // HTTP core stats
         let http_core_broadcaster = Broadcaster::default();
         let http_stats_repository = Arc::new(Repository::new());
         let http_stats_event_bus = Arc::new(EventBus::new(
-            config.core.tracker_usage_statistics,
+            config.core.tracker_usage_statistics.into(),
             http_core_broadcaster.clone(),
         ));
 
         if config.core.tracker_usage_statistics {
-            let _unused = run_event_listener(http_stats_event_bus.receiver(), &http_stats_repository);
+            let _unused = run_event_listener(http_stats_event_bus.receiver(), cancellation_token, &http_stats_repository);
         }
 
         // UDP server stats
         let udp_server_stats_repository = Arc::new(torrust_udp_tracker_server::statistics::repository::Repository::new());
 
         let tracker_metrics = get_metrics(
-            in_memory_torrent_repository.clone(),
-            ban_service.clone(),
+            tracker_core_container.in_memory_torrent_repository.clone(),
+            tracker_core_container.stats_repository.clone(),
             http_stats_repository.clone(),
             udp_server_stats_repository.clone(),
         )
@@ -176,8 +252,8 @@ mod tests {
         assert_eq!(
             tracker_metrics,
             TrackerMetrics {
-                torrents_metrics: AggregateSwarmMetadata::default(),
-                protocol_metrics: Metrics::default(),
+                torrents_metrics: TorrentsMetrics::default(),
+                protocol_metrics: ProtocolMetrics::default(),
             }
         );
     }
diff --git a/packages/server-lib/Cargo.toml b/packages/server-lib/Cargo.toml
index 1d30e7fb5..fbd7a7a7f 100644
--- a/packages/server-lib/Cargo.toml
+++ b/packages/server-lib/Cargo.toml
@@ -4,7 +4,7 @@ description = "Common functionality used in all Torrust HTTP servers."
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["lib", "server", "torrust"]
+keywords = [ "lib", "server", "torrust" ]
 license.workspace = true
 name = "torrust-server-lib"
 publish.workspace = true
@@ -14,10 +14,10 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-derive_more = { version = "2", features = ["as_ref", "constructor", "display", "from"] }
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+derive_more = { version = "2", features = [ "as_ref", "constructor", "display", "from" ] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
-tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
+tower-http = { version = "0", features = [ "compression-full", "cors", "propagate-header", "request-id", "trace" ] }
 tracing = "0"
 
 [dev-dependencies]
diff --git a/packages/swarm-coordination-registry/.gitignore b/packages/swarm-coordination-registry/.gitignore
new file mode 100644
index 000000000..c9907ae11
--- /dev/null
+++ b/packages/swarm-coordination-registry/.gitignore
@@ -0,0 +1 @@
+/.coverage/
diff --git a/packages/torrent-repository/Cargo.toml b/packages/swarm-coordination-registry/Cargo.toml
similarity index 56%
rename from packages/torrent-repository/Cargo.toml
rename to packages/swarm-coordination-registry/Cargo.toml
index e584fadf4..f9513d3c4 100644
--- a/packages/torrent-repository/Cargo.toml
+++ b/packages/swarm-coordination-registry/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "A library that provides a repository of torrents files and their peers."
-keywords = ["library", "repository", "torrents"]
-name = "torrust-tracker-torrent-repository"
+keywords = [ "library", "repository", "torrents" ]
+name = "torrust-tracker-swarm-coordination-registry"
 readme = "README.md"
 
 authors.workspace = true
@@ -18,16 +18,24 @@ version.workspace = true
 [dependencies]
 aquatic_udp_protocol = "0"
 bittorrent-primitives = "0.1.0"
+chrono = { version = "0", default-features = false, features = [ "clock" ] }
 crossbeam-skiplist = "0"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+futures = "0"
+serde = { version = "1.0.219", features = [ "derive" ] }
+thiserror = "2.0.12"
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
+tokio-util = "0.7.15"
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
+torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
+torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
 tracing = "0"
 
 [dev-dependencies]
-async-std = { version = "1", features = ["attributes", "tokio1"] }
-criterion = { version = "0", features = ["async_tokio"] }
+async-std = { version = "1", features = [ "attributes", "tokio1" ] }
+criterion = { version = "0", features = [ "async_tokio" ] }
+mockall = "0"
 rand = "0"
 rstest = "0"
 torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
diff --git a/packages/swarm-coordination-registry/README.md b/packages/swarm-coordination-registry/README.md
new file mode 100644
index 000000000..a8c55746b
--- /dev/null
+++ b/packages/swarm-coordination-registry/README.md
@@ -0,0 +1,22 @@
+# Torrust Tracker Torrent Repository
+
+A library to provide a torrent repository to the [Torrust Tracker](https://github.com/torrust/torrust-tracker).
+
+Its main responsibilities include:
+
+- Managing Torrent Entries: It stores, retrieves, and manages torrent entries, which are torrents being tracked.
+- Persistence: It supports lading tracked torrents from a persistent storage, ensuring that torrent data can be restored across restarts.
+- Pagination and sorting: It provides paginated and stable/sorted access to torrent entries.
+- Peer management: It manages peers associated with torrents, including removing inactive peers and handling torrents with no peers (peerless torrents).
+- Policy handling: It supports different policies for handling torrents, such as persisting, removing, or custom policies for torrents with no peers.
+- Metrics: It can provide metrics about the torrents, such as counts or statuses, likely for monitoring or statistics.
+
+This repo is a core component for managing the state and lifecycle of torrents and their peers in a BitTorrent tracker, with peer management, and flexible policies.
+
+## Documentation
+
+[Crate documentation](https://docs.rs/torrust-tracker-torrent-repository).
+
+## License
+
+The project is licensed under the terms of the [GNU AFFERO GENERAL PUBLIC LICENSE](./LICENSE).
diff --git a/packages/swarm-coordination-registry/src/container.rs b/packages/swarm-coordination-registry/src/container.rs
new file mode 100644
index 000000000..718e3ee52
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/container.rs
@@ -0,0 +1,38 @@
+use std::sync::Arc;
+
+use torrust_tracker_events::bus::SenderStatus;
+
+use crate::event::bus::EventBus;
+use crate::event::sender::Broadcaster;
+use crate::event::{self};
+use crate::statistics::repository::Repository;
+use crate::{statistics, Registry};
+
+pub struct SwarmCoordinationRegistryContainer {
+    pub swarms: Arc<Registry>,
+    pub event_bus: Arc<event::bus::EventBus>,
+    pub stats_event_sender: event::sender::Sender,
+    pub stats_repository: Arc<statistics::repository::Repository>,
+}
+
+impl SwarmCoordinationRegistryContainer {
+    #[must_use]
+    pub fn initialize(sender_status: SenderStatus) -> Self {
+        // // Swarm Coordination Registry Container stats
+        let broadcaster = Broadcaster::default();
+        let stats_repository = Arc::new(Repository::new());
+
+        let event_bus = Arc::new(EventBus::new(sender_status, broadcaster.clone()));
+
+        let stats_event_sender = event_bus.sender();
+
+        let swarms = Arc::new(Registry::new(stats_event_sender.clone()));
+
+        Self {
+            swarms,
+            event_bus,
+            stats_event_sender,
+            stats_repository,
+        }
+    }
+}
diff --git a/packages/swarm-coordination-registry/src/event.rs b/packages/swarm-coordination-registry/src/event.rs
new file mode 100644
index 000000000..65a65ce8c
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/event.rs
@@ -0,0 +1,111 @@
+use bittorrent_primitives::info_hash::InfoHash;
+use torrust_tracker_primitives::peer::{Peer, PeerAnnouncement};
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum Event {
+    TorrentAdded {
+        info_hash: InfoHash,
+        announcement: PeerAnnouncement,
+    },
+    TorrentRemoved {
+        info_hash: InfoHash,
+    },
+    PeerAdded {
+        info_hash: InfoHash,
+        peer: Peer,
+    },
+    PeerRemoved {
+        info_hash: InfoHash,
+        peer: Peer,
+    },
+    PeerUpdated {
+        info_hash: InfoHash,
+        old_peer: Peer,
+        new_peer: Peer,
+    },
+    PeerDownloadCompleted {
+        info_hash: InfoHash,
+        peer: Peer,
+    },
+}
+
+pub mod sender {
+    use std::sync::Arc;
+
+    use super::Event;
+
+    pub type Sender = Option<Arc<dyn torrust_tracker_events::sender::Sender<Event = Event>>>;
+    pub type Broadcaster = torrust_tracker_events::broadcaster::Broadcaster<Event>;
+
+    #[cfg(test)]
+    pub mod tests {
+
+        use futures::future::{self, BoxFuture};
+        use mockall::mock;
+        use mockall::predicate::eq;
+        use torrust_tracker_events::sender::{SendError, Sender};
+
+        use crate::event::Event;
+
+        mock! {
+            pub EventSender {}
+
+            impl Sender for EventSender {
+                type Event = Event;
+
+                fn send(&self, event: Event) -> BoxFuture<'static,Option<Result<usize,SendError<Event> > > > ;
+            }
+        }
+
+        pub fn expect_event(mock: &mut MockEventSender, event: Event) {
+            mock.expect_send()
+                .with(eq(event))
+                .times(1)
+                .returning(|_| Box::pin(future::ready(Some(Ok(1)))));
+        }
+
+        pub fn expect_event_sequence(mock: &mut MockEventSender, event: Vec<Event>) {
+            for e in event {
+                expect_event(mock, e);
+            }
+        }
+    }
+}
+
+pub mod receiver {
+    use super::Event;
+
+    pub type Receiver = Box<dyn torrust_tracker_events::receiver::Receiver<Event = Event>>;
+}
+
+pub mod bus {
+    use crate::event::Event;
+
+    pub type EventBus = torrust_tracker_events::bus::EventBus<Event>;
+}
+
+#[cfg(test)]
+pub mod test {
+
+    use torrust_tracker_primitives::peer::Peer;
+
+    use super::Event;
+    use crate::tests::sample_info_hash;
+
+    #[test]
+    fn events_should_be_comparable() {
+        let info_hash = sample_info_hash();
+
+        let event1 = Event::TorrentAdded {
+            info_hash,
+            announcement: Peer::default(),
+        };
+
+        let event2 = Event::TorrentRemoved { info_hash };
+
+        let event1_clone = event1.clone();
+
+        assert!(event1 == event1_clone);
+        assert!(event1 != event2);
+    }
+}
diff --git a/packages/torrent-repository/src/lib.rs b/packages/swarm-coordination-registry/src/lib.rs
similarity index 89%
rename from packages/torrent-repository/src/lib.rs
rename to packages/swarm-coordination-registry/src/lib.rs
index d7042a1fd..eb2721a0c 100644
--- a/packages/torrent-repository/src/lib.rs
+++ b/packages/swarm-coordination-registry/src/lib.rs
@@ -1,13 +1,16 @@
-pub mod entry;
-pub mod repository;
+pub mod container;
+pub mod event;
+pub mod statistics;
+pub mod swarm;
 
-use std::sync::{Arc, Mutex, MutexGuard};
+use std::sync::Arc;
 
+use tokio::sync::Mutex;
 use torrust_tracker_clock::clock;
 
-pub type TorrentRepository = repository::TorrentRepository;
-pub type TrackedTorrentHandle = Arc<Mutex<TrackedTorrent>>;
-pub type TrackedTorrent = entry::torrent::TrackedTorrent;
+pub type Registry = swarm::registry::Registry;
+pub type CoordinatorHandle = Arc<Mutex<Coordinator>>;
+pub type Coordinator = swarm::coordinator::Coordinator;
 
 /// Working version, for production.
 #[cfg(not(test))]
@@ -19,15 +22,7 @@ pub(crate) type CurrentClock = clock::Working;
 #[allow(dead_code)]
 pub(crate) type CurrentClock = clock::Stopped;
 
-pub trait LockTrackedTorrent {
-    fn lock_or_panic(&self) -> MutexGuard<'_, TrackedTorrent>;
-}
-
-impl LockTrackedTorrent for Arc<Mutex<TrackedTorrent>> {
-    fn lock_or_panic(&self) -> MutexGuard<'_, TrackedTorrent> {
-        self.lock().expect("can't acquire lock for tracked torrent handle")
-    }
-}
+pub const SWARM_COORDINATION_REGISTRY_LOG_TARGET: &str = "SWARM_COORDINATION_REGISTRY";
 
 #[cfg(test)]
 pub(crate) mod tests {
diff --git a/packages/swarm-coordination-registry/src/statistics/activity_metrics_updater.rs b/packages/swarm-coordination-registry/src/statistics/activity_metrics_updater.rs
new file mode 100644
index 000000000..cf814e810
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/statistics/activity_metrics_updater.rs
@@ -0,0 +1,104 @@
+//! Job that runs a task on intervals to update peers' activity metrics.
+use std::sync::Arc;
+
+use chrono::Utc;
+use tokio::task::JoinHandle;
+use torrust_tracker_clock::clock::Time;
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric_name;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+use tracing::instrument;
+
+use super::repository::Repository;
+use crate::statistics::{SWARM_COORDINATION_REGISTRY_PEERS_INACTIVE_TOTAL, SWARM_COORDINATION_REGISTRY_TORRENTS_INACTIVE_TOTAL};
+use crate::{CurrentClock, Registry};
+
+#[must_use]
+#[instrument(skip(swarms, stats_repository))]
+pub fn start_job(
+    swarms: &Arc<Registry>,
+    stats_repository: &Arc<Repository>,
+    inactivity_cutoff: DurationSinceUnixEpoch,
+) -> JoinHandle<()> {
+    let weak_swarms = std::sync::Arc::downgrade(swarms);
+    let weak_stats_repository = std::sync::Arc::downgrade(stats_repository);
+
+    let interval_in_secs = 15; // todo: make this configurable
+
+    tokio::spawn(async move {
+        let interval = std::time::Duration::from_secs(interval_in_secs);
+        let mut interval = tokio::time::interval(interval);
+        interval.tick().await;
+
+        loop {
+            tokio::select! {
+                _ = tokio::signal::ctrl_c() => {
+                    tracing::info!("Stopping peers activity metrics update job (ctrl-c signal received) ...");
+                    break;
+                }
+                _ = interval.tick() => {
+                    if let (Some(swarms), Some(stats_repository)) = (weak_swarms.upgrade(), weak_stats_repository.upgrade()) {
+                        update_activity_metrics(interval_in_secs, &swarms, &stats_repository, inactivity_cutoff).await;
+                    } else {
+                        tracing::info!("Stopping peers activity metrics update job (can't upgrade weak pointers) ...");
+                        break;
+                    }
+                }
+            }
+        }
+    })
+}
+
+async fn update_activity_metrics(
+    interval_in_secs: u64,
+    swarms: &Arc<Registry>,
+    stats_repository: &Arc<Repository>,
+    inactivity_cutoff: DurationSinceUnixEpoch,
+) {
+    let start_time = Utc::now().time();
+
+    tracing::debug!(
+        "Updating peers and torrents activity metrics (executed every {} secs) ...",
+        interval_in_secs
+    );
+
+    let activity_metadata = swarms.get_activity_metadata(inactivity_cutoff).await;
+
+    activity_metadata.log();
+
+    update_inactive_peers_total(stats_repository, activity_metadata.inactive_peers_total).await;
+    update_inactive_torrents_total(stats_repository, activity_metadata.inactive_torrents_total).await;
+
+    tracing::debug!(
+        "Peers and torrents activity metrics updated in {} ms",
+        (Utc::now().time() - start_time).num_milliseconds()
+    );
+}
+
+async fn update_inactive_peers_total(stats_repository: &Arc<Repository>, inactive_peers_total: usize) {
+    #[allow(clippy::cast_precision_loss)]
+    let inactive_peers_total = inactive_peers_total as f64;
+
+    let _unused = stats_repository
+        .set_gauge(
+            &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_INACTIVE_TOTAL),
+            &LabelSet::default(),
+            inactive_peers_total,
+            CurrentClock::now(),
+        )
+        .await;
+}
+
+async fn update_inactive_torrents_total(stats_repository: &Arc<Repository>, inactive_torrents_total: usize) {
+    #[allow(clippy::cast_precision_loss)]
+    let inactive_torrents_total = inactive_torrents_total as f64;
+
+    let _unused = stats_repository
+        .set_gauge(
+            &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_INACTIVE_TOTAL),
+            &LabelSet::default(),
+            inactive_torrents_total,
+            CurrentClock::now(),
+        )
+        .await;
+}
diff --git a/packages/swarm-coordination-registry/src/statistics/event/handler.rs b/packages/swarm-coordination-registry/src/statistics/event/handler.rs
new file mode 100644
index 000000000..1d3f8f32c
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/statistics/event/handler.rs
@@ -0,0 +1,655 @@
+use std::sync::Arc;
+
+use torrust_tracker_metrics::label::{LabelSet, LabelValue};
+use torrust_tracker_metrics::{label_name, metric_name};
+use torrust_tracker_primitives::peer::Peer;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::Event;
+use crate::statistics::repository::Repository;
+use crate::statistics::{
+    SWARM_COORDINATION_REGISTRY_PEERS_ADDED_TOTAL, SWARM_COORDINATION_REGISTRY_PEERS_COMPLETED_STATE_REVERTED_TOTAL,
+    SWARM_COORDINATION_REGISTRY_PEERS_REMOVED_TOTAL, SWARM_COORDINATION_REGISTRY_PEERS_UPDATED_TOTAL,
+    SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL, SWARM_COORDINATION_REGISTRY_TORRENTS_ADDED_TOTAL,
+    SWARM_COORDINATION_REGISTRY_TORRENTS_DOWNLOADS_TOTAL, SWARM_COORDINATION_REGISTRY_TORRENTS_REMOVED_TOTAL,
+    SWARM_COORDINATION_REGISTRY_TORRENTS_TOTAL,
+};
+
+#[allow(clippy::too_many_lines)]
+pub async fn handle_event(event: Event, stats_repository: &Arc<Repository>, now: DurationSinceUnixEpoch) {
+    match event {
+        // Torrent events
+        Event::TorrentAdded { info_hash, .. } => {
+            tracing::debug!(info_hash = ?info_hash, "Torrent added",);
+
+            let _unused = stats_repository
+                .increment_gauge(
+                    &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_TOTAL),
+                    &LabelSet::default(),
+                    now,
+                )
+                .await;
+
+            let _unused = stats_repository
+                .increment_counter(
+                    &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_ADDED_TOTAL),
+                    &LabelSet::default(),
+                    now,
+                )
+                .await;
+        }
+        Event::TorrentRemoved { info_hash } => {
+            tracing::debug!(info_hash = ?info_hash, "Torrent removed",);
+
+            let _unused = stats_repository
+                .decrement_gauge(
+                    &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_TOTAL),
+                    &LabelSet::default(),
+                    now,
+                )
+                .await;
+
+            let _unused = stats_repository
+                .increment_counter(
+                    &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_REMOVED_TOTAL),
+                    &LabelSet::default(),
+                    now,
+                )
+                .await;
+        }
+
+        // Peer events
+        Event::PeerAdded { info_hash, peer } => {
+            tracing::debug!(info_hash = ?info_hash, peer = ?peer, "Peer added", );
+
+            let label_set = label_set_for_peer(&peer);
+
+            let _unused = stats_repository
+                .increment_gauge(
+                    &metric_name!(SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL),
+                    &label_set,
+                    now,
+                )
+                .await;
+
+            let _unused = stats_repository
+                .increment_counter(&metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_ADDED_TOTAL), &label_set, now)
+                .await;
+        }
+        Event::PeerRemoved { info_hash, peer } => {
+            tracing::debug!(info_hash = ?info_hash, peer = ?peer, "Peer removed", );
+
+            let label_set = label_set_for_peer(&peer);
+
+            let _unused = stats_repository
+                .decrement_gauge(
+                    &metric_name!(SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL),
+                    &label_set,
+                    now,
+                )
+                .await;
+
+            let _unused = stats_repository
+                .increment_counter(
+                    &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_REMOVED_TOTAL),
+                    &label_set,
+                    now,
+                )
+                .await;
+        }
+        Event::PeerUpdated {
+            info_hash,
+            old_peer,
+            new_peer,
+        } => {
+            tracing::debug!(info_hash = ?info_hash, old_peer = ?old_peer, new_peer = ?new_peer, "Peer updated", );
+
+            // If the peer's role has changed, we need to adjust the number of
+            // connections
+            if old_peer.role() != new_peer.role() {
+                let _unused = stats_repository
+                    .increment_gauge(
+                        &metric_name!(SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL),
+                        &label_set_for_peer(&new_peer),
+                        now,
+                    )
+                    .await;
+
+                let _unused = stats_repository
+                    .decrement_gauge(
+                        &metric_name!(SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL),
+                        &label_set_for_peer(&old_peer),
+                        now,
+                    )
+                    .await;
+            }
+
+            // If the peer reverted from a completed state to any other state,
+            // we need to increment the counter for reverted completed.
+            if old_peer.is_completed() && !new_peer.is_completed() {
+                let _unused = stats_repository
+                    .increment_counter(
+                        &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_COMPLETED_STATE_REVERTED_TOTAL),
+                        &LabelSet::default(),
+                        now,
+                    )
+                    .await;
+            }
+
+            // Regardless of the role change, we still need to increment the
+            // counter for updated peers.
+            let label_set = label_set_for_peer(&new_peer);
+
+            let _unused = stats_repository
+                .increment_counter(
+                    &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_UPDATED_TOTAL),
+                    &label_set,
+                    now,
+                )
+                .await;
+        }
+        Event::PeerDownloadCompleted { info_hash, peer } => {
+            tracing::debug!(info_hash = ?info_hash, peer = ?peer, "Peer download completed", );
+
+            let _unused: Result<(), torrust_tracker_metrics::metric_collection::Error> = stats_repository
+                .increment_counter(
+                    &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_DOWNLOADS_TOTAL),
+                    &label_set_for_peer(&peer),
+                    now,
+                )
+                .await;
+        }
+    }
+}
+
+/// Returns the label set to be included in the metrics for the given peer.
+pub(crate) fn label_set_for_peer(peer: &Peer) -> LabelSet {
+    if peer.is_seeder() {
+        (label_name!("peer_role"), LabelValue::new("seeder")).into()
+    } else {
+        (label_name!("peer_role"), LabelValue::new("leecher")).into()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+
+    use aquatic_udp_protocol::NumberOfBytes;
+    use torrust_tracker_metrics::label::LabelSet;
+    use torrust_tracker_metrics::metric::MetricName;
+    use torrust_tracker_primitives::peer::{Peer, PeerRole};
+
+    use crate::statistics::repository::Repository;
+    use crate::tests::{leecher, seeder};
+
+    fn make_peer(role: PeerRole) -> Peer {
+        match role {
+            PeerRole::Seeder => seeder(),
+            PeerRole::Leecher => leecher(),
+        }
+    }
+
+    // It returns a peer with the opposite role of the given peer.
+    fn make_opposite_role_peer(peer: &Peer) -> Peer {
+        let mut opposite_role_peer = *peer;
+
+        match peer.role() {
+            PeerRole::Seeder => {
+                opposite_role_peer.left = NumberOfBytes::new(1);
+            }
+            PeerRole::Leecher => {
+                opposite_role_peer.left = NumberOfBytes::new(0);
+            }
+        }
+
+        opposite_role_peer
+    }
+
+    pub async fn expect_counter_metric_to_be(
+        stats_repository: &Arc<Repository>,
+        metric_name: &MetricName,
+        label_set: &LabelSet,
+        expected_value: u64,
+    ) {
+        let value = get_counter_metric(stats_repository, metric_name, label_set).await;
+        assert_eq!(value.to_string(), expected_value.to_string());
+    }
+
+    async fn get_counter_metric(stats_repository: &Arc<Repository>, metric_name: &MetricName, label_set: &LabelSet) -> u64 {
+        stats_repository
+            .get_metrics()
+            .await
+            .metric_collection
+            .get_counter_value(metric_name, label_set)
+            .unwrap_or_else(|| panic!("Failed to get counter value for metric name '{metric_name}' and label set '{label_set}'"))
+            .value()
+    }
+
+    async fn expect_gauge_metric_to_be(
+        stats_repository: &Arc<Repository>,
+        metric_name: &MetricName,
+        label_set: &LabelSet,
+        expected_value: f64,
+    ) {
+        let value = get_gauge_metric(stats_repository, metric_name, label_set).await;
+        assert_eq!(value.to_string(), expected_value.to_string());
+    }
+
+    async fn get_gauge_metric(stats_repository: &Arc<Repository>, metric_name: &MetricName, label_set: &LabelSet) -> f64 {
+        stats_repository
+            .get_metrics()
+            .await
+            .metric_collection
+            .get_gauge_value(metric_name, label_set)
+            .unwrap_or_else(|| panic!("Failed to get gauge value for metric name '{metric_name}' and label set '{label_set}'"))
+            .value()
+    }
+
+    mod for_torrent_metrics {
+
+        use std::sync::Arc;
+
+        use torrust_tracker_clock::clock::stopped::Stopped;
+        use torrust_tracker_clock::clock::{self, Time};
+        use torrust_tracker_metrics::label::LabelSet;
+        use torrust_tracker_metrics::metric_name;
+
+        use crate::event::Event;
+        use crate::statistics::event::handler::handle_event;
+        use crate::statistics::event::handler::tests::{expect_counter_metric_to_be, expect_gauge_metric_to_be};
+        use crate::statistics::repository::Repository;
+        use crate::statistics::{
+            SWARM_COORDINATION_REGISTRY_TORRENTS_ADDED_TOTAL, SWARM_COORDINATION_REGISTRY_TORRENTS_REMOVED_TOTAL,
+            SWARM_COORDINATION_REGISTRY_TORRENTS_TOTAL,
+        };
+        use crate::tests::{sample_info_hash, sample_peer};
+        use crate::CurrentClock;
+
+        #[tokio::test]
+        async fn it_should_increment_the_number_of_torrents_when_a_torrent_added_event_is_received() {
+            clock::Stopped::local_set_to_unix_epoch();
+
+            let stats_repository = Arc::new(Repository::new());
+
+            handle_event(
+                Event::TorrentAdded {
+                    info_hash: sample_info_hash(),
+                    announcement: sample_peer(),
+                },
+                &stats_repository,
+                CurrentClock::now(),
+            )
+            .await;
+
+            expect_gauge_metric_to_be(
+                &stats_repository,
+                &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_TOTAL),
+                &LabelSet::default(),
+                1.0,
+            )
+            .await;
+        }
+
+        #[tokio::test]
+        async fn it_should_decrement_the_number_of_torrents_when_a_torrent_removed_event_is_received() {
+            clock::Stopped::local_set_to_unix_epoch();
+
+            let stats_repository = Arc::new(Repository::new());
+            let metric_name = metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_TOTAL);
+            let label_set = LabelSet::default();
+
+            // Increment the gauge first to simulate a torrent being added.
+            stats_repository
+                .increment_gauge(&metric_name, &label_set, CurrentClock::now())
+                .await
+                .unwrap();
+
+            handle_event(
+                Event::TorrentRemoved {
+                    info_hash: sample_info_hash(),
+                },
+                &stats_repository,
+                CurrentClock::now(),
+            )
+            .await;
+
+            expect_gauge_metric_to_be(&stats_repository, &metric_name, &label_set, 0.0).await;
+        }
+
+        #[tokio::test]
+        async fn it_should_increment_the_number_of_torrents_added_when_a_torrent_added_event_is_received() {
+            clock::Stopped::local_set_to_unix_epoch();
+
+            let stats_repository = Arc::new(Repository::new());
+
+            handle_event(
+                Event::TorrentAdded {
+                    info_hash: sample_info_hash(),
+                    announcement: sample_peer(),
+                },
+                &stats_repository,
+                CurrentClock::now(),
+            )
+            .await;
+
+            expect_counter_metric_to_be(
+                &stats_repository,
+                &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_ADDED_TOTAL),
+                &LabelSet::default(),
+                1,
+            )
+            .await;
+        }
+
+        #[tokio::test]
+        async fn it_should_increment_the_number_of_torrents_removed_when_a_torrent_removed_event_is_received() {
+            clock::Stopped::local_set_to_unix_epoch();
+
+            let stats_repository = Arc::new(Repository::new());
+
+            handle_event(
+                Event::TorrentRemoved {
+                    info_hash: sample_info_hash(),
+                },
+                &stats_repository,
+                CurrentClock::now(),
+            )
+            .await;
+
+            expect_counter_metric_to_be(
+                &stats_repository,
+                &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_REMOVED_TOTAL),
+                &LabelSet::default(),
+                1,
+            )
+            .await;
+        }
+    }
+
+    mod for_peer_metrics {
+        use std::sync::Arc;
+
+        use torrust_tracker_clock::clock::stopped::Stopped;
+        use torrust_tracker_clock::clock::{self, Time};
+        use torrust_tracker_metrics::metric_name;
+
+        use crate::event::Event;
+        use crate::statistics::event::handler::tests::expect_counter_metric_to_be;
+        use crate::statistics::event::handler::{handle_event, label_set_for_peer};
+        use crate::statistics::repository::Repository;
+        use crate::statistics::{
+            SWARM_COORDINATION_REGISTRY_PEERS_ADDED_TOTAL, SWARM_COORDINATION_REGISTRY_PEERS_REMOVED_TOTAL,
+            SWARM_COORDINATION_REGISTRY_PEERS_UPDATED_TOTAL,
+        };
+        use crate::tests::{sample_info_hash, sample_peer};
+        use crate::CurrentClock;
+
+        mod peer_connections_total {
+
+            use std::sync::Arc;
+
+            use rstest::rstest;
+            use torrust_tracker_clock::clock::stopped::Stopped;
+            use torrust_tracker_clock::clock::{self, Time};
+            use torrust_tracker_metrics::label::LabelValue;
+            use torrust_tracker_metrics::{label_name, metric_name};
+            use torrust_tracker_primitives::peer::PeerRole;
+
+            use crate::event::Event;
+            use crate::statistics::event::handler::handle_event;
+            use crate::statistics::event::handler::tests::{
+                expect_gauge_metric_to_be, get_gauge_metric, make_opposite_role_peer, make_peer,
+            };
+            use crate::statistics::repository::Repository;
+            use crate::statistics::SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL;
+            use crate::tests::sample_info_hash;
+            use crate::CurrentClock;
+
+            #[rstest]
+            #[case("seeder")]
+            #[case("leecher")]
+            #[tokio::test]
+            async fn it_should_increment_the_number_of_peer_connections_when_a_peer_added_event_is_received(
+                #[case] role: PeerRole,
+            ) {
+                clock::Stopped::local_set_to_unix_epoch();
+
+                let peer = make_peer(role);
+
+                let stats_repository = Arc::new(Repository::new());
+                let metric_name = metric_name!(SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL);
+                let label_set = (label_name!("peer_role"), LabelValue::new(&role.to_string())).into();
+
+                handle_event(
+                    Event::PeerAdded {
+                        info_hash: sample_info_hash(),
+                        peer,
+                    },
+                    &stats_repository,
+                    CurrentClock::now(),
+                )
+                .await;
+
+                expect_gauge_metric_to_be(&stats_repository, &metric_name, &label_set, 1.0).await;
+            }
+
+            #[rstest]
+            #[case("seeder")]
+            #[case("leecher")]
+            #[tokio::test]
+            async fn it_should_decrement_the_number_of_peer_connections_when_a_peer_removed_event_is_received(
+                #[case] role: PeerRole,
+            ) {
+                clock::Stopped::local_set_to_unix_epoch();
+
+                let peer = make_peer(role);
+
+                let stats_repository = Arc::new(Repository::new());
+
+                let metric_name = metric_name!(SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL);
+                let label_set = (label_name!("peer_role"), LabelValue::new(&role.to_string())).into();
+
+                // Increment the gauge first to simulate a peer being added.
+                stats_repository
+                    .increment_gauge(&metric_name, &label_set, CurrentClock::now())
+                    .await
+                    .unwrap();
+
+                handle_event(
+                    Event::PeerRemoved {
+                        info_hash: sample_info_hash(),
+                        peer,
+                    },
+                    &stats_repository,
+                    CurrentClock::now(),
+                )
+                .await;
+
+                expect_gauge_metric_to_be(&stats_repository, &metric_name, &label_set, 0.0).await;
+            }
+
+            #[rstest]
+            #[case("seeder")]
+            #[case("leecher")]
+            #[tokio::test]
+            async fn it_should_adjust_the_number_of_seeders_and_leechers_when_a_peer_updated_event_is_received_and_the_peer_changed_its_role(
+                #[case] old_role: PeerRole,
+            ) {
+                clock::Stopped::local_set_to_unix_epoch();
+
+                let stats_repository = Arc::new(Repository::new());
+
+                let old_peer = make_peer(old_role);
+                let new_peer = make_opposite_role_peer(&old_peer);
+
+                let metric_name = metric_name!(SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL);
+                let old_role_label_set = (label_name!("peer_role"), LabelValue::new(&old_peer.role().to_string())).into();
+                let new_role_label_set = (label_name!("peer_role"), LabelValue::new(&new_peer.role().to_string())).into();
+
+                // Increment the gauge first by simulating a peer was added.
+                handle_event(
+                    Event::PeerAdded {
+                        info_hash: sample_info_hash(),
+                        peer: old_peer,
+                    },
+                    &stats_repository,
+                    CurrentClock::now(),
+                )
+                .await;
+
+                let old_role_total = get_gauge_metric(&stats_repository, &metric_name, &old_role_label_set).await;
+                let new_role_total = 0.0;
+
+                // The peer's role has changed, so we need to increment the new
+                // role and decrement the old one.
+                handle_event(
+                    Event::PeerUpdated {
+                        info_hash: sample_info_hash(),
+                        old_peer,
+                        new_peer,
+                    },
+                    &stats_repository,
+                    CurrentClock::now(),
+                )
+                .await;
+
+                // The peer's role has changed, so the new role has incremented.
+                expect_gauge_metric_to_be(&stats_repository, &metric_name, &new_role_label_set, new_role_total + 1.0).await;
+
+                // And the old role has decremented.
+                expect_gauge_metric_to_be(&stats_repository, &metric_name, &old_role_label_set, old_role_total - 1.0).await;
+            }
+        }
+
+        #[tokio::test]
+        async fn it_should_increment_the_number_of_peers_added_when_a_peer_added_event_is_received() {
+            clock::Stopped::local_set_to_unix_epoch();
+
+            let stats_repository = Arc::new(Repository::new());
+
+            let peer = sample_peer();
+
+            handle_event(
+                Event::PeerAdded {
+                    info_hash: sample_info_hash(),
+                    peer,
+                },
+                &stats_repository,
+                CurrentClock::now(),
+            )
+            .await;
+
+            expect_counter_metric_to_be(
+                &stats_repository,
+                &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_ADDED_TOTAL),
+                &label_set_for_peer(&peer),
+                1,
+            )
+            .await;
+        }
+
+        #[tokio::test]
+        async fn it_should_increment_the_number_of_peers_removed_when_a_peer_removed_event_is_received() {
+            clock::Stopped::local_set_to_unix_epoch();
+
+            let stats_repository = Arc::new(Repository::new());
+
+            let peer = sample_peer();
+
+            handle_event(
+                Event::PeerRemoved {
+                    info_hash: sample_info_hash(),
+                    peer,
+                },
+                &stats_repository,
+                CurrentClock::now(),
+            )
+            .await;
+
+            expect_counter_metric_to_be(
+                &stats_repository,
+                &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_REMOVED_TOTAL),
+                &label_set_for_peer(&peer),
+                1,
+            )
+            .await;
+        }
+
+        #[tokio::test]
+        async fn it_should_increment_the_number_of_peers_updated_when_a_peer_updated_event_is_received() {
+            clock::Stopped::local_set_to_unix_epoch();
+
+            let stats_repository = Arc::new(Repository::new());
+
+            let new_peer = sample_peer();
+
+            handle_event(
+                Event::PeerUpdated {
+                    info_hash: sample_info_hash(),
+                    old_peer: sample_peer(),
+                    new_peer,
+                },
+                &stats_repository,
+                CurrentClock::now(),
+            )
+            .await;
+
+            expect_counter_metric_to_be(
+                &stats_repository,
+                &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_UPDATED_TOTAL),
+                &label_set_for_peer(&new_peer),
+                1,
+            )
+            .await;
+        }
+
+        mod torrent_downloads_total {
+
+            use std::sync::Arc;
+
+            use rstest::rstest;
+            use torrust_tracker_clock::clock::stopped::Stopped;
+            use torrust_tracker_clock::clock::{self, Time};
+            use torrust_tracker_metrics::label::LabelValue;
+            use torrust_tracker_metrics::{label_name, metric_name};
+            use torrust_tracker_primitives::peer::PeerRole;
+
+            use crate::event::Event;
+            use crate::statistics::event::handler::handle_event;
+            use crate::statistics::event::handler::tests::{expect_counter_metric_to_be, make_peer};
+            use crate::statistics::repository::Repository;
+            use crate::statistics::SWARM_COORDINATION_REGISTRY_TORRENTS_DOWNLOADS_TOTAL;
+            use crate::tests::sample_info_hash;
+            use crate::CurrentClock;
+
+            #[rstest]
+            #[case("seeder")]
+            #[case("leecher")]
+            #[tokio::test]
+            async fn it_should_increment_the_number_of_downloads_when_a_peer_downloaded_event_is_received(
+                #[case] role: PeerRole,
+            ) {
+                clock::Stopped::local_set_to_unix_epoch();
+
+                let peer = make_peer(role);
+
+                let stats_repository = Arc::new(Repository::new());
+                let metric_name = metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_DOWNLOADS_TOTAL);
+                let label_set = (label_name!("peer_role"), LabelValue::new(&role.to_string())).into();
+
+                handle_event(
+                    Event::PeerDownloadCompleted {
+                        info_hash: sample_info_hash(),
+                        peer,
+                    },
+                    &stats_repository,
+                    CurrentClock::now(),
+                )
+                .await;
+
+                expect_counter_metric_to_be(&stats_repository, &metric_name, &label_set, 1).await;
+            }
+        }
+    }
+}
diff --git a/packages/swarm-coordination-registry/src/statistics/event/listener.rs b/packages/swarm-coordination-registry/src/statistics/event/listener.rs
new file mode 100644
index 000000000..b578d1284
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/statistics/event/listener.rs
@@ -0,0 +1,58 @@
+use std::sync::Arc;
+
+use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
+use torrust_tracker_clock::clock::Time;
+use torrust_tracker_events::receiver::RecvError;
+
+use super::handler::handle_event;
+use crate::event::receiver::Receiver;
+use crate::statistics::repository::Repository;
+use crate::{CurrentClock, SWARM_COORDINATION_REGISTRY_LOG_TARGET};
+
+#[must_use]
+pub fn run_event_listener(
+    receiver: Receiver,
+    cancellation_token: CancellationToken,
+    repository: &Arc<Repository>,
+) -> JoinHandle<()> {
+    let stats_repository = repository.clone();
+
+    tracing::info!(target: SWARM_COORDINATION_REGISTRY_LOG_TARGET, "Starting swarm coordination registry event listener");
+
+    tokio::spawn(async move {
+        dispatch_events(receiver, cancellation_token, stats_repository).await;
+
+        tracing::info!(target: SWARM_COORDINATION_REGISTRY_LOG_TARGET, "Swarm coordination registry listener finished");
+    })
+}
+
+async fn dispatch_events(mut receiver: Receiver, cancellation_token: CancellationToken, stats_repository: Arc<Repository>) {
+    loop {
+        tokio::select! {
+            biased;
+
+            () = cancellation_token.cancelled() => {
+                tracing::info!(target: SWARM_COORDINATION_REGISTRY_LOG_TARGET, "Received cancellation request, shutting down swarm coordination registry event listener.");
+                break;
+            }
+
+            result = receiver.recv() => {
+                match result {
+                    Ok(event) => handle_event(event, &stats_repository, CurrentClock::now()).await,
+                    Err(e) => {
+                        match e {
+                            RecvError::Closed => {
+                                tracing::info!(target: SWARM_COORDINATION_REGISTRY_LOG_TARGET, "Swarm coordination registry event receiver closed.");
+                                break;
+                            }
+                            RecvError::Lagged(n) => {
+                                tracing::warn!(target: SWARM_COORDINATION_REGISTRY_LOG_TARGET, "Swarm coordination registry event receiver lagged by {} events.", n);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/packages/swarm-coordination-registry/src/statistics/event/mod.rs b/packages/swarm-coordination-registry/src/statistics/event/mod.rs
new file mode 100644
index 000000000..dae683398
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/statistics/event/mod.rs
@@ -0,0 +1,2 @@
+pub mod handler;
+pub mod listener;
diff --git a/packages/swarm-coordination-registry/src/statistics/metrics.rs b/packages/swarm-coordination-registry/src/statistics/metrics.rs
new file mode 100644
index 000000000..d62a1ba6e
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/statistics/metrics.rs
@@ -0,0 +1,63 @@
+use serde::Serialize;
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric::MetricName;
+use torrust_tracker_metrics::metric_collection::{Error, MetricCollection};
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+/// Metrics collected by the torrent repository.
+#[derive(Debug, Clone, PartialEq, Default, Serialize)]
+pub struct Metrics {
+    /// A collection of metrics.
+    pub metric_collection: MetricCollection,
+}
+
+impl Metrics {
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn increment_counter(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.increment_counter(metric_name, labels, now)
+    }
+
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn set_gauge(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        value: f64,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.set_gauge(metric_name, labels, value, now)
+    }
+
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn increment_gauge(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.increment_gauge(metric_name, labels, now)
+    }
+
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn decrement_gauge(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.decrement_gauge(metric_name, labels, now)
+    }
+}
diff --git a/packages/swarm-coordination-registry/src/statistics/mod.rs b/packages/swarm-coordination-registry/src/statistics/mod.rs
new file mode 100644
index 000000000..a4bf4c018
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/statistics/mod.rs
@@ -0,0 +1,117 @@
+pub mod activity_metrics_updater;
+pub mod event;
+pub mod metrics;
+pub mod repository;
+
+use metrics::Metrics;
+use torrust_tracker_metrics::metric::description::MetricDescription;
+use torrust_tracker_metrics::metric_name;
+use torrust_tracker_metrics::unit::Unit;
+
+// Torrent metrics
+
+const SWARM_COORDINATION_REGISTRY_TORRENTS_ADDED_TOTAL: &str = "swarm_coordination_registry_torrents_added_total";
+const SWARM_COORDINATION_REGISTRY_TORRENTS_REMOVED_TOTAL: &str = "swarm_coordination_registry_torrents_removed_total";
+
+const SWARM_COORDINATION_REGISTRY_TORRENTS_TOTAL: &str = "swarm_coordination_registry_torrents_total";
+const SWARM_COORDINATION_REGISTRY_TORRENTS_DOWNLOADS_TOTAL: &str = "swarm_coordination_registry_torrents_downloads_total";
+const SWARM_COORDINATION_REGISTRY_TORRENTS_INACTIVE_TOTAL: &str = "swarm_coordination_registry_torrents_inactive_total";
+
+// Peers metrics
+
+const SWARM_COORDINATION_REGISTRY_PEERS_ADDED_TOTAL: &str = "swarm_coordination_registry_peers_added_total";
+const SWARM_COORDINATION_REGISTRY_PEERS_REMOVED_TOTAL: &str = "swarm_coordination_registry_peers_removed_total";
+const SWARM_COORDINATION_REGISTRY_PEERS_UPDATED_TOTAL: &str = "swarm_coordination_registry_peers_updated_total";
+
+const SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL: &str = "swarm_coordination_registry_peer_connections_total";
+const SWARM_COORDINATION_REGISTRY_UNIQUE_PEERS_TOTAL: &str = "swarm_coordination_registry_unique_peers_total"; // todo: not implemented yet
+const SWARM_COORDINATION_REGISTRY_PEERS_INACTIVE_TOTAL: &str = "swarm_coordination_registry_peers_inactive_total";
+const SWARM_COORDINATION_REGISTRY_PEERS_COMPLETED_STATE_REVERTED_TOTAL: &str =
+    "swarm_coordination_registry_peers_completed_state_reverted_total";
+
+#[must_use]
+pub fn describe_metrics() -> Metrics {
+    let mut metrics = Metrics::default();
+
+    // Torrent metrics
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_ADDED_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of torrents added.")),
+    );
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_REMOVED_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of torrents removed.")),
+    );
+
+    metrics.metric_collection.describe_gauge(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of torrents.")),
+    );
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_DOWNLOADS_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of torrent downloads.")),
+    );
+
+    metrics.metric_collection.describe_gauge(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_TORRENTS_INACTIVE_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of inactive torrents.")),
+    );
+
+    // Peers metrics
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_ADDED_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of peers added.")),
+    );
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_REMOVED_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of peers removed.")),
+    );
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_UPDATED_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of peers updated.")),
+    );
+
+    metrics.metric_collection.describe_gauge(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_PEER_CONNECTIONS_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new(
+            "The total number of peer connections (one connection per torrent).",
+        )),
+    );
+
+    metrics.metric_collection.describe_gauge(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_UNIQUE_PEERS_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of unique peers.")),
+    );
+
+    metrics.metric_collection.describe_gauge(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_INACTIVE_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of inactive peers.")),
+    );
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(SWARM_COORDINATION_REGISTRY_PEERS_COMPLETED_STATE_REVERTED_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new(
+            "The total number of peers whose completed state was reverted.",
+        )),
+    );
+
+    metrics
+}
diff --git a/packages/swarm-coordination-registry/src/statistics/repository.rs b/packages/swarm-coordination-registry/src/statistics/repository.rs
new file mode 100644
index 000000000..fe1292d00
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/statistics/repository.rs
@@ -0,0 +1,132 @@
+use std::sync::Arc;
+
+use tokio::sync::{RwLock, RwLockReadGuard};
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric::MetricName;
+use torrust_tracker_metrics::metric_collection::Error;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use super::describe_metrics;
+use super::metrics::Metrics;
+
+/// A repository for the torrent repository metrics.
+#[derive(Clone)]
+pub struct Repository {
+    pub stats: Arc<RwLock<Metrics>>,
+}
+
+impl Default for Repository {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Repository {
+    #[must_use]
+    pub fn new() -> Self {
+        let stats = Arc::new(RwLock::new(describe_metrics()));
+
+        Self { stats }
+    }
+
+    pub async fn get_metrics(&self) -> RwLockReadGuard<'_, Metrics> {
+        self.stats.read().await
+    }
+
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// increment the counter.
+    pub async fn increment_counter(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        let mut stats_lock = self.stats.write().await;
+
+        let result = stats_lock.increment_counter(metric_name, labels, now);
+
+        drop(stats_lock);
+
+        match result {
+            Ok(()) => {}
+            Err(ref err) => tracing::error!("Failed to increment the counter: {}", err),
+        }
+
+        result
+    }
+
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// set the gauge.
+    pub async fn set_gauge(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        value: f64,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        let mut stats_lock = self.stats.write().await;
+
+        let result = stats_lock.set_gauge(metric_name, labels, value, now);
+
+        drop(stats_lock);
+
+        match result {
+            Ok(()) => {}
+            Err(ref err) => tracing::error!("Failed to set the gauge: {}", err),
+        }
+
+        result
+    }
+
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// increment the gauge.
+    pub async fn increment_gauge(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        let mut stats_lock = self.stats.write().await;
+
+        let result = stats_lock.increment_gauge(metric_name, labels, now);
+
+        drop(stats_lock);
+
+        match result {
+            Ok(()) => {}
+            Err(ref err) => tracing::error!("Failed to increment the gauge: {}", err),
+        }
+
+        result
+    }
+
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// decrement the gauge.
+    pub async fn decrement_gauge(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        let mut stats_lock = self.stats.write().await;
+
+        let result = stats_lock.decrement_gauge(metric_name, labels, now);
+
+        drop(stats_lock);
+
+        match result {
+            Ok(()) => {}
+            Err(ref err) => tracing::error!("Failed to decrement the gauge: {}", err),
+        }
+
+        result
+    }
+}
diff --git a/packages/swarm-coordination-registry/src/swarm/coordinator.rs b/packages/swarm-coordination-registry/src/swarm/coordinator.rs
new file mode 100644
index 000000000..433ab9d32
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/swarm/coordinator.rs
@@ -0,0 +1,1040 @@
+//! A swarm is a collection of peers that are all trying to download the same
+//! torrent.
+use std::collections::BTreeMap;
+use std::net::SocketAddr;
+use std::sync::Arc;
+
+use aquatic_udp_protocol::AnnounceEvent;
+use bittorrent_primitives::info_hash::InfoHash;
+use torrust_tracker_configuration::TrackerPolicy;
+use torrust_tracker_primitives::peer::{self, Peer, PeerAnnouncement};
+use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::sender::Sender;
+use crate::event::Event;
+
+#[derive(Clone)]
+pub struct Coordinator {
+    info_hash: InfoHash,
+    peers: BTreeMap<SocketAddr, Arc<PeerAnnouncement>>,
+    metadata: SwarmMetadata,
+    event_sender: Sender,
+}
+
+impl Coordinator {
+    #[must_use]
+    pub fn new(info_hash: &InfoHash, downloaded: u32, event_sender: Sender) -> Self {
+        Self {
+            info_hash: *info_hash,
+            peers: BTreeMap::new(),
+            metadata: SwarmMetadata::new(downloaded, 0, 0),
+            event_sender,
+        }
+    }
+
+    pub async fn handle_announcement(&mut self, incoming_announce: &PeerAnnouncement) {
+        let _previous_peer = match peer::ReadInfo::get_event(incoming_announce) {
+            AnnounceEvent::Started | AnnounceEvent::None | AnnounceEvent::Completed => {
+                self.upsert_peer(Arc::new(*incoming_announce)).await
+            }
+            AnnounceEvent::Stopped => self.remove_peer(&incoming_announce.peer_addr).await,
+        };
+    }
+
+    pub async fn remove_inactive(&mut self, current_cutoff: DurationSinceUnixEpoch) -> usize {
+        let peers_to_remove = self.inactive_peers(current_cutoff);
+
+        for peer_addr in &peers_to_remove {
+            self.remove_peer(peer_addr).await;
+        }
+
+        peers_to_remove.len()
+    }
+
+    #[must_use]
+    pub fn get(&self, peer_addr: &SocketAddr) -> Option<&Arc<Peer>> {
+        self.peers.get(peer_addr)
+    }
+
+    #[must_use]
+    pub fn peers(&self, limit: Option<usize>) -> Vec<Arc<Peer>> {
+        match limit {
+            Some(limit) => self.peers.values().take(limit).cloned().collect(),
+            None => self.peers.values().cloned().collect(),
+        }
+    }
+
+    #[must_use]
+    pub fn peers_excluding(&self, peer_addr: &SocketAddr, limit: Option<usize>) -> Vec<Arc<peer::Peer>> {
+        match limit {
+            Some(limit) => self
+                .peers
+                .values()
+                // Take peers which are not the client peer
+                .filter(|peer| peer::ReadInfo::get_address(peer.as_ref()) != *peer_addr)
+                // Limit the number of peers on the result
+                .take(limit)
+                .cloned()
+                .collect(),
+            None => self
+                .peers
+                .values()
+                // Take peers which are not the client peer
+                .filter(|peer| peer::ReadInfo::get_address(peer.as_ref()) != *peer_addr)
+                .cloned()
+                .collect(),
+        }
+    }
+
+    #[must_use]
+    pub fn metadata(&self) -> SwarmMetadata {
+        self.metadata
+    }
+
+    /// Returns the number of seeders and leechers in the swarm.
+    ///
+    /// # Panics
+    ///
+    /// This function will panic if the `complete` or `incomplete` fields in the
+    /// `metadata` field cannot be converted to `usize`.
+    #[must_use]
+    pub fn seeders_and_leechers(&self) -> (usize, usize) {
+        let seeders = self
+            .metadata
+            .complete
+            .try_into()
+            .expect("Failed to convert 'complete' (seeders) count to usize");
+        let leechers = self
+            .metadata
+            .incomplete
+            .try_into()
+            .expect("Failed to convert 'incomplete' (leechers) count to usize");
+
+        (seeders, leechers)
+    }
+
+    #[must_use]
+    pub fn count_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) -> usize {
+        self.peers
+            .iter()
+            .filter(|(_, peer)| peer::ReadInfo::get_updated(&**peer) <= current_cutoff)
+            .count()
+    }
+
+    #[must_use]
+    pub fn get_activity_metadata(&self, current_cutoff: DurationSinceUnixEpoch) -> ActivityMetadata {
+        let inactive_peers_total = self.count_inactive_peers(current_cutoff);
+
+        let active_peers_total = self.len() - inactive_peers_total;
+
+        let is_active = active_peers_total > 0;
+
+        ActivityMetadata::new(is_active, active_peers_total, inactive_peers_total)
+    }
+
+    #[must_use]
+    pub fn len(&self) -> usize {
+        self.peers.len()
+    }
+
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.peers.is_empty()
+    }
+
+    #[must_use]
+    pub fn is_peerless(&self) -> bool {
+        self.is_empty()
+    }
+
+    /// Returns true if the swarm meets the retention policy, meaning that
+    /// it should be kept in the list of swarms.
+    #[must_use]
+    pub fn meets_retaining_policy(&self, policy: &TrackerPolicy) -> bool {
+        !self.should_be_removed(policy)
+    }
+
+    async fn upsert_peer(&mut self, incoming_announce: Arc<PeerAnnouncement>) -> Option<Arc<Peer>> {
+        let announcement = incoming_announce.clone();
+
+        if let Some(previous_announce) = self.peers.insert(incoming_announce.peer_addr, incoming_announce) {
+            let downloads_increased = self.update_metadata_on_update(&previous_announce, &announcement);
+
+            self.trigger_peer_updated_event(&previous_announce, &announcement).await;
+
+            if downloads_increased {
+                self.trigger_peer_download_completed_event(&announcement).await;
+            }
+
+            Some(previous_announce)
+        } else {
+            self.update_metadata_on_insert(&announcement);
+
+            self.trigger_peer_added_event(&announcement).await;
+
+            None
+        }
+    }
+
+    async fn remove_peer(&mut self, peer_addr: &SocketAddr) -> Option<Arc<Peer>> {
+        if let Some(old_peer) = self.peers.remove(peer_addr) {
+            self.update_metadata_on_removal(&old_peer);
+
+            self.trigger_peer_removed_event(&old_peer).await;
+
+            Some(old_peer)
+        } else {
+            None
+        }
+    }
+
+    #[must_use]
+    fn inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) -> Vec<SocketAddr> {
+        self.peers
+            .iter()
+            .filter(|(_, peer)| peer::ReadInfo::get_updated(&**peer) <= current_cutoff)
+            .map(|(addr, _)| *addr)
+            .collect()
+    }
+
+    /// Returns true if the swarm should be removed according to the retention
+    /// policy.
+    fn should_be_removed(&self, policy: &TrackerPolicy) -> bool {
+        policy.remove_peerless_torrents && self.is_empty()
+    }
+
+    fn update_metadata_on_insert(&mut self, added_peer: &Arc<PeerAnnouncement>) {
+        if added_peer.is_seeder() {
+            self.metadata.complete += 1;
+        } else {
+            self.metadata.incomplete += 1;
+        }
+    }
+
+    fn update_metadata_on_removal(&mut self, removed_peer: &Arc<Peer>) {
+        if removed_peer.is_seeder() {
+            self.metadata.complete -= 1;
+        } else {
+            self.metadata.incomplete -= 1;
+        }
+    }
+
+    fn update_metadata_on_update(
+        &mut self,
+        previous_announce: &Arc<PeerAnnouncement>,
+        new_announce: &Arc<PeerAnnouncement>,
+    ) -> bool {
+        let mut downloads_increased = false;
+
+        if previous_announce.role() != new_announce.role() {
+            if new_announce.is_seeder() {
+                self.metadata.complete += 1;
+                self.metadata.incomplete -= 1;
+            } else {
+                self.metadata.complete -= 1;
+                self.metadata.incomplete += 1;
+            }
+        }
+
+        if new_announce.is_completed() && !previous_announce.is_completed() {
+            self.metadata.downloaded += 1;
+            downloads_increased = true;
+        }
+
+        downloads_increased
+    }
+
+    async fn trigger_peer_added_event(&self, announcement: &Arc<PeerAnnouncement>) {
+        if let Some(event_sender) = self.event_sender.as_deref() {
+            event_sender
+                .send(Event::PeerAdded {
+                    info_hash: self.info_hash,
+                    peer: *announcement.clone(),
+                })
+                .await;
+        }
+    }
+
+    async fn trigger_peer_removed_event(&self, old_peer: &Arc<Peer>) {
+        if let Some(event_sender) = self.event_sender.as_deref() {
+            event_sender
+                .send(Event::PeerRemoved {
+                    info_hash: self.info_hash,
+                    peer: *old_peer.clone(),
+                })
+                .await;
+        }
+    }
+
+    async fn trigger_peer_updated_event(&self, old_announce: &Arc<PeerAnnouncement>, new_announce: &Arc<PeerAnnouncement>) {
+        if let Some(event_sender) = self.event_sender.as_deref() {
+            event_sender
+                .send(Event::PeerUpdated {
+                    info_hash: self.info_hash,
+                    old_peer: *old_announce.clone(),
+                    new_peer: *new_announce.clone(),
+                })
+                .await;
+        }
+    }
+
+    async fn trigger_peer_download_completed_event(&self, new_announce: &Arc<PeerAnnouncement>) {
+        if let Some(event_sender) = self.event_sender.as_deref() {
+            event_sender
+                .send(Event::PeerDownloadCompleted {
+                    info_hash: self.info_hash,
+                    peer: *new_announce.clone(),
+                })
+                .await;
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct ActivityMetadata {
+    /// Indicates if the swarm is active. It's inactive if there are no active
+    /// peers.
+    pub is_active: bool,
+
+    /// The number of active peers in the swarm.
+    pub active_peers_total: usize,
+
+    /// The number of inactive peers in the swarm.
+    pub inactive_peers_total: usize,
+}
+
+impl ActivityMetadata {
+    #[must_use]
+    pub fn new(is_active: bool, active_peers_total: usize, inactive_peers_total: usize) -> Self {
+        Self {
+            is_active,
+            active_peers_total,
+            inactive_peers_total,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+    use std::sync::Arc;
+
+    use aquatic_udp_protocol::PeerId;
+    use torrust_tracker_primitives::peer::fixture::PeerBuilder;
+    use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
+    use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+    use crate::swarm::coordinator::Coordinator;
+    use crate::tests::sample_info_hash;
+
+    #[test]
+    fn it_should_be_empty_when_no_peers_have_been_inserted() {
+        let swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        assert!(swarm.is_empty());
+    }
+
+    #[test]
+    fn it_should_have_zero_length_when_no_peers_have_been_inserted() {
+        let swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        assert_eq!(swarm.len(), 0);
+    }
+
+    #[tokio::test]
+    async fn it_should_allow_inserting_a_new_peer() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer = PeerBuilder::default().build();
+
+        assert_eq!(swarm.upsert_peer(peer.into()).await, None);
+    }
+
+    #[tokio::test]
+    async fn it_should_allow_updating_a_preexisting_peer() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer = PeerBuilder::default().build();
+
+        swarm.upsert_peer(peer.into()).await;
+
+        assert_eq!(swarm.upsert_peer(peer.into()).await, Some(Arc::new(peer)));
+    }
+
+    #[tokio::test]
+    async fn it_should_allow_getting_all_peers() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer = PeerBuilder::default().build();
+
+        swarm.upsert_peer(peer.into()).await;
+
+        assert_eq!(swarm.peers(None), [Arc::new(peer)]);
+    }
+
+    #[tokio::test]
+    async fn it_should_allow_getting_one_peer_by_id() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer = PeerBuilder::default().build();
+
+        swarm.upsert_peer(peer.into()).await;
+
+        assert_eq!(swarm.get(&peer.peer_addr), Some(Arc::new(peer)).as_ref());
+    }
+
+    #[tokio::test]
+    async fn it_should_increase_the_number_of_peers_after_inserting_a_new_one() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer = PeerBuilder::default().build();
+
+        swarm.upsert_peer(peer.into()).await;
+
+        assert_eq!(swarm.len(), 1);
+    }
+
+    #[tokio::test]
+    async fn it_should_decrease_the_number_of_peers_after_removing_one() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer = PeerBuilder::default().build();
+
+        swarm.upsert_peer(peer.into()).await;
+
+        swarm.remove_peer(&peer.peer_addr).await;
+
+        assert!(swarm.is_empty());
+    }
+
+    #[tokio::test]
+    async fn it_should_allow_removing_an_existing_peer() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer = PeerBuilder::default().build();
+
+        swarm.upsert_peer(peer.into()).await;
+
+        let old = swarm.remove_peer(&peer.peer_addr).await;
+
+        assert_eq!(old, Some(Arc::new(peer)));
+        assert_eq!(swarm.get(&peer.peer_addr), None);
+    }
+
+    #[tokio::test]
+    async fn it_should_allow_removing_a_non_existing_peer() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer = PeerBuilder::default().build();
+
+        assert_eq!(swarm.remove_peer(&peer.peer_addr).await, None);
+    }
+
+    #[tokio::test]
+    async fn it_should_allow_getting_all_peers_excluding_peers_with_a_given_address() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer1 = PeerBuilder::default()
+            .with_peer_id(&PeerId(*b"-qB00000000000000001"))
+            .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 6969))
+            .build();
+        swarm.upsert_peer(peer1.into()).await;
+
+        let peer2 = PeerBuilder::default()
+            .with_peer_id(&PeerId(*b"-qB00000000000000002"))
+            .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 6969))
+            .build();
+        swarm.upsert_peer(peer2.into()).await;
+
+        assert_eq!(swarm.peers_excluding(&peer2.peer_addr, None), [Arc::new(peer1)]);
+    }
+
+    #[tokio::test]
+    async fn it_should_count_inactive_peers() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let one_second = DurationSinceUnixEpoch::new(1, 0);
+
+        // Insert the peer
+        let last_update_time = DurationSinceUnixEpoch::new(1_669_397_478_934, 0);
+        let peer = PeerBuilder::default().last_updated_on(last_update_time).build();
+        swarm.upsert_peer(peer.into()).await;
+
+        let inactive_peers_total = swarm.count_inactive_peers(last_update_time + one_second);
+
+        assert_eq!(inactive_peers_total, 1);
+    }
+
+    #[tokio::test]
+    async fn it_should_remove_inactive_peers() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let one_second = DurationSinceUnixEpoch::new(1, 0);
+
+        // Insert the peer
+        let last_update_time = DurationSinceUnixEpoch::new(1_669_397_478_934, 0);
+        let peer = PeerBuilder::default().last_updated_on(last_update_time).build();
+        swarm.upsert_peer(peer.into()).await;
+
+        // Remove peers not updated since one second after inserting the peer
+        swarm.remove_inactive(last_update_time + one_second).await;
+
+        assert_eq!(swarm.len(), 0);
+    }
+
+    #[tokio::test]
+    async fn it_should_not_remove_active_peers() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let one_second = DurationSinceUnixEpoch::new(1, 0);
+
+        // Insert the peer
+        let last_update_time = DurationSinceUnixEpoch::new(1_669_397_478_934, 0);
+        let peer = PeerBuilder::default().last_updated_on(last_update_time).build();
+        swarm.upsert_peer(peer.into()).await;
+
+        // Remove peers not updated since one second before inserting the peer.
+        swarm.remove_inactive(last_update_time.checked_sub(one_second).unwrap()).await;
+
+        assert_eq!(swarm.len(), 1);
+    }
+
+    mod for_retaining_policy {
+
+        use torrust_tracker_configuration::TrackerPolicy;
+        use torrust_tracker_primitives::peer::fixture::PeerBuilder;
+
+        use crate::tests::sample_info_hash;
+        use crate::Coordinator;
+
+        fn empty_swarm() -> Coordinator {
+            Coordinator::new(&sample_info_hash(), 0, None)
+        }
+
+        async fn not_empty_swarm() -> Coordinator {
+            let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+            swarm.upsert_peer(PeerBuilder::default().build().into()).await;
+            swarm
+        }
+
+        async fn not_empty_swarm_with_downloads() -> Coordinator {
+            let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+            let mut peer = PeerBuilder::leecher().build();
+
+            swarm.upsert_peer(peer.into()).await;
+
+            peer.event = aquatic_udp_protocol::AnnounceEvent::Completed;
+
+            swarm.upsert_peer(peer.into()).await;
+
+            assert!(swarm.metadata().downloads() > 0);
+
+            swarm
+        }
+
+        fn remove_peerless_torrents_policy() -> TrackerPolicy {
+            TrackerPolicy {
+                remove_peerless_torrents: true,
+                ..Default::default()
+            }
+        }
+
+        fn don_not_remove_peerless_torrents_policy() -> TrackerPolicy {
+            TrackerPolicy {
+                remove_peerless_torrents: false,
+                ..Default::default()
+            }
+        }
+
+        mod when_removing_peerless_torrents_is_enabled {
+
+            use torrust_tracker_configuration::TrackerPolicy;
+
+            use crate::swarm::coordinator::tests::for_retaining_policy::{
+                empty_swarm, not_empty_swarm, not_empty_swarm_with_downloads, remove_peerless_torrents_policy,
+            };
+
+            #[test]
+            fn it_should_be_removed_if_the_swarm_is_empty() {
+                assert!(empty_swarm().should_be_removed(&remove_peerless_torrents_policy()));
+            }
+
+            #[tokio::test]
+            async fn it_should_not_be_removed_is_the_swarm_is_not_empty() {
+                assert!(!not_empty_swarm().await.should_be_removed(&remove_peerless_torrents_policy()));
+            }
+
+            #[tokio::test]
+            async fn it_should_not_be_removed_even_if_the_swarm_is_empty_if_we_need_to_track_stats_for_downloads_and_there_has_been_downloads(
+            ) {
+                let policy = TrackerPolicy {
+                    remove_peerless_torrents: true,
+                    persistent_torrent_completed_stat: true,
+                    ..Default::default()
+                };
+
+                assert!(!not_empty_swarm_with_downloads().await.should_be_removed(&policy));
+            }
+        }
+
+        mod when_removing_peerless_torrents_is_disabled {
+
+            use crate::swarm::coordinator::tests::for_retaining_policy::{
+                don_not_remove_peerless_torrents_policy, empty_swarm, not_empty_swarm,
+            };
+
+            #[test]
+            fn it_should_not_be_removed_even_if_the_swarm_is_empty() {
+                assert!(!empty_swarm().should_be_removed(&don_not_remove_peerless_torrents_policy()));
+            }
+
+            #[tokio::test]
+            async fn it_should_not_be_removed_is_the_swarm_is_not_empty() {
+                assert!(!not_empty_swarm()
+                    .await
+                    .should_be_removed(&don_not_remove_peerless_torrents_policy()));
+            }
+        }
+    }
+
+    #[tokio::test]
+    async fn it_should_allow_inserting_two_identical_peers_except_for_the_socket_address() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let peer1 = PeerBuilder::default()
+            .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 6969))
+            .build();
+        swarm.upsert_peer(peer1.into()).await;
+
+        let peer2 = PeerBuilder::default()
+            .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 6969))
+            .build();
+        swarm.upsert_peer(peer2.into()).await;
+
+        assert_eq!(swarm.len(), 2);
+    }
+
+    #[tokio::test]
+    async fn it_should_not_allow_inserting_two_peers_with_different_peer_id_but_the_same_socket_address() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        // When that happens the peer ID will be changed in the swarm.
+        // In practice, it's like if the peer had changed its ID.
+
+        let peer1 = PeerBuilder::default()
+            .with_peer_id(&PeerId(*b"-qB00000000000000001"))
+            .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 6969))
+            .build();
+        swarm.upsert_peer(peer1.into()).await;
+
+        let peer2 = PeerBuilder::default()
+            .with_peer_id(&PeerId(*b"-qB00000000000000002"))
+            .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 6969))
+            .build();
+        swarm.upsert_peer(peer2.into()).await;
+
+        assert_eq!(swarm.len(), 1);
+    }
+
+    #[tokio::test]
+    async fn it_should_return_the_swarm_metadata() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let seeder = PeerBuilder::seeder().build();
+        let leecher = PeerBuilder::leecher().build();
+
+        swarm.upsert_peer(seeder.into()).await;
+        swarm.upsert_peer(leecher.into()).await;
+
+        assert_eq!(
+            swarm.metadata(),
+            SwarmMetadata {
+                downloaded: 0,
+                complete: 1,
+                incomplete: 1,
+            }
+        );
+    }
+
+    #[tokio::test]
+    async fn it_should_return_the_number_of_seeders_in_the_list() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let seeder = PeerBuilder::seeder().build();
+        let leecher = PeerBuilder::leecher().build();
+
+        swarm.upsert_peer(seeder.into()).await;
+        swarm.upsert_peer(leecher.into()).await;
+
+        let (seeders, _leechers) = swarm.seeders_and_leechers();
+
+        assert_eq!(seeders, 1);
+    }
+
+    #[tokio::test]
+    async fn it_should_return_the_number_of_leechers_in_the_list() {
+        let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+        let seeder = PeerBuilder::seeder().build();
+        let leecher = PeerBuilder::leecher().build();
+
+        swarm.upsert_peer(seeder.into()).await;
+        swarm.upsert_peer(leecher.into()).await;
+
+        let (_seeders, leechers) = swarm.seeders_and_leechers();
+
+        assert_eq!(leechers, 1);
+    }
+
+    #[tokio::test]
+    async fn it_should_be_a_peerless_swarm_when_it_does_not_contain_any_peers() {
+        let swarm = Coordinator::new(&sample_info_hash(), 0, None);
+        assert!(swarm.is_peerless());
+    }
+
+    mod updating_the_swarm_metadata {
+
+        mod when_a_new_peer_is_added {
+            use torrust_tracker_primitives::peer::fixture::PeerBuilder;
+
+            use crate::swarm::coordinator::Coordinator;
+            use crate::tests::sample_info_hash;
+
+            #[tokio::test]
+            async fn it_should_increase_the_number_of_leechers_if_the_new_peer_is_a_leecher_() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let leechers = swarm.metadata().leechers();
+
+                let leecher = PeerBuilder::leecher().build();
+
+                swarm.upsert_peer(leecher.into()).await;
+
+                assert_eq!(swarm.metadata().leechers(), leechers + 1);
+            }
+
+            #[tokio::test]
+            async fn it_should_increase_the_number_of_seeders_if_the_new_peer_is_a_seeder() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let seeders = swarm.metadata().seeders();
+
+                let seeder = PeerBuilder::seeder().build();
+
+                swarm.upsert_peer(seeder.into()).await;
+
+                assert_eq!(swarm.metadata().seeders(), seeders + 1);
+            }
+
+            #[tokio::test]
+            async fn it_should_not_increasing_the_number_of_downloads_if_the_new_peer_has_completed_downloading_as_it_was_not_previously_known(
+            ) {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let downloads = swarm.metadata().downloads();
+
+                let seeder = PeerBuilder::seeder().build();
+
+                swarm.upsert_peer(seeder.into()).await;
+
+                assert_eq!(swarm.metadata().downloads(), downloads);
+            }
+        }
+
+        mod when_a_peer_is_removed {
+            use torrust_tracker_primitives::peer::fixture::PeerBuilder;
+
+            use crate::swarm::coordinator::Coordinator;
+            use crate::tests::sample_info_hash;
+
+            #[tokio::test]
+            async fn it_should_decrease_the_number_of_leechers_if_the_removed_peer_was_a_leecher() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let leecher = PeerBuilder::leecher().build();
+
+                swarm.upsert_peer(leecher.into()).await;
+
+                let leechers = swarm.metadata().leechers();
+
+                swarm.remove_peer(&leecher.peer_addr).await;
+
+                assert_eq!(swarm.metadata().leechers(), leechers - 1);
+            }
+
+            #[tokio::test]
+            async fn it_should_decrease_the_number_of_seeders_if_the_removed_peer_was_a_seeder() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let seeder = PeerBuilder::seeder().build();
+
+                swarm.upsert_peer(seeder.into()).await;
+
+                let seeders = swarm.metadata().seeders();
+
+                swarm.remove_peer(&seeder.peer_addr).await;
+
+                assert_eq!(swarm.metadata().seeders(), seeders - 1);
+            }
+        }
+
+        mod when_a_peer_is_removed_due_to_inactivity {
+            use std::time::Duration;
+
+            use torrust_tracker_primitives::peer::fixture::PeerBuilder;
+
+            use crate::swarm::coordinator::Coordinator;
+            use crate::tests::sample_info_hash;
+
+            #[tokio::test]
+            async fn it_should_decrease_the_number_of_leechers_when_a_removed_peer_is_a_leecher() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let leecher = PeerBuilder::leecher().build();
+
+                swarm.upsert_peer(leecher.into()).await;
+
+                let leechers = swarm.metadata().leechers();
+
+                swarm.remove_inactive(leecher.updated + Duration::from_secs(1)).await;
+
+                assert_eq!(swarm.metadata().leechers(), leechers - 1);
+            }
+
+            #[tokio::test]
+            async fn it_should_decrease_the_number_of_seeders_when_the_removed_peer_is_a_seeder() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let seeder = PeerBuilder::seeder().build();
+
+                swarm.upsert_peer(seeder.into()).await;
+
+                let seeders = swarm.metadata().seeders();
+
+                swarm.remove_inactive(seeder.updated + Duration::from_secs(1)).await;
+
+                assert_eq!(swarm.metadata().seeders(), seeders - 1);
+            }
+        }
+
+        mod for_changes_in_existing_peers {
+            use aquatic_udp_protocol::NumberOfBytes;
+            use torrust_tracker_primitives::peer::fixture::PeerBuilder;
+
+            use crate::swarm::coordinator::Coordinator;
+            use crate::tests::sample_info_hash;
+
+            #[tokio::test]
+            async fn it_should_increase_seeders_and_decreasing_leechers_when_the_peer_changes_from_leecher_to_seeder_() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let mut peer = PeerBuilder::leecher().build();
+
+                swarm.upsert_peer(peer.into()).await;
+
+                let leechers = swarm.metadata().leechers();
+                let seeders = swarm.metadata().seeders();
+
+                peer.left = NumberOfBytes::new(0); // Convert to seeder
+
+                swarm.upsert_peer(peer.into()).await;
+
+                assert_eq!(swarm.metadata().seeders(), seeders + 1);
+                assert_eq!(swarm.metadata().leechers(), leechers - 1);
+            }
+
+            #[tokio::test]
+            async fn it_should_increase_leechers_and_decreasing_seeders_when_the_peer_changes_from_seeder_to_leecher() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let mut peer = PeerBuilder::seeder().build();
+
+                swarm.upsert_peer(peer.into()).await;
+
+                let leechers = swarm.metadata().leechers();
+                let seeders = swarm.metadata().seeders();
+
+                peer.left = NumberOfBytes::new(10); // Convert to leecher
+
+                swarm.upsert_peer(peer.into()).await;
+
+                assert_eq!(swarm.metadata().leechers(), leechers + 1);
+                assert_eq!(swarm.metadata().seeders(), seeders - 1);
+            }
+
+            #[tokio::test]
+            async fn it_should_increase_the_number_of_downloads_when_the_peer_announces_completed_downloading() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let mut peer = PeerBuilder::leecher().build();
+
+                swarm.upsert_peer(peer.into()).await;
+
+                let downloads = swarm.metadata().downloads();
+
+                peer.event = aquatic_udp_protocol::AnnounceEvent::Completed;
+
+                swarm.upsert_peer(peer.into()).await;
+
+                assert_eq!(swarm.metadata().downloads(), downloads + 1);
+            }
+
+            #[tokio::test]
+            async fn it_should_not_increasing_the_number_of_downloads_when_the_peer_announces_completed_downloading_twice_() {
+                let mut swarm = Coordinator::new(&sample_info_hash(), 0, None);
+
+                let mut peer = PeerBuilder::leecher().build();
+
+                swarm.upsert_peer(peer.into()).await;
+
+                let downloads = swarm.metadata().downloads();
+
+                peer.event = aquatic_udp_protocol::AnnounceEvent::Completed;
+
+                swarm.upsert_peer(peer.into()).await;
+
+                swarm.upsert_peer(peer.into()).await;
+
+                assert_eq!(swarm.metadata().downloads(), downloads + 1);
+            }
+        }
+    }
+
+    mod triggering_events {
+
+        use std::sync::Arc;
+
+        use aquatic_udp_protocol::AnnounceEvent::Started;
+        use torrust_tracker_primitives::peer::fixture::PeerBuilder;
+        use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+        use crate::event::sender::tests::{expect_event_sequence, MockEventSender};
+        use crate::event::Event;
+        use crate::swarm::coordinator::Coordinator;
+        use crate::tests::sample_info_hash;
+
+        #[tokio::test]
+        async fn it_should_trigger_an_event_when_a_new_peer_is_added() {
+            let info_hash = sample_info_hash();
+            let peer = PeerBuilder::leecher().build();
+
+            let mut event_sender_mock = MockEventSender::new();
+
+            expect_event_sequence(&mut event_sender_mock, vec![Event::PeerAdded { info_hash, peer }]);
+
+            let mut swarm = Coordinator::new(&sample_info_hash(), 0, Some(Arc::new(event_sender_mock)));
+
+            swarm.upsert_peer(peer.into()).await;
+        }
+
+        #[tokio::test]
+        async fn it_should_trigger_an_event_when_a_peer_is_directly_removed() {
+            let info_hash = sample_info_hash();
+            let peer = PeerBuilder::leecher().build();
+
+            let mut event_sender_mock = MockEventSender::new();
+
+            expect_event_sequence(
+                &mut event_sender_mock,
+                vec![Event::PeerAdded { info_hash, peer }, Event::PeerRemoved { info_hash, peer }],
+            );
+
+            let mut swarm = Coordinator::new(&info_hash, 0, Some(Arc::new(event_sender_mock)));
+
+            // Insert the peer
+            swarm.upsert_peer(peer.into()).await;
+
+            swarm.remove_peer(&peer.peer_addr).await;
+        }
+
+        #[tokio::test]
+        async fn it_should_trigger_an_event_when_a_peer_is_removed_due_to_inactivity() {
+            let info_hash = sample_info_hash();
+            let peer = PeerBuilder::leecher().build();
+
+            let mut event_sender_mock = MockEventSender::new();
+
+            expect_event_sequence(
+                &mut event_sender_mock,
+                vec![Event::PeerAdded { info_hash, peer }, Event::PeerRemoved { info_hash, peer }],
+            );
+
+            let mut swarm = Coordinator::new(&info_hash, 0, Some(Arc::new(event_sender_mock)));
+
+            // Insert the peer
+            swarm.upsert_peer(peer.into()).await;
+
+            // Peers not updated after this time will be removed
+            let current_cutoff = peer.updated + DurationSinceUnixEpoch::from_secs(1);
+
+            swarm.remove_inactive(current_cutoff).await;
+        }
+
+        #[tokio::test]
+        async fn it_should_trigger_an_event_when_a_peer_is_updated() {
+            let info_hash = sample_info_hash();
+            let peer = PeerBuilder::leecher().with_event(Started).build();
+
+            let mut event_sender_mock = MockEventSender::new();
+
+            expect_event_sequence(
+                &mut event_sender_mock,
+                vec![
+                    Event::PeerAdded { info_hash, peer },
+                    Event::PeerUpdated {
+                        info_hash,
+                        old_peer: peer,
+                        new_peer: peer,
+                    },
+                ],
+            );
+
+            let mut swarm = Coordinator::new(&info_hash, 0, Some(Arc::new(event_sender_mock)));
+
+            // Insert the peer
+            swarm.upsert_peer(peer.into()).await;
+
+            // Update the peer
+            swarm.upsert_peer(peer.into()).await;
+        }
+
+        #[tokio::test]
+        async fn it_should_trigger_an_event_when_a_peer_completes_a_download() {
+            let info_hash = sample_info_hash();
+            let started_peer = PeerBuilder::leecher().with_event(Started).build();
+            let completed_peer = started_peer.into_completed();
+
+            let mut event_sender_mock = MockEventSender::new();
+
+            expect_event_sequence(
+                &mut event_sender_mock,
+                vec![
+                    Event::PeerAdded {
+                        info_hash,
+                        peer: started_peer,
+                    },
+                    Event::PeerUpdated {
+                        info_hash,
+                        old_peer: started_peer,
+                        new_peer: completed_peer,
+                    },
+                    Event::PeerDownloadCompleted {
+                        info_hash,
+                        peer: completed_peer,
+                    },
+                ],
+            );
+
+            let mut swarm = Coordinator::new(&info_hash, 0, Some(Arc::new(event_sender_mock)));
+
+            // Insert the peer
+            swarm.upsert_peer(started_peer.into()).await;
+
+            // Announce as completed
+            swarm.upsert_peer(completed_peer.into()).await;
+        }
+    }
+}
diff --git a/packages/swarm-coordination-registry/src/swarm/mod.rs b/packages/swarm-coordination-registry/src/swarm/mod.rs
new file mode 100644
index 000000000..925ae4948
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/swarm/mod.rs
@@ -0,0 +1,2 @@
+pub mod coordinator;
+pub mod registry;
diff --git a/packages/swarm-coordination-registry/src/swarm/registry.rs b/packages/swarm-coordination-registry/src/swarm/registry.rs
new file mode 100644
index 000000000..c8e98f307
--- /dev/null
+++ b/packages/swarm-coordination-registry/src/swarm/registry.rs
@@ -0,0 +1,1447 @@
+use std::sync::Arc;
+
+use bittorrent_primitives::info_hash::InfoHash;
+use crossbeam_skiplist::SkipMap;
+use tokio::sync::Mutex;
+use torrust_tracker_clock::conv::convert_from_timestamp_to_datetime_utc;
+use torrust_tracker_configuration::TrackerPolicy;
+use torrust_tracker_primitives::pagination::Pagination;
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
+
+use crate::event::sender::Sender;
+use crate::event::Event;
+use crate::swarm::coordinator::Coordinator;
+use crate::CoordinatorHandle;
+
+#[derive(Default)]
+pub struct Registry {
+    swarms: SkipMap<InfoHash, CoordinatorHandle>,
+    event_sender: Sender,
+}
+
+impl Registry {
+    #[must_use]
+    pub fn new(event_sender: Sender) -> Self {
+        Self {
+            swarms: SkipMap::new(),
+            event_sender,
+        }
+    }
+
+    /// Upsert a peer into the swarm of a torrent.
+    ///
+    /// Optionally, it can also preset the number of downloads of the torrent
+    /// only if it's the first time the torrent is being inserted.
+    ///
+    /// # Arguments
+    ///
+    /// * `info_hash` - The info hash of the torrent.
+    /// * `peer` - The peer to upsert.
+    /// * `opt_persistent_torrent` - The optional persisted data about a torrent
+    ///   (number of downloads for the torrent).
+    ///
+    /// # Returns
+    ///
+    /// Returns `true` if the number of downloads was increased because the peer
+    /// completed the download.
+    ///
+    /// # Errors
+    ///
+    /// This function panics if the lock for the swarm handle cannot be acquired.
+    pub async fn handle_announcement(
+        &self,
+        info_hash: &InfoHash,
+        peer: &peer::Peer,
+        opt_persistent_torrent: Option<NumberOfDownloads>,
+    ) -> Result<(), Error> {
+        let swarm_handle = match self.swarms.get(info_hash) {
+            None => {
+                let number_of_downloads = opt_persistent_torrent.unwrap_or_default();
+
+                let new_swarm_handle =
+                    CoordinatorHandle::new(Coordinator::new(info_hash, number_of_downloads, self.event_sender.clone()).into());
+
+                let new_swarm_handle = self.swarms.get_or_insert(*info_hash, new_swarm_handle);
+
+                if let Some(event_sender) = self.event_sender.as_deref() {
+                    event_sender
+                        .send(Event::TorrentAdded {
+                            info_hash: *info_hash,
+                            announcement: *peer,
+                        })
+                        .await;
+                }
+
+                new_swarm_handle
+            }
+            Some(existing_swarm_handle) => existing_swarm_handle,
+        };
+
+        let mut swarm = swarm_handle.value().lock().await;
+
+        swarm.handle_announcement(peer).await;
+
+        Ok(())
+    }
+
+    /// Inserts a new swarm. Only used for testing purposes.
+    pub fn insert(&self, info_hash: &InfoHash, swarm: Coordinator) {
+        // code-review: swarms builder? or constructor from vec?
+        // It's only used for testing purposes. It allows to pre-define the
+        // initial state of the swarm without having to go through the upsert
+        // process.
+
+        let swarm_handle = Arc::new(Mutex::new(swarm));
+
+        self.swarms.insert(*info_hash, swarm_handle);
+
+        // IMPORTANT: Notice this does not send an event because is used only
+        // for testing purposes. The event is sent only when the torrent is
+        // announced for the first time.
+    }
+
+    /// Removes a torrent entry from the repository.
+    ///
+    /// # Returns
+    ///
+    /// An `Option` containing the removed torrent entry if it existed.
+    #[must_use]
+    pub async fn remove(&self, key: &InfoHash) -> Option<CoordinatorHandle> {
+        let swarm_handle = self.swarms.remove(key).map(|entry| entry.value().clone());
+
+        if let Some(event_sender) = self.event_sender.as_deref() {
+            event_sender.send(Event::TorrentRemoved { info_hash: *key }).await;
+        }
+
+        swarm_handle
+    }
+
+    /// Retrieves a tracked torrent handle by its infohash.
+    ///
+    /// # Returns
+    ///
+    /// An `Option` containing the tracked torrent handle if found.
+    #[must_use]
+    pub fn get(&self, key: &InfoHash) -> Option<CoordinatorHandle> {
+        let maybe_entry = self.swarms.get(key);
+        maybe_entry.map(|entry| entry.value().clone())
+    }
+
+    /// Retrieves a paginated list of tracked torrent handles.
+    ///
+    /// This method returns a vector of tuples, each containing an infohash and
+    /// its associated tracked torrent handle. The pagination parameters
+    /// (offset and limit) can be used to control the size of the result set.
+    ///
+    /// # Returns
+    ///
+    /// A vector of `(InfoHash, TorrentEntry)` tuples.
+    #[must_use]
+    pub fn get_paginated(&self, pagination: Option<&Pagination>) -> Vec<(InfoHash, CoordinatorHandle)> {
+        match pagination {
+            Some(pagination) => self
+                .swarms
+                .iter()
+                .skip(pagination.offset as usize)
+                .take(pagination.limit as usize)
+                .map(|entry| (*entry.key(), entry.value().clone()))
+                .collect(),
+            None => self
+                .swarms
+                .iter()
+                .map(|entry| (*entry.key(), entry.value().clone()))
+                .collect(),
+        }
+    }
+
+    /// Retrieves swarm metadata for a given torrent.
+    ///
+    /// # Returns
+    ///
+    /// A `SwarmMetadata` struct containing the aggregated torrent data if found.
+    ///
+    /// # Errors
+    ///
+    /// This function panics if the lock for the swarm handle cannot be acquired.
+    pub async fn get_swarm_metadata(&self, info_hash: &InfoHash) -> Result<Option<SwarmMetadata>, Error> {
+        match self.swarms.get(info_hash) {
+            None => Ok(None),
+            Some(swarm_handle) => {
+                let swarm = swarm_handle.value().lock().await;
+                Ok(Some(swarm.metadata()))
+            }
+        }
+    }
+
+    /// Retrieves swarm metadata for a given torrent.
+    ///
+    /// # Returns
+    ///
+    /// A `SwarmMetadata` struct containing the aggregated torrent data if it's
+    /// found or a zeroed metadata struct if not.
+    ///
+    /// # Errors
+    ///
+    /// This function returns an error if it fails to acquire the lock for the
+    /// swarm handle.
+    pub async fn get_swarm_metadata_or_default(&self, info_hash: &InfoHash) -> Result<SwarmMetadata, Error> {
+        match self.get_swarm_metadata(info_hash).await {
+            Ok(Some(swarm_metadata)) => Ok(swarm_metadata),
+            Ok(None) => Ok(SwarmMetadata::zeroed()),
+            Err(err) => Err(err),
+        }
+    }
+
+    /// Retrieves torrent peers for a given torrent and client, excluding the
+    /// requesting client.
+    ///
+    /// This method filters out the client making the request (based on its
+    /// network address) and returns up to a maximum number of peers, defined by
+    /// the greater of the provided limit or the global `TORRENT_PEERS_LIMIT`.
+    ///
+    /// # Returns
+    ///
+    /// A vector of peers (wrapped in `Arc`) representing the active peers for
+    /// the torrent, excluding the requesting client.
+    ///
+    /// # Errors
+    ///
+    /// This function returns an error if it fails to acquire the lock for the
+    /// swarm handle.
+    pub async fn get_peers_peers_excluding(
+        &self,
+        info_hash: &InfoHash,
+        peer: &peer::Peer,
+        limit: usize,
+    ) -> Result<Vec<Arc<peer::Peer>>, Error> {
+        match self.get(info_hash) {
+            None => Ok(vec![]),
+            Some(swarm_handle) => {
+                let swarm = swarm_handle.lock().await;
+                Ok(swarm.peers_excluding(&peer.peer_addr, Some(limit)))
+            }
+        }
+    }
+
+    /// Retrieves the list of peers for a given torrent.
+    ///
+    /// This method returns up to `TORRENT_PEERS_LIMIT` peers for the torrent
+    /// specified by the info-hash.
+    ///
+    /// # Returns
+    ///
+    /// A vector of peers (wrapped in `Arc`) representing the active peers for
+    /// the torrent.
+    ///
+    /// # Errors
+    ///
+    /// This function returns an error if it fails to acquire the lock for the
+    /// swarm handle.
+    pub async fn get_swarm_peers(&self, info_hash: &InfoHash, limit: usize) -> Result<Vec<Arc<peer::Peer>>, Error> {
+        match self.get(info_hash) {
+            None => Ok(vec![]),
+            Some(swarm_handle) => {
+                let swarm = swarm_handle.lock().await;
+                Ok(swarm.peers(Some(limit)))
+            }
+        }
+    }
+
+    pub async fn get_activity_metadata(&self, current_cutoff: DurationSinceUnixEpoch) -> AggregateActivityMetadata {
+        let mut active_peers_total = 0;
+        let mut inactive_peers_total = 0;
+        let mut active_torrents_total = 0;
+
+        for swarm_handle in &self.swarms {
+            let swarm = swarm_handle.value().lock().await;
+
+            let activity_metadata = swarm.get_activity_metadata(current_cutoff);
+
+            if activity_metadata.is_active {
+                active_torrents_total += 1;
+            }
+
+            active_peers_total += activity_metadata.active_peers_total;
+            inactive_peers_total += activity_metadata.inactive_peers_total;
+        }
+
+        AggregateActivityMetadata {
+            active_peers_total,
+            inactive_peers_total,
+            active_torrents_total,
+            inactive_torrents_total: self.len() - active_torrents_total,
+        }
+    }
+
+    /// Counts the number of inactive peers across all torrents.
+    pub async fn count_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) -> usize {
+        let mut inactive_peers_total = 0;
+
+        for swarm_handle in &self.swarms {
+            let swarm = swarm_handle.value().lock().await;
+            inactive_peers_total += swarm.count_inactive_peers(current_cutoff);
+        }
+
+        inactive_peers_total
+    }
+
+    /// Removes inactive peers from all torrent entries.
+    ///
+    /// A peer is considered inactive if its last update timestamp is older than
+    /// the provided cutoff time.
+    ///
+    /// # Errors
+    ///
+    /// This function returns an error if it fails to acquire the lock for any
+    /// swarm handle.
+    pub async fn remove_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) -> Result<usize, Error> {
+        tracing::info!(
+            "Removing inactive peers since: {:?} ...",
+            convert_from_timestamp_to_datetime_utc(current_cutoff)
+        );
+
+        let mut inactive_peers_removed = 0;
+
+        for swarm_handle in &self.swarms {
+            let mut swarm = swarm_handle.value().lock().await;
+            let removed = swarm.remove_inactive(current_cutoff).await;
+            inactive_peers_removed += removed;
+        }
+
+        tracing::info!(inactive_peers_removed = inactive_peers_removed);
+
+        Ok(inactive_peers_removed)
+    }
+
+    /// Removes torrent entries that have no active peers.
+    ///
+    /// Depending on the tracker policy, torrents without any peers may be
+    /// removed to conserve memory.
+    ///
+    /// # Errors
+    ///
+    /// This function returns an error if it fails to acquire the lock for any
+    /// swarm handle.
+    pub async fn remove_peerless_torrents(&self, policy: &TrackerPolicy) -> Result<u64, Error> {
+        tracing::info!("Removing peerless torrents ...");
+
+        let mut peerless_torrents_removed = 0;
+
+        for swarm_handle in &self.swarms {
+            let swarm = swarm_handle.value().lock().await;
+
+            if swarm.meets_retaining_policy(policy) {
+                continue;
+            }
+
+            let info_hash = *swarm_handle.key();
+
+            swarm_handle.remove();
+
+            peerless_torrents_removed += 1;
+
+            if let Some(event_sender) = self.event_sender.as_deref() {
+                event_sender.send(Event::TorrentRemoved { info_hash }).await;
+            }
+        }
+
+        tracing::info!(peerless_torrents_removed = peerless_torrents_removed);
+
+        Ok(peerless_torrents_removed)
+    }
+
+    /// Imports persistent torrent data into the in-memory repository.
+    ///
+    /// This method takes a set of persisted torrent entries (e.g., from a
+    /// database) and imports them into the in-memory repository for immediate
+    /// access.
+    pub fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) -> u64 {
+        tracing::info!("Importing persisted info about torrents ...");
+
+        let mut torrents_imported = 0;
+
+        for (info_hash, completed) in persistent_torrents {
+            if self.swarms.contains_key(info_hash) {
+                continue;
+            }
+
+            let entry = CoordinatorHandle::new(Coordinator::new(info_hash, *completed, self.event_sender.clone()).into());
+
+            // Since SkipMap is lock-free the torrent could have been inserted
+            // after checking if it exists.
+            self.swarms.get_or_insert(*info_hash, entry);
+
+            torrents_imported += 1;
+        }
+
+        tracing::info!(imported_torrents = torrents_imported);
+
+        torrents_imported
+    }
+
+    /// Calculates and returns overall torrent metrics.
+    ///
+    /// The returned [`AggregateSwarmMetadata`] contains aggregate data such as
+    /// the total number of torrents, total complete (seeders), incomplete
+    /// (leechers), and downloaded counts.
+    ///
+    /// # Returns
+    ///
+    /// A [`AggregateSwarmMetadata`] struct with the aggregated metrics.
+    ///
+    /// # Errors
+    ///
+    /// This function returns an error if it fails to acquire the lock for any
+    /// swarm handle.
+    pub async fn get_aggregate_swarm_metadata(&self) -> Result<AggregateActiveSwarmMetadata, Error> {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
+
+        for swarm_handle in &self.swarms {
+            let swarm = swarm_handle.value().lock().await;
+
+            let stats = swarm.metadata();
+
+            metrics.total_complete += u64::from(stats.complete);
+            metrics.total_downloaded += u64::from(stats.downloaded);
+            metrics.total_incomplete += u64::from(stats.incomplete);
+            metrics.total_torrents += 1;
+        }
+
+        Ok(metrics)
+    }
+
+    /// Counts the number of torrents that are peerless (i.e., have no active
+    /// peers).
+    ///
+    /// # Returns
+    ///
+    /// A `usize` representing the number of peerless torrents.
+    ///
+    /// # Errors
+    ///
+    /// This function returns an error if it fails to acquire the lock for any
+    /// swarm handle.
+    pub async fn count_peerless_torrents(&self) -> Result<usize, Error> {
+        let mut peerless_torrents = 0;
+
+        for swarm_handle in &self.swarms {
+            let swarm = swarm_handle.value().lock().await;
+
+            if swarm.is_peerless() {
+                peerless_torrents += 1;
+            }
+        }
+
+        Ok(peerless_torrents)
+    }
+
+    /// Counts the total number of peers across all torrents.
+    ///
+    /// # Returns
+    ///
+    /// A `usize` representing the total number of peers.
+    ///
+    /// # Errors
+    ///
+    /// This function returns an error if it fails to acquire the lock for any
+    /// swarm handle.
+    pub async fn count_peers(&self) -> Result<usize, Error> {
+        let mut peers = 0;
+
+        for swarm_handle in &self.swarms {
+            let swarm = swarm_handle.value().lock().await;
+
+            peers += swarm.len();
+        }
+
+        Ok(peers)
+    }
+
+    #[must_use]
+    pub fn len(&self) -> usize {
+        self.swarms.len()
+    }
+
+    #[must_use]
+    pub fn is_empty(&self) -> bool {
+        self.swarms.is_empty()
+    }
+
+    pub fn contains(&self, key: &InfoHash) -> bool {
+        self.swarms.contains_key(key)
+    }
+}
+
+#[derive(thiserror::Error, Debug, Clone)]
+pub enum Error {}
+
+#[derive(Clone, Debug, Default)]
+pub struct AggregateActivityMetadata {
+    /// The number of active peers in all swarms.
+    pub active_peers_total: usize,
+
+    /// The number of inactive peers in all swarms.
+    pub inactive_peers_total: usize,
+
+    /// The number of active torrents.
+    pub active_torrents_total: usize,
+
+    /// The number of inactive torrents.
+    pub inactive_torrents_total: usize,
+}
+
+impl AggregateActivityMetadata {
+    pub fn log(&self) {
+        tracing::info!(
+            active_peers_total = self.active_peers_total,
+            inactive_peers_total = self.inactive_peers_total,
+            active_torrents_total = self.active_torrents_total,
+            inactive_torrents_total = self.inactive_torrents_total
+        );
+    }
+}
+#[cfg(test)]
+mod tests {
+
+    mod the_swarm_repository {
+
+        use std::sync::Arc;
+
+        use aquatic_udp_protocol::PeerId;
+
+        use crate::swarm::registry::Registry;
+        use crate::tests::{sample_info_hash, sample_peer};
+
+        /// It generates a peer id from a number where the number is the last
+        /// part of the peer ID. For example, for `12` it returns
+        /// `-qB00000000000000012`.
+        fn numeric_peer_id(two_digits_value: i32) -> PeerId {
+            // Format idx as a string with leading zeros, ensuring it has exactly 2 digits
+            let idx_str = format!("{two_digits_value:02}");
+
+            // Create the base part of the peer ID.
+            let base = b"-qB00000000000000000";
+
+            // Concatenate the base with idx bytes, ensuring the total length is 20 bytes.
+            let mut peer_id_bytes = [0u8; 20];
+            peer_id_bytes[..base.len()].copy_from_slice(base);
+            peer_id_bytes[base.len() - idx_str.len()..].copy_from_slice(idx_str.as_bytes());
+
+            PeerId(peer_id_bytes)
+        }
+
+        // The `TorrentRepository` has these responsibilities:
+        // - To maintain the peer lists for each torrent.
+        // - To maintain the the torrent entries, which contains all the info
+        //   about the torrents, including the peer lists.
+        // - To return the torrent entries (swarm handles).
+        // - To return the peer lists for a given torrent.
+        // - To return the torrent metrics.
+        // - To return the swarm metadata for a given torrent.
+        // - To handle the persistence of the torrent entries.
+
+        #[tokio::test]
+        async fn it_should_return_zero_length_when_it_has_no_swarms() {
+            let swarms = Arc::new(Registry::default());
+            assert_eq!(swarms.len(), 0);
+        }
+
+        #[tokio::test]
+        async fn it_should_return_the_length_when_it_has_swarms() {
+            let swarms = Arc::new(Registry::default());
+            let info_hash = sample_info_hash();
+            let peer = sample_peer();
+            swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+            assert_eq!(swarms.len(), 1);
+        }
+
+        #[tokio::test]
+        async fn it_should_be_empty_when_it_has_no_swarms() {
+            let swarms = Arc::new(Registry::default());
+            assert!(swarms.is_empty());
+
+            let info_hash = sample_info_hash();
+            let peer = sample_peer();
+            swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+            assert!(!swarms.is_empty());
+        }
+
+        #[tokio::test]
+        async fn it_should_not_be_empty_when_it_has_at_least_one_swarm() {
+            let swarms = Arc::new(Registry::default());
+            let info_hash = sample_info_hash();
+            let peer = sample_peer();
+            swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+            assert!(!swarms.is_empty());
+        }
+
+        mod maintaining_the_peer_lists {
+
+            use std::sync::Arc;
+
+            use crate::swarm::registry::Registry;
+            use crate::tests::{sample_info_hash, sample_peer};
+
+            #[tokio::test]
+            async fn it_should_add_the_first_peer_to_the_torrent_peer_list() {
+                let swarms = Arc::new(Registry::default());
+
+                let info_hash = sample_info_hash();
+
+                swarms.handle_announcement(&info_hash, &sample_peer(), None).await.unwrap();
+
+                assert!(swarms.get(&info_hash).is_some());
+            }
+
+            #[tokio::test]
+            async fn it_should_allow_adding_the_same_peer_twice_to_the_torrent_peer_list() {
+                let swarms = Arc::new(Registry::default());
+
+                let info_hash = sample_info_hash();
+
+                swarms.handle_announcement(&info_hash, &sample_peer(), None).await.unwrap();
+                swarms.handle_announcement(&info_hash, &sample_peer(), None).await.unwrap();
+
+                assert!(swarms.get(&info_hash).is_some());
+            }
+        }
+
+        mod returning_peer_lists_for_a_torrent {
+
+            use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+            use std::sync::Arc;
+
+            use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
+            use torrust_tracker_primitives::peer::Peer;
+            use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+            use crate::swarm::registry::tests::the_swarm_repository::numeric_peer_id;
+            use crate::swarm::registry::Registry;
+            use crate::tests::{sample_info_hash, sample_peer};
+
+            #[tokio::test]
+            async fn it_should_return_the_peers_for_a_given_torrent() {
+                let swarms = Arc::new(Registry::default());
+
+                let info_hash = sample_info_hash();
+                let peer = sample_peer();
+
+                swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+                let peers = swarms.get_swarm_peers(&info_hash, 74).await.unwrap();
+
+                assert_eq!(peers, vec![Arc::new(peer)]);
+            }
+
+            #[tokio::test]
+            async fn it_should_return_an_empty_list_or_peers_for_a_non_existing_torrent() {
+                let swarms = Arc::new(Registry::default());
+
+                let peers = swarms.get_swarm_peers(&sample_info_hash(), 74).await.unwrap();
+
+                assert!(peers.is_empty());
+            }
+
+            #[tokio::test]
+            async fn it_should_return_74_peers_at_the_most_for_a_given_torrent() {
+                let swarms = Arc::new(Registry::default());
+
+                let info_hash = sample_info_hash();
+
+                for idx in 1..=75 {
+                    let peer = Peer {
+                        peer_id: numeric_peer_id(idx),
+                        peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, idx.try_into().unwrap())), 8080),
+                        updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
+                        uploaded: NumberOfBytes::new(0),
+                        downloaded: NumberOfBytes::new(0),
+                        left: NumberOfBytes::new(0), // No bytes left to download
+                        event: AnnounceEvent::Completed,
+                    };
+
+                    swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+                }
+
+                let peers = swarms.get_swarm_peers(&info_hash, 74).await.unwrap();
+
+                assert_eq!(peers.len(), 74);
+            }
+
+            mod excluding_the_client_peer {
+
+                use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+                use std::sync::Arc;
+
+                use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
+                use torrust_tracker_configuration::TORRENT_PEERS_LIMIT;
+                use torrust_tracker_primitives::peer::Peer;
+                use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+                use crate::swarm::registry::tests::the_swarm_repository::numeric_peer_id;
+                use crate::swarm::registry::Registry;
+                use crate::tests::{sample_info_hash, sample_peer};
+
+                #[tokio::test]
+                async fn it_should_return_an_empty_peer_list_for_a_non_existing_torrent() {
+                    let swarms = Arc::new(Registry::default());
+
+                    let peers = swarms
+                        .get_peers_peers_excluding(&sample_info_hash(), &sample_peer(), TORRENT_PEERS_LIMIT)
+                        .await
+                        .unwrap();
+
+                    assert_eq!(peers, vec![]);
+                }
+
+                #[tokio::test]
+                async fn it_should_return_the_peers_for_a_given_torrent_excluding_a_given_peer() {
+                    let swarms = Arc::new(Registry::default());
+
+                    let info_hash = sample_info_hash();
+                    let peer = sample_peer();
+
+                    swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+                    let peers = swarms
+                        .get_peers_peers_excluding(&info_hash, &peer, TORRENT_PEERS_LIMIT)
+                        .await
+                        .unwrap();
+
+                    assert_eq!(peers, vec![]);
+                }
+
+                #[tokio::test]
+                async fn it_should_return_74_peers_at_the_most_for_a_given_torrent_when_it_filters_out_a_given_peer() {
+                    let swarms = Arc::new(Registry::default());
+
+                    let info_hash = sample_info_hash();
+
+                    let excluded_peer = sample_peer();
+
+                    swarms.handle_announcement(&info_hash, &excluded_peer, None).await.unwrap();
+
+                    // Add 74 peers
+                    for idx in 2..=75 {
+                        let peer = Peer {
+                            peer_id: numeric_peer_id(idx),
+                            peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, idx.try_into().unwrap())), 8080),
+                            updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
+                            uploaded: NumberOfBytes::new(0),
+                            downloaded: NumberOfBytes::new(0),
+                            left: NumberOfBytes::new(0), // No bytes left to download
+                            event: AnnounceEvent::Completed,
+                        };
+
+                        swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+                    }
+
+                    let peers = swarms
+                        .get_peers_peers_excluding(&info_hash, &excluded_peer, TORRENT_PEERS_LIMIT)
+                        .await
+                        .unwrap();
+
+                    assert_eq!(peers.len(), 74);
+                }
+            }
+        }
+
+        mod maintaining_the_torrent_entries {
+
+            use std::ops::Add;
+            use std::sync::Arc;
+            use std::time::Duration;
+
+            use bittorrent_primitives::info_hash::InfoHash;
+            use torrust_tracker_configuration::TrackerPolicy;
+            use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+            use crate::swarm::registry::Registry;
+            use crate::tests::{sample_info_hash, sample_peer};
+
+            #[tokio::test]
+            async fn it_should_remove_a_torrent_entry() {
+                let swarms = Arc::new(Registry::default());
+
+                let info_hash = sample_info_hash();
+                swarms.handle_announcement(&info_hash, &sample_peer(), None).await.unwrap();
+
+                let _unused = swarms.remove(&info_hash).await;
+
+                assert!(swarms.get(&info_hash).is_none());
+            }
+
+            #[tokio::test]
+            async fn it_should_count_inactive_peers() {
+                let swarms = Arc::new(Registry::default());
+
+                let info_hash = sample_info_hash();
+                let mut peer = sample_peer();
+                peer.updated = DurationSinceUnixEpoch::new(0, 0);
+
+                swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+                // Cut off time is 1 second after the peer was updated
+                let inactive_peers_total = swarms.count_inactive_peers(peer.updated.add(Duration::from_secs(1))).await;
+
+                assert_eq!(inactive_peers_total, 1);
+            }
+
+            #[tokio::test]
+            async fn it_should_remove_peers_that_have_not_been_updated_after_a_cutoff_time() {
+                let swarms = Arc::new(Registry::default());
+
+                let info_hash = sample_info_hash();
+                let mut peer = sample_peer();
+                peer.updated = DurationSinceUnixEpoch::new(0, 0);
+
+                swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+                // Cut off time is 1 second after the peer was updated
+                swarms
+                    .remove_inactive_peers(peer.updated.add(Duration::from_secs(1)))
+                    .await
+                    .unwrap();
+
+                assert!(!swarms
+                    .get_swarm_peers(&info_hash, 74)
+                    .await
+                    .unwrap()
+                    .contains(&Arc::new(peer)));
+            }
+
+            async fn initialize_repository_with_one_torrent_without_peers(info_hash: &InfoHash) -> Arc<Registry> {
+                let swarms = Arc::new(Registry::default());
+
+                // Insert a sample peer for the torrent to force adding the torrent entry
+                let mut peer = sample_peer();
+                peer.updated = DurationSinceUnixEpoch::new(0, 0);
+                swarms.handle_announcement(info_hash, &peer, None).await.unwrap();
+
+                // Remove the peer
+                swarms
+                    .remove_inactive_peers(peer.updated.add(Duration::from_secs(1)))
+                    .await
+                    .unwrap();
+
+                swarms
+            }
+
+            #[tokio::test]
+            async fn it_should_remove_torrents_without_peers() {
+                let info_hash = sample_info_hash();
+
+                let swarms = initialize_repository_with_one_torrent_without_peers(&info_hash).await;
+
+                let tracker_policy = TrackerPolicy {
+                    remove_peerless_torrents: true,
+                    ..Default::default()
+                };
+
+                swarms.remove_peerless_torrents(&tracker_policy).await.unwrap();
+
+                assert!(swarms.get(&info_hash).is_none());
+            }
+        }
+        mod returning_torrent_entries {
+
+            use std::sync::Arc;
+
+            use torrust_tracker_primitives::peer::Peer;
+            use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
+
+            use crate::swarm::registry::Registry;
+            use crate::tests::{sample_info_hash, sample_peer};
+            use crate::{Coordinator, CoordinatorHandle};
+
+            /// `TorrentEntry` data is not directly accessible. It's only
+            /// accessible through the trait methods. We need this temporary
+            /// DTO to write simple and more readable assertions.
+            #[derive(Debug, Clone, PartialEq)]
+            struct TorrentEntryInfo {
+                swarm_metadata: SwarmMetadata,
+                peers: Vec<Peer>,
+                number_of_peers: usize,
+            }
+
+            async fn torrent_entry_info(swarm_handle: CoordinatorHandle) -> TorrentEntryInfo {
+                let torrent_guard = swarm_handle.lock().await;
+                torrent_guard.clone().into()
+            }
+
+            #[allow(clippy::from_over_into)]
+            impl Into<TorrentEntryInfo> for Coordinator {
+                fn into(self) -> TorrentEntryInfo {
+                    let torrent_entry_info = TorrentEntryInfo {
+                        swarm_metadata: self.metadata(),
+                        peers: self.peers(None).iter().map(|peer| *peer.clone()).collect(),
+                        number_of_peers: self.len(),
+                    };
+                    torrent_entry_info
+                }
+            }
+
+            #[tokio::test]
+            async fn it_should_return_one_torrent_entry_by_infohash() {
+                let swarms = Arc::new(Registry::default());
+
+                let info_hash = sample_info_hash();
+                let peer = sample_peer();
+
+                swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+                let torrent_entry_info = torrent_entry_info(swarms.get(&info_hash).unwrap()).await;
+
+                assert_eq!(
+                    TorrentEntryInfo {
+                        swarm_metadata: SwarmMetadata {
+                            downloaded: 0,
+                            complete: 1,
+                            incomplete: 0
+                        },
+                        peers: vec!(peer),
+                        number_of_peers: 1
+                    },
+                    torrent_entry_info
+                );
+            }
+
+            mod it_should_return_many_torrent_entries {
+                use std::sync::Arc;
+
+                use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
+
+                use crate::swarm::registry::tests::the_swarm_repository::returning_torrent_entries::{
+                    torrent_entry_info, TorrentEntryInfo,
+                };
+                use crate::swarm::registry::Registry;
+                use crate::tests::{sample_info_hash, sample_peer};
+
+                #[tokio::test]
+                async fn without_pagination() {
+                    let swarms = Arc::new(Registry::default());
+
+                    let info_hash = sample_info_hash();
+                    let peer = sample_peer();
+                    swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+                    let torrent_entries = swarms.get_paginated(None);
+
+                    assert_eq!(torrent_entries.len(), 1);
+
+                    let torrent_entry = torrent_entry_info(torrent_entries.first().unwrap().1.clone()).await;
+
+                    assert_eq!(
+                        TorrentEntryInfo {
+                            swarm_metadata: SwarmMetadata {
+                                downloaded: 0,
+                                complete: 1,
+                                incomplete: 0
+                            },
+                            peers: vec!(peer),
+                            number_of_peers: 1
+                        },
+                        torrent_entry
+                    );
+                }
+
+                mod with_pagination {
+                    use std::sync::Arc;
+
+                    use torrust_tracker_primitives::pagination::Pagination;
+                    use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
+
+                    use crate::swarm::registry::tests::the_swarm_repository::returning_torrent_entries::{
+                        torrent_entry_info, TorrentEntryInfo,
+                    };
+                    use crate::swarm::registry::Registry;
+                    use crate::tests::{
+                        sample_info_hash_alphabetically_ordered_after_sample_info_hash_one, sample_info_hash_one,
+                        sample_peer_one, sample_peer_two,
+                    };
+
+                    #[tokio::test]
+                    async fn it_should_return_the_first_page() {
+                        let swarms = Arc::new(Registry::default());
+
+                        // Insert one torrent entry
+                        let info_hash_one = sample_info_hash_one();
+                        let peer_one = sample_peer_one();
+                        swarms.handle_announcement(&info_hash_one, &peer_one, None).await.unwrap();
+
+                        // Insert another torrent entry
+                        let info_hash_one = sample_info_hash_alphabetically_ordered_after_sample_info_hash_one();
+                        let peer_two = sample_peer_two();
+                        swarms.handle_announcement(&info_hash_one, &peer_two, None).await.unwrap();
+
+                        // Get only the first page where page size is 1
+                        let torrent_entries = swarms.get_paginated(Some(&Pagination { offset: 0, limit: 1 }));
+
+                        assert_eq!(torrent_entries.len(), 1);
+
+                        let torrent_entry_info = torrent_entry_info(torrent_entries.first().unwrap().1.clone()).await;
+
+                        assert_eq!(
+                            TorrentEntryInfo {
+                                swarm_metadata: SwarmMetadata {
+                                    downloaded: 0,
+                                    complete: 1,
+                                    incomplete: 0
+                                },
+                                peers: vec!(peer_one),
+                                number_of_peers: 1
+                            },
+                            torrent_entry_info
+                        );
+                    }
+
+                    #[tokio::test]
+                    async fn it_should_return_the_second_page() {
+                        let swarms = Arc::new(Registry::default());
+
+                        // Insert one torrent entry
+                        let info_hash_one = sample_info_hash_one();
+                        let peer_one = sample_peer_one();
+                        swarms.handle_announcement(&info_hash_one, &peer_one, None).await.unwrap();
+
+                        // Insert another torrent entry
+                        let info_hash_one = sample_info_hash_alphabetically_ordered_after_sample_info_hash_one();
+                        let peer_two = sample_peer_two();
+                        swarms.handle_announcement(&info_hash_one, &peer_two, None).await.unwrap();
+
+                        // Get only the first page where page size is 1
+                        let torrent_entries = swarms.get_paginated(Some(&Pagination { offset: 1, limit: 1 }));
+
+                        assert_eq!(torrent_entries.len(), 1);
+
+                        let torrent_entry_info = torrent_entry_info(torrent_entries.first().unwrap().1.clone()).await;
+
+                        assert_eq!(
+                            TorrentEntryInfo {
+                                swarm_metadata: SwarmMetadata {
+                                    downloaded: 0,
+                                    complete: 1,
+                                    incomplete: 0
+                                },
+                                peers: vec!(peer_two),
+                                number_of_peers: 1
+                            },
+                            torrent_entry_info
+                        );
+                    }
+
+                    #[tokio::test]
+                    async fn it_should_allow_changing_the_page_size() {
+                        let swarms = Arc::new(Registry::default());
+
+                        // Insert one torrent entry
+                        let info_hash_one = sample_info_hash_one();
+                        let peer_one = sample_peer_one();
+                        swarms.handle_announcement(&info_hash_one, &peer_one, None).await.unwrap();
+
+                        // Insert another torrent entry
+                        let info_hash_one = sample_info_hash_alphabetically_ordered_after_sample_info_hash_one();
+                        let peer_two = sample_peer_two();
+                        swarms.handle_announcement(&info_hash_one, &peer_two, None).await.unwrap();
+
+                        // Get only the first page where page size is 1
+                        let torrent_entries = swarms.get_paginated(Some(&Pagination { offset: 1, limit: 1 }));
+
+                        assert_eq!(torrent_entries.len(), 1);
+                    }
+                }
+            }
+        }
+
+        mod returning_aggregate_swarm_metadata {
+
+            use std::sync::Arc;
+
+            use bittorrent_primitives::info_hash::fixture::gen_seeded_infohash;
+            use torrust_tracker_primitives::swarm_metadata::AggregateActiveSwarmMetadata;
+
+            use crate::swarm::registry::Registry;
+            use crate::tests::{complete_peer, leecher, sample_info_hash, seeder};
+
+            // todo: refactor to use test parametrization
+
+            #[tokio::test]
+            async fn it_should_get_empty_aggregate_swarm_metadata_when_there_are_no_torrents() {
+                let swarms = Arc::new(Registry::default());
+
+                let aggregate_swarm_metadata = swarms.get_aggregate_swarm_metadata().await.unwrap();
+
+                assert_eq!(
+                    aggregate_swarm_metadata,
+                    AggregateActiveSwarmMetadata {
+                        total_complete: 0,
+                        total_downloaded: 0,
+                        total_incomplete: 0,
+                        total_torrents: 0
+                    }
+                );
+            }
+
+            #[tokio::test]
+            async fn it_should_return_the_aggregate_swarm_metadata_when_there_is_a_leecher() {
+                let swarms = Arc::new(Registry::default());
+
+                swarms
+                    .handle_announcement(&sample_info_hash(), &leecher(), None)
+                    .await
+                    .unwrap();
+
+                let aggregate_swarm_metadata = swarms.get_aggregate_swarm_metadata().await.unwrap();
+
+                assert_eq!(
+                    aggregate_swarm_metadata,
+                    AggregateActiveSwarmMetadata {
+                        total_complete: 0,
+                        total_downloaded: 0,
+                        total_incomplete: 1,
+                        total_torrents: 1,
+                    }
+                );
+            }
+
+            #[tokio::test]
+            async fn it_should_return_the_aggregate_swarm_metadata_when_there_is_a_seeder() {
+                let swarms = Arc::new(Registry::default());
+
+                swarms
+                    .handle_announcement(&sample_info_hash(), &seeder(), None)
+                    .await
+                    .unwrap();
+
+                let aggregate_swarm_metadata = swarms.get_aggregate_swarm_metadata().await.unwrap();
+
+                assert_eq!(
+                    aggregate_swarm_metadata,
+                    AggregateActiveSwarmMetadata {
+                        total_complete: 1,
+                        total_downloaded: 0,
+                        total_incomplete: 0,
+                        total_torrents: 1,
+                    }
+                );
+            }
+
+            #[tokio::test]
+            async fn it_should_return_the_aggregate_swarm_metadata_when_there_is_a_completed_peer() {
+                let swarms = Arc::new(Registry::default());
+
+                swarms
+                    .handle_announcement(&sample_info_hash(), &complete_peer(), None)
+                    .await
+                    .unwrap();
+
+                let aggregate_swarm_metadata = swarms.get_aggregate_swarm_metadata().await.unwrap();
+
+                assert_eq!(
+                    aggregate_swarm_metadata,
+                    AggregateActiveSwarmMetadata {
+                        total_complete: 1,
+                        total_downloaded: 0,
+                        total_incomplete: 0,
+                        total_torrents: 1,
+                    }
+                );
+            }
+
+            #[tokio::test]
+            async fn it_should_return_the_aggregate_swarm_metadata_when_there_are_multiple_torrents() {
+                let swarms = Arc::new(Registry::default());
+
+                let start_time = std::time::Instant::now();
+                for i in 0..1_000_000 {
+                    swarms
+                        .handle_announcement(&gen_seeded_infohash(&i), &leecher(), None)
+                        .await
+                        .unwrap();
+                }
+                let result_a = start_time.elapsed();
+
+                let start_time = std::time::Instant::now();
+                let aggregate_swarm_metadata = swarms.get_aggregate_swarm_metadata().await.unwrap();
+                let result_b = start_time.elapsed();
+
+                assert_eq!(
+                    (aggregate_swarm_metadata),
+                    (AggregateActiveSwarmMetadata {
+                        total_complete: 0,
+                        total_downloaded: 0,
+                        total_incomplete: 1_000_000,
+                        total_torrents: 1_000_000,
+                    }),
+                    "{result_a:?} {result_b:?}"
+                );
+            }
+
+            mod it_should_count_peerless_torrents {
+                use std::sync::Arc;
+
+                use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+                use crate::swarm::registry::Registry;
+                use crate::tests::{sample_info_hash, sample_peer};
+
+                #[tokio::test]
+                async fn no_peerless_torrents() {
+                    let swarms = Arc::new(Registry::default());
+                    assert_eq!(swarms.count_peerless_torrents().await.unwrap(), 0);
+                }
+
+                #[tokio::test]
+                async fn one_peerless_torrents() {
+                    let info_hash = sample_info_hash();
+                    let peer = sample_peer();
+
+                    let swarms = Arc::new(Registry::default());
+                    swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+                    let current_cutoff = peer.updated + DurationSinceUnixEpoch::from_secs(1);
+                    swarms.remove_inactive_peers(current_cutoff).await.unwrap();
+
+                    assert_eq!(swarms.count_peerless_torrents().await.unwrap(), 1);
+                }
+            }
+
+            mod it_should_count_peers {
+                use std::sync::Arc;
+
+                use crate::swarm::registry::Registry;
+                use crate::tests::{sample_info_hash, sample_peer};
+
+                #[tokio::test]
+                async fn no_peers() {
+                    let swarms = Arc::new(Registry::default());
+                    assert_eq!(swarms.count_peers().await.unwrap(), 0);
+                }
+
+                #[tokio::test]
+                async fn one_peer() {
+                    let info_hash = sample_info_hash();
+                    let peer = sample_peer();
+
+                    let swarms = Arc::new(Registry::default());
+                    swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+                    assert_eq!(swarms.count_peers().await.unwrap(), 1);
+                }
+            }
+        }
+
+        mod returning_swarm_metadata {
+
+            use std::sync::Arc;
+
+            use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
+
+            use crate::swarm::registry::Registry;
+            use crate::tests::{leecher, sample_info_hash};
+
+            #[tokio::test]
+            async fn it_should_get_swarm_metadata_for_an_existing_torrent() {
+                let swarms = Arc::new(Registry::default());
+
+                let infohash = sample_info_hash();
+
+                swarms.handle_announcement(&infohash, &leecher(), None).await.unwrap();
+
+                let swarm_metadata = swarms.get_swarm_metadata_or_default(&infohash).await.unwrap();
+
+                assert_eq!(
+                    swarm_metadata,
+                    SwarmMetadata {
+                        complete: 0,
+                        downloaded: 0,
+                        incomplete: 1,
+                    }
+                );
+            }
+
+            #[tokio::test]
+            async fn it_should_return_zeroed_swarm_metadata_for_a_non_existing_torrent() {
+                let swarms = Arc::new(Registry::default());
+
+                let swarm_metadata = swarms.get_swarm_metadata_or_default(&sample_info_hash()).await.unwrap();
+
+                assert_eq!(swarm_metadata, SwarmMetadata::zeroed());
+            }
+        }
+
+        mod handling_persistence {
+
+            use std::sync::Arc;
+
+            use torrust_tracker_primitives::NumberOfDownloadsBTreeMap;
+
+            use crate::swarm::registry::Registry;
+            use crate::tests::{leecher, sample_info_hash};
+
+            #[tokio::test]
+            async fn it_should_allow_importing_persisted_torrent_entries() {
+                let swarms = Arc::new(Registry::default());
+
+                let infohash = sample_info_hash();
+
+                let mut persistent_torrents = NumberOfDownloadsBTreeMap::default();
+
+                persistent_torrents.insert(infohash, 1);
+
+                swarms.import_persistent(&persistent_torrents);
+
+                let swarm_metadata = swarms.get_swarm_metadata_or_default(&infohash).await.unwrap();
+
+                // Only the number of downloads is persisted.
+                assert_eq!(swarm_metadata.downloaded, 1);
+            }
+
+            #[tokio::test]
+            async fn it_should_allow_overwriting_a_previously_imported_persisted_torrent() {
+                // code-review: do we want to allow this?
+
+                let swarms = Arc::new(Registry::default());
+
+                let infohash = sample_info_hash();
+
+                let mut persistent_torrents = NumberOfDownloadsBTreeMap::default();
+
+                persistent_torrents.insert(infohash, 1);
+                persistent_torrents.insert(infohash, 2);
+
+                swarms.import_persistent(&persistent_torrents);
+
+                let swarm_metadata = swarms.get_swarm_metadata_or_default(&infohash).await.unwrap();
+
+                // It takes the last value
+                assert_eq!(swarm_metadata.downloaded, 2);
+            }
+
+            #[tokio::test]
+            async fn it_should_now_allow_importing_a_persisted_torrent_if_it_already_exists() {
+                let swarms = Arc::new(Registry::default());
+
+                let infohash = sample_info_hash();
+
+                // Insert a new the torrent entry
+                swarms.handle_announcement(&infohash, &leecher(), None).await.unwrap();
+                let initial_number_of_downloads = swarms.get_swarm_metadata_or_default(&infohash).await.unwrap().downloaded;
+
+                // Try to import the torrent entry
+                let new_number_of_downloads = initial_number_of_downloads + 1;
+                let mut persistent_torrents = NumberOfDownloadsBTreeMap::default();
+                persistent_torrents.insert(infohash, new_number_of_downloads);
+                swarms.import_persistent(&persistent_torrents);
+
+                // The number of downloads should not be changed
+                assert_eq!(
+                    swarms.get_swarm_metadata_or_default(&infohash).await.unwrap().downloaded,
+                    initial_number_of_downloads
+                );
+            }
+        }
+    }
+
+    mod triggering_events {
+
+        use std::sync::Arc;
+
+        use torrust_tracker_primitives::peer::fixture::PeerBuilder;
+        use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+        use crate::event::sender::tests::{expect_event_sequence, MockEventSender};
+        use crate::event::Event;
+        use crate::swarm::registry::Registry;
+        use crate::tests::sample_info_hash;
+
+        #[tokio::test]
+        async fn it_should_trigger_an_event_when_a_new_torrent_is_added() {
+            let info_hash = sample_info_hash();
+            let peer = PeerBuilder::leecher().build();
+
+            let mut event_sender_mock = MockEventSender::new();
+
+            expect_event_sequence(
+                &mut event_sender_mock,
+                vec![
+                    Event::TorrentAdded {
+                        info_hash,
+                        announcement: peer,
+                    },
+                    Event::PeerAdded { info_hash, peer },
+                ],
+            );
+
+            let swarms = Registry::new(Some(Arc::new(event_sender_mock)));
+
+            swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+        }
+
+        #[tokio::test]
+        async fn it_should_trigger_an_event_when_a_torrent_is_directly_removed() {
+            let info_hash = sample_info_hash();
+            let peer = PeerBuilder::leecher().build();
+
+            let mut event_sender_mock = MockEventSender::new();
+
+            expect_event_sequence(
+                &mut event_sender_mock,
+                vec![
+                    Event::TorrentAdded {
+                        info_hash,
+                        announcement: peer,
+                    },
+                    Event::PeerAdded { info_hash, peer },
+                    Event::TorrentRemoved { info_hash },
+                ],
+            );
+
+            let swarms = Registry::new(Some(Arc::new(event_sender_mock)));
+
+            swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+            swarms.remove(&info_hash).await.unwrap();
+        }
+
+        #[tokio::test]
+        async fn it_should_trigger_an_event_when_a_peerless_torrent_is_removed() {
+            let info_hash = sample_info_hash();
+            let peer = PeerBuilder::leecher().build();
+
+            let mut event_sender_mock = MockEventSender::new();
+
+            expect_event_sequence(
+                &mut event_sender_mock,
+                vec![
+                    Event::TorrentAdded {
+                        info_hash,
+                        announcement: peer,
+                    },
+                    Event::PeerAdded { info_hash, peer },
+                    Event::PeerRemoved { info_hash, peer },
+                    Event::TorrentRemoved { info_hash },
+                ],
+            );
+
+            let swarms = Registry::new(Some(Arc::new(event_sender_mock)));
+
+            // Add the new torrent
+            swarms.handle_announcement(&info_hash, &peer, None).await.unwrap();
+
+            // Remove the peer
+            let current_cutoff = peer.updated + DurationSinceUnixEpoch::from_secs(1);
+            swarms.remove_inactive_peers(current_cutoff).await.unwrap();
+
+            // Remove peerless torrents
+
+            let tracker_policy = torrust_tracker_configuration::TrackerPolicy {
+                remove_peerless_torrents: true,
+                ..Default::default()
+            };
+
+            swarms.remove_peerless_torrents(&tracker_policy).await.unwrap();
+        }
+    }
+}
diff --git a/packages/test-helpers/Cargo.toml b/packages/test-helpers/Cargo.toml
index 3495c314a..fb240730d 100644
--- a/packages/test-helpers/Cargo.toml
+++ b/packages/test-helpers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library providing helpers for testing the Torrust tracker."
-keywords = ["helper", "library", "testing"]
+keywords = [ "helper", "library", "testing" ]
 name = "torrust-tracker-test-helpers"
 readme = "README.md"
 
@@ -18,4 +18,4 @@ version.workspace = true
 rand = "0"
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 tracing = "0"
-tracing-subscriber = { version = "0", features = ["json"] }
+tracing-subscriber = { version = "0", features = [ "json" ] }
diff --git a/packages/test-helpers/src/configuration.rs b/packages/test-helpers/src/configuration.rs
index 986981b1f..ffe3af3b2 100644
--- a/packages/test-helpers/src/configuration.rs
+++ b/packages/test-helpers/src/configuration.rs
@@ -40,7 +40,7 @@ pub fn ephemeral() -> Configuration {
     // Ephemeral socket address for API
     let api_port = 0u16;
     let mut http_api = HttpApi {
-        bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), api_port),
+        bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), api_port),
         ..Default::default()
     };
     http_api.add_token("admin", "MyAccessToken");
@@ -48,12 +48,12 @@ pub fn ephemeral() -> Configuration {
 
     // Ephemeral socket address for Health Check API
     let health_check_api_port = 0u16;
-    config.health_check_api.bind_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), health_check_api_port);
+    config.health_check_api.bind_address = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), health_check_api_port);
 
     // Ephemeral socket address for UDP tracker
     let udp_port = 0u16;
     config.udp_trackers = Some(vec![UdpTracker {
-        bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), udp_port),
+        bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), udp_port),
         cookie_lifetime: Duration::from_secs(120),
         tracker_usage_statistics: true,
     }]);
@@ -61,7 +61,7 @@ pub fn ephemeral() -> Configuration {
     // Ephemeral socket address for HTTP tracker
     let http_port = 0u16;
     config.http_trackers = Some(vec![HttpTracker {
-        bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), http_port),
+        bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), http_port),
         tsl_config: None,
         tracker_usage_statistics: true,
     }]);
@@ -156,7 +156,7 @@ pub fn ephemeral_with_external_ip(ip: IpAddr) -> Configuration {
 pub fn ephemeral_ipv6() -> Configuration {
     let mut cfg = ephemeral();
 
-    let ipv6 = SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)), 0);
+    let ipv6 = SocketAddr::new(IpAddr::V6(Ipv6Addr::UNSPECIFIED), 0);
 
     if let Some(ref mut http_api) = cfg.http_api {
         http_api.bind_address.clone_from(&ipv6);
diff --git a/packages/test-helpers/src/random.rs b/packages/test-helpers/src/random.rs
index f096d695c..62265dbd7 100644
--- a/packages/test-helpers/src/random.rs
+++ b/packages/test-helpers/src/random.rs
@@ -1,6 +1,6 @@
 //! Random data generators for testing.
 use rand::distr::Alphanumeric;
-use rand::{rng, Rng};
+use rand::{rng, RngExt};
 
 /// Returns a random alphanumeric string of a certain size.
 ///
diff --git a/packages/torrent-repository-benchmarking/Cargo.toml b/packages/torrent-repository-benchmarking/Cargo.toml
index 1a93c513c..653ad8102 100644
--- a/packages/torrent-repository-benchmarking/Cargo.toml
+++ b/packages/torrent-repository-benchmarking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library to runt benchmarking for different implementations of a repository of torrents files and their peers."
-keywords = ["library", "repository", "torrents"]
+keywords = [ "library", "repository", "torrents" ]
 name = "torrust-tracker-torrent-repository-benchmarking"
 readme = "README.md"
 
@@ -22,15 +22,15 @@ crossbeam-skiplist = "0"
 dashmap = "6"
 futures = "0"
 parking_lot = "0"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
 zerocopy = "0.7"
 
 [dev-dependencies]
-async-std = { version = "1", features = ["attributes", "tokio1"] }
-criterion = { version = "0", features = ["async_tokio"] }
+async-std = { version = "1", features = [ "attributes", "tokio1" ] }
+criterion = { version = "0", features = [ "async_tokio" ] }
 rstest = "0"
 
 [[bench]]
diff --git a/packages/torrent-repository-benchmarking/README.md b/packages/torrent-repository-benchmarking/README.md
index f248ca0da..a0556a58f 100644
--- a/packages/torrent-repository-benchmarking/README.md
+++ b/packages/torrent-repository-benchmarking/README.md
@@ -1,4 +1,4 @@
-# Torrust Tracker Torrent Repository Benchmarking
+# Torrust Tracker Swarm Coordination Registry Benchmarking
 
 A library to runt benchmarking for different implementations of a repository of torrents files and their peers. Torrent repositories are used by the [Torrust Tracker](https://github.com/torrust/torrust-tracker).
 
diff --git a/packages/torrent-repository-benchmarking/benches/helpers/utils.rs b/packages/torrent-repository-benchmarking/benches/helpers/utils.rs
index 51b09ec0f..16ba0bf7f 100644
--- a/packages/torrent-repository-benchmarking/benches/helpers/utils.rs
+++ b/packages/torrent-repository-benchmarking/benches/helpers/utils.rs
@@ -9,7 +9,7 @@ use zerocopy::I64;
 
 pub const DEFAULT_PEER: Peer = Peer {
     peer_id: PeerId([0; 20]),
-    peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080),
+    peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080),
     updated: DurationSinceUnixEpoch::from_secs(0),
     uploaded: NumberOfBytes(I64::ZERO),
     downloaded: NumberOfBytes(I64::ZERO),
diff --git a/packages/torrent-repository-benchmarking/benches/repository_benchmark.rs b/packages/torrent-repository-benchmarking/benches/repository_benchmark.rs
index a58207492..f5f8e4b28 100644
--- a/packages/torrent-repository-benchmarking/benches/repository_benchmark.rs
+++ b/packages/torrent-repository-benchmarking/benches/repository_benchmark.rs
@@ -17,7 +17,7 @@ fn add_one_torrent(c: &mut Criterion) {
     let mut group = c.benchmark_group("add_one_torrent");
 
     group.warm_up_time(Duration::from_millis(500));
-    group.measurement_time(Duration::from_millis(1000));
+    group.measurement_time(Duration::from_secs(1));
 
     group.bench_function("RwLockStd", |b| {
         b.iter_custom(sync::add_one_torrent::<TorrentsRwLockStd, _>);
@@ -74,7 +74,7 @@ fn add_multiple_torrents_in_parallel(c: &mut Criterion) {
     //group.sample_size(10);
 
     group.warm_up_time(Duration::from_millis(500));
-    group.measurement_time(Duration::from_millis(1000));
+    group.measurement_time(Duration::from_secs(1));
 
     group.bench_function("RwLockStd", |b| {
         b.to_async(&rt)
@@ -138,7 +138,7 @@ fn update_one_torrent_in_parallel(c: &mut Criterion) {
     //group.sample_size(10);
 
     group.warm_up_time(Duration::from_millis(500));
-    group.measurement_time(Duration::from_millis(1000));
+    group.measurement_time(Duration::from_secs(1));
 
     group.bench_function("RwLockStd", |b| {
         b.to_async(&rt)
@@ -202,7 +202,7 @@ fn update_multiple_torrents_in_parallel(c: &mut Criterion) {
     //group.sample_size(10);
 
     group.warm_up_time(Duration::from_millis(500));
-    group.measurement_time(Duration::from_millis(1000));
+    group.measurement_time(Duration::from_secs(1));
 
     group.bench_function("RwLockStd", |b| {
         b.to_async(&rt)
diff --git a/packages/torrent-repository-benchmarking/src/entry/peer_list.rs b/packages/torrent-repository-benchmarking/src/entry/peer_list.rs
index 33270cf27..976e89d03 100644
--- a/packages/torrent-repository-benchmarking/src/entry/peer_list.rs
+++ b/packages/torrent-repository-benchmarking/src/entry/peer_list.rs
@@ -195,7 +195,7 @@ mod tests {
 
             let peer1 = PeerBuilder::default()
                 .with_peer_id(&PeerId(*b"-qB00000000000000001"))
-                .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 6969))
+                .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 6969))
                 .build();
             peer_list.upsert(peer1.into());
 
@@ -265,7 +265,7 @@ mod tests {
             peer_list.upsert(peer.into());
 
             // Remove peers not updated since one second before inserting the peer.
-            peer_list.remove_inactive_peers(last_update_time - one_second);
+            peer_list.remove_inactive_peers(last_update_time.checked_sub(one_second).unwrap());
 
             assert_eq!(peer_list.len(), 1);
         }
diff --git a/packages/torrent-repository-benchmarking/src/repository/dash_map_mutex_std.rs b/packages/torrent-repository-benchmarking/src/repository/dash_map_mutex_std.rs
index d4a84caa0..fec94b4a5 100644
--- a/packages/torrent-repository-benchmarking/src/repository/dash_map_mutex_std.rs
+++ b/packages/torrent-repository-benchmarking/src/repository/dash_map_mutex_std.rs
@@ -4,8 +4,8 @@ use bittorrent_primitives::info_hash::InfoHash;
 use dashmap::DashMap;
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use super::Repository;
 use crate::entry::peer_list::PeerList;
@@ -22,7 +22,7 @@ where
     EntryMutexStd: EntrySync,
     EntrySingle: Entry,
 {
-    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<PersistentTorrent>) -> bool {
+    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<NumberOfDownloads>) -> bool {
         // todo: load persistent torrent data if provided
 
         if let Some(entry) = self.torrents.get(info_hash) {
@@ -46,8 +46,8 @@ where
         maybe_entry.map(|entry| entry.clone())
     }
 
-    fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         for entry in &self.torrents {
             let stats = entry.value().lock().expect("it should get a lock").get_swarm_metadata();
@@ -77,7 +77,7 @@ where
         }
     }
 
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         for (info_hash, completed) in persistent_torrents {
             if self.torrents.contains_key(info_hash) {
                 continue;
diff --git a/packages/torrent-repository-benchmarking/src/repository/mod.rs b/packages/torrent-repository-benchmarking/src/repository/mod.rs
index 9284ff6e6..cf58838a1 100644
--- a/packages/torrent-repository-benchmarking/src/repository/mod.rs
+++ b/packages/torrent-repository-benchmarking/src/repository/mod.rs
@@ -1,8 +1,8 @@
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 pub mod dash_map_mutex_std;
 pub mod rw_lock_std;
@@ -17,22 +17,22 @@ use std::fmt::Debug;
 
 pub trait Repository<T>: Debug + Default + Sized + 'static {
     fn get(&self, key: &InfoHash) -> Option<T>;
-    fn get_metrics(&self) -> AggregateSwarmMetadata;
+    fn get_metrics(&self) -> AggregateActiveSwarmMetadata;
     fn get_paginated(&self, pagination: Option<&Pagination>) -> Vec<(InfoHash, T)>;
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents);
+    fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap);
     fn remove(&self, key: &InfoHash) -> Option<T>;
     fn remove_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch);
     fn remove_peerless_torrents(&self, policy: &TrackerPolicy);
-    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, opt_persistent_torrent: Option<PersistentTorrent>) -> bool;
+    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, opt_persistent_torrent: Option<NumberOfDownloads>) -> bool;
     fn get_swarm_metadata(&self, info_hash: &InfoHash) -> Option<SwarmMetadata>;
 }
 
 #[allow(clippy::module_name_repetitions)]
 pub trait RepositoryAsync<T>: Debug + Default + Sized + 'static {
     fn get(&self, key: &InfoHash) -> impl std::future::Future<Output = Option<T>> + Send;
-    fn get_metrics(&self) -> impl std::future::Future<Output = AggregateSwarmMetadata> + Send;
+    fn get_metrics(&self) -> impl std::future::Future<Output = AggregateActiveSwarmMetadata> + Send;
     fn get_paginated(&self, pagination: Option<&Pagination>) -> impl std::future::Future<Output = Vec<(InfoHash, T)>> + Send;
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents) -> impl std::future::Future<Output = ()> + Send;
+    fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) -> impl std::future::Future<Output = ()> + Send;
     fn remove(&self, key: &InfoHash) -> impl std::future::Future<Output = Option<T>> + Send;
     fn remove_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) -> impl std::future::Future<Output = ()> + Send;
     fn remove_peerless_torrents(&self, policy: &TrackerPolicy) -> impl std::future::Future<Output = ()> + Send;
@@ -40,7 +40,7 @@ pub trait RepositoryAsync<T>: Debug + Default + Sized + 'static {
         &self,
         info_hash: &InfoHash,
         peer: &peer::Peer,
-        opt_persistent_torrent: Option<PersistentTorrent>,
+        opt_persistent_torrent: Option<NumberOfDownloads>,
     ) -> impl std::future::Future<Output = bool> + Send;
     fn get_swarm_metadata(&self, info_hash: &InfoHash) -> impl std::future::Future<Output = Option<SwarmMetadata>> + Send;
 }
diff --git a/packages/torrent-repository-benchmarking/src/repository/rw_lock_std.rs b/packages/torrent-repository-benchmarking/src/repository/rw_lock_std.rs
index d190718af..5000579dd 100644
--- a/packages/torrent-repository-benchmarking/src/repository/rw_lock_std.rs
+++ b/packages/torrent-repository-benchmarking/src/repository/rw_lock_std.rs
@@ -1,8 +1,8 @@
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use super::Repository;
 use crate::entry::peer_list::PeerList;
@@ -45,7 +45,7 @@ impl Repository<EntrySingle> for TorrentsRwLockStd
 where
     EntrySingle: Entry,
 {
-    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<PersistentTorrent>) -> bool {
+    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<NumberOfDownloads>) -> bool {
         // todo: load persistent torrent data if provided
 
         let mut db = self.get_torrents_mut();
@@ -64,8 +64,8 @@ where
         db.get(key).cloned()
     }
 
-    fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         for entry in self.get_torrents().values() {
             let stats = entry.get_swarm_metadata();
@@ -92,7 +92,7 @@ where
         }
     }
 
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         let mut torrents = self.get_torrents_mut();
 
         for (info_hash, downloaded) in persistent_torrents {
diff --git a/packages/torrent-repository-benchmarking/src/repository/rw_lock_std_mutex_std.rs b/packages/torrent-repository-benchmarking/src/repository/rw_lock_std_mutex_std.rs
index 1764b94e8..085256ff1 100644
--- a/packages/torrent-repository-benchmarking/src/repository/rw_lock_std_mutex_std.rs
+++ b/packages/torrent-repository-benchmarking/src/repository/rw_lock_std_mutex_std.rs
@@ -3,8 +3,8 @@ use std::sync::Arc;
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use super::Repository;
 use crate::entry::peer_list::PeerList;
@@ -32,7 +32,7 @@ where
     EntryMutexStd: EntrySync,
     EntrySingle: Entry,
 {
-    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<PersistentTorrent>) -> bool {
+    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<NumberOfDownloads>) -> bool {
         // todo: load persistent torrent data if provided
 
         let maybe_entry = self.get_torrents().get(info_hash).cloned();
@@ -59,8 +59,8 @@ where
         db.get(key).cloned()
     }
 
-    fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         for entry in self.get_torrents().values() {
             let stats = entry.lock().expect("it should get a lock").get_swarm_metadata();
@@ -87,7 +87,7 @@ where
         }
     }
 
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         let mut torrents = self.get_torrents_mut();
 
         for (info_hash, completed) in persistent_torrents {
diff --git a/packages/torrent-repository-benchmarking/src/repository/rw_lock_std_mutex_tokio.rs b/packages/torrent-repository-benchmarking/src/repository/rw_lock_std_mutex_tokio.rs
index 116c1ff87..9fd451149 100644
--- a/packages/torrent-repository-benchmarking/src/repository/rw_lock_std_mutex_tokio.rs
+++ b/packages/torrent-repository-benchmarking/src/repository/rw_lock_std_mutex_tokio.rs
@@ -7,8 +7,8 @@ use futures::future::join_all;
 use futures::{Future, FutureExt};
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use super::RepositoryAsync;
 use crate::entry::peer_list::PeerList;
@@ -40,7 +40,7 @@ where
         &self,
         info_hash: &InfoHash,
         peer: &peer::Peer,
-        _opt_persistent_torrent: Option<PersistentTorrent>,
+        _opt_persistent_torrent: Option<NumberOfDownloads>,
     ) -> bool {
         // todo: load persistent torrent data if provided
 
@@ -85,8 +85,8 @@ where
         }
     }
 
-    async fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    async fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         let entries: Vec<_> = self.get_torrents().values().cloned().collect();
 
@@ -101,7 +101,7 @@ where
         metrics
     }
 
-    async fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    async fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         let mut db = self.get_torrents_mut();
 
         for (info_hash, completed) in persistent_torrents {
diff --git a/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio.rs b/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio.rs
index 53838023d..e85200aeb 100644
--- a/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio.rs
+++ b/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio.rs
@@ -1,8 +1,8 @@
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use super::RepositoryAsync;
 use crate::entry::peer_list::PeerList;
@@ -50,7 +50,7 @@ where
         &self,
         info_hash: &InfoHash,
         peer: &peer::Peer,
-        _opt_persistent_torrent: Option<PersistentTorrent>,
+        _opt_persistent_torrent: Option<NumberOfDownloads>,
     ) -> bool {
         // todo: load persistent torrent data if provided
 
@@ -84,8 +84,8 @@ where
         }
     }
 
-    async fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    async fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         for entry in self.get_torrents().await.values() {
             let stats = entry.get_swarm_metadata();
@@ -98,7 +98,7 @@ where
         metrics
     }
 
-    async fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    async fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         let mut torrents = self.get_torrents_mut().await;
 
         for (info_hash, completed) in persistent_torrents {
diff --git a/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio_mutex_std.rs b/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio_mutex_std.rs
index eb7e300fd..8d6584713 100644
--- a/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio_mutex_std.rs
+++ b/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio_mutex_std.rs
@@ -3,8 +3,8 @@ use std::sync::Arc;
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use super::RepositoryAsync;
 use crate::entry::peer_list::PeerList;
@@ -38,7 +38,7 @@ where
         &self,
         info_hash: &InfoHash,
         peer: &peer::Peer,
-        _opt_persistent_torrent: Option<PersistentTorrent>,
+        _opt_persistent_torrent: Option<NumberOfDownloads>,
     ) -> bool {
         // todo: load persistent torrent data if provided
 
@@ -78,8 +78,8 @@ where
         }
     }
 
-    async fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    async fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         for entry in self.get_torrents().await.values() {
             let stats = entry.get_swarm_metadata();
@@ -92,7 +92,7 @@ where
         metrics
     }
 
-    async fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    async fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         let mut torrents = self.get_torrents_mut().await;
 
         for (info_hash, completed) in persistent_torrents {
diff --git a/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio_mutex_tokio.rs b/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio_mutex_tokio.rs
index c8ebaf4d6..c8f499e03 100644
--- a/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio_mutex_tokio.rs
+++ b/packages/torrent-repository-benchmarking/src/repository/rw_lock_tokio_mutex_tokio.rs
@@ -3,8 +3,8 @@ use std::sync::Arc;
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use super::RepositoryAsync;
 use crate::entry::peer_list::PeerList;
@@ -38,7 +38,7 @@ where
         &self,
         info_hash: &InfoHash,
         peer: &peer::Peer,
-        _opt_persistent_torrent: Option<PersistentTorrent>,
+        _opt_persistent_torrent: Option<NumberOfDownloads>,
     ) -> bool {
         // todo: load persistent torrent data if provided
 
@@ -81,8 +81,8 @@ where
         }
     }
 
-    async fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    async fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         for entry in self.get_torrents().await.values() {
             let stats = entry.get_swarm_metadata().await;
@@ -95,7 +95,7 @@ where
         metrics
     }
 
-    async fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    async fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         let mut db = self.get_torrents_mut().await;
 
         for (info_hash, completed) in persistent_torrents {
diff --git a/packages/torrent-repository-benchmarking/src/repository/skip_map_mutex_std.rs b/packages/torrent-repository-benchmarking/src/repository/skip_map_mutex_std.rs
index 8a15a9442..0432b13d0 100644
--- a/packages/torrent-repository-benchmarking/src/repository/skip_map_mutex_std.rs
+++ b/packages/torrent-repository-benchmarking/src/repository/skip_map_mutex_std.rs
@@ -4,8 +4,8 @@ use bittorrent_primitives::info_hash::InfoHash;
 use crossbeam_skiplist::SkipMap;
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use super::Repository;
 use crate::entry::peer_list::PeerList;
@@ -38,7 +38,7 @@ where
     ///
     /// Returns `true` if the number of downloads was increased because the peer
     /// completed the download.
-    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, opt_persistent_torrent: Option<PersistentTorrent>) -> bool {
+    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, opt_persistent_torrent: Option<NumberOfDownloads>) -> bool {
         if let Some(existing_entry) = self.torrents.get(info_hash) {
             existing_entry.value().upsert_peer(peer)
         } else {
@@ -69,8 +69,8 @@ where
         maybe_entry.map(|entry| entry.value().clone())
     }
 
-    fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         for entry in &self.torrents {
             let stats = entry.value().lock().expect("it should get a lock").get_swarm_metadata();
@@ -100,7 +100,7 @@ where
         }
     }
 
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         for (info_hash, completed) in persistent_torrents {
             if self.torrents.contains_key(info_hash) {
                 continue;
@@ -146,7 +146,7 @@ where
     EntryRwLockParkingLot: EntrySync,
     EntrySingle: Entry,
 {
-    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<PersistentTorrent>) -> bool {
+    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<NumberOfDownloads>) -> bool {
         // todo: load persistent torrent data if provided
 
         let entry = self.torrents.get_or_insert(*info_hash, Arc::default());
@@ -162,8 +162,8 @@ where
         maybe_entry.map(|entry| entry.value().clone())
     }
 
-    fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         for entry in &self.torrents {
             let stats = entry.value().read().get_swarm_metadata();
@@ -193,7 +193,7 @@ where
         }
     }
 
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         for (info_hash, completed) in persistent_torrents {
             if self.torrents.contains_key(info_hash) {
                 continue;
@@ -239,7 +239,7 @@ where
     EntryMutexParkingLot: EntrySync,
     EntrySingle: Entry,
 {
-    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<PersistentTorrent>) -> bool {
+    fn upsert_peer(&self, info_hash: &InfoHash, peer: &peer::Peer, _opt_persistent_torrent: Option<NumberOfDownloads>) -> bool {
         // todo: load persistent torrent data if provided
 
         let entry = self.torrents.get_or_insert(*info_hash, Arc::default());
@@ -255,8 +255,8 @@ where
         maybe_entry.map(|entry| entry.value().clone())
     }
 
-    fn get_metrics(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
+    fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
+        let mut metrics = AggregateActiveSwarmMetadata::default();
 
         for entry in &self.torrents {
             let stats = entry.value().lock().get_swarm_metadata();
@@ -286,7 +286,7 @@ where
         }
     }
 
-    fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         for (info_hash, completed) in persistent_torrents {
             if self.torrents.contains_key(info_hash) {
                 continue;
diff --git a/packages/torrent-repository-benchmarking/tests/common/repo.rs b/packages/torrent-repository-benchmarking/tests/common/repo.rs
index 6c5c6ff77..2987240ef 100644
--- a/packages/torrent-repository-benchmarking/tests/common/repo.rs
+++ b/packages/torrent-repository-benchmarking/tests/common/repo.rs
@@ -1,8 +1,8 @@
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 use torrust_tracker_torrent_repository_benchmarking::repository::{Repository as _, RepositoryAsync as _};
 use torrust_tracker_torrent_repository_benchmarking::{
     EntrySingle, TorrentsDashMapMutexStd, TorrentsRwLockStd, TorrentsRwLockStdMutexStd, TorrentsRwLockStdMutexTokio,
@@ -29,7 +29,7 @@ impl Repo {
         &self,
         info_hash: &InfoHash,
         peer: &peer::Peer,
-        opt_persistent_torrent: Option<PersistentTorrent>,
+        opt_persistent_torrent: Option<NumberOfDownloads>,
     ) -> bool {
         match self {
             Repo::RwLockStd(repo) => repo.upsert_peer(info_hash, peer, opt_persistent_torrent),
@@ -75,7 +75,7 @@ impl Repo {
         }
     }
 
-    pub(crate) async fn get_metrics(&self) -> AggregateSwarmMetadata {
+    pub(crate) async fn get_metrics(&self) -> AggregateActiveSwarmMetadata {
         match self {
             Repo::RwLockStd(repo) => repo.get_metrics(),
             Repo::RwLockStdMutexStd(repo) => repo.get_metrics(),
@@ -144,7 +144,7 @@ impl Repo {
         }
     }
 
-    pub(crate) async fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
+    pub(crate) async fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
         match self {
             Repo::RwLockStd(repo) => repo.import_persistent(persistent_torrents),
             Repo::RwLockStdMutexStd(repo) => repo.import_persistent(persistent_torrents),
diff --git a/packages/torrent-repository-benchmarking/tests/common/torrent_peer_builder.rs b/packages/torrent-repository-benchmarking/tests/common/torrent_peer_builder.rs
index 33120180d..48aa981cd 100644
--- a/packages/torrent-repository-benchmarking/tests/common/torrent_peer_builder.rs
+++ b/packages/torrent-repository-benchmarking/tests/common/torrent_peer_builder.rs
@@ -1,79 +1,15 @@
-use std::net::SocketAddr;
-
-use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
-use torrust_tracker_clock::clock::Time;
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
-
-use crate::CurrentClock;
-
-#[derive(Debug, Default)]
-struct TorrentPeerBuilder {
-    peer: peer::Peer,
-}
-
-#[allow(dead_code)]
-impl TorrentPeerBuilder {
-    #[must_use]
-    fn new() -> Self {
-        Self {
-            peer: peer::Peer {
-                updated: CurrentClock::now(),
-                ..Default::default()
-            },
-        }
-    }
-
-    #[must_use]
-    fn with_event_completed(mut self) -> Self {
-        self.peer.event = AnnounceEvent::Completed;
-        self
-    }
-
-    #[must_use]
-    fn with_event_started(mut self) -> Self {
-        self.peer.event = AnnounceEvent::Started;
-        self
-    }
-
-    #[must_use]
-    fn with_peer_address(mut self, peer_addr: SocketAddr) -> Self {
-        self.peer.peer_addr = peer_addr;
-        self
-    }
-
-    #[must_use]
-    fn with_peer_id(mut self, peer_id: PeerId) -> Self {
-        self.peer.peer_id = peer_id;
-        self
-    }
-
-    #[must_use]
-    fn with_number_of_bytes_left(mut self, left: i64) -> Self {
-        self.peer.left = NumberOfBytes::new(left);
-        self
-    }
-
-    #[must_use]
-    fn updated_at(mut self, updated: DurationSinceUnixEpoch) -> Self {
-        self.peer.updated = updated;
-        self
-    }
-
-    #[must_use]
-    fn into(self) -> peer::Peer {
-        self.peer
-    }
-}
+use torrust_tracker_primitives::peer::fixture::PeerBuilder;
+use torrust_tracker_primitives::peer::{self};
 
 /// A torrent seeder is a peer with 0 bytes left to download which
 /// has not announced it has stopped
 #[must_use]
 pub fn a_completed_peer(id: i32) -> peer::Peer {
     let peer_id = peer::Id::new(id);
-    TorrentPeerBuilder::new()
-        .with_number_of_bytes_left(0)
+    PeerBuilder::default()
+        .with_bytes_left_to_download(0)
         .with_event_completed()
-        .with_peer_id(*peer_id)
+        .with_peer_id(&peer_id)
         .into()
 }
 
@@ -82,9 +18,9 @@ pub fn a_completed_peer(id: i32) -> peer::Peer {
 #[must_use]
 pub fn a_started_peer(id: i32) -> peer::Peer {
     let peer_id = peer::Id::new(id);
-    TorrentPeerBuilder::new()
-        .with_number_of_bytes_left(1)
+    PeerBuilder::default()
+        .with_bytes_left_to_download(1)
         .with_event_started()
-        .with_peer_id(*peer_id)
+        .with_peer_id(&peer_id)
         .into()
 }
diff --git a/packages/torrent-repository-benchmarking/tests/entry/mod.rs b/packages/torrent-repository-benchmarking/tests/entry/mod.rs
index b46c05415..86ca891d4 100644
--- a/packages/torrent-repository-benchmarking/tests/entry/mod.rs
+++ b/packages/torrent-repository-benchmarking/tests/entry/mod.rs
@@ -1,5 +1,4 @@
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use std::ops::Sub;
 use std::time::Duration;
 
 use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
@@ -368,7 +367,7 @@ async fn it_should_get_peers_excluding_the_client_socket(
     let peers = torrent.get_peers(None).await;
     let mut peer = **peers.first().expect("there should be a peer");
 
-    let socket = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8081);
+    let socket = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8081);
 
     // for this test, we should not already use this socket.
     assert_ne!(peer.peer_addr, socket);
@@ -430,7 +429,9 @@ async fn it_should_remove_inactive_peers_beyond_cutoff(
     let now = clock::Working::now();
     clock::Stopped::local_set(&now);
 
-    peer.updated = now.sub(EXPIRE);
+    peer.updated = now
+        .checked_sub(EXPIRE)
+        .expect("it_should_remove_inactive_peers_beyond_cutoff: EXPIRE must not exceed now");
 
     torrent.upsert_peer(&peer).await;
 
diff --git a/packages/torrent-repository-benchmarking/tests/repository/mod.rs b/packages/torrent-repository-benchmarking/tests/repository/mod.rs
index 6973f38bd..fb0b8fcff 100644
--- a/packages/torrent-repository-benchmarking/tests/repository/mod.rs
+++ b/packages/torrent-repository-benchmarking/tests/repository/mod.rs
@@ -7,7 +7,7 @@ use rstest::{fixture, rstest};
 use torrust_tracker_configuration::TrackerPolicy;
 use torrust_tracker_primitives::pagination::Pagination;
 use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
-use torrust_tracker_primitives::PersistentTorrents;
+use torrust_tracker_primitives::NumberOfDownloadsBTreeMap;
 use torrust_tracker_torrent_repository_benchmarking::entry::Entry as _;
 use torrust_tracker_torrent_repository_benchmarking::repository::dash_map_mutex_std::XacrimonDashMap;
 use torrust_tracker_torrent_repository_benchmarking::repository::rw_lock_std::RwLockStd;
@@ -167,12 +167,12 @@ fn many_hashed_in_order() -> Entries {
 }
 
 #[fixture]
-fn persistent_empty() -> PersistentTorrents {
-    PersistentTorrents::default()
+fn persistent_empty() -> NumberOfDownloadsBTreeMap {
+    NumberOfDownloadsBTreeMap::default()
 }
 
 #[fixture]
-fn persistent_single() -> PersistentTorrents {
+fn persistent_single() -> NumberOfDownloadsBTreeMap {
     let hash = &mut DefaultHasher::default();
 
     hash.write_u8(1);
@@ -182,7 +182,7 @@ fn persistent_single() -> PersistentTorrents {
 }
 
 #[fixture]
-fn persistent_three() -> PersistentTorrents {
+fn persistent_three() -> NumberOfDownloadsBTreeMap {
     let hash = &mut DefaultHasher::default();
 
     hash.write_u8(1);
@@ -364,12 +364,10 @@ async fn it_should_get_paginated(
         }
 
         // it should return the only the second entry if both the limit and the offset are one.
-        Pagination { limit: 1, offset: 1 } => {
-            if info_hashes.len() > 1 {
-                let page = repo.get_paginated(Some(&paginated)).await;
-                assert_eq!(page.len(), 1);
-                assert_eq!(page[0].0, info_hashes[1]);
-            }
+        Pagination { limit: 1, offset: 1 } if info_hashes.len() > 1 => {
+            let page = repo.get_paginated(Some(&paginated)).await;
+            assert_eq!(page.len(), 1);
+            assert_eq!(page[0].0, info_hashes[1]);
         }
         // the other cases are not yet tested.
         _ => {}
@@ -402,11 +400,11 @@ async fn it_should_get_metrics(
     repo: Repo,
     #[case] entries: Entries,
 ) {
-    use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
+    use torrust_tracker_primitives::swarm_metadata::AggregateActiveSwarmMetadata;
 
     make(&repo, &entries).await;
 
-    let mut metrics = AggregateSwarmMetadata::default();
+    let mut metrics = AggregateActiveSwarmMetadata::default();
 
     for (_, torrent) in entries {
         let stats = torrent.get_swarm_metadata();
@@ -445,12 +443,14 @@ async fn it_should_import_persistent_torrents(
     )]
     repo: Repo,
     #[case] entries: Entries,
-    #[values(persistent_empty(), persistent_single(), persistent_three())] persistent_torrents: PersistentTorrents,
+    #[values(persistent_empty(), persistent_single(), persistent_three())] persistent_torrents: NumberOfDownloadsBTreeMap,
 ) {
     make(&repo, &entries).await;
 
     let mut downloaded = repo.get_metrics().await.total_downloaded;
-    persistent_torrents.iter().for_each(|(_, d)| downloaded += u64::from(*d));
+    for d in persistent_torrents.values() {
+        downloaded += u64::from(*d);
+    }
 
     repo.import_persistent(&persistent_torrents).await;
 
@@ -526,7 +526,6 @@ async fn it_should_remove_inactive_peers(
     repo: Repo,
     #[case] entries: Entries,
 ) {
-    use std::ops::Sub as _;
     use std::time::Duration;
 
     use torrust_tracker_clock::clock::stopped::Stopped as _;
@@ -556,7 +555,9 @@ async fn it_should_remove_inactive_peers(
         let now = clock::Working::now();
         clock::Stopped::local_set(&now);
 
-        peer.updated = now.sub(EXPIRE);
+        peer.updated = now
+            .checked_sub(EXPIRE)
+            .expect("it_should_remove_inactive_peers_beyond_cutoff: EXPIRE must not exceed now");
     }
 
     // Insert the infohash and peer into the repository
diff --git a/packages/torrent-repository/README.md b/packages/torrent-repository/README.md
deleted file mode 100644
index ffc71f1d7..000000000
--- a/packages/torrent-repository/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Torrust Tracker Torrent Repository
-
-A library to provide a torrent repository to the [Torrust Tracker](https://github.com/torrust/torrust-tracker).
-
-## Benchmarking
-
-```console
-cargo bench -p torrust-tracker-torrent-repository
-```
-
-Example partial output:
-
-```output
-     Running benches/repository_benchmark.rs (target/release/deps/repository_benchmark-a9b0013c8d09c3c3)
-add_one_torrent/RwLockStd
-                        time:   [63.057 ns 63.242 ns 63.506 ns]
-Found 12 outliers among 100 measurements (12.00%)
-  2 (2.00%) low severe
-  2 (2.00%) low mild
-  2 (2.00%) high mild
-  6 (6.00%) high severe
-add_one_torrent/RwLockStdMutexStd
-                        time:   [62.505 ns 63.077 ns 63.817 ns]
-```
-
-## Documentation
-
-[Crate documentation](https://docs.rs/torrust-tracker-torrent-repository).
-
-## License
-
-The project is licensed under the terms of the [GNU AFFERO GENERAL PUBLIC LICENSE](./LICENSE).
diff --git a/packages/torrent-repository/src/entry/mod.rs b/packages/torrent-repository/src/entry/mod.rs
deleted file mode 100644
index 785672be5..000000000
--- a/packages/torrent-repository/src/entry/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod peer_list;
-pub mod torrent;
diff --git a/packages/torrent-repository/src/entry/peer_list.rs b/packages/torrent-repository/src/entry/peer_list.rs
deleted file mode 100644
index 33270cf27..000000000
--- a/packages/torrent-repository/src/entry/peer_list.rs
+++ /dev/null
@@ -1,286 +0,0 @@
-//! A peer list.
-use std::net::SocketAddr;
-use std::sync::Arc;
-
-use aquatic_udp_protocol::PeerId;
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
-
-// code-review: the current implementation uses the peer Id as the ``BTreeMap``
-// key. That would allow adding two identical peers except for the Id.
-// For example, two peers with the same socket address but a different peer Id
-// would be allowed. That would lead to duplicated peers in the tracker responses.
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct PeerList {
-    peers: std::collections::BTreeMap<PeerId, Arc<peer::Peer>>,
-}
-
-impl PeerList {
-    #[must_use]
-    pub fn len(&self) -> usize {
-        self.peers.len()
-    }
-
-    #[must_use]
-    pub fn is_empty(&self) -> bool {
-        self.peers.is_empty()
-    }
-
-    pub fn upsert(&mut self, value: Arc<peer::Peer>) -> Option<Arc<peer::Peer>> {
-        self.peers.insert(value.peer_id, value)
-    }
-
-    pub fn remove(&mut self, key: &PeerId) -> Option<Arc<peer::Peer>> {
-        self.peers.remove(key)
-    }
-
-    pub fn remove_inactive_peers(&mut self, current_cutoff: DurationSinceUnixEpoch) {
-        self.peers
-            .retain(|_, peer| peer::ReadInfo::get_updated(peer) > current_cutoff);
-    }
-
-    #[must_use]
-    pub fn get(&self, peer_id: &PeerId) -> Option<&Arc<peer::Peer>> {
-        self.peers.get(peer_id)
-    }
-
-    #[must_use]
-    pub fn get_all(&self, limit: Option<usize>) -> Vec<Arc<peer::Peer>> {
-        match limit {
-            Some(limit) => self.peers.values().take(limit).cloned().collect(),
-            None => self.peers.values().cloned().collect(),
-        }
-    }
-
-    #[must_use]
-    pub fn seeders_and_leechers(&self) -> (usize, usize) {
-        let seeders = self.peers.values().filter(|peer| peer.is_seeder()).count();
-        let leechers = self.len() - seeders;
-
-        (seeders, leechers)
-    }
-
-    #[must_use]
-    pub fn get_peers_excluding_addr(&self, peer_addr: &SocketAddr, limit: Option<usize>) -> Vec<Arc<peer::Peer>> {
-        match limit {
-            Some(limit) => self
-                .peers
-                .values()
-                // Take peers which are not the client peer
-                .filter(|peer| peer::ReadInfo::get_address(peer.as_ref()) != *peer_addr)
-                // Limit the number of peers on the result
-                .take(limit)
-                .cloned()
-                .collect(),
-            None => self
-                .peers
-                .values()
-                // Take peers which are not the client peer
-                .filter(|peer| peer::ReadInfo::get_address(peer.as_ref()) != *peer_addr)
-                .cloned()
-                .collect(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    mod it_should {
-        use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-        use std::sync::Arc;
-
-        use aquatic_udp_protocol::PeerId;
-        use torrust_tracker_primitives::peer::fixture::PeerBuilder;
-        use torrust_tracker_primitives::DurationSinceUnixEpoch;
-
-        use crate::entry::peer_list::PeerList;
-
-        #[test]
-        fn be_empty_when_no_peers_have_been_inserted() {
-            let peer_list = PeerList::default();
-
-            assert!(peer_list.is_empty());
-        }
-
-        #[test]
-        fn have_zero_length_when_no_peers_have_been_inserted() {
-            let peer_list = PeerList::default();
-
-            assert_eq!(peer_list.len(), 0);
-        }
-
-        #[test]
-        fn allow_inserting_a_new_peer() {
-            let mut peer_list = PeerList::default();
-
-            let peer = PeerBuilder::default().build();
-
-            assert_eq!(peer_list.upsert(peer.into()), None);
-        }
-
-        #[test]
-        fn allow_updating_a_preexisting_peer() {
-            let mut peer_list = PeerList::default();
-
-            let peer = PeerBuilder::default().build();
-
-            peer_list.upsert(peer.into());
-
-            assert_eq!(peer_list.upsert(peer.into()), Some(Arc::new(peer)));
-        }
-
-        #[test]
-        fn allow_getting_all_peers() {
-            let mut peer_list = PeerList::default();
-
-            let peer = PeerBuilder::default().build();
-
-            peer_list.upsert(peer.into());
-
-            assert_eq!(peer_list.get_all(None), [Arc::new(peer)]);
-        }
-
-        #[test]
-        fn allow_getting_one_peer_by_id() {
-            let mut peer_list = PeerList::default();
-
-            let peer = PeerBuilder::default().build();
-
-            peer_list.upsert(peer.into());
-
-            assert_eq!(peer_list.get(&peer.peer_id), Some(Arc::new(peer)).as_ref());
-        }
-
-        #[test]
-        fn increase_the_number_of_peers_after_inserting_a_new_one() {
-            let mut peer_list = PeerList::default();
-
-            let peer = PeerBuilder::default().build();
-
-            peer_list.upsert(peer.into());
-
-            assert_eq!(peer_list.len(), 1);
-        }
-
-        #[test]
-        fn decrease_the_number_of_peers_after_removing_one() {
-            let mut peer_list = PeerList::default();
-
-            let peer = PeerBuilder::default().build();
-
-            peer_list.upsert(peer.into());
-
-            peer_list.remove(&peer.peer_id);
-
-            assert!(peer_list.is_empty());
-        }
-
-        #[test]
-        fn allow_removing_an_existing_peer() {
-            let mut peer_list = PeerList::default();
-
-            let peer = PeerBuilder::default().build();
-
-            peer_list.upsert(peer.into());
-
-            peer_list.remove(&peer.peer_id);
-
-            assert_eq!(peer_list.get(&peer.peer_id), None);
-        }
-
-        #[test]
-        fn allow_getting_all_peers_excluding_peers_with_a_given_address() {
-            let mut peer_list = PeerList::default();
-
-            let peer1 = PeerBuilder::default()
-                .with_peer_id(&PeerId(*b"-qB00000000000000001"))
-                .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 6969))
-                .build();
-            peer_list.upsert(peer1.into());
-
-            let peer2 = PeerBuilder::default()
-                .with_peer_id(&PeerId(*b"-qB00000000000000002"))
-                .with_peer_addr(&SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 6969))
-                .build();
-            peer_list.upsert(peer2.into());
-
-            assert_eq!(peer_list.get_peers_excluding_addr(&peer2.peer_addr, None), [Arc::new(peer1)]);
-        }
-
-        #[test]
-        fn return_the_number_of_seeders_in_the_list() {
-            let mut peer_list = PeerList::default();
-
-            let seeder = PeerBuilder::seeder().build();
-            let leecher = PeerBuilder::leecher().build();
-
-            peer_list.upsert(seeder.into());
-            peer_list.upsert(leecher.into());
-
-            let (seeders, _leechers) = peer_list.seeders_and_leechers();
-
-            assert_eq!(seeders, 1);
-        }
-
-        #[test]
-        fn return_the_number_of_leechers_in_the_list() {
-            let mut peer_list = PeerList::default();
-
-            let seeder = PeerBuilder::seeder().build();
-            let leecher = PeerBuilder::leecher().build();
-
-            peer_list.upsert(seeder.into());
-            peer_list.upsert(leecher.into());
-
-            let (_seeders, leechers) = peer_list.seeders_and_leechers();
-
-            assert_eq!(leechers, 1);
-        }
-
-        #[test]
-        fn remove_inactive_peers() {
-            let mut peer_list = PeerList::default();
-            let one_second = DurationSinceUnixEpoch::new(1, 0);
-
-            // Insert the peer
-            let last_update_time = DurationSinceUnixEpoch::new(1_669_397_478_934, 0);
-            let peer = PeerBuilder::default().last_updated_on(last_update_time).build();
-            peer_list.upsert(peer.into());
-
-            // Remove peers not updated since one second after inserting the peer
-            peer_list.remove_inactive_peers(last_update_time + one_second);
-
-            assert_eq!(peer_list.len(), 0);
-        }
-
-        #[test]
-        fn not_remove_active_peers() {
-            let mut peer_list = PeerList::default();
-            let one_second = DurationSinceUnixEpoch::new(1, 0);
-
-            // Insert the peer
-            let last_update_time = DurationSinceUnixEpoch::new(1_669_397_478_934, 0);
-            let peer = PeerBuilder::default().last_updated_on(last_update_time).build();
-            peer_list.upsert(peer.into());
-
-            // Remove peers not updated since one second before inserting the peer.
-            peer_list.remove_inactive_peers(last_update_time - one_second);
-
-            assert_eq!(peer_list.len(), 1);
-        }
-
-        #[test]
-        fn allow_inserting_two_identical_peers_except_for_the_id() {
-            let mut peer_list = PeerList::default();
-
-            let peer1 = PeerBuilder::default().with_peer_id(&PeerId(*b"-qB00000000000000001")).build();
-            peer_list.upsert(peer1.into());
-
-            let peer2 = PeerBuilder::default().with_peer_id(&PeerId(*b"-qB00000000000000002")).build();
-            peer_list.upsert(peer2.into());
-
-            assert_eq!(peer_list.len(), 2);
-        }
-    }
-}
diff --git a/packages/torrent-repository/src/entry/torrent.rs b/packages/torrent-repository/src/entry/torrent.rs
deleted file mode 100644
index 1cc0f7ba2..000000000
--- a/packages/torrent-repository/src/entry/torrent.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use std::fmt::Debug;
-use std::net::SocketAddr;
-use std::sync::Arc;
-
-use aquatic_udp_protocol::AnnounceEvent;
-use torrust_tracker_configuration::TrackerPolicy;
-use torrust_tracker_primitives::peer::{self};
-use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
-use torrust_tracker_primitives::DurationSinceUnixEpoch;
-
-use super::peer_list::PeerList;
-
-/// A data structure containing all the information about a torrent in the tracker.
-///
-/// This is the tracker entry for a given torrent and contains the swarm data,
-/// that's the list of all the peers trying to download the same torrent.
-/// The tracker keeps one entry like this for every torrent.
-#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct TrackedTorrent {
-    /// A network of peers that are all trying to download the torrent associated to this entry
-    pub(crate) swarm: PeerList,
-
-    /// The number of peers that have ever completed downloading the torrent associated to this entry
-    pub(crate) downloaded: u32,
-}
-
-impl TrackedTorrent {
-    #[allow(clippy::cast_possible_truncation)]
-    #[must_use]
-    pub fn get_swarm_metadata(&self) -> SwarmMetadata {
-        let (seeders, leechers) = self.swarm.seeders_and_leechers();
-
-        SwarmMetadata {
-            downloaded: self.downloaded,
-            complete: seeders as u32,
-            incomplete: leechers as u32,
-        }
-    }
-
-    #[must_use]
-    pub fn meets_retaining_policy(&self, policy: &TrackerPolicy) -> bool {
-        if policy.persistent_torrent_completed_stat && self.downloaded > 0 {
-            return true;
-        }
-
-        if policy.remove_peerless_torrents && self.swarm.is_empty() {
-            return false;
-        }
-
-        true
-    }
-
-    #[must_use]
-    pub fn peers_is_empty(&self) -> bool {
-        self.swarm.is_empty()
-    }
-
-    #[must_use]
-    pub fn get_peers_len(&self) -> usize {
-        self.swarm.len()
-    }
-
-    #[must_use]
-    pub fn get_peers(&self, limit: Option<usize>) -> Vec<Arc<peer::Peer>> {
-        self.swarm.get_all(limit)
-    }
-
-    #[must_use]
-    pub fn get_peers_for_client(&self, client: &SocketAddr, limit: Option<usize>) -> Vec<Arc<peer::Peer>> {
-        self.swarm.get_peers_excluding_addr(client, limit)
-    }
-
-    pub fn upsert_peer(&mut self, peer: &peer::Peer) -> bool {
-        let mut number_of_downloads_increased: bool = false;
-
-        match peer::ReadInfo::get_event(peer) {
-            AnnounceEvent::Stopped => {
-                drop(self.swarm.remove(&peer::ReadInfo::get_id(peer)));
-            }
-            AnnounceEvent::Completed => {
-                let previous = self.swarm.upsert(Arc::new(*peer));
-                // Don't count if peer was not previously known and not already completed.
-                if previous.is_some_and(|p| p.event != AnnounceEvent::Completed) {
-                    self.downloaded += 1;
-                    number_of_downloads_increased = true;
-                }
-            }
-            _ => {
-                // `Started` event (first announced event) or
-                // `None` event (announcements done at regular intervals).
-                drop(self.swarm.upsert(Arc::new(*peer)));
-            }
-        }
-
-        number_of_downloads_increased
-    }
-
-    pub fn remove_inactive_peers(&mut self, current_cutoff: DurationSinceUnixEpoch) {
-        self.swarm.remove_inactive_peers(current_cutoff);
-    }
-}
diff --git a/packages/torrent-repository/src/repository.rs b/packages/torrent-repository/src/repository.rs
deleted file mode 100644
index 8e67f2487..000000000
--- a/packages/torrent-repository/src/repository.rs
+++ /dev/null
@@ -1,935 +0,0 @@
-use std::sync::Arc;
-
-use bittorrent_primitives::info_hash::InfoHash;
-use crossbeam_skiplist::SkipMap;
-use torrust_tracker_configuration::TrackerPolicy;
-use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
-
-use crate::entry::peer_list::PeerList;
-use crate::entry::torrent::TrackedTorrent;
-use crate::{LockTrackedTorrent, TrackedTorrentHandle};
-
-#[derive(Default, Debug)]
-pub struct TorrentRepository {
-    pub torrents: SkipMap<InfoHash, TrackedTorrentHandle>,
-}
-
-impl TorrentRepository {
-    /// Upsert a peer into the swarm of a torrent.
-    ///
-    /// Optionally, it can also preset the number of downloads of the torrent
-    /// only if it's the first time the torrent is being inserted.
-    ///
-    /// # Arguments
-    ///
-    /// * `info_hash` - The info hash of the torrent.
-    /// * `peer` - The peer to upsert.
-    /// * `opt_persistent_torrent` - The optional persisted data about a torrent
-    ///   (number of downloads for the torrent).
-    ///
-    /// # Returns
-    ///
-    /// Returns `true` if the number of downloads was increased because the peer
-    /// completed the download.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if the lock for the entry cannot be obtained.
-    pub fn upsert_peer(
-        &self,
-        info_hash: &InfoHash,
-        peer: &peer::Peer,
-        opt_persistent_torrent: Option<PersistentTorrent>,
-    ) -> bool {
-        if let Some(existing_entry) = self.torrents.get(info_hash) {
-            tracing::debug!("Torrent already exists: {:?}", info_hash);
-
-            existing_entry.value().lock_or_panic().upsert_peer(peer)
-        } else {
-            tracing::debug!("Inserting new torrent: {:?}", info_hash);
-
-            let new_entry = if let Some(number_of_downloads) = opt_persistent_torrent {
-                TrackedTorrentHandle::new(
-                    TrackedTorrent {
-                        swarm: PeerList::default(),
-                        downloaded: number_of_downloads,
-                    }
-                    .into(),
-                )
-            } else {
-                TrackedTorrentHandle::default()
-            };
-
-            let inserted_entry = self.torrents.get_or_insert(*info_hash, new_entry);
-
-            let mut torrent_guard = inserted_entry.value().lock_or_panic();
-
-            torrent_guard.upsert_peer(peer)
-        }
-    }
-
-    /// Removes a torrent entry from the repository.
-    ///
-    /// # Returns
-    ///
-    /// An `Option` containing the removed torrent entry if it existed.
-    #[must_use]
-    pub fn remove(&self, key: &InfoHash) -> Option<TrackedTorrentHandle> {
-        self.torrents.remove(key).map(|entry| entry.value().clone())
-    }
-
-    /// Removes inactive peers from all torrent entries.
-    ///
-    /// A peer is considered inactive if its last update timestamp is older than
-    /// the provided cutoff time.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if the lock for the entry cannot be obtained.
-    pub fn remove_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) {
-        for entry in &self.torrents {
-            entry.value().lock_or_panic().remove_inactive_peers(current_cutoff);
-        }
-    }
-
-    /// Retrieves a tracked torrent handle by its infohash.
-    ///
-    /// # Returns
-    ///
-    /// An `Option` containing the tracked torrent handle if found.
-    #[must_use]
-    pub fn get(&self, key: &InfoHash) -> Option<TrackedTorrentHandle> {
-        let maybe_entry = self.torrents.get(key);
-        maybe_entry.map(|entry| entry.value().clone())
-    }
-
-    /// Retrieves a paginated list of tracked torrent handles.
-    ///
-    /// This method returns a vector of tuples, each containing an infohash and
-    /// its associated tracked torrent handle. The pagination parameters
-    /// (offset and limit) can be used to control the size of the result set.
-    ///
-    /// # Returns
-    ///
-    /// A vector of `(InfoHash, TorrentEntry)` tuples.
-    #[must_use]
-    pub fn get_paginated(&self, pagination: Option<&Pagination>) -> Vec<(InfoHash, TrackedTorrentHandle)> {
-        match pagination {
-            Some(pagination) => self
-                .torrents
-                .iter()
-                .skip(pagination.offset as usize)
-                .take(pagination.limit as usize)
-                .map(|entry| (*entry.key(), entry.value().clone()))
-                .collect(),
-            None => self
-                .torrents
-                .iter()
-                .map(|entry| (*entry.key(), entry.value().clone()))
-                .collect(),
-        }
-    }
-
-    /// Retrieves swarm metadata for a given torrent.
-    ///
-    /// # Returns
-    ///
-    /// A `SwarmMetadata` struct containing the aggregated torrent data if found.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if the lock for the entry cannot be obtained.
-    #[must_use]
-    pub fn get_swarm_metadata(&self, info_hash: &InfoHash) -> Option<SwarmMetadata> {
-        self.torrents
-            .get(info_hash)
-            .map(|entry| entry.value().lock_or_panic().get_swarm_metadata())
-    }
-
-    /// Retrieves swarm metadata for a given torrent.
-    ///
-    /// # Returns
-    ///
-    /// A `SwarmMetadata` struct containing the aggregated torrent data if it's
-    /// found or a zeroed metadata struct if not.
-    #[must_use]
-    pub fn get_swarm_metadata_or_default(&self, info_hash: &InfoHash) -> SwarmMetadata {
-        match self.get_swarm_metadata(info_hash) {
-            Some(swarm_metadata) => swarm_metadata,
-            None => SwarmMetadata::zeroed(),
-        }
-    }
-
-    /// Retrieves torrent peers for a given torrent and client, excluding the
-    /// requesting client.
-    ///
-    /// This method filters out the client making the request (based on its
-    /// network address) and returns up to a maximum number of peers, defined by
-    /// the greater of the provided limit or the global `TORRENT_PEERS_LIMIT`.
-    ///
-    /// # Returns
-    ///
-    /// A vector of peers (wrapped in `Arc`) representing the active peers for
-    /// the torrent, excluding the requesting client.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if the lock for the torrent entry cannot be obtained.
-    #[must_use]
-    pub fn get_peers_for(&self, info_hash: &InfoHash, peer: &peer::Peer, limit: usize) -> Vec<Arc<peer::Peer>> {
-        match self.get(info_hash) {
-            None => vec![],
-            Some(entry) => entry.lock_or_panic().get_peers_for_client(&peer.peer_addr, Some(limit)),
-        }
-    }
-
-    /// Retrieves the list of peers for a given torrent.
-    ///
-    /// This method returns up to `TORRENT_PEERS_LIMIT` peers for the torrent
-    /// specified by the info-hash.
-    ///
-    /// # Returns
-    ///
-    /// A vector of peers (wrapped in `Arc`) representing the active peers for
-    /// the torrent.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if the lock for the torrent entry cannot be obtained.
-    #[must_use]
-    pub fn get_torrent_peers(&self, info_hash: &InfoHash, limit: usize) -> Vec<Arc<peer::Peer>> {
-        match self.get(info_hash) {
-            None => vec![],
-            Some(entry) => entry.lock_or_panic().get_peers(Some(limit)),
-        }
-    }
-
-    /// Removes torrent entries that have no active peers.
-    ///
-    /// Depending on the tracker policy, torrents without any peers may be
-    /// removed to conserve memory.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if the lock for the entry cannot be obtained.
-    pub fn remove_peerless_torrents(&self, policy: &TrackerPolicy) {
-        for entry in &self.torrents {
-            if entry.value().lock_or_panic().meets_retaining_policy(policy) {
-                continue;
-            }
-
-            entry.remove();
-        }
-    }
-
-    /// Imports persistent torrent data into the in-memory repository.
-    ///
-    /// This method takes a set of persisted torrent entries (e.g., from a
-    /// database) and imports them into the in-memory repository for immediate
-    /// access.
-    pub fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
-        for (info_hash, completed) in persistent_torrents {
-            if self.torrents.contains_key(info_hash) {
-                continue;
-            }
-
-            let entry = TrackedTorrentHandle::new(
-                TrackedTorrent {
-                    swarm: PeerList::default(),
-                    downloaded: *completed,
-                }
-                .into(),
-            );
-
-            // Since SkipMap is lock-free the torrent could have been inserted
-            // after checking if it exists.
-            self.torrents.get_or_insert(*info_hash, entry);
-        }
-    }
-
-    /// Calculates and returns overall torrent metrics.
-    ///
-    /// The returned [`AggregateSwarmMetadata`] contains aggregate data such as
-    /// the total number of torrents, total complete (seeders), incomplete
-    /// (leechers), and downloaded counts.
-    ///
-    /// # Returns
-    ///
-    /// A [`AggregateSwarmMetadata`] struct with the aggregated metrics.
-    ///
-    /// # Panics
-    ///
-    /// This function panics if the lock for the entry cannot be obtained.
-    #[must_use]
-    pub fn get_aggregate_swarm_metadata(&self) -> AggregateSwarmMetadata {
-        let mut metrics = AggregateSwarmMetadata::default();
-
-        for entry in &self.torrents {
-            let stats = entry.value().lock_or_panic().get_swarm_metadata();
-            metrics.total_complete += u64::from(stats.complete);
-            metrics.total_downloaded += u64::from(stats.downloaded);
-            metrics.total_incomplete += u64::from(stats.incomplete);
-            metrics.total_torrents += 1;
-        }
-
-        metrics
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    mod the_in_memory_torrent_repository {
-
-        use aquatic_udp_protocol::PeerId;
-
-        /// It generates a peer id from a number where the number is the last
-        /// part of the peer ID. For example, for `12` it returns
-        /// `-qB00000000000000012`.
-        fn numeric_peer_id(two_digits_value: i32) -> PeerId {
-            // Format idx as a string with leading zeros, ensuring it has exactly 2 digits
-            let idx_str = format!("{two_digits_value:02}");
-
-            // Create the base part of the peer ID.
-            let base = b"-qB00000000000000000";
-
-            // Concatenate the base with idx bytes, ensuring the total length is 20 bytes.
-            let mut peer_id_bytes = [0u8; 20];
-            peer_id_bytes[..base.len()].copy_from_slice(base);
-            peer_id_bytes[base.len() - idx_str.len()..].copy_from_slice(idx_str.as_bytes());
-
-            PeerId(peer_id_bytes)
-        }
-
-        // The `TorrentRepository` has these responsibilities:
-        // - To maintain the peer lists for each torrent.
-        // - To maintain the the torrent entries, which contains all the info about the
-        //   torrents, including the peer lists.
-        // - To return the torrent entries.
-        // - To return the peer lists for a given torrent.
-        // - To return the torrent metrics.
-        // - To return the swarm metadata for a given torrent.
-        // - To handle the persistence of the torrent entries.
-
-        mod maintaining_the_peer_lists {
-
-            use std::sync::Arc;
-
-            use crate::repository::TorrentRepository;
-            use crate::tests::{sample_info_hash, sample_peer};
-
-            #[tokio::test]
-            async fn it_should_add_the_first_peer_to_the_torrent_peer_list() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let info_hash = sample_info_hash();
-
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &sample_peer(), None);
-
-                assert!(torrent_repository.get(&info_hash).is_some());
-            }
-
-            #[tokio::test]
-            async fn it_should_allow_adding_the_same_peer_twice_to_the_torrent_peer_list() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let info_hash = sample_info_hash();
-
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &sample_peer(), None);
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &sample_peer(), None);
-
-                assert!(torrent_repository.get(&info_hash).is_some());
-            }
-        }
-
-        mod returning_peer_lists_for_a_torrent {
-
-            use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-            use std::sync::Arc;
-
-            use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
-            use torrust_tracker_primitives::peer::Peer;
-            use torrust_tracker_primitives::DurationSinceUnixEpoch;
-
-            use crate::repository::tests::the_in_memory_torrent_repository::numeric_peer_id;
-            use crate::repository::TorrentRepository;
-            use crate::tests::{sample_info_hash, sample_peer};
-
-            #[tokio::test]
-            async fn it_should_return_the_peers_for_a_given_torrent() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let info_hash = sample_info_hash();
-                let peer = sample_peer();
-
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &peer, None);
-
-                let peers = torrent_repository.get_torrent_peers(&info_hash, 74);
-
-                assert_eq!(peers, vec![Arc::new(peer)]);
-            }
-
-            #[tokio::test]
-            async fn it_should_return_an_empty_list_or_peers_for_a_non_existing_torrent() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let peers = torrent_repository.get_torrent_peers(&sample_info_hash(), 74);
-
-                assert!(peers.is_empty());
-            }
-
-            #[tokio::test]
-            async fn it_should_return_74_peers_at_the_most_for_a_given_torrent() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let info_hash = sample_info_hash();
-
-                for idx in 1..=75 {
-                    let peer = Peer {
-                        peer_id: numeric_peer_id(idx),
-                        peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, idx.try_into().unwrap())), 8080),
-                        updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
-                        uploaded: NumberOfBytes::new(0),
-                        downloaded: NumberOfBytes::new(0),
-                        left: NumberOfBytes::new(0), // No bytes left to download
-                        event: AnnounceEvent::Completed,
-                    };
-
-                    let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &peer, None);
-                }
-
-                let peers = torrent_repository.get_torrent_peers(&info_hash, 74);
-
-                assert_eq!(peers.len(), 74);
-            }
-
-            mod excluding_the_client_peer {
-
-                use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-                use std::sync::Arc;
-
-                use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
-                use torrust_tracker_configuration::TORRENT_PEERS_LIMIT;
-                use torrust_tracker_primitives::peer::Peer;
-                use torrust_tracker_primitives::DurationSinceUnixEpoch;
-
-                use crate::repository::tests::the_in_memory_torrent_repository::numeric_peer_id;
-                use crate::repository::TorrentRepository;
-                use crate::tests::{sample_info_hash, sample_peer};
-
-                #[tokio::test]
-                async fn it_should_return_an_empty_peer_list_for_a_non_existing_torrent() {
-                    let torrent_repository = Arc::new(TorrentRepository::default());
-
-                    let peers = torrent_repository.get_peers_for(&sample_info_hash(), &sample_peer(), TORRENT_PEERS_LIMIT);
-
-                    assert_eq!(peers, vec![]);
-                }
-
-                #[tokio::test]
-                async fn it_should_return_the_peers_for_a_given_torrent_excluding_a_given_peer() {
-                    let torrent_repository = Arc::new(TorrentRepository::default());
-
-                    let info_hash = sample_info_hash();
-                    let peer = sample_peer();
-
-                    let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &peer, None);
-
-                    let peers = torrent_repository.get_peers_for(&info_hash, &peer, TORRENT_PEERS_LIMIT);
-
-                    assert_eq!(peers, vec![]);
-                }
-
-                #[tokio::test]
-                async fn it_should_return_74_peers_at_the_most_for_a_given_torrent_when_it_filters_out_a_given_peer() {
-                    let torrent_repository = Arc::new(TorrentRepository::default());
-
-                    let info_hash = sample_info_hash();
-
-                    let excluded_peer = sample_peer();
-
-                    let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &excluded_peer, None);
-
-                    // Add 74 peers
-                    for idx in 2..=75 {
-                        let peer = Peer {
-                            peer_id: numeric_peer_id(idx),
-                            peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, idx.try_into().unwrap())), 8080),
-                            updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
-                            uploaded: NumberOfBytes::new(0),
-                            downloaded: NumberOfBytes::new(0),
-                            left: NumberOfBytes::new(0), // No bytes left to download
-                            event: AnnounceEvent::Completed,
-                        };
-
-                        let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &peer, None);
-                    }
-
-                    let peers = torrent_repository.get_peers_for(&info_hash, &excluded_peer, TORRENT_PEERS_LIMIT);
-
-                    assert_eq!(peers.len(), 74);
-                }
-            }
-        }
-
-        mod maintaining_the_torrent_entries {
-
-            use std::ops::Add;
-            use std::sync::Arc;
-            use std::time::Duration;
-
-            use bittorrent_primitives::info_hash::InfoHash;
-            use torrust_tracker_configuration::TrackerPolicy;
-            use torrust_tracker_primitives::DurationSinceUnixEpoch;
-
-            use crate::repository::TorrentRepository;
-            use crate::tests::{sample_info_hash, sample_peer};
-
-            #[tokio::test]
-            async fn it_should_remove_a_torrent_entry() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let info_hash = sample_info_hash();
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &sample_peer(), None);
-
-                let _unused = torrent_repository.remove(&info_hash);
-
-                assert!(torrent_repository.get(&info_hash).is_none());
-            }
-
-            #[tokio::test]
-            async fn it_should_remove_peers_that_have_not_been_updated_after_a_cutoff_time() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let info_hash = sample_info_hash();
-                let mut peer = sample_peer();
-                peer.updated = DurationSinceUnixEpoch::new(0, 0);
-
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &peer, None);
-
-                // Cut off time is 1 second after the peer was updated
-                torrent_repository.remove_inactive_peers(peer.updated.add(Duration::from_secs(1)));
-
-                assert!(!torrent_repository.get_torrent_peers(&info_hash, 74).contains(&Arc::new(peer)));
-            }
-
-            fn initialize_repository_with_one_torrent_without_peers(info_hash: &InfoHash) -> Arc<TorrentRepository> {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                // Insert a sample peer for the torrent to force adding the torrent entry
-                let mut peer = sample_peer();
-                peer.updated = DurationSinceUnixEpoch::new(0, 0);
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(info_hash, &peer, None);
-
-                // Remove the peer
-                torrent_repository.remove_inactive_peers(peer.updated.add(Duration::from_secs(1)));
-
-                torrent_repository
-            }
-
-            #[tokio::test]
-            async fn it_should_remove_torrents_without_peers() {
-                let info_hash = sample_info_hash();
-
-                let torrent_repository = initialize_repository_with_one_torrent_without_peers(&info_hash);
-
-                let tracker_policy = TrackerPolicy {
-                    remove_peerless_torrents: true,
-                    ..Default::default()
-                };
-
-                torrent_repository.remove_peerless_torrents(&tracker_policy);
-
-                assert!(torrent_repository.get(&info_hash).is_none());
-            }
-        }
-        mod returning_torrent_entries {
-
-            use std::sync::Arc;
-
-            use torrust_tracker_primitives::peer::Peer;
-            use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
-
-            use crate::repository::TorrentRepository;
-            use crate::tests::{sample_info_hash, sample_peer};
-            use crate::{LockTrackedTorrent, TrackedTorrentHandle};
-
-            /// `TorrentEntry` data is not directly accessible. It's only
-            /// accessible through the trait methods. We need this temporary
-            /// DTO to write simple and more readable assertions.
-            #[derive(Debug, Clone, PartialEq)]
-            struct TorrentEntryInfo {
-                swarm_metadata: SwarmMetadata,
-                peers: Vec<Peer>,
-                number_of_peers: usize,
-            }
-
-            #[allow(clippy::from_over_into)]
-            impl Into<TorrentEntryInfo> for TrackedTorrentHandle {
-                fn into(self) -> TorrentEntryInfo {
-                    let torrent_guard = self.lock_or_panic();
-
-                    let torrent_entry_info = TorrentEntryInfo {
-                        swarm_metadata: torrent_guard.get_swarm_metadata(),
-                        peers: torrent_guard.get_peers(None).iter().map(|peer| *peer.clone()).collect(),
-                        number_of_peers: torrent_guard.get_peers_len(),
-                    };
-
-                    drop(torrent_guard);
-
-                    torrent_entry_info
-                }
-            }
-
-            #[tokio::test]
-            async fn it_should_return_one_torrent_entry_by_infohash() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let info_hash = sample_info_hash();
-                let peer = sample_peer();
-
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &peer, None);
-
-                let torrent_entry = torrent_repository.get(&info_hash).unwrap();
-
-                assert_eq!(
-                    TorrentEntryInfo {
-                        swarm_metadata: SwarmMetadata {
-                            downloaded: 0,
-                            complete: 1,
-                            incomplete: 0
-                        },
-                        peers: vec!(peer),
-                        number_of_peers: 1
-                    },
-                    torrent_entry.into()
-                );
-            }
-
-            mod it_should_return_many_torrent_entries {
-                use std::sync::Arc;
-
-                use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
-
-                use crate::repository::tests::the_in_memory_torrent_repository::returning_torrent_entries::TorrentEntryInfo;
-                use crate::repository::TorrentRepository;
-                use crate::tests::{sample_info_hash, sample_peer};
-
-                #[tokio::test]
-                async fn without_pagination() {
-                    let torrent_repository = Arc::new(TorrentRepository::default());
-
-                    let info_hash = sample_info_hash();
-                    let peer = sample_peer();
-                    let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash, &peer, None);
-
-                    let torrent_entries = torrent_repository.get_paginated(None);
-
-                    assert_eq!(torrent_entries.len(), 1);
-
-                    let torrent_entry = torrent_entries.first().unwrap().1.clone();
-
-                    assert_eq!(
-                        TorrentEntryInfo {
-                            swarm_metadata: SwarmMetadata {
-                                downloaded: 0,
-                                complete: 1,
-                                incomplete: 0
-                            },
-                            peers: vec!(peer),
-                            number_of_peers: 1
-                        },
-                        torrent_entry.into()
-                    );
-                }
-
-                mod with_pagination {
-                    use std::sync::Arc;
-
-                    use torrust_tracker_primitives::pagination::Pagination;
-                    use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
-
-                    use crate::repository::tests::the_in_memory_torrent_repository::returning_torrent_entries::TorrentEntryInfo;
-                    use crate::repository::TorrentRepository;
-                    use crate::tests::{
-                        sample_info_hash_alphabetically_ordered_after_sample_info_hash_one, sample_info_hash_one,
-                        sample_peer_one, sample_peer_two,
-                    };
-
-                    #[tokio::test]
-                    async fn it_should_return_the_first_page() {
-                        let torrent_repository = Arc::new(TorrentRepository::default());
-
-                        // Insert one torrent entry
-                        let info_hash_one = sample_info_hash_one();
-                        let peer_one = sample_peer_one();
-                        let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash_one, &peer_one, None);
-
-                        // Insert another torrent entry
-                        let info_hash_one = sample_info_hash_alphabetically_ordered_after_sample_info_hash_one();
-                        let peer_two = sample_peer_two();
-                        let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash_one, &peer_two, None);
-
-                        // Get only the first page where page size is 1
-                        let torrent_entries = torrent_repository.get_paginated(Some(&Pagination { offset: 0, limit: 1 }));
-
-                        assert_eq!(torrent_entries.len(), 1);
-
-                        let torrent_entry = torrent_entries.first().unwrap().1.clone();
-
-                        assert_eq!(
-                            TorrentEntryInfo {
-                                swarm_metadata: SwarmMetadata {
-                                    downloaded: 0,
-                                    complete: 1,
-                                    incomplete: 0
-                                },
-                                peers: vec!(peer_one),
-                                number_of_peers: 1
-                            },
-                            torrent_entry.into()
-                        );
-                    }
-
-                    #[tokio::test]
-                    async fn it_should_return_the_second_page() {
-                        let torrent_repository = Arc::new(TorrentRepository::default());
-
-                        // Insert one torrent entry
-                        let info_hash_one = sample_info_hash_one();
-                        let peer_one = sample_peer_one();
-                        let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash_one, &peer_one, None);
-
-                        // Insert another torrent entry
-                        let info_hash_one = sample_info_hash_alphabetically_ordered_after_sample_info_hash_one();
-                        let peer_two = sample_peer_two();
-                        let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash_one, &peer_two, None);
-
-                        // Get only the first page where page size is 1
-                        let torrent_entries = torrent_repository.get_paginated(Some(&Pagination { offset: 1, limit: 1 }));
-
-                        assert_eq!(torrent_entries.len(), 1);
-
-                        let torrent_entry = torrent_entries.first().unwrap().1.clone();
-
-                        assert_eq!(
-                            TorrentEntryInfo {
-                                swarm_metadata: SwarmMetadata {
-                                    downloaded: 0,
-                                    complete: 1,
-                                    incomplete: 0
-                                },
-                                peers: vec!(peer_two),
-                                number_of_peers: 1
-                            },
-                            torrent_entry.into()
-                        );
-                    }
-
-                    #[tokio::test]
-                    async fn it_should_allow_changing_the_page_size() {
-                        let torrent_repository = Arc::new(TorrentRepository::default());
-
-                        // Insert one torrent entry
-                        let info_hash_one = sample_info_hash_one();
-                        let peer_one = sample_peer_one();
-                        let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash_one, &peer_one, None);
-
-                        // Insert another torrent entry
-                        let info_hash_one = sample_info_hash_alphabetically_ordered_after_sample_info_hash_one();
-                        let peer_two = sample_peer_two();
-                        let _number_of_downloads_increased = torrent_repository.upsert_peer(&info_hash_one, &peer_two, None);
-
-                        // Get only the first page where page size is 1
-                        let torrent_entries = torrent_repository.get_paginated(Some(&Pagination { offset: 1, limit: 1 }));
-
-                        assert_eq!(torrent_entries.len(), 1);
-                    }
-                }
-            }
-        }
-
-        mod returning_aggregate_swarm_metadata {
-
-            use std::sync::Arc;
-
-            use bittorrent_primitives::info_hash::fixture::gen_seeded_infohash;
-            use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
-
-            use crate::repository::TorrentRepository;
-            use crate::tests::{complete_peer, leecher, sample_info_hash, seeder};
-
-            // todo: refactor to use test parametrization
-
-            #[tokio::test]
-            async fn it_should_get_empty_aggregate_swarm_metadata_when_there_are_no_torrents() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let aggregate_swarm_metadata = torrent_repository.get_aggregate_swarm_metadata();
-
-                assert_eq!(
-                    aggregate_swarm_metadata,
-                    AggregateSwarmMetadata {
-                        total_complete: 0,
-                        total_downloaded: 0,
-                        total_incomplete: 0,
-                        total_torrents: 0
-                    }
-                );
-            }
-
-            #[tokio::test]
-            async fn it_should_return_the_aggregate_swarm_metadata_when_there_is_a_leecher() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&sample_info_hash(), &leecher(), None);
-
-                let aggregate_swarm_metadata = torrent_repository.get_aggregate_swarm_metadata();
-
-                assert_eq!(
-                    aggregate_swarm_metadata,
-                    AggregateSwarmMetadata {
-                        total_complete: 0,
-                        total_downloaded: 0,
-                        total_incomplete: 1,
-                        total_torrents: 1,
-                    }
-                );
-            }
-
-            #[tokio::test]
-            async fn it_should_return_the_aggregate_swarm_metadata_when_there_is_a_seeder() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&sample_info_hash(), &seeder(), None);
-
-                let aggregate_swarm_metadata = torrent_repository.get_aggregate_swarm_metadata();
-
-                assert_eq!(
-                    aggregate_swarm_metadata,
-                    AggregateSwarmMetadata {
-                        total_complete: 1,
-                        total_downloaded: 0,
-                        total_incomplete: 0,
-                        total_torrents: 1,
-                    }
-                );
-            }
-
-            #[tokio::test]
-            async fn it_should_return_the_aggregate_swarm_metadata_when_there_is_a_completed_peer() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&sample_info_hash(), &complete_peer(), None);
-
-                let aggregate_swarm_metadata = torrent_repository.get_aggregate_swarm_metadata();
-
-                assert_eq!(
-                    aggregate_swarm_metadata,
-                    AggregateSwarmMetadata {
-                        total_complete: 1,
-                        total_downloaded: 0,
-                        total_incomplete: 0,
-                        total_torrents: 1,
-                    }
-                );
-            }
-
-            #[tokio::test]
-            async fn it_should_return_the_aggregate_swarm_metadata_when_there_are_multiple_torrents() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let start_time = std::time::Instant::now();
-                for i in 0..1_000_000 {
-                    let _number_of_downloads_increased =
-                        torrent_repository.upsert_peer(&gen_seeded_infohash(&i), &leecher(), None);
-                }
-                let result_a = start_time.elapsed();
-
-                let start_time = std::time::Instant::now();
-                let aggregate_swarm_metadata = torrent_repository.get_aggregate_swarm_metadata();
-                let result_b = start_time.elapsed();
-
-                assert_eq!(
-                    (aggregate_swarm_metadata),
-                    (AggregateSwarmMetadata {
-                        total_complete: 0,
-                        total_downloaded: 0,
-                        total_incomplete: 1_000_000,
-                        total_torrents: 1_000_000,
-                    }),
-                    "{result_a:?} {result_b:?}"
-                );
-            }
-        }
-
-        mod returning_swarm_metadata {
-
-            use std::sync::Arc;
-
-            use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
-
-            use crate::repository::TorrentRepository;
-            use crate::tests::{leecher, sample_info_hash};
-
-            #[tokio::test]
-            async fn it_should_get_swarm_metadata_for_an_existing_torrent() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let infohash = sample_info_hash();
-
-                let _number_of_downloads_increased = torrent_repository.upsert_peer(&infohash, &leecher(), None);
-
-                let swarm_metadata = torrent_repository.get_swarm_metadata_or_default(&infohash);
-
-                assert_eq!(
-                    swarm_metadata,
-                    SwarmMetadata {
-                        complete: 0,
-                        downloaded: 0,
-                        incomplete: 1,
-                    }
-                );
-            }
-
-            #[tokio::test]
-            async fn it_should_return_zeroed_swarm_metadata_for_a_non_existing_torrent() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let swarm_metadata = torrent_repository.get_swarm_metadata_or_default(&sample_info_hash());
-
-                assert_eq!(swarm_metadata, SwarmMetadata::zeroed());
-            }
-        }
-
-        mod handling_persistence {
-
-            use std::sync::Arc;
-
-            use torrust_tracker_primitives::PersistentTorrents;
-
-            use crate::repository::TorrentRepository;
-            use crate::tests::sample_info_hash;
-
-            #[tokio::test]
-            async fn it_should_allow_importing_persisted_torrent_entries() {
-                let torrent_repository = Arc::new(TorrentRepository::default());
-
-                let infohash = sample_info_hash();
-
-                let mut persistent_torrents = PersistentTorrents::default();
-
-                persistent_torrents.insert(infohash, 1);
-
-                torrent_repository.import_persistent(&persistent_torrents);
-
-                let swarm_metadata = torrent_repository.get_swarm_metadata_or_default(&infohash);
-
-                // Only the number of downloads is persisted.
-                assert_eq!(swarm_metadata.downloaded, 1);
-            }
-        }
-    }
-}
diff --git a/packages/torrent-repository/tests/common/mod.rs b/packages/torrent-repository/tests/common/mod.rs
deleted file mode 100644
index e083a05cc..000000000
--- a/packages/torrent-repository/tests/common/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod torrent;
-pub mod torrent_peer_builder;
diff --git a/packages/torrent-repository/tests/common/torrent.rs b/packages/torrent-repository/tests/common/torrent.rs
deleted file mode 100644
index ffa3c6d71..000000000
--- a/packages/torrent-repository/tests/common/torrent.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use std::net::SocketAddr;
-use std::sync::Arc;
-
-use torrust_tracker_configuration::TrackerPolicy;
-use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
-use torrust_tracker_torrent_repository::{entry, LockTrackedTorrent, TrackedTorrentHandle};
-
-#[derive(Debug, Clone)]
-pub(crate) enum Torrent {
-    Single(entry::torrent::TrackedTorrent),
-    MutexStd(TrackedTorrentHandle),
-}
-
-impl Torrent {
-    pub(crate) fn get_stats(&self) -> SwarmMetadata {
-        match self {
-            Torrent::Single(entry) => entry.get_swarm_metadata(),
-            Torrent::MutexStd(entry) => entry.lock_or_panic().get_swarm_metadata(),
-        }
-    }
-
-    pub(crate) fn meets_retaining_policy(&self, policy: &TrackerPolicy) -> bool {
-        match self {
-            Torrent::Single(entry) => entry.meets_retaining_policy(policy),
-            Torrent::MutexStd(entry) => entry.lock_or_panic().meets_retaining_policy(policy),
-        }
-    }
-
-    pub(crate) fn peers_is_empty(&self) -> bool {
-        match self {
-            Torrent::Single(entry) => entry.peers_is_empty(),
-            Torrent::MutexStd(entry) => entry.lock_or_panic().peers_is_empty(),
-        }
-    }
-
-    pub(crate) fn get_peers_len(&self) -> usize {
-        match self {
-            Torrent::Single(entry) => entry.get_peers_len(),
-            Torrent::MutexStd(entry) => entry.lock_or_panic().get_peers_len(),
-        }
-    }
-
-    pub(crate) fn get_peers(&self, limit: Option<usize>) -> Vec<Arc<peer::Peer>> {
-        match self {
-            Torrent::Single(entry) => entry.get_peers(limit),
-            Torrent::MutexStd(entry) => entry.lock_or_panic().get_peers(limit),
-        }
-    }
-
-    pub(crate) fn get_peers_for_client(&self, client: &SocketAddr, limit: Option<usize>) -> Vec<Arc<peer::Peer>> {
-        match self {
-            Torrent::Single(entry) => entry.get_peers_for_client(client, limit),
-            Torrent::MutexStd(entry) => entry.lock_or_panic().get_peers_for_client(client, limit),
-        }
-    }
-
-    pub(crate) fn upsert_peer(&mut self, peer: &peer::Peer) -> bool {
-        match self {
-            Torrent::Single(entry) => entry.upsert_peer(peer),
-            Torrent::MutexStd(entry) => entry.lock_or_panic().upsert_peer(peer),
-        }
-    }
-
-    pub(crate) fn remove_inactive_peers(&mut self, current_cutoff: DurationSinceUnixEpoch) {
-        match self {
-            Torrent::Single(entry) => entry.remove_inactive_peers(current_cutoff),
-            Torrent::MutexStd(entry) => entry.lock_or_panic().remove_inactive_peers(current_cutoff),
-        }
-    }
-}
diff --git a/packages/torrent-repository/tests/common/torrent_peer_builder.rs b/packages/torrent-repository/tests/common/torrent_peer_builder.rs
deleted file mode 100644
index 33120180d..000000000
--- a/packages/torrent-repository/tests/common/torrent_peer_builder.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use std::net::SocketAddr;
-
-use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
-use torrust_tracker_clock::clock::Time;
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
-
-use crate::CurrentClock;
-
-#[derive(Debug, Default)]
-struct TorrentPeerBuilder {
-    peer: peer::Peer,
-}
-
-#[allow(dead_code)]
-impl TorrentPeerBuilder {
-    #[must_use]
-    fn new() -> Self {
-        Self {
-            peer: peer::Peer {
-                updated: CurrentClock::now(),
-                ..Default::default()
-            },
-        }
-    }
-
-    #[must_use]
-    fn with_event_completed(mut self) -> Self {
-        self.peer.event = AnnounceEvent::Completed;
-        self
-    }
-
-    #[must_use]
-    fn with_event_started(mut self) -> Self {
-        self.peer.event = AnnounceEvent::Started;
-        self
-    }
-
-    #[must_use]
-    fn with_peer_address(mut self, peer_addr: SocketAddr) -> Self {
-        self.peer.peer_addr = peer_addr;
-        self
-    }
-
-    #[must_use]
-    fn with_peer_id(mut self, peer_id: PeerId) -> Self {
-        self.peer.peer_id = peer_id;
-        self
-    }
-
-    #[must_use]
-    fn with_number_of_bytes_left(mut self, left: i64) -> Self {
-        self.peer.left = NumberOfBytes::new(left);
-        self
-    }
-
-    #[must_use]
-    fn updated_at(mut self, updated: DurationSinceUnixEpoch) -> Self {
-        self.peer.updated = updated;
-        self
-    }
-
-    #[must_use]
-    fn into(self) -> peer::Peer {
-        self.peer
-    }
-}
-
-/// A torrent seeder is a peer with 0 bytes left to download which
-/// has not announced it has stopped
-#[must_use]
-pub fn a_completed_peer(id: i32) -> peer::Peer {
-    let peer_id = peer::Id::new(id);
-    TorrentPeerBuilder::new()
-        .with_number_of_bytes_left(0)
-        .with_event_completed()
-        .with_peer_id(*peer_id)
-        .into()
-}
-
-/// A torrent leecher is a peer that is not a seeder.
-/// Leecher: left > 0 OR event = Stopped
-#[must_use]
-pub fn a_started_peer(id: i32) -> peer::Peer {
-    let peer_id = peer::Id::new(id);
-    TorrentPeerBuilder::new()
-        .with_number_of_bytes_left(1)
-        .with_event_started()
-        .with_peer_id(*peer_id)
-        .into()
-}
diff --git a/packages/torrent-repository/tests/entry/mod.rs b/packages/torrent-repository/tests/entry/mod.rs
deleted file mode 100644
index 27bb5f238..000000000
--- a/packages/torrent-repository/tests/entry/mod.rs
+++ /dev/null
@@ -1,414 +0,0 @@
-use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use std::ops::Sub;
-use std::time::Duration;
-
-use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
-use rstest::{fixture, rstest};
-use torrust_tracker_clock::clock::stopped::Stopped as _;
-use torrust_tracker_clock::clock::{self, Time as _};
-use torrust_tracker_configuration::{TrackerPolicy, TORRENT_PEERS_LIMIT};
-use torrust_tracker_primitives::peer;
-use torrust_tracker_primitives::peer::Peer;
-use torrust_tracker_torrent_repository::{entry, TrackedTorrentHandle};
-
-use crate::common::torrent::Torrent;
-use crate::common::torrent_peer_builder::{a_completed_peer, a_started_peer};
-use crate::CurrentClock;
-
-#[fixture]
-fn single() -> Torrent {
-    Torrent::Single(entry::torrent::TrackedTorrent::default())
-}
-#[fixture]
-fn mutex_std() -> Torrent {
-    Torrent::MutexStd(TrackedTorrentHandle::default())
-}
-
-#[fixture]
-fn policy_none() -> TrackerPolicy {
-    TrackerPolicy::new(0, false, false)
-}
-
-#[fixture]
-fn policy_persist() -> TrackerPolicy {
-    TrackerPolicy::new(0, true, false)
-}
-
-#[fixture]
-fn policy_remove() -> TrackerPolicy {
-    TrackerPolicy::new(0, false, true)
-}
-
-#[fixture]
-fn policy_remove_persist() -> TrackerPolicy {
-    TrackerPolicy::new(0, true, true)
-}
-
-pub enum Makes {
-    Empty,
-    Started,
-    Completed,
-    Downloaded,
-    Three,
-}
-
-fn make(torrent: &mut Torrent, makes: &Makes) -> Vec<Peer> {
-    match makes {
-        Makes::Empty => vec![],
-        Makes::Started => {
-            let peer = a_started_peer(1);
-            torrent.upsert_peer(&peer);
-            vec![peer]
-        }
-        Makes::Completed => {
-            let peer = a_completed_peer(2);
-            torrent.upsert_peer(&peer);
-            vec![peer]
-        }
-        Makes::Downloaded => {
-            let mut peer = a_started_peer(3);
-            torrent.upsert_peer(&peer);
-            peer.event = AnnounceEvent::Completed;
-            peer.left = NumberOfBytes::new(0);
-            torrent.upsert_peer(&peer);
-            vec![peer]
-        }
-        Makes::Three => {
-            let peer_1 = a_started_peer(1);
-            torrent.upsert_peer(&peer_1);
-
-            let peer_2 = a_completed_peer(2);
-            torrent.upsert_peer(&peer_2);
-
-            let mut peer_3 = a_started_peer(3);
-            torrent.upsert_peer(&peer_3);
-            peer_3.event = AnnounceEvent::Completed;
-            peer_3.left = NumberOfBytes::new(0);
-            torrent.upsert_peer(&peer_3);
-            vec![peer_1, peer_2, peer_3]
-        }
-    }
-}
-
-#[rstest]
-#[case::empty(&Makes::Empty)]
-#[tokio::test]
-async fn it_should_be_empty_by_default(#[values(single(), mutex_std())] mut torrent: Torrent, #[case] makes: &Makes) {
-    make(&mut torrent, makes);
-
-    assert_eq!(torrent.get_peers_len(), 0);
-}
-
-#[rstest]
-#[case::empty(&Makes::Empty)]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_check_if_entry_should_be_retained_based_on_the_tracker_policy(
-    #[values(single(), mutex_std())] mut torrent: Torrent,
-    #[case] makes: &Makes,
-    #[values(policy_none(), policy_persist(), policy_remove(), policy_remove_persist())] policy: TrackerPolicy,
-) {
-    make(&mut torrent, makes);
-
-    let has_peers = !torrent.peers_is_empty();
-    let has_downloads = torrent.get_stats().downloaded != 0;
-
-    match (policy.remove_peerless_torrents, policy.persistent_torrent_completed_stat) {
-        // remove torrents without peers, and keep completed download stats
-        (true, true) => match (has_peers, has_downloads) {
-            // no peers, but has downloads
-            // peers, with or without downloads
-            (false, true) | (true, true | false) => assert!(torrent.meets_retaining_policy(&policy)),
-            // no peers and no downloads
-            (false, false) => assert!(!torrent.meets_retaining_policy(&policy)),
-        },
-        // remove torrents without peers and drop completed download stats
-        (true, false) => match (has_peers, has_downloads) {
-            // peers, with or without downloads
-            (true, true | false) => assert!(torrent.meets_retaining_policy(&policy)),
-            // no peers and with or without downloads
-            (false, true | false) => assert!(!torrent.meets_retaining_policy(&policy)),
-        },
-        // keep torrents without peers, but keep or drop completed download stats
-        (false, true | false) => assert!(torrent.meets_retaining_policy(&policy)),
-    }
-}
-
-#[rstest]
-#[case::empty(&Makes::Empty)]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_get_peers_for_torrent_entry(#[values(single(), mutex_std())] mut torrent: Torrent, #[case] makes: &Makes) {
-    let peers = make(&mut torrent, makes);
-
-    let torrent_peers = torrent.get_peers(None);
-
-    assert_eq!(torrent_peers.len(), peers.len());
-
-    for peer in torrent_peers {
-        assert!(peers.contains(&peer));
-    }
-}
-
-#[rstest]
-#[case::empty(&Makes::Empty)]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_update_a_peer(#[values(single(), mutex_std())] mut torrent: Torrent, #[case] makes: &Makes) {
-    make(&mut torrent, makes);
-
-    // Make and insert a new peer.
-    let mut peer = a_started_peer(-1);
-    torrent.upsert_peer(&peer);
-
-    // Get the Inserted Peer by Id.
-    let peers = torrent.get_peers(None);
-    let original = peers
-        .iter()
-        .find(|p| peer::ReadInfo::get_id(*p) == peer::ReadInfo::get_id(&peer))
-        .expect("it should find peer by id");
-
-    assert_eq!(original.event, AnnounceEvent::Started, "it should be as created");
-
-    // Announce "Completed" torrent download event.
-    peer.event = AnnounceEvent::Completed;
-    torrent.upsert_peer(&peer);
-
-    // Get the Updated Peer by Id.
-    let peers = torrent.get_peers(None);
-    let updated = peers
-        .iter()
-        .find(|p| peer::ReadInfo::get_id(*p) == peer::ReadInfo::get_id(&peer))
-        .expect("it should find peer by id");
-
-    assert_eq!(updated.event, AnnounceEvent::Completed, "it should be updated");
-}
-
-#[rstest]
-#[case::empty(&Makes::Empty)]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_remove_a_peer_upon_stopped_announcement(
-    #[values(single(), mutex_std())] mut torrent: Torrent,
-    #[case] makes: &Makes,
-) {
-    use torrust_tracker_primitives::peer::ReadInfo as _;
-
-    make(&mut torrent, makes);
-
-    let mut peer = a_started_peer(-1);
-
-    torrent.upsert_peer(&peer);
-
-    // The started peer should be inserted.
-    let peers = torrent.get_peers(None);
-    let original = peers
-        .iter()
-        .find(|p| p.get_id() == peer.get_id())
-        .expect("it should find peer by id");
-
-    assert_eq!(original.event, AnnounceEvent::Started);
-
-    // Change peer to "Stopped" and insert.
-    peer.event = AnnounceEvent::Stopped;
-    torrent.upsert_peer(&peer);
-
-    // It should be removed now.
-    let peers = torrent.get_peers(None);
-
-    assert_eq!(
-        peers.iter().find(|p| p.get_id() == peer.get_id()),
-        None,
-        "it should be removed"
-    );
-}
-
-#[rstest]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_handle_a_peer_completed_announcement_and_update_the_downloaded_statistic(
-    #[values(single(), mutex_std())] mut torrent: Torrent,
-    #[case] makes: &Makes,
-) {
-    make(&mut torrent, makes);
-    let downloaded = torrent.get_stats().downloaded;
-
-    let peers = torrent.get_peers(None);
-    let mut peer = **peers.first().expect("there should be a peer");
-
-    let is_already_completed = peer.event == AnnounceEvent::Completed;
-
-    // Announce "Completed" torrent download event.
-    peer.event = AnnounceEvent::Completed;
-
-    torrent.upsert_peer(&peer);
-    let stats = torrent.get_stats();
-
-    if is_already_completed {
-        assert_eq!(stats.downloaded, downloaded);
-    } else {
-        assert_eq!(stats.downloaded, downloaded + 1);
-    }
-}
-
-#[rstest]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_update_a_peer_as_a_seeder(#[values(single(), mutex_std())] mut torrent: Torrent, #[case] makes: &Makes) {
-    let peers = make(&mut torrent, makes);
-    let completed = u32::try_from(peers.iter().filter(|p| p.is_seeder()).count()).expect("it_should_not_be_so_many");
-
-    let peers = torrent.get_peers(None);
-    let mut peer = **peers.first().expect("there should be a peer");
-
-    let is_already_non_left = peer.left == NumberOfBytes::new(0);
-
-    // Set Bytes Left to Zero
-    peer.left = NumberOfBytes::new(0);
-    torrent.upsert_peer(&peer);
-    let stats = torrent.get_stats();
-
-    if is_already_non_left {
-        // it was already complete
-        assert_eq!(stats.complete, completed);
-    } else {
-        // now it is complete
-        assert_eq!(stats.complete, completed + 1);
-    }
-}
-
-#[rstest]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_update_a_peer_as_incomplete(#[values(single(), mutex_std())] mut torrent: Torrent, #[case] makes: &Makes) {
-    let peers = make(&mut torrent, makes);
-    let incomplete = u32::try_from(peers.iter().filter(|p| !p.is_seeder()).count()).expect("it should not be so many");
-
-    let peers = torrent.get_peers(None);
-    let mut peer = **peers.first().expect("there should be a peer");
-
-    let completed_already = peer.left == NumberOfBytes::new(0);
-
-    // Set Bytes Left to no Zero
-    peer.left = NumberOfBytes::new(1);
-    torrent.upsert_peer(&peer);
-    let stats = torrent.get_stats();
-
-    if completed_already {
-        // now it is incomplete
-        assert_eq!(stats.incomplete, incomplete + 1);
-    } else {
-        // was already incomplete
-        assert_eq!(stats.incomplete, incomplete);
-    }
-}
-
-#[rstest]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_get_peers_excluding_the_client_socket(
-    #[values(single(), mutex_std())] mut torrent: Torrent,
-    #[case] makes: &Makes,
-) {
-    make(&mut torrent, makes);
-
-    let peers = torrent.get_peers(None);
-    let mut peer = **peers.first().expect("there should be a peer");
-
-    let socket = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8081);
-
-    // for this test, we should not already use this socket.
-    assert_ne!(peer.peer_addr, socket);
-
-    // it should get the peer as it dose not share the socket.
-    assert!(torrent.get_peers_for_client(&socket, None).contains(&peer.into()));
-
-    // set the address to the socket.
-    peer.peer_addr = socket;
-    torrent.upsert_peer(&peer); // Add peer
-
-    // It should not include the peer that has the same socket.
-    assert!(!torrent.get_peers_for_client(&socket, None).contains(&peer.into()));
-}
-
-#[rstest]
-#[case::empty(&Makes::Empty)]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_limit_the_number_of_peers_returned(
-    #[values(single(), mutex_std())] mut torrent: Torrent,
-    #[case] makes: &Makes,
-) {
-    make(&mut torrent, makes);
-
-    // We add one more peer than the scrape limit
-    for peer_number in 1..=74 + 1 {
-        let mut peer = a_started_peer(1);
-        peer.peer_id = *peer::Id::new(peer_number);
-        torrent.upsert_peer(&peer);
-    }
-
-    let peers = torrent.get_peers(Some(TORRENT_PEERS_LIMIT));
-
-    assert_eq!(peers.len(), 74);
-}
-
-#[rstest]
-#[case::empty(&Makes::Empty)]
-#[case::started(&Makes::Started)]
-#[case::completed(&Makes::Completed)]
-#[case::downloaded(&Makes::Downloaded)]
-#[case::three(&Makes::Three)]
-#[tokio::test]
-async fn it_should_remove_inactive_peers_beyond_cutoff(
-    #[values(single(), mutex_std())] mut torrent: Torrent,
-    #[case] makes: &Makes,
-) {
-    const TIMEOUT: Duration = Duration::from_secs(120);
-    const EXPIRE: Duration = Duration::from_secs(121);
-
-    let peers = make(&mut torrent, makes);
-
-    let mut peer = a_completed_peer(-1);
-
-    let now = clock::Working::now();
-    clock::Stopped::local_set(&now);
-
-    peer.updated = now.sub(EXPIRE);
-
-    torrent.upsert_peer(&peer);
-
-    assert_eq!(torrent.get_peers_len(), peers.len() + 1);
-
-    let current_cutoff = CurrentClock::now_sub(&TIMEOUT).unwrap_or_default();
-    torrent.remove_inactive_peers(current_cutoff);
-
-    assert_eq!(torrent.get_peers_len(), peers.len());
-}
diff --git a/packages/torrent-repository/tests/integration.rs b/packages/torrent-repository/tests/integration.rs
deleted file mode 100644
index 5aab67b03..000000000
--- a/packages/torrent-repository/tests/integration.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-//! Integration tests.
-//!
-//! ```text
-//! cargo test --test integration
-//! ```
-
-use torrust_tracker_clock::clock;
-
-pub mod common;
-mod entry;
-mod repository;
-
-/// This code needs to be copied into each crate.
-/// Working version, for production.
-#[cfg(not(test))]
-#[allow(dead_code)]
-pub(crate) type CurrentClock = clock::Working;
-
-/// Stopped version, for testing.
-#[cfg(test)]
-#[allow(dead_code)]
-pub(crate) type CurrentClock = clock::Stopped;
diff --git a/packages/torrent-repository/tests/repository/mod.rs b/packages/torrent-repository/tests/repository/mod.rs
deleted file mode 100644
index 9701fc53d..000000000
--- a/packages/torrent-repository/tests/repository/mod.rs
+++ /dev/null
@@ -1,504 +0,0 @@
-use std::collections::{BTreeMap, HashSet};
-use std::hash::{DefaultHasher, Hash, Hasher};
-use std::sync::{Arc, Mutex};
-
-use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
-use bittorrent_primitives::info_hash::InfoHash;
-use rstest::{fixture, rstest};
-use torrust_tracker_configuration::TrackerPolicy;
-use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
-use torrust_tracker_primitives::PersistentTorrents;
-use torrust_tracker_torrent_repository::entry::torrent::TrackedTorrent;
-use torrust_tracker_torrent_repository::{LockTrackedTorrent, TorrentRepository};
-
-use crate::common::torrent_peer_builder::{a_completed_peer, a_started_peer};
-
-#[fixture]
-fn skip_list_mutex_std() -> TorrentRepository {
-    TorrentRepository::default()
-}
-
-type Entries = Vec<(InfoHash, TrackedTorrent)>;
-
-#[fixture]
-fn empty() -> Entries {
-    vec![]
-}
-
-#[fixture]
-fn default() -> Entries {
-    vec![(InfoHash::default(), TrackedTorrent::default())]
-}
-
-#[fixture]
-fn started() -> Entries {
-    let mut torrent = TrackedTorrent::default();
-    torrent.upsert_peer(&a_started_peer(1));
-    vec![(InfoHash::default(), torrent)]
-}
-
-#[fixture]
-fn completed() -> Entries {
-    let mut torrent = TrackedTorrent::default();
-    torrent.upsert_peer(&a_completed_peer(2));
-    vec![(InfoHash::default(), torrent)]
-}
-
-#[fixture]
-fn downloaded() -> Entries {
-    let mut torrent = TrackedTorrent::default();
-    let mut peer = a_started_peer(3);
-    torrent.upsert_peer(&peer);
-    peer.event = AnnounceEvent::Completed;
-    peer.left = NumberOfBytes::new(0);
-    torrent.upsert_peer(&peer);
-    vec![(InfoHash::default(), torrent)]
-}
-
-#[fixture]
-fn three() -> Entries {
-    let mut started = TrackedTorrent::default();
-    let started_h = &mut DefaultHasher::default();
-    started.upsert_peer(&a_started_peer(1));
-    started.hash(started_h);
-
-    let mut completed = TrackedTorrent::default();
-    let completed_h = &mut DefaultHasher::default();
-    completed.upsert_peer(&a_completed_peer(2));
-    completed.hash(completed_h);
-
-    let mut downloaded = TrackedTorrent::default();
-    let downloaded_h = &mut DefaultHasher::default();
-    let mut downloaded_peer = a_started_peer(3);
-    downloaded.upsert_peer(&downloaded_peer);
-    downloaded_peer.event = AnnounceEvent::Completed;
-    downloaded_peer.left = NumberOfBytes::new(0);
-    downloaded.upsert_peer(&downloaded_peer);
-    downloaded.hash(downloaded_h);
-
-    vec![
-        (InfoHash::from(&started_h.clone()), started),
-        (InfoHash::from(&completed_h.clone()), completed),
-        (InfoHash::from(&downloaded_h.clone()), downloaded),
-    ]
-}
-
-#[fixture]
-fn many_out_of_order() -> Entries {
-    let mut entries: HashSet<(InfoHash, TrackedTorrent)> = HashSet::default();
-
-    for i in 0..408 {
-        let mut entry = TrackedTorrent::default();
-        entry.upsert_peer(&a_started_peer(i));
-
-        entries.insert((InfoHash::from(&i), entry));
-    }
-
-    // we keep the random order from the hashed set for the vector.
-    entries.iter().map(|(i, e)| (*i, e.clone())).collect()
-}
-
-#[fixture]
-fn many_hashed_in_order() -> Entries {
-    let mut entries: BTreeMap<InfoHash, TrackedTorrent> = BTreeMap::default();
-
-    for i in 0..408 {
-        let mut entry = TrackedTorrent::default();
-        entry.upsert_peer(&a_started_peer(i));
-
-        let hash: &mut DefaultHasher = &mut DefaultHasher::default();
-        hash.write_i32(i);
-
-        entries.insert(InfoHash::from(&hash.clone()), entry);
-    }
-
-    // We return the entries in-order from from the b-tree map.
-    entries.iter().map(|(i, e)| (*i, e.clone())).collect()
-}
-
-#[fixture]
-fn persistent_empty() -> PersistentTorrents {
-    PersistentTorrents::default()
-}
-
-#[fixture]
-fn persistent_single() -> PersistentTorrents {
-    let hash = &mut DefaultHasher::default();
-
-    hash.write_u8(1);
-    let t = [(InfoHash::from(&hash.clone()), 0_u32)];
-
-    t.iter().copied().collect()
-}
-
-#[fixture]
-fn persistent_three() -> PersistentTorrents {
-    let hash = &mut DefaultHasher::default();
-
-    hash.write_u8(1);
-    let info_1 = InfoHash::from(&hash.clone());
-    hash.write_u8(2);
-    let info_2 = InfoHash::from(&hash.clone());
-    hash.write_u8(3);
-    let info_3 = InfoHash::from(&hash.clone());
-
-    let t = [(info_1, 1_u32), (info_2, 2_u32), (info_3, 3_u32)];
-
-    t.iter().copied().collect()
-}
-
-fn make(repo: &TorrentRepository, entries: &Entries) {
-    for (info_hash, entry) in entries {
-        let new = Arc::new(Mutex::new(entry.clone()));
-        repo.torrents.insert(*info_hash, new);
-    }
-}
-
-#[fixture]
-fn paginated_limit_zero() -> Pagination {
-    Pagination::new(0, 0)
-}
-
-#[fixture]
-fn paginated_limit_one() -> Pagination {
-    Pagination::new(0, 1)
-}
-
-#[fixture]
-fn paginated_limit_one_offset_one() -> Pagination {
-    Pagination::new(1, 1)
-}
-
-#[fixture]
-fn policy_none() -> TrackerPolicy {
-    TrackerPolicy::new(0, false, false)
-}
-
-#[fixture]
-fn policy_persist() -> TrackerPolicy {
-    TrackerPolicy::new(0, true, false)
-}
-
-#[fixture]
-fn policy_remove() -> TrackerPolicy {
-    TrackerPolicy::new(0, false, true)
-}
-
-#[fixture]
-fn policy_remove_persist() -> TrackerPolicy {
-    TrackerPolicy::new(0, true, true)
-}
-
-#[rstest]
-#[case::empty(empty())]
-#[case::default(default())]
-#[case::started(started())]
-#[case::completed(completed())]
-#[case::downloaded(downloaded())]
-#[case::three(three())]
-#[case::out_of_order(many_out_of_order())]
-#[case::in_order(many_hashed_in_order())]
-#[tokio::test]
-async fn it_should_get_a_torrent_entry(#[values(skip_list_mutex_std())] repo: TorrentRepository, #[case] entries: Entries) {
-    make(&repo, &entries);
-
-    if let Some((info_hash, torrent)) = entries.first() {
-        assert_eq!(
-            Some(repo.get(info_hash).unwrap().lock_or_panic().clone()),
-            Some(torrent.clone())
-        );
-    } else {
-        assert!(repo.get(&InfoHash::default()).is_none());
-    }
-}
-
-#[rstest]
-#[case::empty(empty())]
-#[case::default(default())]
-#[case::started(started())]
-#[case::completed(completed())]
-#[case::downloaded(downloaded())]
-#[case::three(three())]
-#[case::out_of_order(many_out_of_order())]
-#[case::in_order(many_hashed_in_order())]
-#[tokio::test]
-async fn it_should_get_paginated_entries_in_a_stable_or_sorted_order(
-    #[values(skip_list_mutex_std())] repo: TorrentRepository,
-    #[case] entries: Entries,
-    many_out_of_order: Entries,
-) {
-    make(&repo, &entries);
-
-    let entries_a = repo.get_paginated(None).iter().map(|(i, _)| *i).collect::<Vec<_>>();
-
-    make(&repo, &many_out_of_order);
-
-    let entries_b = repo.get_paginated(None).iter().map(|(i, _)| *i).collect::<Vec<_>>();
-
-    let is_equal = entries_b.iter().take(entries_a.len()).copied().collect::<Vec<_>>() == entries_a;
-
-    let is_sorted = entries_b.windows(2).all(|w| w[0] <= w[1]);
-
-    assert!(
-        is_equal || is_sorted,
-        "The order is unstable: {is_equal}, or is sorted {is_sorted}."
-    );
-}
-
-#[rstest]
-#[case::empty(empty())]
-#[case::default(default())]
-#[case::started(started())]
-#[case::completed(completed())]
-#[case::downloaded(downloaded())]
-#[case::three(three())]
-#[case::out_of_order(many_out_of_order())]
-#[case::in_order(many_hashed_in_order())]
-#[tokio::test]
-async fn it_should_get_paginated(
-    #[values(skip_list_mutex_std())] repo: TorrentRepository,
-    #[case] entries: Entries,
-    #[values(paginated_limit_zero(), paginated_limit_one(), paginated_limit_one_offset_one())] paginated: Pagination,
-) {
-    make(&repo, &entries);
-
-    let mut info_hashes = repo.get_paginated(None).iter().map(|(i, _)| *i).collect::<Vec<_>>();
-    info_hashes.sort();
-
-    match paginated {
-        // it should return empty if limit is zero.
-        Pagination { limit: 0, .. } => {
-            let torrents: Vec<(InfoHash, TrackedTorrent)> = repo
-                .get_paginated(Some(&paginated))
-                .iter()
-                .map(|(i, lock_tracked_torrent)| (*i, lock_tracked_torrent.lock_or_panic().clone()))
-                .collect();
-
-            assert_eq!(torrents, vec![]);
-        }
-
-        // it should return a single entry if the limit is one.
-        Pagination { limit: 1, offset: 0 } => {
-            if info_hashes.is_empty() {
-                assert_eq!(repo.get_paginated(Some(&paginated)).len(), 0);
-            } else {
-                let page = repo.get_paginated(Some(&paginated));
-                assert_eq!(page.len(), 1);
-                assert_eq!(page.first().map(|(i, _)| i), info_hashes.first());
-            }
-        }
-
-        // it should return the only the second entry if both the limit and the offset are one.
-        Pagination { limit: 1, offset: 1 } => {
-            if info_hashes.len() > 1 {
-                let page = repo.get_paginated(Some(&paginated));
-                assert_eq!(page.len(), 1);
-                assert_eq!(page[0].0, info_hashes[1]);
-            }
-        }
-        // the other cases are not yet tested.
-        _ => {}
-    }
-}
-
-#[rstest]
-#[case::empty(empty())]
-#[case::default(default())]
-#[case::started(started())]
-#[case::completed(completed())]
-#[case::downloaded(downloaded())]
-#[case::three(three())]
-#[case::out_of_order(many_out_of_order())]
-#[case::in_order(many_hashed_in_order())]
-#[tokio::test]
-async fn it_should_get_metrics(#[values(skip_list_mutex_std())] repo: TorrentRepository, #[case] entries: Entries) {
-    use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
-
-    make(&repo, &entries);
-
-    let mut metrics = AggregateSwarmMetadata::default();
-
-    for (_, torrent) in entries {
-        let stats = torrent.get_swarm_metadata();
-
-        metrics.total_torrents += 1;
-        metrics.total_incomplete += u64::from(stats.incomplete);
-        metrics.total_complete += u64::from(stats.complete);
-        metrics.total_downloaded += u64::from(stats.downloaded);
-    }
-
-    assert_eq!(repo.get_aggregate_swarm_metadata(), metrics);
-}
-
-#[rstest]
-#[case::empty(empty())]
-#[case::default(default())]
-#[case::started(started())]
-#[case::completed(completed())]
-#[case::downloaded(downloaded())]
-#[case::three(three())]
-#[case::out_of_order(many_out_of_order())]
-#[case::in_order(many_hashed_in_order())]
-#[tokio::test]
-async fn it_should_import_persistent_torrents(
-    #[values(skip_list_mutex_std())] repo: TorrentRepository,
-    #[case] entries: Entries,
-    #[values(persistent_empty(), persistent_single(), persistent_three())] persistent_torrents: PersistentTorrents,
-) {
-    make(&repo, &entries);
-
-    let mut downloaded = repo.get_aggregate_swarm_metadata().total_downloaded;
-    persistent_torrents.iter().for_each(|(_, d)| downloaded += u64::from(*d));
-
-    repo.import_persistent(&persistent_torrents);
-
-    assert_eq!(repo.get_aggregate_swarm_metadata().total_downloaded, downloaded);
-
-    for (entry, _) in persistent_torrents {
-        assert!(repo.get(&entry).is_some());
-    }
-}
-
-#[rstest]
-#[case::empty(empty())]
-#[case::default(default())]
-#[case::started(started())]
-#[case::completed(completed())]
-#[case::downloaded(downloaded())]
-#[case::three(three())]
-#[case::out_of_order(many_out_of_order())]
-#[case::in_order(many_hashed_in_order())]
-#[tokio::test]
-async fn it_should_remove_an_entry(#[values(skip_list_mutex_std())] repo: TorrentRepository, #[case] entries: Entries) {
-    make(&repo, &entries);
-
-    for (info_hash, torrent) in entries {
-        assert_eq!(
-            Some(repo.get(&info_hash).unwrap().lock_or_panic().clone()),
-            Some(torrent.clone())
-        );
-        assert_eq!(Some(repo.remove(&info_hash).unwrap().lock_or_panic().clone()), Some(torrent));
-
-        assert!(repo.get(&info_hash).is_none());
-        assert!(repo.remove(&info_hash).is_none());
-    }
-
-    assert_eq!(repo.get_aggregate_swarm_metadata().total_torrents, 0);
-}
-
-#[rstest]
-#[case::empty(empty())]
-#[case::default(default())]
-#[case::started(started())]
-#[case::completed(completed())]
-#[case::downloaded(downloaded())]
-#[case::three(three())]
-#[case::out_of_order(many_out_of_order())]
-#[case::in_order(many_hashed_in_order())]
-#[tokio::test]
-async fn it_should_remove_inactive_peers(#[values(skip_list_mutex_std())] repo: TorrentRepository, #[case] entries: Entries) {
-    use std::ops::Sub as _;
-    use std::time::Duration;
-
-    use torrust_tracker_clock::clock::stopped::Stopped as _;
-    use torrust_tracker_clock::clock::{self, Time as _};
-    use torrust_tracker_primitives::peer;
-
-    use crate::CurrentClock;
-
-    const TIMEOUT: Duration = Duration::from_secs(120);
-    const EXPIRE: Duration = Duration::from_secs(121);
-
-    make(&repo, &entries);
-
-    let info_hash: InfoHash;
-    let mut peer: peer::Peer;
-
-    // Generate a new infohash and peer.
-    {
-        let hash = &mut DefaultHasher::default();
-        hash.write_u8(255);
-        info_hash = InfoHash::from(&hash.clone());
-        peer = a_completed_peer(-1);
-    }
-
-    // Set the last updated time of the peer to be 121 seconds ago.
-    {
-        let now = clock::Working::now();
-        clock::Stopped::local_set(&now);
-
-        peer.updated = now.sub(EXPIRE);
-    }
-
-    // Insert the infohash and peer into the repository
-    // and verify there is an extra torrent entry.
-    {
-        repo.upsert_peer(&info_hash, &peer, None);
-        assert_eq!(repo.get_aggregate_swarm_metadata().total_torrents, entries.len() as u64 + 1);
-    }
-
-    // Insert the infohash and peer into the repository
-    // and verify the swarm metadata was updated.
-    {
-        repo.upsert_peer(&info_hash, &peer, None);
-        let stats = repo.get_swarm_metadata(&info_hash);
-        assert_eq!(
-            stats,
-            Some(SwarmMetadata {
-                downloaded: 0,
-                complete: 1,
-                incomplete: 0
-            })
-        );
-    }
-
-    // Verify that this new peer was inserted into the repository.
-    {
-        let lock_tracked_torrent = repo.get(&info_hash).expect("it_should_get_some");
-        let entry = lock_tracked_torrent.lock_or_panic();
-        assert!(entry.get_peers(None).contains(&peer.into()));
-    }
-
-    // Remove peers that have not been updated since the timeout (120 seconds ago).
-    {
-        repo.remove_inactive_peers(CurrentClock::now_sub(&TIMEOUT).expect("it should get a time passed"));
-    }
-
-    // Verify that the this peer was removed from the repository.
-    {
-        let lock_tracked_torrent = repo.get(&info_hash).expect("it_should_get_some");
-        let entry = lock_tracked_torrent.lock_or_panic();
-        assert!(!entry.get_peers(None).contains(&peer.into()));
-    }
-}
-
-#[rstest]
-#[case::empty(empty())]
-#[case::default(default())]
-#[case::started(started())]
-#[case::completed(completed())]
-#[case::downloaded(downloaded())]
-#[case::three(three())]
-#[case::out_of_order(many_out_of_order())]
-#[case::in_order(many_hashed_in_order())]
-#[tokio::test]
-async fn it_should_remove_peerless_torrents(
-    #[values(skip_list_mutex_std())] repo: TorrentRepository,
-    #[case] entries: Entries,
-    #[values(policy_none(), policy_persist(), policy_remove(), policy_remove_persist())] policy: TrackerPolicy,
-) {
-    make(&repo, &entries);
-
-    repo.remove_peerless_torrents(&policy);
-
-    let torrents: Vec<(InfoHash, TrackedTorrent)> = repo
-        .get_paginated(None)
-        .iter()
-        .map(|(i, lock_tracked_torrent)| (*i, lock_tracked_torrent.lock_or_panic().clone()))
-        .collect();
-
-    for (_, entry) in torrents {
-        assert!(entry.meets_retaining_policy(&policy));
-    }
-}
diff --git a/packages/tracker-client/Cargo.toml b/packages/tracker-client/Cargo.toml
index ef5cccaa2..0cd419471 100644
--- a/packages/tracker-client/Cargo.toml
+++ b/packages/tracker-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library with the generic tracker clients."
-keywords = ["bittorrent", "client", "tracker"]
+keywords = [ "bittorrent", "client", "tracker" ]
 license = "LGPL-3.0"
 name = "bittorrent-tracker-client"
 readme = "README.md"
@@ -17,16 +17,16 @@ version.workspace = true
 [dependencies]
 aquatic_udp_protocol = "0"
 bittorrent-primitives = "0.1.0"
-derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = [ "as_ref", "constructor", "from" ] }
 hyper = "1"
 percent-encoding = "2"
-reqwest = { version = "0", features = ["json"] }
-serde = { version = "1", features = ["derive"] }
+reqwest = { version = "0", features = [ "json" ] }
+serde = { version = "1", features = [ "derive" ] }
 serde_bencode = "0"
 serde_bytes = "0"
 serde_repr = "0"
 thiserror = "2"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-located-error = { version = "3.0.0-develop", path = "../located-error" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
@@ -34,4 +34,4 @@ tracing = "0"
 zerocopy = "0.7"
 
 [package.metadata.cargo-machete]
-ignored = ["serde_bytes"]
+ignored = [ "serde_bytes" ]
diff --git a/packages/tracker-client/src/http/client/requests/announce.rs b/packages/tracker-client/src/http/client/requests/announce.rs
index 7d20fbba8..87bdbad52 100644
--- a/packages/tracker-client/src/http/client/requests/announce.rs
+++ b/packages/tracker-client/src/http/client/requests/announce.rs
@@ -53,16 +53,16 @@ pub type BaseTenASCII = u64;
 pub type PortNumber = u16;
 
 pub enum Event {
-    //Started,
-    //Stopped,
+    Started,
+    Stopped,
     Completed,
 }
 
 impl fmt::Display for Event {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            //Event::Started => write!(f, "started"),
-            //Event::Stopped => write!(f, "stopped"),
+            Event::Started => write!(f, "started"),
+            Event::Stopped => write!(f, "stopped"),
             Event::Completed => write!(f, "completed"),
         }
     }
@@ -102,7 +102,7 @@ impl QueryBuilder {
             peer_id: PeerId(*b"-qB00000000000000001").0,
             port: 17548,
             left: 0,
-            event: Some(Event::Completed),
+            event: Some(Event::Started),
             compact: Some(Compact::NotAccepted),
         };
         Self {
diff --git a/packages/tracker-client/src/udp/client.rs b/packages/tracker-client/src/udp/client.rs
index 1c5ffd901..94c882d29 100644
--- a/packages/tracker-client/src/udp/client.rs
+++ b/packages/tracker-client/src/udp/client.rs
@@ -256,7 +256,7 @@ pub async fn check(service_binding: &ServiceBinding) -> Result<String, String> {
                 }
             };
 
-            let sleep = time::sleep(Duration::from_millis(2000));
+            let sleep = time::sleep(Duration::from_secs(2));
             tokio::pin!(sleep);
 
             tokio::select! {
diff --git a/packages/tracker-core/Cargo.toml b/packages/tracker-core/Cargo.toml
index ac1cee88d..fb864cde7 100644
--- a/packages/tracker-core/Cargo.toml
+++ b/packages/tracker-core/Cargo.toml
@@ -4,7 +4,7 @@ description = "A library with the core functionality needed to implement a BitTo
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["api", "bittorrent", "core", "library", "tracker"]
+keywords = [ "api", "bittorrent", "core", "library", "tracker" ]
 license.workspace = true
 name = "bittorrent-tracker-core"
 publish.workspace = true
@@ -16,22 +16,25 @@ version.workspace = true
 [dependencies]
 aquatic_udp_protocol = "0"
 bittorrent-primitives = "0.1.0"
-chrono = { version = "0", default-features = false, features = ["clock"] }
-derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
+chrono = { version = "0", default-features = false, features = [ "clock" ] }
+derive_more = { version = "2", features = [ "as_ref", "constructor", "from" ] }
 mockall = "0"
 r2d2 = "0"
 r2d2_mysql = "25"
-r2d2_sqlite = { version = "0", features = ["bundled"] }
+r2d2_sqlite = { version = "0", features = [ "bundled" ] }
 rand = "0"
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1", features = ["preserve_order"] }
+serde = { version = "1", features = [ "derive" ] }
+serde_json = { version = "1", features = [ "preserve_order" ] }
 thiserror = "2"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
+tokio-util = "0.7.15"
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
+torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
 torrust-tracker-located-error = { version = "3.0.0-develop", path = "../located-error" }
+torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
-torrust-tracker-torrent-repository = { version = "3.0.0-develop", path = "../torrent-repository" }
+torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "../swarm-coordination-registry" }
 tracing = "0"
 
 [dev-dependencies]
diff --git a/packages/tracker-core/migrations/mysql/20240730183000_torrust_tracker_create_all_tables.sql b/packages/tracker-core/migrations/mysql/20240730183000_torrust_tracker_create_all_tables.sql
index 407ae4dd1..ab160bd75 100644
--- a/packages/tracker-core/migrations/mysql/20240730183000_torrust_tracker_create_all_tables.sql
+++ b/packages/tracker-core/migrations/mysql/20240730183000_torrust_tracker_create_all_tables.sql
@@ -4,6 +4,7 @@ CREATE TABLE
         info_hash VARCHAR(40) NOT NULL UNIQUE
     );
 
+# todo: rename to `torrent_metrics`
 CREATE TABLE
     IF NOT EXISTS torrents (
         id integer PRIMARY KEY AUTO_INCREMENT,
diff --git a/packages/tracker-core/migrations/mysql/20250527093000_torrust_tracker_new_torrent_aggregate_metrics_table.sql b/packages/tracker-core/migrations/mysql/20250527093000_torrust_tracker_new_torrent_aggregate_metrics_table.sql
new file mode 100644
index 000000000..36f940cc3
--- /dev/null
+++ b/packages/tracker-core/migrations/mysql/20250527093000_torrust_tracker_new_torrent_aggregate_metrics_table.sql
@@ -0,0 +1,6 @@
+CREATE TABLE
+    IF NOT EXISTS torrent_aggregate_metrics (
+        id integer PRIMARY KEY AUTO_INCREMENT,
+        metric_name VARCHAR(50) NOT NULL UNIQUE,
+        value INTEGER DEFAULT 0 NOT NULL
+    );
\ No newline at end of file
diff --git a/packages/tracker-core/migrations/sqlite/20240730183000_torrust_tracker_create_all_tables.sql b/packages/tracker-core/migrations/sqlite/20240730183000_torrust_tracker_create_all_tables.sql
index bd451bf8b..c5bcad926 100644
--- a/packages/tracker-core/migrations/sqlite/20240730183000_torrust_tracker_create_all_tables.sql
+++ b/packages/tracker-core/migrations/sqlite/20240730183000_torrust_tracker_create_all_tables.sql
@@ -4,6 +4,7 @@ CREATE TABLE
         info_hash TEXT NOT NULL UNIQUE
     );
 
+# todo: rename to `torrent_metrics`
 CREATE TABLE
     IF NOT EXISTS torrents (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
diff --git a/packages/tracker-core/migrations/sqlite/20250527093000_torrust_tracker_new_torrent_aggregate_metrics_table.sql b/packages/tracker-core/migrations/sqlite/20250527093000_torrust_tracker_new_torrent_aggregate_metrics_table.sql
new file mode 100644
index 000000000..34166903c
--- /dev/null
+++ b/packages/tracker-core/migrations/sqlite/20250527093000_torrust_tracker_new_torrent_aggregate_metrics_table.sql
@@ -0,0 +1,6 @@
+CREATE TABLE
+    IF NOT EXISTS torrent_aggregate_metrics (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        metric_name TEXT NOT NULL UNIQUE,
+        value INTEGER DEFAULT 0 NOT NULL
+    );
\ No newline at end of file
diff --git a/packages/tracker-core/src/announce_handler.rs b/packages/tracker-core/src/announce_handler.rs
index 6174190dc..0b6bffd31 100644
--- a/packages/tracker-core/src/announce_handler.rs
+++ b/packages/tracker-core/src/announce_handler.rs
@@ -96,11 +96,12 @@ use std::sync::Arc;
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_configuration::{Core, TORRENT_PEERS_LIMIT};
 use torrust_tracker_primitives::core::AnnounceData;
-use torrust_tracker_primitives::peer;
+use torrust_tracker_primitives::{peer, NumberOfDownloads};
 
 use super::torrent::repository::in_memory::InMemoryTorrentRepository;
-use super::torrent::repository::persisted::DatabasePersistentTorrentRepository;
+use crate::databases;
 use crate::error::AnnounceError;
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 use crate::whitelist::authorization::WhitelistAuthorization;
 
 /// Handles `announce` requests from `BitTorrent` clients.
@@ -115,7 +116,7 @@ pub struct AnnounceHandler {
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
 
     /// Repository for persistent torrent data (database).
-    db_torrent_repository: Arc<DatabasePersistentTorrentRepository>,
+    db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository>,
 }
 
 impl AnnounceHandler {
@@ -125,13 +126,13 @@ impl AnnounceHandler {
         config: &Core,
         whitelist_authorization: &Arc<WhitelistAuthorization>,
         in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>,
-        db_torrent_repository: &Arc<DatabasePersistentTorrentRepository>,
+        db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
     ) -> Self {
         Self {
             whitelist_authorization: whitelist_authorization.clone(),
             config: config.clone(),
             in_memory_torrent_repository: in_memory_torrent_repository.clone(),
-            db_torrent_repository: db_torrent_repository.clone(),
+            db_downloads_metric_repository: db_downloads_metric_repository.clone(),
         }
     }
 
@@ -154,7 +155,7 @@ impl AnnounceHandler {
     ///
     /// Returns an error if the tracker is running in `listed` mode and the
     /// torrent is not whitelisted.
-    pub async fn announce(
+    pub async fn handle_announcement(
         &self,
         info_hash: &InfoHash,
         peer: &mut peer::Peer,
@@ -163,32 +164,39 @@ impl AnnounceHandler {
     ) -> Result<AnnounceData, AnnounceError> {
         self.whitelist_authorization.authorize(info_hash).await?;
 
-        let opt_persistent_torrent = if self.config.tracker_policy.persistent_torrent_completed_stat {
-            self.db_torrent_repository.load(info_hash)?
-        } else {
-            None
-        };
-
         peer.change_ip(&assign_ip_address_to_peer(remote_client_ip, self.config.net.external_ip));
 
-        let number_of_downloads_increased =
-            self.in_memory_torrent_repository
-                .upsert_peer(info_hash, peer, opt_persistent_torrent);
+        self.in_memory_torrent_repository
+            .handle_announcement(info_hash, peer, self.load_downloads_metric_if_needed(info_hash)?)
+            .await;
 
-        if self.config.tracker_policy.persistent_torrent_completed_stat && number_of_downloads_increased {
-            self.db_torrent_repository.increase_number_of_downloads(info_hash)?;
-        }
+        Ok(self.build_announce_data(info_hash, peer, peers_wanted).await)
+    }
 
-        Ok(self.build_announce_data(info_hash, peer, peers_wanted))
+    /// Loads the number of downloads for a torrent if needed.
+    fn load_downloads_metric_if_needed(
+        &self,
+        info_hash: &InfoHash,
+    ) -> Result<Option<NumberOfDownloads>, databases::error::Error> {
+        if self.config.tracker_policy.persistent_torrent_completed_stat && !self.in_memory_torrent_repository.contains(info_hash)
+        {
+            Ok(self.db_downloads_metric_repository.load_torrent_downloads(info_hash)?)
+        } else {
+            Ok(None)
+        }
     }
 
     /// Builds the announce data for the peer making the request.
-    fn build_announce_data(&self, info_hash: &InfoHash, peer: &peer::Peer, peers_wanted: &PeersWanted) -> AnnounceData {
+    async fn build_announce_data(&self, info_hash: &InfoHash, peer: &peer::Peer, peers_wanted: &PeersWanted) -> AnnounceData {
         let peers = self
             .in_memory_torrent_repository
-            .get_peers_for(info_hash, peer, peers_wanted.limit());
+            .get_peers_for(info_hash, peer, peers_wanted.limit())
+            .await;
 
-        let swarm_metadata = self.in_memory_torrent_repository.get_swarm_metadata_or_default(info_hash);
+        let swarm_metadata = self
+            .in_memory_torrent_repository
+            .get_swarm_metadata_or_default(info_hash)
+            .await;
 
         AnnounceData {
             peers,
@@ -450,7 +458,7 @@ mod tests {
                     let mut peer = sample_peer();
 
                     let announce_data = announce_handler
-                        .announce(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
+                        .handle_announcement(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
                         .await
                         .unwrap();
 
@@ -463,7 +471,7 @@ mod tests {
 
                     let mut previously_announced_peer = sample_peer_1();
                     announce_handler
-                        .announce(
+                        .handle_announcement(
                             &sample_info_hash(),
                             &mut previously_announced_peer,
                             &peer_ip(),
@@ -474,7 +482,7 @@ mod tests {
 
                     let mut peer = sample_peer_2();
                     let announce_data = announce_handler
-                        .announce(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
+                        .handle_announcement(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
                         .await
                         .unwrap();
 
@@ -487,7 +495,7 @@ mod tests {
 
                     let mut previously_announced_peer_1 = sample_peer_1();
                     announce_handler
-                        .announce(
+                        .handle_announcement(
                             &sample_info_hash(),
                             &mut previously_announced_peer_1,
                             &peer_ip(),
@@ -498,7 +506,7 @@ mod tests {
 
                     let mut previously_announced_peer_2 = sample_peer_2();
                     announce_handler
-                        .announce(
+                        .handle_announcement(
                             &sample_info_hash(),
                             &mut previously_announced_peer_2,
                             &peer_ip(),
@@ -509,7 +517,7 @@ mod tests {
 
                     let mut peer = sample_peer_3();
                     let announce_data = announce_handler
-                        .announce(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::only(1))
+                        .handle_announcement(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::only(1))
                         .await
                         .unwrap();
 
@@ -534,7 +542,7 @@ mod tests {
                         let mut peer = seeder();
 
                         let announce_data = announce_handler
-                            .announce(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
+                            .handle_announcement(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
                             .await
                             .unwrap();
 
@@ -548,7 +556,7 @@ mod tests {
                         let mut peer = leecher();
 
                         let announce_data = announce_handler
-                            .announce(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
+                            .handle_announcement(&sample_info_hash(), &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
                             .await
                             .unwrap();
 
@@ -562,7 +570,7 @@ mod tests {
                         // We have to announce with "started" event because peer does not count if peer was not previously known
                         let mut started_peer = started_peer();
                         announce_handler
-                            .announce(
+                            .handle_announcement(
                                 &sample_info_hash(),
                                 &mut started_peer,
                                 &peer_ip(),
@@ -573,7 +581,7 @@ mod tests {
 
                         let mut completed_peer = completed_peer();
                         let announce_data = announce_handler
-                            .announce(
+                            .handle_announcement(
                                 &sample_info_hash(),
                                 &mut completed_peer,
                                 &peer_ip(),
@@ -588,82 +596,6 @@ mod tests {
             }
         }
 
-        mod handling_torrent_persistence {
-
-            use std::sync::Arc;
-
-            use aquatic_udp_protocol::AnnounceEvent;
-            use torrust_tracker_test_helpers::configuration;
-            use torrust_tracker_torrent_repository::LockTrackedTorrent;
-
-            use crate::announce_handler::tests::the_announce_handler::peer_ip;
-            use crate::announce_handler::{AnnounceHandler, PeersWanted};
-            use crate::databases::setup::initialize_database;
-            use crate::test_helpers::tests::{sample_info_hash, sample_peer};
-            use crate::torrent::manager::TorrentsManager;
-            use crate::torrent::repository::in_memory::InMemoryTorrentRepository;
-            use crate::torrent::repository::persisted::DatabasePersistentTorrentRepository;
-            use crate::whitelist::authorization::WhitelistAuthorization;
-            use crate::whitelist::repository::in_memory::InMemoryWhitelist;
-
-            #[tokio::test]
-            async fn it_should_persist_the_number_of_completed_peers_for_all_torrents_into_the_database() {
-                let mut config = configuration::ephemeral_public();
-
-                config.core.tracker_policy.persistent_torrent_completed_stat = true;
-
-                let database = initialize_database(&config.core);
-                let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-                let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
-                let torrents_manager = Arc::new(TorrentsManager::new(
-                    &config.core,
-                    &in_memory_torrent_repository,
-                    &db_torrent_repository,
-                ));
-                let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
-                let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
-                let announce_handler = Arc::new(AnnounceHandler::new(
-                    &config.core,
-                    &whitelist_authorization,
-                    &in_memory_torrent_repository,
-                    &db_torrent_repository,
-                ));
-
-                let info_hash = sample_info_hash();
-
-                let mut peer = sample_peer();
-
-                peer.event = AnnounceEvent::Started;
-                let announce_data = announce_handler
-                    .announce(&info_hash, &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
-                    .await
-                    .unwrap();
-                assert_eq!(announce_data.stats.downloaded, 0);
-
-                peer.event = AnnounceEvent::Completed;
-                let announce_data = announce_handler
-                    .announce(&info_hash, &mut peer, &peer_ip(), &PeersWanted::AsManyAsPossible)
-                    .await
-                    .unwrap();
-                assert_eq!(announce_data.stats.downloaded, 1);
-
-                // Remove the newly updated torrent from memory
-                let _unused = in_memory_torrent_repository.remove(&info_hash);
-
-                torrents_manager.load_torrents_from_database().unwrap();
-
-                let torrent_entry = in_memory_torrent_repository
-                    .get(&info_hash)
-                    .expect("it should be able to get entry");
-
-                // It persists the number of completed peers.
-                assert_eq!(torrent_entry.lock_or_panic().get_swarm_metadata().downloaded, 1);
-
-                // It does not persist the peers
-                assert!(torrent_entry.lock_or_panic().peers_is_empty());
-            }
-        }
-
         mod should_allow_the_client_peers_to_specified_the_number_of_peers_wanted {
 
             use torrust_tracker_configuration::TORRENT_PEERS_LIMIT;
diff --git a/packages/tracker-core/src/authentication/key/peer_key.rs b/packages/tracker-core/src/authentication/key/peer_key.rs
index 41aba950b..ba648ad2f 100644
--- a/packages/tracker-core/src/authentication/key/peer_key.rs
+++ b/packages/tracker-core/src/authentication/key/peer_key.rs
@@ -13,7 +13,7 @@ use std::time::Duration;
 
 use derive_more::Display;
 use rand::distr::Alphanumeric;
-use rand::{rng, Rng};
+use rand::{rng, RngExt};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use torrust_tracker_clock::conv::convert_from_timestamp_to_datetime_utc;
diff --git a/packages/tracker-core/src/container.rs b/packages/tracker-core/src/container.rs
index 9f4d23802..93b8efd7e 100644
--- a/packages/tracker-core/src/container.rs
+++ b/packages/tracker-core/src/container.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use torrust_tracker_configuration::Core;
+use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
 
 use crate::announce_handler::AnnounceHandler;
 use crate::authentication::handler::KeysHandler;
@@ -10,14 +11,14 @@ use crate::authentication::service::AuthenticationService;
 use crate::databases::setup::initialize_database;
 use crate::databases::Database;
 use crate::scrape_handler::ScrapeHandler;
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 use crate::torrent::manager::TorrentsManager;
 use crate::torrent::repository::in_memory::InMemoryTorrentRepository;
-use crate::torrent::repository::persisted::DatabasePersistentTorrentRepository;
-use crate::whitelist;
 use crate::whitelist::authorization::WhitelistAuthorization;
 use crate::whitelist::manager::WhitelistManager;
 use crate::whitelist::repository::in_memory::InMemoryWhitelist;
 use crate::whitelist::setup::initialize_whitelist_manager;
+use crate::{statistics, whitelist};
 
 pub struct TrackerCoreContainer {
     pub core_config: Arc<Core>,
@@ -30,13 +31,17 @@ pub struct TrackerCoreContainer {
     pub whitelist_authorization: Arc<whitelist::authorization::WhitelistAuthorization>,
     pub whitelist_manager: Arc<WhitelistManager>,
     pub in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
-    pub db_torrent_repository: Arc<DatabasePersistentTorrentRepository>,
+    pub db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository>,
     pub torrents_manager: Arc<TorrentsManager>,
+    pub stats_repository: Arc<statistics::repository::Repository>,
 }
 
 impl TrackerCoreContainer {
     #[must_use]
-    pub fn initialize(core_config: &Arc<Core>) -> Self {
+    pub fn initialize_from(
+        core_config: &Arc<Core>,
+        swarm_coordination_registry_container: &Arc<SwarmCoordinationRegistryContainer>,
+    ) -> Self {
         let database = initialize_database(core_config);
         let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
         let whitelist_authorization = Arc::new(WhitelistAuthorization::new(core_config, &in_memory_whitelist.clone()));
@@ -48,20 +53,24 @@ impl TrackerCoreContainer {
             &db_key_repository.clone(),
             &in_memory_key_repository.clone(),
         ));
-        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
+        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::new(
+            swarm_coordination_registry_container.swarms.clone(),
+        ));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
 
         let torrents_manager = Arc::new(TorrentsManager::new(
             core_config,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
+        let stats_repository = Arc::new(statistics::repository::Repository::new());
+
         let announce_handler = Arc::new(AnnounceHandler::new(
             core_config,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
@@ -77,8 +86,9 @@ impl TrackerCoreContainer {
             whitelist_authorization,
             whitelist_manager,
             in_memory_torrent_repository,
-            db_torrent_repository,
+            db_downloads_metric_repository,
             torrents_manager,
+            stats_repository,
         }
     }
 }
diff --git a/packages/tracker-core/src/databases/driver/mod.rs b/packages/tracker-core/src/databases/driver/mod.rs
index 2cedab2d7..6c849bb70 100644
--- a/packages/tracker-core/src/databases/driver/mod.rs
+++ b/packages/tracker-core/src/databases/driver/mod.rs
@@ -6,6 +6,9 @@ use sqlite::Sqlite;
 use super::error::Error;
 use super::Database;
 
+/// Metric name in DB for the total number of downloads across all torrents.
+const TORRENTS_DOWNLOADS_TOTAL: &str = "torrents_downloads_total";
+
 /// The database management system used by the tracker.
 ///
 /// Refer to:
@@ -97,9 +100,14 @@ pub(crate) mod tests {
 
         // Persistent torrents (stats)
 
+        // Torrent metrics
         handling_torrent_persistence::it_should_save_and_load_persistent_torrents(driver);
         handling_torrent_persistence::it_should_load_all_persistent_torrents(driver);
         handling_torrent_persistence::it_should_increase_the_number_of_downloads_for_a_given_torrent(driver);
+        // Aggregate metrics for all torrents
+        handling_torrent_persistence::it_should_save_and_load_the_global_number_of_downloads(driver);
+        handling_torrent_persistence::it_should_load_the_global_number_of_downloads(driver);
+        handling_torrent_persistence::it_should_increase_the_global_number_of_downloads(driver);
 
         // Authentication keys (for private trackers)
 
@@ -154,14 +162,16 @@ pub(crate) mod tests {
         use crate::databases::Database;
         use crate::test_helpers::tests::sample_info_hash;
 
+        // Metrics per torrent
+
         pub fn it_should_save_and_load_persistent_torrents(driver: &Arc<Box<dyn Database>>) {
             let infohash = sample_info_hash();
 
             let number_of_downloads = 1;
 
-            driver.save_persistent_torrent(&infohash, number_of_downloads).unwrap();
+            driver.save_torrent_downloads(&infohash, number_of_downloads).unwrap();
 
-            let number_of_downloads = driver.load_persistent_torrent(&infohash).unwrap().unwrap();
+            let number_of_downloads = driver.load_torrent_downloads(&infohash).unwrap().unwrap();
 
             assert_eq!(number_of_downloads, 1);
         }
@@ -171,9 +181,9 @@ pub(crate) mod tests {
 
             let number_of_downloads = 1;
 
-            driver.save_persistent_torrent(&infohash, number_of_downloads).unwrap();
+            driver.save_torrent_downloads(&infohash, number_of_downloads).unwrap();
 
-            let torrents = driver.load_persistent_torrents().unwrap();
+            let torrents = driver.load_all_torrents_downloads().unwrap();
 
             assert_eq!(torrents.len(), 1);
             assert_eq!(torrents.get(&infohash), Some(number_of_downloads).as_ref());
@@ -184,11 +194,45 @@ pub(crate) mod tests {
 
             let number_of_downloads = 1;
 
-            driver.save_persistent_torrent(&infohash, number_of_downloads).unwrap();
+            driver.save_torrent_downloads(&infohash, number_of_downloads).unwrap();
+
+            driver.increase_downloads_for_torrent(&infohash).unwrap();
+
+            let number_of_downloads = driver.load_torrent_downloads(&infohash).unwrap().unwrap();
+
+            assert_eq!(number_of_downloads, 2);
+        }
+
+        // Aggregate metrics for all torrents
+
+        pub fn it_should_save_and_load_the_global_number_of_downloads(driver: &Arc<Box<dyn Database>>) {
+            let number_of_downloads = 1;
+
+            driver.save_global_downloads(number_of_downloads).unwrap();
+
+            let number_of_downloads = driver.load_global_downloads().unwrap().unwrap();
+
+            assert_eq!(number_of_downloads, 1);
+        }
+
+        pub fn it_should_load_the_global_number_of_downloads(driver: &Arc<Box<dyn Database>>) {
+            let number_of_downloads = 1;
+
+            driver.save_global_downloads(number_of_downloads).unwrap();
+
+            let number_of_downloads = driver.load_global_downloads().unwrap().unwrap();
+
+            assert_eq!(number_of_downloads, 1);
+        }
+
+        pub fn it_should_increase_the_global_number_of_downloads(driver: &Arc<Box<dyn Database>>) {
+            let number_of_downloads = 1;
+
+            driver.save_global_downloads(number_of_downloads).unwrap();
 
-            driver.increase_number_of_downloads(&infohash).unwrap();
+            driver.increase_global_downloads().unwrap();
 
-            let number_of_downloads = driver.load_persistent_torrent(&infohash).unwrap().unwrap();
+            let number_of_downloads = driver.load_global_downloads().unwrap().unwrap();
 
             assert_eq!(number_of_downloads, 2);
         }
diff --git a/packages/tracker-core/src/databases/driver/mysql.rs b/packages/tracker-core/src/databases/driver/mysql.rs
index d07f061c2..da2f86ce8 100644
--- a/packages/tracker-core/src/databases/driver/mysql.rs
+++ b/packages/tracker-core/src/databases/driver/mysql.rs
@@ -13,9 +13,9 @@ use r2d2::Pool;
 use r2d2_mysql::mysql::prelude::Queryable;
 use r2d2_mysql::mysql::{params, Opts, OptsBuilder};
 use r2d2_mysql::MySqlConnectionManager;
-use torrust_tracker_primitives::{PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::{NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
-use super::{Database, Driver, Error};
+use super::{Database, Driver, Error, TORRENTS_DOWNLOADS_TOTAL};
 use crate::authentication::key::AUTH_KEY_LENGTH;
 use crate::authentication::{self, Key};
 
@@ -46,6 +46,27 @@ impl Mysql {
 
         Ok(Self { pool })
     }
+
+    fn load_torrent_aggregate_metric(&self, metric_name: &str) -> Result<Option<NumberOfDownloads>, Error> {
+        let mut conn = self.pool.get().map_err(|e| (e, DRIVER))?;
+
+        let query = conn.exec_first::<u32, _, _>(
+            "SELECT value FROM torrent_aggregate_metrics WHERE metric_name = :metric_name",
+            params! { "metric_name" => metric_name },
+        );
+
+        let persistent_torrent = query?;
+
+        Ok(persistent_torrent)
+    }
+
+    fn save_torrent_aggregate_metric(&self, metric_name: &str, completed: NumberOfDownloads) -> Result<(), Error> {
+        const COMMAND : &str = "INSERT INTO torrent_aggregate_metrics (metric_name, value) VALUES (:metric_name, :completed) ON DUPLICATE KEY UPDATE value = VALUES(value)";
+
+        let mut conn = self.pool.get().map_err(|e| (e, DRIVER))?;
+
+        Ok(conn.exec_drop(COMMAND, params! { metric_name, completed })?)
+    }
 }
 
 impl Database for Mysql {
@@ -66,6 +87,14 @@ impl Database for Mysql {
         );"
         .to_string();
 
+        let create_torrent_aggregate_metrics_table = "
+        CREATE TABLE IF NOT EXISTS torrent_aggregate_metrics (
+            id integer PRIMARY KEY AUTO_INCREMENT,
+            metric_name VARCHAR(50) NOT NULL UNIQUE,
+            value INTEGER DEFAULT 0 NOT NULL
+        );"
+        .to_string();
+
         let create_keys_table = format!(
             "
         CREATE TABLE IF NOT EXISTS `keys` (
@@ -82,6 +111,8 @@ impl Database for Mysql {
 
         conn.query_drop(&create_torrents_table)
             .expect("Could not create torrents table.");
+        conn.query_drop(&create_torrent_aggregate_metrics_table)
+            .expect("Could not create create_torrent_aggregate_metrics_table table.");
         conn.query_drop(&create_keys_table).expect("Could not create keys table.");
         conn.query_drop(&create_whitelist_table)
             .expect("Could not create whitelist table.");
@@ -115,7 +146,7 @@ impl Database for Mysql {
     }
 
     /// Refer to [`databases::Database::load_persistent_torrents`](crate::core::databases::Database::load_persistent_torrents).
-    fn load_persistent_torrents(&self) -> Result<PersistentTorrents, Error> {
+    fn load_all_torrents_downloads(&self) -> Result<NumberOfDownloadsBTreeMap, Error> {
         let mut conn = self.pool.get().map_err(|e| (e, DRIVER))?;
 
         let torrents = conn.query_map(
@@ -130,7 +161,7 @@ impl Database for Mysql {
     }
 
     /// Refer to [`databases::Database::load_persistent_torrent`](crate::core::databases::Database::load_persistent_torrent).
-    fn load_persistent_torrent(&self, info_hash: &InfoHash) -> Result<Option<PersistentTorrent>, Error> {
+    fn load_torrent_downloads(&self, info_hash: &InfoHash) -> Result<Option<NumberOfDownloads>, Error> {
         let mut conn = self.pool.get().map_err(|e| (e, DRIVER))?;
 
         let query = conn.exec_first::<u32, _, _>(
@@ -144,7 +175,7 @@ impl Database for Mysql {
     }
 
     /// Refer to [`databases::Database::save_persistent_torrent`](crate::core::databases::Database::save_persistent_torrent).
-    fn save_persistent_torrent(&self, info_hash: &InfoHash, completed: u32) -> Result<(), Error> {
+    fn save_torrent_downloads(&self, info_hash: &InfoHash, completed: u32) -> Result<(), Error> {
         const COMMAND : &str = "INSERT INTO torrents (info_hash, completed) VALUES (:info_hash_str, :completed) ON DUPLICATE KEY UPDATE completed = VALUES(completed)";
 
         let mut conn = self.pool.get().map_err(|e| (e, DRIVER))?;
@@ -155,7 +186,7 @@ impl Database for Mysql {
     }
 
     /// Refer to [`databases::Database::increase_number_of_downloads`](crate::core::databases::Database::increase_number_of_downloads).
-    fn increase_number_of_downloads(&self, info_hash: &InfoHash) -> Result<(), Error> {
+    fn increase_downloads_for_torrent(&self, info_hash: &InfoHash) -> Result<(), Error> {
         let mut conn = self.pool.get().map_err(|e| (e, DRIVER))?;
 
         let info_hash_str = info_hash.to_string();
@@ -168,6 +199,30 @@ impl Database for Mysql {
         Ok(())
     }
 
+    /// Refer to [`databases::Database::load_global_number_of_downloads`](crate::core::databases::Database::load_global_number_of_downloads).
+    fn load_global_downloads(&self) -> Result<Option<NumberOfDownloads>, Error> {
+        self.load_torrent_aggregate_metric(TORRENTS_DOWNLOADS_TOTAL)
+    }
+
+    /// Refer to [`databases::Database::save_global_number_of_downloads`](crate::core::databases::Database::save_global_number_of_downloads).
+    fn save_global_downloads(&self, downloaded: NumberOfDownloads) -> Result<(), Error> {
+        self.save_torrent_aggregate_metric(TORRENTS_DOWNLOADS_TOTAL, downloaded)
+    }
+
+    /// Refer to [`databases::Database::increase_global_number_of_downloads`](crate::core::databases::Database::increase_global_number_of_downloads).
+    fn increase_global_downloads(&self) -> Result<(), Error> {
+        let mut conn = self.pool.get().map_err(|e| (e, DRIVER))?;
+
+        let metric_name = TORRENTS_DOWNLOADS_TOTAL;
+
+        conn.exec_drop(
+            "UPDATE torrent_aggregate_metrics SET value = value + 1 WHERE metric_name = :metric_name",
+            params! { metric_name },
+        )?;
+
+        Ok(())
+    }
+
     /// Refer to [`databases::Database::load_keys`](crate::core::databases::Database::load_keys).
     fn load_keys(&self) -> Result<Vec<authentication::PeerKey>, Error> {
         let mut conn = self.pool.get().map_err(|e| (e, DRIVER))?;
diff --git a/packages/tracker-core/src/databases/driver/sqlite.rs b/packages/tracker-core/src/databases/driver/sqlite.rs
index d36f24f8b..d08351aa8 100644
--- a/packages/tracker-core/src/databases/driver/sqlite.rs
+++ b/packages/tracker-core/src/databases/driver/sqlite.rs
@@ -13,9 +13,9 @@ use r2d2::Pool;
 use r2d2_sqlite::rusqlite::params;
 use r2d2_sqlite::rusqlite::types::Null;
 use r2d2_sqlite::SqliteConnectionManager;
-use torrust_tracker_primitives::{DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::{DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
-use super::{Database, Driver, Error};
+use super::{Database, Driver, Error, TORRENTS_DOWNLOADS_TOTAL};
 use crate::authentication::{self, Key};
 
 const DRIVER: Driver = Driver::Sqlite3;
@@ -49,6 +49,39 @@ impl Sqlite {
 
         Ok(Self { pool })
     }
+
+    fn load_torrent_aggregate_metric(&self, metric_name: &str) -> Result<Option<NumberOfDownloads>, Error> {
+        let conn = self.pool.get().map_err(|e| (e, DRIVER))?;
+
+        let mut stmt = conn.prepare("SELECT value FROM torrent_aggregate_metrics WHERE metric_name = ?")?;
+
+        let mut rows = stmt.query([metric_name])?;
+
+        let persistent_torrent = rows.next()?;
+
+        Ok(persistent_torrent.map(|f| {
+            let value: i64 = f.get(0).unwrap();
+            u32::try_from(value).unwrap()
+        }))
+    }
+
+    fn save_torrent_aggregate_metric(&self, metric_name: &str, completed: NumberOfDownloads) -> Result<(), Error> {
+        let conn = self.pool.get().map_err(|e| (e, DRIVER))?;
+
+        let insert = conn.execute(
+            "INSERT INTO torrent_aggregate_metrics (metric_name, value) VALUES (?1, ?2) ON CONFLICT(metric_name) DO UPDATE SET value = ?2",
+            [metric_name.to_string(), completed.to_string()],
+        )?;
+
+        if insert == 0 {
+            Err(Error::InsertFailed {
+                location: Location::caller(),
+                driver: DRIVER,
+            })
+        } else {
+            Ok(())
+        }
+    }
 }
 
 impl Database for Sqlite {
@@ -69,6 +102,14 @@ impl Database for Sqlite {
         );"
         .to_string();
 
+        let create_torrent_aggregate_metrics_table = "
+        CREATE TABLE IF NOT EXISTS torrent_aggregate_metrics (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            metric_name TEXT NOT NULL UNIQUE,
+            value INTEGER DEFAULT 0 NOT NULL
+        );"
+        .to_string();
+
         let create_keys_table = "
         CREATE TABLE IF NOT EXISTS keys (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -82,6 +123,7 @@ impl Database for Sqlite {
         conn.execute(&create_whitelist_table, [])?;
         conn.execute(&create_keys_table, [])?;
         conn.execute(&create_torrents_table, [])?;
+        conn.execute(&create_torrent_aggregate_metrics_table, [])?;
 
         Ok(())
     }
@@ -110,7 +152,7 @@ impl Database for Sqlite {
     }
 
     /// Refer to [`databases::Database::load_persistent_torrents`](crate::core::databases::Database::load_persistent_torrents).
-    fn load_persistent_torrents(&self) -> Result<PersistentTorrents, Error> {
+    fn load_all_torrents_downloads(&self) -> Result<NumberOfDownloadsBTreeMap, Error> {
         let conn = self.pool.get().map_err(|e| (e, DRIVER))?;
 
         let mut stmt = conn.prepare("SELECT info_hash, completed FROM torrents")?;
@@ -126,7 +168,7 @@ impl Database for Sqlite {
     }
 
     /// Refer to [`databases::Database::load_persistent_torrent`](crate::core::databases::Database::load_persistent_torrent).
-    fn load_persistent_torrent(&self, info_hash: &InfoHash) -> Result<Option<PersistentTorrent>, Error> {
+    fn load_torrent_downloads(&self, info_hash: &InfoHash) -> Result<Option<NumberOfDownloads>, Error> {
         let conn = self.pool.get().map_err(|e| (e, DRIVER))?;
 
         let mut stmt = conn.prepare("SELECT completed FROM torrents WHERE info_hash = ?")?;
@@ -142,7 +184,7 @@ impl Database for Sqlite {
     }
 
     /// Refer to [`databases::Database::save_persistent_torrent`](crate::core::databases::Database::save_persistent_torrent).
-    fn save_persistent_torrent(&self, info_hash: &InfoHash, completed: u32) -> Result<(), Error> {
+    fn save_torrent_downloads(&self, info_hash: &InfoHash, completed: u32) -> Result<(), Error> {
         let conn = self.pool.get().map_err(|e| (e, DRIVER))?;
 
         let insert = conn.execute(
@@ -161,7 +203,7 @@ impl Database for Sqlite {
     }
 
     /// Refer to [`databases::Database::increase_number_of_downloads`](crate::core::databases::Database::increase_number_of_downloads).
-    fn increase_number_of_downloads(&self, info_hash: &InfoHash) -> Result<(), Error> {
+    fn increase_downloads_for_torrent(&self, info_hash: &InfoHash) -> Result<(), Error> {
         let conn = self.pool.get().map_err(|e| (e, DRIVER))?;
 
         let _ = conn.execute(
@@ -172,6 +214,30 @@ impl Database for Sqlite {
         Ok(())
     }
 
+    /// Refer to [`databases::Database::load_global_number_of_downloads`](crate::core::databases::Database::load_global_number_of_downloads).
+    fn load_global_downloads(&self) -> Result<Option<NumberOfDownloads>, Error> {
+        self.load_torrent_aggregate_metric(TORRENTS_DOWNLOADS_TOTAL)
+    }
+
+    /// Refer to [`databases::Database::save_global_number_of_downloads`](crate::core::databases::Database::save_global_number_of_downloads).
+    fn save_global_downloads(&self, downloaded: NumberOfDownloads) -> Result<(), Error> {
+        self.save_torrent_aggregate_metric(TORRENTS_DOWNLOADS_TOTAL, downloaded)
+    }
+
+    /// Refer to [`databases::Database::increase_global_number_of_downloads`](crate::core::databases::Database::increase_global_number_of_downloads).
+    fn increase_global_downloads(&self) -> Result<(), Error> {
+        let conn = self.pool.get().map_err(|e| (e, DRIVER))?;
+
+        let metric_name = TORRENTS_DOWNLOADS_TOTAL;
+
+        let _ = conn.execute(
+            "UPDATE torrent_aggregate_metrics SET value = value + 1 WHERE metric_name = ?",
+            [metric_name],
+        )?;
+
+        Ok(())
+    }
+
     /// Refer to [`databases::Database::load_keys`](crate::core::databases::Database::load_keys).
     fn load_keys(&self) -> Result<Vec<authentication::PeerKey>, Error> {
         let conn = self.pool.get().map_err(|e| (e, DRIVER))?;
diff --git a/packages/tracker-core/src/databases/mod.rs b/packages/tracker-core/src/databases/mod.rs
index 2703ab8bf..c9d89769a 100644
--- a/packages/tracker-core/src/databases/mod.rs
+++ b/packages/tracker-core/src/databases/mod.rs
@@ -52,7 +52,7 @@ pub mod setup;
 
 use bittorrent_primitives::info_hash::InfoHash;
 use mockall::automock;
-use torrust_tracker_primitives::{PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::{NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use self::error::Error;
 use crate::authentication::{self, Key};
@@ -101,7 +101,7 @@ pub trait Database: Sync + Send {
     /// # Errors
     ///
     /// Returns an [`Error`] if the metrics cannot be loaded.
-    fn load_persistent_torrents(&self) -> Result<PersistentTorrents, Error>;
+    fn load_all_torrents_downloads(&self) -> Result<NumberOfDownloadsBTreeMap, Error>;
 
     /// Loads torrent metrics data from the database for one torrent.
     ///
@@ -110,7 +110,7 @@ pub trait Database: Sync + Send {
     /// # Errors
     ///
     /// Returns an [`Error`] if the metrics cannot be loaded.
-    fn load_persistent_torrent(&self, info_hash: &InfoHash) -> Result<Option<PersistentTorrent>, Error>;
+    fn load_torrent_downloads(&self, info_hash: &InfoHash) -> Result<Option<NumberOfDownloads>, Error>;
 
     /// Saves torrent metrics data into the database.
     ///
@@ -124,23 +124,55 @@ pub trait Database: Sync + Send {
     /// # Errors
     ///
     /// Returns an [`Error`] if the metrics cannot be saved.
-    fn save_persistent_torrent(&self, info_hash: &InfoHash, downloaded: u32) -> Result<(), Error>;
+    fn save_torrent_downloads(&self, info_hash: &InfoHash, downloaded: u32) -> Result<(), Error>;
 
     /// Increases the number of downloads for a given torrent.
     ///
     /// It does not create a new entry if the torrent is not found and it does
     /// not return an error.
     ///
+    /// # Context: Torrent Metrics
+    ///
+    /// # Arguments
+    ///
+    /// * `info_hash` - A reference to the torrent's info hash.
+    ///
+    /// # Errors
+    ///
+    /// Returns an [`Error`] if the query failed.
+    fn increase_downloads_for_torrent(&self, info_hash: &InfoHash) -> Result<(), Error>;
+
+    /// Loads the total number of downloads for all torrents from the database.
+    ///
+    /// # Context: Torrent Metrics
+    ///
+    /// # Errors
+    ///
+    /// Returns an [`Error`] if the total downloads cannot be loaded.
+    fn load_global_downloads(&self) -> Result<Option<NumberOfDownloads>, Error>;
+
+    /// Saves the total number of downloads for all torrents into the database.
+    ///
+    /// # Context: Torrent Metrics
+    ///
     /// # Arguments
     ///
     /// * `info_hash` - A reference to the torrent's info hash.
+    /// * `downloaded` - The number of times the torrent has been downloaded.
+    ///
+    /// # Errors
+    ///
+    /// Returns an [`Error`] if the total downloads cannot be saved.
+    fn save_global_downloads(&self, downloaded: NumberOfDownloads) -> Result<(), Error>;
+
+    /// Increases the total number of downloads for all torrents.
     ///
     /// # Context: Torrent Metrics
     ///
     /// # Errors
     ///
     /// Returns an [`Error`] if the query failed.
-    fn increase_number_of_downloads(&self, info_hash: &InfoHash) -> Result<(), Error>;
+    fn increase_global_downloads(&self) -> Result<(), Error>;
 
     // Whitelist
 
diff --git a/packages/tracker-core/src/error.rs b/packages/tracker-core/src/error.rs
index 4a35e9a0b..866aa64c5 100644
--- a/packages/tracker-core/src/error.rs
+++ b/packages/tracker-core/src/error.rs
@@ -84,7 +84,7 @@ pub enum ScrapeError {
 ///
 /// This error is returned when an operation involves a torrent that is not
 /// present in the whitelist.
-#[derive(thiserror::Error, Debug, Clone)]
+#[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
 pub enum WhitelistError {
     /// Indicates that the torrent identified by `info_hash` is not whitelisted.
     #[error("The torrent: {info_hash}, is not whitelisted, {location}")]
diff --git a/packages/tracker-core/src/lib.rs b/packages/tracker-core/src/lib.rs
index d9da9b9e7..5167abf51 100644
--- a/packages/tracker-core/src/lib.rs
+++ b/packages/tracker-core/src/lib.rs
@@ -124,6 +124,7 @@ pub mod container;
 pub mod databases;
 pub mod error;
 pub mod scrape_handler;
+pub mod statistics;
 pub mod torrent;
 pub mod whitelist;
 
@@ -156,6 +157,8 @@ pub(crate) type CurrentClock = clock::Working;
 #[allow(dead_code)]
 pub(crate) type CurrentClock = clock::Stopped;
 
+pub const TRACKER_CORE_LOG_TARGET: &str = "TRACKER_CORE";
+
 #[cfg(test)]
 mod tests {
     mod the_tracker {
@@ -200,7 +203,7 @@ mod tests {
                     // Announce a "complete" peer for the torrent
                     let mut complete_peer = complete_peer();
                     announce_handler
-                        .announce(
+                        .handle_announcement(
                             &info_hash,
                             &mut complete_peer,
                             &IpAddr::V4(Ipv4Addr::new(126, 0, 0, 10)),
@@ -212,7 +215,7 @@ mod tests {
                     // Announce an "incomplete" peer for the torrent
                     let mut incomplete_peer = incomplete_peer();
                     announce_handler
-                        .announce(
+                        .handle_announcement(
                             &info_hash,
                             &mut incomplete_peer,
                             &IpAddr::V4(Ipv4Addr::new(126, 0, 0, 11)),
@@ -222,16 +225,16 @@ mod tests {
                         .unwrap();
 
                     // Scrape
-                    let scrape_data = scrape_handler.scrape(&vec![info_hash]).await.unwrap();
+                    let scrape_data = scrape_handler.handle_scrape(&vec![info_hash]).await.unwrap();
 
-                    // The expected swarm metadata for the file
+                    // The expected swarm metadata for the torrent
                     let mut expected_scrape_data = ScrapeData::empty();
                     expected_scrape_data.add_file(
                         &info_hash,
                         SwarmMetadata {
-                            complete: 0, // the "complete" peer does not count because it was not previously known
-                            downloaded: 0,
-                            incomplete: 1, // the "incomplete" peer we have just announced
+                            complete: 1,   // the "incomplete" announced
+                            downloaded: 0, // the "complete" peer download does not count because it was not previously known
+                            incomplete: 1, // the "incomplete" peer announced
                         },
                     );
 
@@ -256,7 +259,7 @@ mod tests {
 
                     let non_whitelisted_info_hash = "3b245504cf5f11bbdbe1201cea6a6bf45aee1bc0".parse::<InfoHash>().unwrap(); // DevSkim: ignore DS173237
 
-                    let scrape_data = scrape_handler.scrape(&vec![non_whitelisted_info_hash]).await.unwrap();
+                    let scrape_data = scrape_handler.handle_scrape(&vec![non_whitelisted_info_hash]).await.unwrap();
 
                     // The expected zeroed swarm metadata for the file
                     let mut expected_scrape_data = ScrapeData::empty();
diff --git a/packages/tracker-core/src/scrape_handler.rs b/packages/tracker-core/src/scrape_handler.rs
index 5d78c7d90..9c94a4e50 100644
--- a/packages/tracker-core/src/scrape_handler.rs
+++ b/packages/tracker-core/src/scrape_handler.rs
@@ -107,12 +107,16 @@ impl ScrapeHandler {
     /// # BEP Reference:
     ///
     /// [BEP 48: Scrape Protocol](https://www.bittorrent.org/beps/bep_0048.html)
-    pub async fn scrape(&self, info_hashes: &Vec<InfoHash>) -> Result<ScrapeData, ScrapeError> {
+    pub async fn handle_scrape(&self, info_hashes: &Vec<InfoHash>) -> Result<ScrapeData, ScrapeError> {
         let mut scrape_data = ScrapeData::empty();
 
         for info_hash in info_hashes {
             let swarm_metadata = match self.whitelist_authorization.authorize(info_hash).await {
-                Ok(()) => self.in_memory_torrent_repository.get_swarm_metadata_or_default(info_hash),
+                Ok(()) => {
+                    self.in_memory_torrent_repository
+                        .get_swarm_metadata_or_default(info_hash)
+                        .await
+                }
                 Err(_) => SwarmMetadata::zeroed(),
             };
             scrape_data.add_file(info_hash, swarm_metadata);
@@ -154,7 +158,7 @@ mod tests {
 
         let info_hashes = vec!["3b245504cf5f11bbdbe1201cea6a6bf45aee1bc0".parse::<InfoHash>().unwrap()]; // DevSkim: ignore DS173237
 
-        let scrape_data = scrape_handler.scrape(&info_hashes).await.unwrap();
+        let scrape_data = scrape_handler.handle_scrape(&info_hashes).await.unwrap();
 
         let mut expected_scrape_data = ScrapeData::empty();
 
@@ -172,7 +176,7 @@ mod tests {
             "99c82bb73505a3c0b453f9fa0e881d6e5a32a0c1".parse::<InfoHash>().unwrap(), // DevSkim: ignore DS173237
         ];
 
-        let scrape_data = scrape_handler.scrape(&info_hashes).await.unwrap();
+        let scrape_data = scrape_handler.handle_scrape(&info_hashes).await.unwrap();
 
         let mut expected_scrape_data = ScrapeData::empty();
         expected_scrape_data.add_file_with_zeroed_metadata(&info_hashes[0]);
diff --git a/packages/tracker-core/src/statistics/event/handler.rs b/packages/tracker-core/src/statistics/event/handler.rs
new file mode 100644
index 000000000..9a5182f25
--- /dev/null
+++ b/packages/tracker-core/src/statistics/event/handler.rs
@@ -0,0 +1,77 @@
+use std::sync::Arc;
+
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric_name;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+use torrust_tracker_swarm_coordination_registry::event::Event;
+
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
+use crate::statistics::repository::Repository;
+use crate::statistics::TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL;
+
+pub async fn handle_event(
+    event: Event,
+    stats_repository: &Arc<Repository>,
+    db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
+    persistent_torrent_completed_stat: bool,
+    now: DurationSinceUnixEpoch,
+) {
+    match event {
+        // Torrent events
+        Event::TorrentAdded { info_hash, .. } => {
+            tracing::debug!(info_hash = ?info_hash, "Torrent added",);
+        }
+        Event::TorrentRemoved { info_hash } => {
+            tracing::debug!(info_hash = ?info_hash, "Torrent removed",);
+        }
+
+        // Peer events
+        Event::PeerAdded { info_hash, peer } => {
+            tracing::debug!(info_hash = ?info_hash, peer = ?peer, "Peer added", );
+        }
+        Event::PeerRemoved { info_hash, peer } => {
+            tracing::debug!(info_hash = ?info_hash, peer = ?peer, "Peer removed", );
+        }
+        Event::PeerUpdated {
+            info_hash,
+            old_peer,
+            new_peer,
+        } => {
+            tracing::debug!(info_hash = ?info_hash, old_peer = ?old_peer, new_peer = ?new_peer, "Peer updated");
+        }
+        Event::PeerDownloadCompleted { info_hash, peer } => {
+            tracing::debug!(info_hash = ?info_hash, peer = ?peer, "Peer download completed", );
+
+            // Increment the number of downloads for all the torrents in memory
+            let _unused = stats_repository
+                .increment_counter(
+                    &metric_name!(TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL),
+                    &LabelSet::default(),
+                    now,
+                )
+                .await;
+
+            if persistent_torrent_completed_stat {
+                // Increment the number of downloads for the torrent in the database
+                match db_downloads_metric_repository.increase_downloads_for_torrent(&info_hash) {
+                    Ok(()) => {
+                        tracing::debug!(info_hash = ?info_hash, "Number of torrent downloads increased");
+                    }
+                    Err(err) => {
+                        tracing::error!(info_hash = ?info_hash, error = ?err, "Failed to increase number of downloads for the torrent");
+                    }
+                }
+
+                // Increment the global number of downloads (for all torrents) in the database
+                match db_downloads_metric_repository.increase_global_downloads() {
+                    Ok(()) => {
+                        tracing::debug!("Global number of downloads increased");
+                    }
+                    Err(err) => {
+                        tracing::error!(error = ?err, "Failed to increase global number of downloads");
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/packages/tracker-core/src/statistics/event/listener.rs b/packages/tracker-core/src/statistics/event/listener.rs
new file mode 100644
index 000000000..8d2d74c71
--- /dev/null
+++ b/packages/tracker-core/src/statistics/event/listener.rs
@@ -0,0 +1,80 @@
+use std::sync::Arc;
+
+use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
+use torrust_tracker_clock::clock::Time;
+use torrust_tracker_events::receiver::RecvError;
+use torrust_tracker_swarm_coordination_registry::event::receiver::Receiver;
+
+use super::handler::handle_event;
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
+use crate::statistics::repository::Repository;
+use crate::{CurrentClock, TRACKER_CORE_LOG_TARGET};
+
+#[must_use]
+pub fn run_event_listener(
+    receiver: Receiver,
+    cancellation_token: CancellationToken,
+    repository: &Arc<Repository>,
+    db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
+    persistent_torrent_completed_stat: bool,
+) -> JoinHandle<()> {
+    let stats_repository = repository.clone();
+    let db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository> = db_downloads_metric_repository.clone();
+
+    tracing::info!(target: TRACKER_CORE_LOG_TARGET, "Starting tracker core event listener");
+
+    tokio::spawn(async move {
+        dispatch_events(
+            receiver,
+            cancellation_token,
+            stats_repository,
+            db_downloads_metric_repository,
+            persistent_torrent_completed_stat,
+        )
+        .await;
+
+        tracing::info!(target: TRACKER_CORE_LOG_TARGET, "Tracker core listener finished");
+    })
+}
+
+async fn dispatch_events(
+    mut receiver: Receiver,
+    cancellation_token: CancellationToken,
+    stats_repository: Arc<Repository>,
+    db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository>,
+    persistent_torrent_completed_stat: bool,
+) {
+    loop {
+        tokio::select! {
+            biased;
+
+            () = cancellation_token.cancelled() => {
+                tracing::info!(target: TRACKER_CORE_LOG_TARGET, "Received cancellation request, shutting down tracker core event listener.");
+                break;
+            }
+
+            result = receiver.recv() => {
+                match result {
+                    Ok(event) => handle_event(
+                        event,
+                        &stats_repository,
+                        &db_downloads_metric_repository,
+                        persistent_torrent_completed_stat,
+                        CurrentClock::now()).await,
+                    Err(e) => {
+                        match e {
+                            RecvError::Closed => {
+                                tracing::info!(target: TRACKER_CORE_LOG_TARGET, "Tracker core event receiver closed");
+                                break;
+                            }
+                            RecvError::Lagged(n) => {
+                                tracing::warn!(target: TRACKER_CORE_LOG_TARGET, "Tracker core event receiver lagged by {} events", n);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/packages/tracker-core/src/statistics/event/mod.rs b/packages/tracker-core/src/statistics/event/mod.rs
new file mode 100644
index 000000000..dae683398
--- /dev/null
+++ b/packages/tracker-core/src/statistics/event/mod.rs
@@ -0,0 +1,2 @@
+pub mod handler;
+pub mod listener;
diff --git a/packages/tracker-core/src/statistics/metrics.rs b/packages/tracker-core/src/statistics/metrics.rs
new file mode 100644
index 000000000..a5caaf1cf
--- /dev/null
+++ b/packages/tracker-core/src/statistics/metrics.rs
@@ -0,0 +1,76 @@
+use serde::Serialize;
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric::MetricName;
+use torrust_tracker_metrics::metric_collection::{Error, MetricCollection};
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+/// Metrics collected by the torrent repository.
+#[derive(Debug, Clone, PartialEq, Default, Serialize)]
+pub struct Metrics {
+    /// A collection of metrics.
+    pub metric_collection: MetricCollection,
+}
+
+impl Metrics {
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn increment_counter(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.increment_counter(metric_name, labels, now)
+    }
+
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn set_counter(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        value: u64,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.set_counter(metric_name, labels, value, now)
+    }
+
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn set_gauge(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        value: f64,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.set_gauge(metric_name, labels, value, now)
+    }
+
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn increment_gauge(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.increment_gauge(metric_name, labels, now)
+    }
+
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn decrement_gauge(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.decrement_gauge(metric_name, labels, now)
+    }
+}
diff --git a/packages/tracker-core/src/statistics/mod.rs b/packages/tracker-core/src/statistics/mod.rs
new file mode 100644
index 000000000..fdb8e8fd4
--- /dev/null
+++ b/packages/tracker-core/src/statistics/mod.rs
@@ -0,0 +1,28 @@
+pub mod event;
+pub mod metrics;
+pub mod persisted;
+pub mod repository;
+
+use metrics::Metrics;
+use torrust_tracker_metrics::metric::description::MetricDescription;
+use torrust_tracker_metrics::metric_name;
+use torrust_tracker_metrics::unit::Unit;
+
+// Torrent metrics
+
+const TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL: &str = "tracker_core_persistent_torrents_downloads_total";
+
+#[must_use]
+pub fn describe_metrics() -> Metrics {
+    let mut metrics = Metrics::default();
+
+    // Torrent metrics
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("The total number of torrent downloads (persisted).")),
+    );
+
+    metrics
+}
diff --git a/packages/tracker-core/src/torrent/repository/persisted.rs b/packages/tracker-core/src/statistics/persisted/downloads.rs
similarity index 61%
rename from packages/tracker-core/src/torrent/repository/persisted.rs
rename to packages/tracker-core/src/statistics/persisted/downloads.rs
index dec571baf..6248bdc73 100644
--- a/packages/tracker-core/src/torrent/repository/persisted.rs
+++ b/packages/tracker-core/src/statistics/persisted/downloads.rs
@@ -2,12 +2,12 @@
 use std::sync::Arc;
 
 use bittorrent_primitives::info_hash::InfoHash;
-use torrust_tracker_primitives::{PersistentTorrent, PersistentTorrents};
+use torrust_tracker_primitives::{NumberOfDownloads, NumberOfDownloadsBTreeMap};
 
 use crate::databases::error::Error;
 use crate::databases::Database;
 
-/// Torrent repository implementation that persists torrent metrics in a database.
+/// It persists torrent metrics in a database.
 ///
 /// This repository persists only a subset of the torrent data: the torrent
 /// metrics, specifically the number of downloads (or completed counts) for each
@@ -19,7 +19,7 @@ use crate::databases::Database;
 ///
 /// Not all in-memory torrent data is persisted; only the aggregate metrics are
 /// stored.
-pub struct DatabasePersistentTorrentRepository {
+pub struct DatabaseDownloadsMetricRepository {
     /// A shared reference to the database driver implementation.
     ///
     /// The driver must implement the [`Database`] trait. This allows for
@@ -28,7 +28,7 @@ pub struct DatabasePersistentTorrentRepository {
     database: Arc<Box<dyn Database>>,
 }
 
-impl DatabasePersistentTorrentRepository {
+impl DatabaseDownloadsMetricRepository {
     /// Creates a new instance of `DatabasePersistentTorrentRepository`.
     ///
     /// # Arguments
@@ -41,12 +41,14 @@ impl DatabasePersistentTorrentRepository {
     /// A new `DatabasePersistentTorrentRepository` instance with a cloned
     /// reference to the provided database.
     #[must_use]
-    pub fn new(database: &Arc<Box<dyn Database>>) -> DatabasePersistentTorrentRepository {
+    pub fn new(database: &Arc<Box<dyn Database>>) -> DatabaseDownloadsMetricRepository {
         Self {
             database: database.clone(),
         }
     }
 
+    // Single Torrent Metrics
+
     /// Increases the number of downloads for a given torrent.
     ///
     /// If the torrent is not found, it creates a new entry.
@@ -58,12 +60,12 @@ impl DatabasePersistentTorrentRepository {
     /// # Errors
     ///
     /// Returns an [`Error`] if the database operation fails.
-    pub(crate) fn increase_number_of_downloads(&self, info_hash: &InfoHash) -> Result<(), Error> {
-        let torrent = self.load(info_hash)?;
+    pub(crate) fn increase_downloads_for_torrent(&self, info_hash: &InfoHash) -> Result<(), Error> {
+        let torrent = self.load_torrent_downloads(info_hash)?;
 
         match torrent {
-            Some(_number_of_downloads) => self.database.increase_number_of_downloads(info_hash),
-            None => self.save(info_hash, 1),
+            Some(_number_of_downloads) => self.database.increase_downloads_for_torrent(info_hash),
+            None => self.save_torrent_downloads(info_hash, 1),
         }
     }
 
@@ -75,8 +77,8 @@ impl DatabasePersistentTorrentRepository {
     /// # Errors
     ///
     /// Returns an [`Error`] if the underlying database query fails.
-    pub(crate) fn load_all(&self) -> Result<PersistentTorrents, Error> {
-        self.database.load_persistent_torrents()
+    pub(crate) fn load_all_torrents_downloads(&self) -> Result<NumberOfDownloadsBTreeMap, Error> {
+        self.database.load_all_torrents_downloads()
     }
 
     /// Loads one persistent torrent metrics from the database.
@@ -87,8 +89,8 @@ impl DatabasePersistentTorrentRepository {
     /// # Errors
     ///
     /// Returns an [`Error`] if the underlying database query fails.
-    pub(crate) fn load(&self, info_hash: &InfoHash) -> Result<Option<PersistentTorrent>, Error> {
-        self.database.load_persistent_torrent(info_hash)
+    pub(crate) fn load_torrent_downloads(&self, info_hash: &InfoHash) -> Result<Option<NumberOfDownloads>, Error> {
+        self.database.load_torrent_downloads(info_hash)
     }
 
     /// Saves the persistent torrent metric into the database.
@@ -104,24 +106,51 @@ impl DatabasePersistentTorrentRepository {
     /// # Errors
     ///
     /// Returns an [`Error`] if the database operation fails.
-    pub(crate) fn save(&self, info_hash: &InfoHash, downloaded: u32) -> Result<(), Error> {
-        self.database.save_persistent_torrent(info_hash, downloaded)
+    pub(crate) fn save_torrent_downloads(&self, info_hash: &InfoHash, downloaded: u32) -> Result<(), Error> {
+        self.database.save_torrent_downloads(info_hash, downloaded)
+    }
+
+    // Aggregate Metrics
+
+    /// Increases the global number of downloads for all torrent.
+    ///
+    /// If the metric is not found, it creates it.
+    ///
+    /// # Errors
+    ///
+    /// Returns an [`Error`] if the database operation fails.
+    pub(crate) fn increase_global_downloads(&self) -> Result<(), Error> {
+        let torrent = self.database.load_global_downloads()?;
+
+        match torrent {
+            Some(_number_of_downloads) => self.database.increase_global_downloads(),
+            None => self.database.save_global_downloads(1),
+        }
+    }
+
+    /// Loads the global number of downloads for all torrents from the database.
+    ///
+    /// # Errors
+    ///
+    /// Returns an [`Error`] if the underlying database query fails.
+    pub(crate) fn load_global_downloads(&self) -> Result<Option<NumberOfDownloads>, Error> {
+        self.database.load_global_downloads()
     }
 }
 
 #[cfg(test)]
 mod tests {
 
-    use torrust_tracker_primitives::PersistentTorrents;
+    use torrust_tracker_primitives::NumberOfDownloadsBTreeMap;
 
-    use super::DatabasePersistentTorrentRepository;
+    use super::DatabaseDownloadsMetricRepository;
     use crate::databases::setup::initialize_database;
     use crate::test_helpers::tests::{ephemeral_configuration, sample_info_hash, sample_info_hash_one, sample_info_hash_two};
 
-    fn initialize_db_persistent_torrent_repository() -> DatabasePersistentTorrentRepository {
+    fn initialize_db_persistent_torrent_repository() -> DatabaseDownloadsMetricRepository {
         let config = ephemeral_configuration();
         let database = initialize_database(&config);
-        DatabasePersistentTorrentRepository::new(&database)
+        DatabaseDownloadsMetricRepository::new(&database)
     }
 
     #[test]
@@ -130,9 +159,9 @@ mod tests {
 
         let infohash = sample_info_hash();
 
-        repository.save(&infohash, 1).unwrap();
+        repository.save_torrent_downloads(&infohash, 1).unwrap();
 
-        let torrents = repository.load_all().unwrap();
+        let torrents = repository.load_all_torrents_downloads().unwrap();
 
         assert_eq!(torrents.get(&infohash), Some(1).as_ref());
     }
@@ -143,9 +172,9 @@ mod tests {
 
         let infohash = sample_info_hash();
 
-        repository.increase_number_of_downloads(&infohash).unwrap();
+        repository.increase_downloads_for_torrent(&infohash).unwrap();
 
-        let torrents = repository.load_all().unwrap();
+        let torrents = repository.load_all_torrents_downloads().unwrap();
 
         assert_eq!(torrents.get(&infohash), Some(1).as_ref());
     }
@@ -157,12 +186,12 @@ mod tests {
         let infohash_one = sample_info_hash_one();
         let infohash_two = sample_info_hash_two();
 
-        repository.save(&infohash_one, 1).unwrap();
-        repository.save(&infohash_two, 2).unwrap();
+        repository.save_torrent_downloads(&infohash_one, 1).unwrap();
+        repository.save_torrent_downloads(&infohash_two, 2).unwrap();
 
-        let torrents = repository.load_all().unwrap();
+        let torrents = repository.load_all_torrents_downloads().unwrap();
 
-        let mut expected_torrents = PersistentTorrents::new();
+        let mut expected_torrents = NumberOfDownloadsBTreeMap::new();
         expected_torrents.insert(infohash_one, 1);
         expected_torrents.insert(infohash_two, 2);
 
diff --git a/packages/tracker-core/src/statistics/persisted/mod.rs b/packages/tracker-core/src/statistics/persisted/mod.rs
new file mode 100644
index 000000000..86c28370d
--- /dev/null
+++ b/packages/tracker-core/src/statistics/persisted/mod.rs
@@ -0,0 +1,59 @@
+pub mod downloads;
+
+use std::sync::Arc;
+
+use thiserror::Error;
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::{metric_collection, metric_name};
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use super::repository::Repository;
+use super::TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL;
+use crate::databases;
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
+
+/// Loads persisted metrics from the database and sets them in the stats repository.
+///
+/// # Errors
+///
+/// This function will return an error if the database query fails or if the
+/// metric collection fails to set the initial metric values.
+pub async fn load_persisted_metrics(
+    stats_repository: &Arc<Repository>,
+    db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
+    now: DurationSinceUnixEpoch,
+) -> Result<(), Error> {
+    if let Some(downloads) = db_downloads_metric_repository.load_global_downloads()? {
+        stats_repository
+            .set_counter(
+                &metric_name!(TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL),
+                &LabelSet::default(),
+                u64::from(downloads),
+                now,
+            )
+            .await?;
+    }
+
+    Ok(())
+}
+
+#[derive(Error, Debug, Clone)]
+pub enum Error {
+    #[error("Database error: {err}")]
+    DatabaseError { err: databases::error::Error },
+
+    #[error("Metrics error: {err}")]
+    MetricsError { err: metric_collection::Error },
+}
+
+impl From<databases::error::Error> for Error {
+    fn from(err: databases::error::Error) -> Self {
+        Self::DatabaseError { err }
+    }
+}
+
+impl From<metric_collection::Error> for Error {
+    fn from(err: metric_collection::Error) -> Self {
+        Self::MetricsError { err }
+    }
+}
diff --git a/packages/tracker-core/src/statistics/repository.rs b/packages/tracker-core/src/statistics/repository.rs
new file mode 100644
index 000000000..21b1da7f2
--- /dev/null
+++ b/packages/tracker-core/src/statistics/repository.rs
@@ -0,0 +1,176 @@
+use std::sync::Arc;
+
+use tokio::sync::{RwLock, RwLockReadGuard};
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric::MetricName;
+use torrust_tracker_metrics::metric_collection::Error;
+use torrust_tracker_metrics::metric_name;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use super::metrics::Metrics;
+use super::{describe_metrics, TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL};
+
+/// A repository for the torrent repository metrics.
+#[derive(Clone)]
+pub struct Repository {
+    pub stats: Arc<RwLock<Metrics>>,
+}
+
+impl Default for Repository {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Repository {
+    #[must_use]
+    pub fn new() -> Self {
+        let stats = Arc::new(RwLock::new(describe_metrics()));
+
+        Self { stats }
+    }
+
+    pub async fn get_metrics(&self) -> RwLockReadGuard<'_, Metrics> {
+        self.stats.read().await
+    }
+
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// increment the counter.
+    pub async fn increment_counter(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        let mut stats_lock = self.stats.write().await;
+
+        let result = stats_lock.increment_counter(metric_name, labels, now);
+
+        drop(stats_lock);
+
+        match result {
+            Ok(()) => {}
+            Err(ref err) => tracing::error!("Failed to increment the counter: {}", err),
+        }
+
+        result
+    }
+
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// increment the counter.
+    pub async fn set_counter(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        value: u64,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        let mut stats_lock = self.stats.write().await;
+
+        let result = stats_lock.set_counter(metric_name, labels, value, now);
+
+        drop(stats_lock);
+
+        match result {
+            Ok(()) => {}
+            Err(ref err) => tracing::error!("Failed to set the counter: {}", err),
+        }
+
+        result
+    }
+
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// set the gauge.
+    pub async fn set_gauge(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        value: f64,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        let mut stats_lock = self.stats.write().await;
+
+        let result = stats_lock.set_gauge(metric_name, labels, value, now);
+
+        drop(stats_lock);
+
+        match result {
+            Ok(()) => {}
+            Err(ref err) => tracing::error!("Failed to set the gauge: {}", err),
+        }
+
+        result
+    }
+
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// increment the gauge.
+    pub async fn increment_gauge(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        let mut stats_lock = self.stats.write().await;
+
+        let result = stats_lock.increment_gauge(metric_name, labels, now);
+
+        drop(stats_lock);
+
+        match result {
+            Ok(()) => {}
+            Err(ref err) => tracing::error!("Failed to increment the gauge: {}", err),
+        }
+
+        result
+    }
+
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// decrement the gauge.
+    pub async fn decrement_gauge(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        let mut stats_lock = self.stats.write().await;
+
+        let result = stats_lock.decrement_gauge(metric_name, labels, now);
+
+        drop(stats_lock);
+
+        match result {
+            Ok(()) => {}
+            Err(ref err) => tracing::error!("Failed to decrement the gauge: {}", err),
+        }
+
+        result
+    }
+
+    /// Get the total number of torrent downloads.
+    ///
+    /// The value is persisted in database if persistence for downloads metrics is enabled.
+    pub async fn get_torrents_downloads_total(&self) -> u64 {
+        let metrics = self.get_metrics().await;
+
+        let downloads = metrics.metric_collection.get_counter_value(
+            &metric_name!(TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL),
+            &LabelSet::default(),
+        );
+
+        if let Some(downloads) = downloads {
+            downloads.value()
+        } else {
+            0
+        }
+    }
+}
diff --git a/packages/tracker-core/src/test_helpers.rs b/packages/tracker-core/src/test_helpers.rs
index 0d7ca012f..bf21e6f94 100644
--- a/packages/tracker-core/src/test_helpers.rs
+++ b/packages/tracker-core/src/test_helpers.rs
@@ -7,7 +7,7 @@ pub(crate) mod tests {
 
     use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
     use bittorrent_primitives::info_hash::InfoHash;
-    use rand::Rng;
+    use rand::RngExt;
     use torrust_tracker_configuration::Configuration;
     #[cfg(test)]
     use torrust_tracker_configuration::Core;
@@ -19,8 +19,8 @@ pub(crate) mod tests {
     use crate::announce_handler::AnnounceHandler;
     use crate::databases::setup::initialize_database;
     use crate::scrape_handler::ScrapeHandler;
+    use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
     use crate::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use crate::torrent::repository::persisted::DatabasePersistentTorrentRepository;
     use crate::whitelist::repository::in_memory::InMemoryWhitelist;
     use crate::whitelist::{self};
 
@@ -104,7 +104,7 @@ pub(crate) mod tests {
     #[must_use]
     pub fn complete_peer() -> Peer {
         Peer {
-            peer_id: PeerId(*b"-qB00000000000000000"),
+            peer_id: PeerId(*b"-qB00000000000000001"),
             peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1)), 8080),
             updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
             uploaded: NumberOfBytes::new(0),
@@ -118,8 +118,8 @@ pub(crate) mod tests {
     #[must_use]
     pub fn incomplete_peer() -> Peer {
         Peer {
-            peer_id: PeerId(*b"-qB00000000000000000"),
-            peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 1)), 8080),
+            peer_id: PeerId(*b"-qB00000000000000002"),
+            peer_addr: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(126, 0, 0, 2)), 8080),
             updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
             uploaded: NumberOfBytes::new(0),
             downloaded: NumberOfBytes::new(0),
@@ -137,13 +137,13 @@ pub(crate) mod tests {
             &in_memory_whitelist.clone(),
         ));
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
 
         let announce_handler = Arc::new(AnnounceHandler::new(
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
 
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
diff --git a/packages/tracker-core/src/torrent/manager.rs b/packages/tracker-core/src/torrent/manager.rs
index ae7c61741..5acc27980 100644
--- a/packages/tracker-core/src/torrent/manager.rs
+++ b/packages/tracker-core/src/torrent/manager.rs
@@ -4,9 +4,10 @@ use std::time::Duration;
 
 use torrust_tracker_clock::clock::Time;
 use torrust_tracker_configuration::Core;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
 
 use super::repository::in_memory::InMemoryTorrentRepository;
-use super::repository::persisted::DatabasePersistentTorrentRepository;
+use crate::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
 use crate::{databases, CurrentClock};
 
 /// The `TorrentsManager` is responsible for managing torrent entries by
@@ -28,9 +29,8 @@ pub struct TorrentsManager {
     /// The in-memory torrents repository.
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
 
-    /// The persistent torrents repository.
-    #[allow(dead_code)]
-    db_torrent_repository: Arc<DatabasePersistentTorrentRepository>,
+    /// The download metrics repository.
+    db_downloads_metric_repository: Arc<DatabaseDownloadsMetricRepository>,
 }
 
 impl TorrentsManager {
@@ -41,7 +41,7 @@ impl TorrentsManager {
     /// * `config` - A reference to the tracker configuration.
     /// * `in_memory_torrent_repository` - A shared reference to the in-memory
     ///   repository of torrents.
-    /// * `db_torrent_repository` - A shared reference to the persistent
+    /// * `db_downloads_metric_repository` - A shared reference to the persistent
     ///   repository for torrent metrics.
     ///
     /// # Returns
@@ -51,16 +51,16 @@ impl TorrentsManager {
     pub fn new(
         config: &Core,
         in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>,
-        db_torrent_repository: &Arc<DatabasePersistentTorrentRepository>,
+        db_downloads_metric_repository: &Arc<DatabaseDownloadsMetricRepository>,
     ) -> Self {
         Self {
             config: config.clone(),
             in_memory_torrent_repository: in_memory_torrent_repository.clone(),
-            db_torrent_repository: db_torrent_repository.clone(),
+            db_downloads_metric_repository: db_downloads_metric_repository.clone(),
         }
     }
 
-    /// Loads torrents from the persistent database into the in-memory repository.
+    /// Loads torrents from the database into the in-memory repository.
     ///
     /// This function retrieves the list of persistent torrent entries (which
     /// include only the aggregate metrics, not the detailed peer lists) from
@@ -70,9 +70,8 @@ impl TorrentsManager {
     ///
     /// Returns a `databases::error::Error` if unable to load the persistent
     /// torrent data.
-    #[allow(dead_code)]
-    pub(crate) fn load_torrents_from_database(&self) -> Result<(), databases::error::Error> {
-        let persistent_torrents = self.db_torrent_repository.load_all()?;
+    pub fn load_torrents_from_database(&self) -> Result<(), databases::error::Error> {
+        let persistent_torrents = self.db_downloads_metric_repository.load_all_torrents_downloads()?;
 
         self.in_memory_torrent_repository.import_persistent(&persistent_torrents);
 
@@ -91,17 +90,56 @@ impl TorrentsManager {
     /// 2. If the tracker is configured to remove peerless torrents
     ///    (`remove_peerless_torrents` is set), it removes entire torrent
     ///    entries that have no active peers.
-    pub fn cleanup_torrents(&self) {
-        let current_cutoff = CurrentClock::now_sub(&Duration::from_secs(u64::from(self.config.tracker_policy.max_peer_timeout)))
-            .unwrap_or_default();
+    pub async fn cleanup_torrents(&self) {
+        self.log_aggregate_swarm_metadata().await;
 
-        self.in_memory_torrent_repository.remove_inactive_peers(current_cutoff);
+        self.remove_inactive_peers().await;
 
+        self.log_aggregate_swarm_metadata().await;
+
+        self.remove_peerless_torrents().await;
+
+        self.log_aggregate_swarm_metadata().await;
+    }
+
+    async fn remove_inactive_peers(&self) {
+        self.in_memory_torrent_repository
+            .remove_inactive_peers(self.current_cutoff())
+            .await;
+    }
+
+    fn current_cutoff(&self) -> DurationSinceUnixEpoch {
+        CurrentClock::now_sub(&Duration::from_secs(u64::from(self.config.tracker_policy.max_peer_timeout))).unwrap_or_default()
+    }
+
+    async fn remove_peerless_torrents(&self) {
         if self.config.tracker_policy.remove_peerless_torrents {
             self.in_memory_torrent_repository
-                .remove_peerless_torrents(&self.config.tracker_policy);
+                .remove_peerless_torrents(&self.config.tracker_policy)
+                .await;
         }
     }
+
+    async fn log_aggregate_swarm_metadata(&self) {
+        // Pre-calculated data
+        let aggregate_swarm_metadata = self.in_memory_torrent_repository.get_aggregate_swarm_metadata().await;
+
+        tracing::info!(name: "pre_calculated_aggregate_swarm_metadata",
+            torrents = aggregate_swarm_metadata.total_torrents,
+            downloads = aggregate_swarm_metadata.total_downloaded,
+            seeders = aggregate_swarm_metadata.total_complete,
+            leechers = aggregate_swarm_metadata.total_incomplete,
+        );
+
+        // Hot data (iterating over data structures)
+        let peerless_torrents = self.in_memory_torrent_repository.count_peerless_torrents().await;
+        let peers = self.in_memory_torrent_repository.count_peers().await;
+
+        tracing::info!(name: "hot_aggregate_swarm_metadata",
+            peerless_torrents = peerless_torrents,
+            peers = peers,
+        );
+    }
 }
 
 #[cfg(test)]
@@ -110,9 +148,9 @@ mod tests {
     use std::sync::Arc;
 
     use torrust_tracker_configuration::Core;
-    use torrust_tracker_torrent_repository::LockTrackedTorrent;
+    use torrust_tracker_swarm_coordination_registry::Registry;
 
-    use super::{DatabasePersistentTorrentRepository, TorrentsManager};
+    use super::{DatabaseDownloadsMetricRepository, TorrentsManager};
     use crate::databases::setup::initialize_database;
     use crate::test_helpers::tests::{ephemeral_configuration, sample_info_hash};
     use crate::torrent::repository::in_memory::InMemoryTorrentRepository;
@@ -120,7 +158,7 @@ mod tests {
     struct TorrentsManagerDeps {
         config: Arc<Core>,
         in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
-        database_persistent_torrent_repository: Arc<DatabasePersistentTorrentRepository>,
+        database_persistent_torrent_repository: Arc<DatabaseDownloadsMetricRepository>,
     }
 
     fn initialize_torrents_manager() -> (Arc<TorrentsManager>, Arc<TorrentsManagerDeps>) {
@@ -129,9 +167,10 @@ mod tests {
     }
 
     fn initialize_torrents_manager_with(config: Core) -> (Arc<TorrentsManager>, Arc<TorrentsManagerDeps>) {
-        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
+        let swarms = Arc::new(Registry::default());
+        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::new(swarms));
         let database = initialize_database(&config);
-        let database_persistent_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
+        let database_persistent_torrent_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
 
         let torrents_manager = Arc::new(TorrentsManager::new(
             &config,
@@ -149,13 +188,16 @@ mod tests {
         )
     }
 
-    #[test]
-    fn it_should_load_the_numbers_of_downloads_for_all_torrents_from_the_database() {
+    #[tokio::test]
+    async fn it_should_load_the_numbers_of_downloads_for_all_torrents_from_the_database() {
         let (torrents_manager, services) = initialize_torrents_manager();
 
         let infohash = sample_info_hash();
 
-        services.database_persistent_torrent_repository.save(&infohash, 1).unwrap();
+        services
+            .database_persistent_torrent_repository
+            .save_torrent_downloads(&infohash, 1)
+            .unwrap();
 
         torrents_manager.load_torrents_from_database().unwrap();
 
@@ -164,8 +206,9 @@ mod tests {
                 .in_memory_torrent_repository
                 .get(&infohash)
                 .unwrap()
-                .lock_or_panic()
-                .get_swarm_metadata()
+                .lock()
+                .await
+                .metadata()
                 .downloaded,
             1
         );
@@ -185,8 +228,8 @@ mod tests {
         use crate::torrent::manager::tests::{initialize_torrents_manager, initialize_torrents_manager_with};
         use crate::torrent::repository::in_memory::InMemoryTorrentRepository;
 
-        #[test]
-        fn it_should_remove_peers_that_have_not_been_updated_after_a_cutoff_time() {
+        #[tokio::test]
+        async fn it_should_remove_peers_that_have_not_been_updated_after_a_cutoff_time() {
             let (torrents_manager, services) = initialize_torrents_manager();
 
             let infohash = sample_info_hash();
@@ -196,7 +239,10 @@ mod tests {
             // Add a peer to the torrent
             let mut peer = sample_peer();
             peer.updated = DurationSinceUnixEpoch::new(0, 0);
-            let _number_of_downloads_increased = services.in_memory_torrent_repository.upsert_peer(&infohash, &peer, None);
+            services
+                .in_memory_torrent_repository
+                .handle_announcement(&infohash, &peer, None)
+                .await;
 
             // Simulate the time has passed 1 second more than the max peer timeout.
             clock::Stopped::local_add(&Duration::from_secs(
@@ -204,23 +250,25 @@ mod tests {
             ))
             .unwrap();
 
-            torrents_manager.cleanup_torrents();
+            torrents_manager.cleanup_torrents().await;
 
             assert!(services.in_memory_torrent_repository.get(&infohash).is_none());
         }
 
-        fn add_a_peerless_torrent(infohash: &InfoHash, in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>) {
+        async fn add_a_peerless_torrent(infohash: &InfoHash, in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>) {
             // Add a peer to the torrent
             let mut peer = sample_peer();
             peer.updated = DurationSinceUnixEpoch::new(0, 0);
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(infohash, &peer, None);
+            in_memory_torrent_repository.handle_announcement(infohash, &peer, None).await;
 
             // Remove the peer. The torrent is now peerless.
-            in_memory_torrent_repository.remove_inactive_peers(peer.updated.add(Duration::from_secs(1)));
+            in_memory_torrent_repository
+                .remove_inactive_peers(peer.updated.add(Duration::from_secs(1)))
+                .await;
         }
 
-        #[test]
-        fn it_should_remove_torrents_that_have_no_peers_when_it_is_configured_to_do_so() {
+        #[tokio::test]
+        async fn it_should_remove_torrents_that_have_no_peers_when_it_is_configured_to_do_so() {
             let mut config = ephemeral_configuration();
             config.tracker_policy.remove_peerless_torrents = true;
 
@@ -228,15 +276,15 @@ mod tests {
 
             let infohash = sample_info_hash();
 
-            add_a_peerless_torrent(&infohash, &services.in_memory_torrent_repository);
+            add_a_peerless_torrent(&infohash, &services.in_memory_torrent_repository).await;
 
-            torrents_manager.cleanup_torrents();
+            torrents_manager.cleanup_torrents().await;
 
             assert!(services.in_memory_torrent_repository.get(&infohash).is_none());
         }
 
-        #[test]
-        fn it_should_retain_peerless_torrents_when_it_is_configured_to_do_so() {
+        #[tokio::test]
+        async fn it_should_retain_peerless_torrents_when_it_is_configured_to_do_so() {
             let mut config = ephemeral_configuration();
             config.tracker_policy.remove_peerless_torrents = false;
 
@@ -244,9 +292,9 @@ mod tests {
 
             let infohash = sample_info_hash();
 
-            add_a_peerless_torrent(&infohash, &services.in_memory_torrent_repository);
+            add_a_peerless_torrent(&infohash, &services.in_memory_torrent_repository).await;
 
-            torrents_manager.cleanup_torrents();
+            torrents_manager.cleanup_torrents().await;
 
             assert!(services.in_memory_torrent_repository.get(&infohash).is_some());
         }
diff --git a/packages/tracker-core/src/torrent/repository/in_memory.rs b/packages/tracker-core/src/torrent/repository/in_memory.rs
index e362b20c1..e50a82933 100644
--- a/packages/tracker-core/src/torrent/repository/in_memory.rs
+++ b/packages/tracker-core/src/torrent/repository/in_memory.rs
@@ -5,9 +5,9 @@ use std::sync::Arc;
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_configuration::{TrackerPolicy, TORRENT_PEERS_LIMIT};
 use torrust_tracker_primitives::pagination::Pagination;
-use torrust_tracker_primitives::swarm_metadata::{AggregateSwarmMetadata, SwarmMetadata};
-use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, PersistentTorrent, PersistentTorrents};
-use torrust_tracker_torrent_repository::{TorrentRepository, TrackedTorrentHandle};
+use torrust_tracker_primitives::swarm_metadata::{AggregateActiveSwarmMetadata, SwarmMetadata};
+use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch, NumberOfDownloads, NumberOfDownloadsBTreeMap};
+use torrust_tracker_swarm_coordination_registry::{CoordinatorHandle, Registry};
 
 /// In-memory repository for torrent entries.
 ///
@@ -18,13 +18,18 @@ use torrust_tracker_torrent_repository::{TorrentRepository, TrackedTorrentHandle
 ///
 /// Multiple implementations were considered, and the chosen implementation is
 /// used in production. Other implementations are kept for reference.
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct InMemoryTorrentRepository {
-    /// The underlying in-memory data structure that stores torrent entries.
-    torrents: Arc<TorrentRepository>,
+    /// The underlying in-memory data structure that stores swarms data.
+    swarms: Arc<Registry>,
 }
 
 impl InMemoryTorrentRepository {
+    #[must_use]
+    pub fn new(swarms: Arc<Registry>) -> Self {
+        Self { swarms }
+    }
+
     /// Inserts or updates a peer in the torrent entry corresponding to the
     /// given infohash.
     ///
@@ -39,33 +44,20 @@ impl InMemoryTorrentRepository {
     /// # Returns
     ///
     /// `true` if the peer stats were updated.
-    #[must_use]
-    pub fn upsert_peer(
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the underling swarms return an error.
+    pub async fn handle_announcement(
         &self,
         info_hash: &InfoHash,
         peer: &peer::Peer,
-        opt_persistent_torrent: Option<PersistentTorrent>,
-    ) -> bool {
-        self.torrents.upsert_peer(info_hash, peer, opt_persistent_torrent)
-    }
-
-    /// Removes a torrent entry from the repository.
-    ///
-    /// This method is only available in tests. It removes the torrent entry
-    /// associated with the given info hash and returns the removed entry if it
-    /// existed.
-    ///
-    /// # Arguments
-    ///
-    /// * `key` - The info hash of the torrent to remove.
-    ///
-    /// # Returns
-    ///
-    /// An `Option` containing the removed torrent entry if it existed.
-    #[cfg(test)]
-    #[must_use]
-    pub(crate) fn remove(&self, key: &InfoHash) -> Option<TrackedTorrentHandle> {
-        self.torrents.remove(key)
+        opt_persistent_torrent: Option<NumberOfDownloads>,
+    ) {
+        self.swarms
+            .handle_announcement(info_hash, peer, opt_persistent_torrent)
+            .await
+            .expect("Failed to upsert the peer in swarms");
     }
 
     /// Removes inactive peers from all torrent entries.
@@ -77,8 +69,15 @@ impl InMemoryTorrentRepository {
     ///
     /// * `current_cutoff` - The cutoff timestamp; peers not updated since this
     ///   time will be removed.
-    pub(crate) fn remove_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) {
-        self.torrents.remove_inactive_peers(current_cutoff);
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the underling swarms return an error.
+    pub(crate) async fn remove_inactive_peers(&self, current_cutoff: DurationSinceUnixEpoch) {
+        self.swarms
+            .remove_inactive_peers(current_cutoff)
+            .await
+            .expect("Failed to remove inactive peers from swarms");
     }
 
     /// Removes torrent entries that have no active peers.
@@ -90,8 +89,15 @@ impl InMemoryTorrentRepository {
     ///
     /// * `policy` - The tracker policy containing the configuration for
     ///   removing peerless torrents.
-    pub(crate) fn remove_peerless_torrents(&self, policy: &TrackerPolicy) {
-        self.torrents.remove_peerless_torrents(policy);
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the underling swarms return an error.
+    pub(crate) async fn remove_peerless_torrents(&self, policy: &TrackerPolicy) {
+        self.swarms
+            .remove_peerless_torrents(policy)
+            .await
+            .expect("Failed to remove peerless torrents from swarms");
     }
 
     /// Retrieves a torrent entry by its infohash.
@@ -104,8 +110,8 @@ impl InMemoryTorrentRepository {
     ///
     /// An `Option` containing the torrent entry if found.
     #[must_use]
-    pub(crate) fn get(&self, key: &InfoHash) -> Option<TrackedTorrentHandle> {
-        self.torrents.get(key)
+    pub(crate) fn get(&self, key: &InfoHash) -> Option<CoordinatorHandle> {
+        self.swarms.get(key)
     }
 
     /// Retrieves a paginated list of torrent entries.
@@ -122,8 +128,8 @@ impl InMemoryTorrentRepository {
     ///
     /// A vector of `(InfoHash, TorrentEntry)` tuples.
     #[must_use]
-    pub(crate) fn get_paginated(&self, pagination: Option<&Pagination>) -> Vec<(InfoHash, TrackedTorrentHandle)> {
-        self.torrents.get_paginated(pagination)
+    pub(crate) fn get_paginated(&self, pagination: Option<&Pagination>) -> Vec<(InfoHash, CoordinatorHandle)> {
+        self.swarms.get_paginated(pagination)
     }
 
     /// Retrieves swarm metadata for a given torrent.
@@ -139,9 +145,16 @@ impl InMemoryTorrentRepository {
     /// # Returns
     ///
     /// A `SwarmMetadata` struct containing the aggregated torrent data.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the underling swarms return an error.s
     #[must_use]
-    pub(crate) fn get_swarm_metadata_or_default(&self, info_hash: &InfoHash) -> SwarmMetadata {
-        self.torrents.get_swarm_metadata_or_default(info_hash)
+    pub(crate) async fn get_swarm_metadata_or_default(&self, info_hash: &InfoHash) -> SwarmMetadata {
+        self.swarms
+            .get_swarm_metadata_or_default(info_hash)
+            .await
+            .expect("Failed to get swarm metadata")
     }
 
     /// Retrieves torrent peers for a given torrent and client, excluding the
@@ -161,9 +174,16 @@ impl InMemoryTorrentRepository {
     ///
     /// A vector of peers (wrapped in `Arc`) representing the active peers for
     /// the torrent, excluding the requesting client.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the underling swarms return an error.
     #[must_use]
-    pub(crate) fn get_peers_for(&self, info_hash: &InfoHash, peer: &peer::Peer, limit: usize) -> Vec<Arc<peer::Peer>> {
-        self.torrents.get_peers_for(info_hash, peer, max(limit, TORRENT_PEERS_LIMIT))
+    pub(crate) async fn get_peers_for(&self, info_hash: &InfoHash, peer: &peer::Peer, limit: usize) -> Vec<Arc<peer::Peer>> {
+        self.swarms
+            .get_peers_peers_excluding(info_hash, peer, max(limit, TORRENT_PEERS_LIMIT))
+            .await
+            .expect("Failed to get other peers in swarm")
     }
 
     /// Retrieves the list of peers for a given torrent.
@@ -182,11 +202,14 @@ impl InMemoryTorrentRepository {
     ///
     /// # Panics
     ///
-    /// This function panics if the lock for the torrent entry cannot be obtained.
+    /// This function panics if the underling swarms return an error.
     #[must_use]
-    pub fn get_torrent_peers(&self, info_hash: &InfoHash) -> Vec<Arc<peer::Peer>> {
+    pub async fn get_torrent_peers(&self, info_hash: &InfoHash) -> Vec<Arc<peer::Peer>> {
         // todo: pass the limit as an argument like `get_peers_for`
-        self.torrents.get_torrent_peers(info_hash, TORRENT_PEERS_LIMIT)
+        self.swarms
+            .get_swarm_peers(info_hash, TORRENT_PEERS_LIMIT)
+            .await
+            .expect("Failed to get other peers in swarm")
     }
 
     /// Calculates and returns overall torrent metrics.
@@ -198,9 +221,39 @@ impl InMemoryTorrentRepository {
     /// # Returns
     ///
     /// A [`AggregateSwarmMetadata`] struct with the aggregated metrics.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the underling swarms return an error.
     #[must_use]
-    pub fn get_aggregate_swarm_metadata(&self) -> AggregateSwarmMetadata {
-        self.torrents.get_aggregate_swarm_metadata()
+    pub async fn get_aggregate_swarm_metadata(&self) -> AggregateActiveSwarmMetadata {
+        self.swarms
+            .get_aggregate_swarm_metadata()
+            .await
+            .expect("Failed to get aggregate swarm metadata")
+    }
+
+    /// Counts the number of peerless torrents in the repository.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the underling swarms return an error.
+    #[must_use]
+    pub async fn count_peerless_torrents(&self) -> usize {
+        self.swarms
+            .count_peerless_torrents()
+            .await
+            .expect("Failed to count peerless torrents")
+    }
+
+    /// Counts the number of peers in the repository.
+    ///
+    /// # Panics
+    ///
+    /// This function panics if the underling swarms return an error.
+    #[must_use]
+    pub async fn count_peers(&self) -> usize {
+        self.swarms.count_peers().await.expect("Failed to count peers")
     }
 
     /// Imports persistent torrent data into the in-memory repository.
@@ -211,7 +264,13 @@ impl InMemoryTorrentRepository {
     /// # Arguments
     ///
     /// * `persistent_torrents` - A reference to the persisted torrent data.
-    pub fn import_persistent(&self, persistent_torrents: &PersistentTorrents) {
-        self.torrents.import_persistent(persistent_torrents);
+    pub fn import_persistent(&self, persistent_torrents: &NumberOfDownloadsBTreeMap) {
+        self.swarms.import_persistent(persistent_torrents);
+    }
+
+    /// Checks if the repository contains a torrent entry for the given infohash.
+    #[must_use]
+    pub fn contains(&self, info_hash: &InfoHash) -> bool {
+        self.swarms.contains(info_hash)
     }
 }
diff --git a/packages/tracker-core/src/torrent/repository/mod.rs b/packages/tracker-core/src/torrent/repository/mod.rs
index ae789e5e9..d8325dec5 100644
--- a/packages/tracker-core/src/torrent/repository/mod.rs
+++ b/packages/tracker-core/src/torrent/repository/mod.rs
@@ -1,3 +1,2 @@
 //! Torrent repository implementations.
 pub mod in_memory;
-pub mod persisted;
diff --git a/packages/tracker-core/src/torrent/services.rs b/packages/tracker-core/src/torrent/services.rs
index 37846b4e3..874ad1349 100644
--- a/packages/tracker-core/src/torrent/services.rs
+++ b/packages/tracker-core/src/torrent/services.rs
@@ -17,7 +17,6 @@ use std::sync::Arc;
 use bittorrent_primitives::info_hash::InfoHash;
 use torrust_tracker_primitives::pagination::Pagination;
 use torrust_tracker_primitives::peer;
-use torrust_tracker_torrent_repository::LockTrackedTorrent;
 
 use crate::torrent::repository::in_memory::InMemoryTorrentRepository;
 
@@ -94,16 +93,19 @@ pub struct BasicInfo {
 ///
 /// This function panics if the lock for the torrent entry cannot be obtained.
 #[must_use]
-pub fn get_torrent_info(in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>, info_hash: &InfoHash) -> Option<Info> {
+pub async fn get_torrent_info(
+    in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>,
+    info_hash: &InfoHash,
+) -> Option<Info> {
     let torrent_entry_option = in_memory_torrent_repository.get(info_hash);
 
     let torrent_entry = torrent_entry_option?;
 
-    let stats = torrent_entry.lock_or_panic().get_swarm_metadata();
+    let stats = torrent_entry.lock().await.metadata();
 
-    let peers = torrent_entry.lock_or_panic().get_peers(None);
+    let peers = torrent_entry.lock().await.peers(None);
 
-    let peers = Some(peers.iter().map(|peer| (**peer)).collect());
+    let peers = Some(peers.iter().map(|peer| **peer).collect());
 
     Some(Info {
         info_hash: *info_hash,
@@ -136,14 +138,14 @@ pub fn get_torrent_info(in_memory_torrent_repository: &Arc<InMemoryTorrentReposi
 ///
 /// This function panics if the lock for the torrent entry cannot be obtained.
 #[must_use]
-pub fn get_torrents_page(
+pub async fn get_torrents_page(
     in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>,
     pagination: Option<&Pagination>,
 ) -> Vec<BasicInfo> {
     let mut basic_infos: Vec<BasicInfo> = vec![];
 
     for (info_hash, torrent_entry) in in_memory_torrent_repository.get_paginated(pagination) {
-        let stats = torrent_entry.lock_or_panic().get_swarm_metadata();
+        let stats = torrent_entry.lock().await.metadata();
 
         basic_infos.push(BasicInfo {
             info_hash,
@@ -178,19 +180,21 @@ pub fn get_torrents_page(
 ///
 /// This function panics if the lock for the torrent entry cannot be obtained.
 #[must_use]
-pub fn get_torrents(in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>, info_hashes: &[InfoHash]) -> Vec<BasicInfo> {
+pub async fn get_torrents(
+    in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>,
+    info_hashes: &[InfoHash],
+) -> Vec<BasicInfo> {
     let mut basic_infos: Vec<BasicInfo> = vec![];
 
     for info_hash in info_hashes {
-        if let Some(stats) = in_memory_torrent_repository
-            .get(info_hash)
-            .map(|torrent_entry| torrent_entry.lock_or_panic().get_swarm_metadata())
-        {
+        if let Some(torrent_entry) = in_memory_torrent_repository.get(info_hash) {
+            let metadata = torrent_entry.lock().await.metadata();
+
             basic_infos.push(BasicInfo {
                 info_hash: *info_hash,
-                seeders: u64::from(stats.complete),
-                completed: u64::from(stats.downloaded),
-                leechers: u64::from(stats.incomplete),
+                seeders: u64::from(metadata.complete),
+                completed: u64::from(metadata.downloaded),
+                leechers: u64::from(metadata.incomplete),
             });
         }
     }
@@ -235,7 +239,8 @@ mod tests {
             let torrent_info = get_torrent_info(
                 &in_memory_torrent_repository,
                 &InfoHash::from_str("0b3aea4adc213ce32295be85d3883a63bca25446").unwrap(), // DevSkim: ignore DS173237
-            );
+            )
+            .await;
 
             assert!(torrent_info.is_none());
         }
@@ -246,9 +251,11 @@ mod tests {
 
             let hash = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned(); // DevSkim: ignore DS173237
             let info_hash = InfoHash::from_str(&hash).unwrap();
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer(), None);
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash, &sample_peer(), None)
+                .await;
 
-            let torrent_info = get_torrent_info(&in_memory_torrent_repository, &info_hash).unwrap();
+            let torrent_info = get_torrent_info(&in_memory_torrent_repository, &info_hash).await.unwrap();
 
             assert_eq!(
                 torrent_info,
@@ -278,7 +285,7 @@ mod tests {
         async fn it_should_return_an_empty_result_if_the_tracker_does_not_have_any_torrent() {
             let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
-            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::default()));
+            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::default())).await;
 
             assert_eq!(torrents, vec![]);
         }
@@ -290,9 +297,11 @@ mod tests {
             let hash = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned(); // DevSkim: ignore DS173237
             let info_hash = InfoHash::from_str(&hash).unwrap();
 
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer(), None);
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash, &sample_peer(), None)
+                .await;
 
-            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::default()));
+            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::default())).await;
 
             assert_eq!(
                 torrents,
@@ -315,13 +324,17 @@ mod tests {
             let hash2 = "03840548643af2a7b63a9f5cbca348bc7150ca3a".to_owned(); // DevSkim: ignore DS173237
             let info_hash2 = InfoHash::from_str(&hash2).unwrap();
 
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash1, &sample_peer(), None);
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash2, &sample_peer(), None);
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash1, &sample_peer(), None)
+                .await;
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash2, &sample_peer(), None)
+                .await;
 
             let offset = 0;
             let limit = 1;
 
-            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::new(offset, limit)));
+            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::new(offset, limit))).await;
 
             assert_eq!(torrents.len(), 1);
         }
@@ -336,13 +349,17 @@ mod tests {
             let hash2 = "03840548643af2a7b63a9f5cbca348bc7150ca3a".to_owned(); // DevSkim: ignore DS173237
             let info_hash2 = InfoHash::from_str(&hash2).unwrap();
 
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash1, &sample_peer(), None);
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash2, &sample_peer(), None);
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash1, &sample_peer(), None)
+                .await;
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash2, &sample_peer(), None)
+                .await;
 
             let offset = 1;
             let limit = 4000;
 
-            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::new(offset, limit)));
+            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::new(offset, limit))).await;
 
             assert_eq!(torrents.len(), 1);
             assert_eq!(
@@ -362,13 +379,17 @@ mod tests {
 
             let hash1 = "9e0217d0fa71c87332cd8bf9dbeabcb2c2cf3c4d".to_owned(); // DevSkim: ignore DS173237
             let info_hash1 = InfoHash::from_str(&hash1).unwrap();
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash1, &sample_peer(), None);
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash1, &sample_peer(), None)
+                .await;
 
             let hash2 = "03840548643af2a7b63a9f5cbca348bc7150ca3a".to_owned(); // DevSkim: ignore DS173237
             let info_hash2 = InfoHash::from_str(&hash2).unwrap();
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash2, &sample_peer(), None);
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash2, &sample_peer(), None)
+                .await;
 
-            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::default()));
+            let torrents = get_torrents_page(&in_memory_torrent_repository, Some(&Pagination::default())).await;
 
             assert_eq!(
                 torrents,
@@ -403,7 +424,7 @@ mod tests {
         async fn it_should_return_an_empty_list_if_none_of_the_requested_torrents_is_found() {
             let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
-            let torrent_info = get_torrents(&in_memory_torrent_repository, &[sample_info_hash()]);
+            let torrent_info = get_torrents(&in_memory_torrent_repository, &[sample_info_hash()]).await;
 
             assert!(torrent_info.is_empty());
         }
@@ -414,9 +435,11 @@ mod tests {
 
             let info_hash = sample_info_hash();
 
-            let _ = in_memory_torrent_repository.upsert_peer(&info_hash, &sample_peer(), None);
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash, &sample_peer(), None)
+                .await;
 
-            let torrent_info = get_torrents(&in_memory_torrent_repository, &[info_hash]);
+            let torrent_info = get_torrents(&in_memory_torrent_repository, &[info_hash]).await;
 
             assert_eq!(
                 torrent_info,
diff --git a/packages/tracker-core/tests/common/fixtures.rs b/packages/tracker-core/tests/common/fixtures.rs
new file mode 100644
index 000000000..ea9c93a65
--- /dev/null
+++ b/packages/tracker-core/tests/common/fixtures.rs
@@ -0,0 +1,52 @@
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+use std::str::FromStr;
+
+use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
+use bittorrent_primitives::info_hash::InfoHash;
+use torrust_tracker_configuration::Core;
+use torrust_tracker_primitives::peer::Peer;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+use torrust_tracker_test_helpers::configuration::ephemeral_sqlite_database;
+
+/// # Panics
+///
+/// Will panic if the temporary file path is not a valid UTF-8 string.
+#[must_use]
+pub fn ephemeral_configuration() -> Core {
+    let mut config = Core::default();
+
+    let temp_file = ephemeral_sqlite_database();
+    temp_file.to_str().unwrap().clone_into(&mut config.database.path);
+
+    config
+}
+
+/// # Panics
+///
+/// Will panic if the string representation of the info hash is not a valid infohash.
+#[must_use]
+pub fn sample_info_hash() -> InfoHash {
+    "3b245504cf5f11bbdbe1201cea6a6bf45aee1bc0" // DevSkim: ignore DS173237
+        .parse::<InfoHash>()
+        .expect("String should be a valid info hash")
+}
+
+/// Sample peer whose state is not relevant for the tests.
+#[must_use]
+pub fn sample_peer() -> Peer {
+    Peer {
+        peer_id: PeerId(*b"-qB00000000000000000"),
+        peer_addr: SocketAddr::new(remote_client_ip(), 8080),
+        updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
+        uploaded: NumberOfBytes::new(0),
+        downloaded: NumberOfBytes::new(0),
+        left: NumberOfBytes::new(0), // No bytes left to download
+        event: AnnounceEvent::Completed,
+    }
+}
+
+// The client peer IP.
+#[must_use]
+pub fn remote_client_ip() -> IpAddr {
+    IpAddr::V4(Ipv4Addr::from_str("126.0.0.1").unwrap())
+}
diff --git a/packages/tracker-core/tests/common/mod.rs b/packages/tracker-core/tests/common/mod.rs
new file mode 100644
index 000000000..414e9d7b5
--- /dev/null
+++ b/packages/tracker-core/tests/common/mod.rs
@@ -0,0 +1,2 @@
+pub mod fixtures;
+pub mod test_env;
diff --git a/packages/tracker-core/tests/common/test_env.rs b/packages/tracker-core/tests/common/test_env.rs
new file mode 100644
index 000000000..3fe0464fe
--- /dev/null
+++ b/packages/tracker-core/tests/common/test_env.rs
@@ -0,0 +1,180 @@
+use std::net::IpAddr;
+use std::sync::Arc;
+
+use aquatic_udp_protocol::AnnounceEvent;
+use bittorrent_primitives::info_hash::InfoHash;
+use bittorrent_tracker_core::announce_handler::PeersWanted;
+use bittorrent_tracker_core::container::TrackerCoreContainer;
+use bittorrent_tracker_core::statistics::persisted::load_persisted_metrics;
+use tokio::task::yield_now;
+use tokio_util::sync::CancellationToken;
+use torrust_tracker_configuration::Core;
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric::MetricName;
+use torrust_tracker_primitives::core::{AnnounceData, ScrapeData};
+use torrust_tracker_primitives::peer::Peer;
+use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
+
+pub struct TestEnv {
+    pub swarm_coordination_registry_container: Arc<SwarmCoordinationRegistryContainer>,
+    pub tracker_core_container: Arc<TrackerCoreContainer>,
+}
+
+impl TestEnv {
+    #[must_use]
+    pub async fn started(core_config: Core) -> Self {
+        let test_env = TestEnv::new(core_config);
+        test_env.start().await;
+        test_env
+    }
+
+    #[must_use]
+    pub fn new(core_config: Core) -> Self {
+        let core_config = Arc::new(core_config);
+
+        let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
+            core_config.tracker_usage_statistics.into(),
+        ));
+
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
+            &core_config,
+            &swarm_coordination_registry_container,
+        ));
+
+        Self {
+            swarm_coordination_registry_container,
+            tracker_core_container,
+        }
+    }
+
+    pub async fn start(&self) {
+        let now = DurationSinceUnixEpoch::from_secs(0);
+        self.load_persisted_metrics(now).await;
+        self.run_jobs().await;
+    }
+
+    async fn load_persisted_metrics(&self, now: DurationSinceUnixEpoch) {
+        load_persisted_metrics(
+            &self.tracker_core_container.stats_repository,
+            &self.tracker_core_container.db_downloads_metric_repository,
+            now,
+        )
+        .await
+        .unwrap();
+    }
+
+    async fn run_jobs(&self) {
+        let mut jobs = vec![];
+        let cancellation_token = CancellationToken::new();
+
+        let job = torrust_tracker_swarm_coordination_registry::statistics::event::listener::run_event_listener(
+            self.swarm_coordination_registry_container.event_bus.receiver(),
+            cancellation_token.clone(),
+            &self.swarm_coordination_registry_container.stats_repository,
+        );
+
+        jobs.push(job);
+
+        let job = bittorrent_tracker_core::statistics::event::listener::run_event_listener(
+            self.swarm_coordination_registry_container.event_bus.receiver(),
+            cancellation_token.clone(),
+            &self.tracker_core_container.stats_repository,
+            &self.tracker_core_container.db_downloads_metric_repository,
+            self.tracker_core_container
+                .core_config
+                .tracker_policy
+                .persistent_torrent_completed_stat,
+        );
+        jobs.push(job);
+
+        // Give the event listeners some time to start
+        // todo: they should notify when they are ready
+        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+    }
+
+    pub async fn announce_peer_started(
+        &mut self,
+        mut peer: Peer,
+        remote_client_ip: &IpAddr,
+        info_hash: &InfoHash,
+    ) -> AnnounceData {
+        peer.event = AnnounceEvent::Started;
+
+        let announce_data = self
+            .tracker_core_container
+            .announce_handler
+            .handle_announcement(info_hash, &mut peer, remote_client_ip, &PeersWanted::AsManyAsPossible)
+            .await
+            .unwrap();
+
+        // Give time to the event listeners to process the event
+        yield_now().await;
+
+        announce_data
+    }
+
+    pub async fn announce_peer_completed(
+        &mut self,
+        mut peer: Peer,
+        remote_client_ip: &IpAddr,
+        info_hash: &InfoHash,
+    ) -> AnnounceData {
+        peer.event = AnnounceEvent::Completed;
+
+        let announce_data = self
+            .tracker_core_container
+            .announce_handler
+            .handle_announcement(info_hash, &mut peer, remote_client_ip, &PeersWanted::AsManyAsPossible)
+            .await
+            .unwrap();
+
+        // Give time to the event listeners to process the event
+        yield_now().await;
+
+        announce_data
+    }
+
+    pub async fn scrape(&self, info_hash: &InfoHash) -> ScrapeData {
+        self.tracker_core_container
+            .scrape_handler
+            .handle_scrape(&vec![*info_hash])
+            .await
+            .unwrap()
+    }
+
+    pub async fn increase_number_of_downloads(&mut self, peer: Peer, remote_client_ip: &IpAddr, info_hash: &InfoHash) {
+        let _announce_data = self.announce_peer_started(peer, remote_client_ip, info_hash).await;
+        let announce_data = self.announce_peer_completed(peer, remote_client_ip, info_hash).await;
+
+        assert_eq!(announce_data.stats.downloads(), 1);
+    }
+
+    pub async fn get_swarm_metadata(&self, info_hash: &InfoHash) -> Option<SwarmMetadata> {
+        self.swarm_coordination_registry_container
+            .swarms
+            .get_swarm_metadata(info_hash)
+            .await
+            .unwrap()
+    }
+
+    pub async fn remove_swarm(&self, info_hash: &InfoHash) {
+        self.swarm_coordination_registry_container
+            .swarms
+            .remove(info_hash)
+            .await
+            .unwrap();
+    }
+
+    pub async fn get_counter_value(&self, metric_name: &str) -> u64 {
+        self.tracker_core_container
+            .stats_repository
+            .get_metrics()
+            .await
+            .metric_collection
+            .get_counter_value(&MetricName::new(metric_name), &LabelSet::default())
+            .unwrap()
+            .value()
+    }
+}
diff --git a/packages/tracker-core/tests/integration.rs b/packages/tracker-core/tests/integration.rs
index 5aaded10a..b170aaebd 100644
--- a/packages/tracker-core/tests/integration.rs
+++ b/packages/tracker-core/tests/integration.rs
@@ -1,135 +1,113 @@
-use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use std::str::FromStr;
-use std::sync::Arc;
-
-use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
-use bittorrent_primitives::info_hash::InfoHash;
-use bittorrent_tracker_core::announce_handler::{AnnounceHandler, PeersWanted};
-use bittorrent_tracker_core::databases::setup::initialize_database;
-use bittorrent_tracker_core::scrape_handler::ScrapeHandler;
-use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
-use bittorrent_tracker_core::whitelist;
-use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
-use torrust_tracker_configuration::Core;
-use torrust_tracker_primitives::peer::Peer;
-use torrust_tracker_primitives::DurationSinceUnixEpoch;
-use torrust_tracker_test_helpers::configuration::ephemeral_sqlite_database;
-
-/// # Panics
-///
-/// Will panic if the temporary file path is not a valid UTF-8 string.
-#[must_use]
-pub fn ephemeral_configuration() -> Core {
-    let mut config = Core::default();
-
-    let temp_file = ephemeral_sqlite_database();
-    temp_file.to_str().unwrap().clone_into(&mut config.database.path);
-
-    config
-}
+mod common;
 
-/// # Panics
-///
-/// Will panic if the string representation of the info hash is not a valid infohash.
-#[must_use]
-pub fn sample_info_hash() -> InfoHash {
-    "3b245504cf5f11bbdbe1201cea6a6bf45aee1bc0" // DevSkim: ignore DS173237
-        .parse::<InfoHash>()
-        .expect("String should be a valid info hash")
-}
+use common::fixtures::{ephemeral_configuration, remote_client_ip, sample_info_hash, sample_peer};
+use common::test_env::TestEnv;
+use torrust_tracker_configuration::AnnouncePolicy;
+use torrust_tracker_primitives::core::AnnounceData;
+use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
 
-/// Sample peer whose state is not relevant for the tests.
-#[must_use]
-pub fn sample_peer() -> Peer {
-    Peer {
-        peer_id: PeerId(*b"-qB00000000000000000"),
-        peer_addr: SocketAddr::new(remote_client_ip(), 8080),
-        updated: DurationSinceUnixEpoch::new(1_669_397_478_934, 0),
-        uploaded: NumberOfBytes::new(0),
-        downloaded: NumberOfBytes::new(0),
-        left: NumberOfBytes::new(0), // No bytes left to download
-        event: AnnounceEvent::Completed,
-    }
+#[tokio::test]
+async fn it_should_handle_the_announce_request() {
+    let mut test_env = TestEnv::started(ephemeral_configuration()).await;
+
+    let announce_data = test_env
+        .announce_peer_started(sample_peer(), &remote_client_ip(), &sample_info_hash())
+        .await;
+
+    assert_eq!(
+        announce_data,
+        AnnounceData {
+            peers: vec![],
+            stats: SwarmMetadata {
+                downloaded: 0,
+                complete: 1,
+                incomplete: 0
+            },
+            policy: AnnouncePolicy {
+                interval: 120,
+                interval_min: 120
+            }
+        }
+    );
 }
 
-// The client peer IP.
-#[must_use]
-fn remote_client_ip() -> IpAddr {
-    IpAddr::V4(Ipv4Addr::from_str("126.0.0.1").unwrap())
-}
+#[tokio::test]
+async fn it_should_not_return_the_peer_making_the_announce_request() {
+    let mut test_env = TestEnv::started(ephemeral_configuration()).await;
+
+    let announce_data = test_env
+        .announce_peer_started(sample_peer(), &remote_client_ip(), &sample_info_hash())
+        .await;
 
-struct Container {
-    pub announce_handler: Arc<AnnounceHandler>,
-    pub scrape_handler: Arc<ScrapeHandler>,
+    assert_eq!(announce_data.peers.len(), 0);
 }
 
-impl Container {
-    pub fn initialize(config: &Core) -> Self {
-        let database = initialize_database(config);
-        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
-        let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
-        let whitelist_authorization = Arc::new(whitelist::authorization::WhitelistAuthorization::new(
-            config,
-            &in_memory_whitelist.clone(),
-        ));
-        let announce_handler = Arc::new(AnnounceHandler::new(
-            config,
-            &whitelist_authorization,
-            &in_memory_torrent_repository,
-            &db_torrent_repository,
-        ));
-        let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
-
-        Self {
-            announce_handler,
-            scrape_handler,
-        }
-    }
+#[tokio::test]
+async fn it_should_handle_the_scrape_request() {
+    let mut test_env = TestEnv::started(ephemeral_configuration()).await;
+
+    let info_hash = sample_info_hash();
+
+    let _announce_data = test_env
+        .announce_peer_started(sample_peer(), &remote_client_ip(), &info_hash)
+        .await;
+
+    let scrape_data = test_env.scrape(&info_hash).await;
+
+    assert!(scrape_data.files.contains_key(&info_hash));
 }
 
 #[tokio::test]
-async fn test_announce_and_scrape_requests() {
-    let config = ephemeral_configuration();
+async fn it_should_persist_the_number_of_completed_peers_for_each_torrent_into_the_database() {
+    let mut core_config = ephemeral_configuration();
+    core_config.tracker_policy.persistent_torrent_completed_stat = true;
 
-    let container = Container::initialize(&config);
+    let mut test_env = TestEnv::started(core_config).await;
 
     let info_hash = sample_info_hash();
 
-    let mut peer = sample_peer();
+    test_env
+        .increase_number_of_downloads(sample_peer(), &remote_client_ip(), &info_hash)
+        .await;
 
-    // Announce
+    assert!(test_env.get_swarm_metadata(&info_hash).await.unwrap().downloads() == 1);
 
-    // First announce: download started
-    peer.event = AnnounceEvent::Started;
-    let announce_data = container
-        .announce_handler
-        .announce(&info_hash, &mut peer, &remote_client_ip(), &PeersWanted::AsManyAsPossible)
-        .await
-        .unwrap();
+    test_env.remove_swarm(&info_hash).await;
 
-    // NOTICE: you don't get back the peer making the request.
-    assert_eq!(announce_data.peers.len(), 0);
-    assert_eq!(announce_data.stats.downloaded, 0);
-
-    // Second announce: download completed
-    peer.event = AnnounceEvent::Completed;
-    let announce_data = container
-        .announce_handler
-        .announce(&info_hash, &mut peer, &remote_client_ip(), &PeersWanted::AsManyAsPossible)
-        .await
+    // Ensure the swarm metadata is removed
+    assert!(test_env.get_swarm_metadata(&info_hash).await.is_none());
+
+    // Load torrents from the database to ensure the completed stats are persisted
+    test_env
+        .tracker_core_container
+        .torrents_manager
+        .load_torrents_from_database()
         .unwrap();
 
-    assert_eq!(announce_data.peers.len(), 0);
-    assert_eq!(announce_data.stats.downloaded, 1);
+    assert!(test_env.get_swarm_metadata(&info_hash).await.unwrap().downloads() == 1);
+}
 
-    // Scrape
+#[tokio::test]
+async fn it_should_persist_the_global_number_of_completed_peers_into_the_database() {
+    let mut core_config = ephemeral_configuration();
 
-    let scrape_data = container.scrape_handler.scrape(&vec![info_hash]).await.unwrap();
+    core_config.tracker_policy.persistent_torrent_completed_stat = true;
 
-    assert!(scrape_data.files.contains_key(&info_hash));
-}
+    let mut test_env = TestEnv::started(core_config.clone()).await;
+
+    test_env
+        .increase_number_of_downloads(sample_peer(), &remote_client_ip(), &sample_info_hash())
+        .await;
 
-#[test]
-fn test_scrape_request() {}
+    // We run a new instance of the test environment to simulate a restart.
+    // The new instance uses the same underlying database.
+
+    let new_test_env = TestEnv::started(core_config).await;
+
+    assert_eq!(
+        new_test_env
+            .get_counter_value("tracker_core_persistent_torrents_downloads_total")
+            .await,
+        1
+    );
+}
diff --git a/packages/udp-protocol/Cargo.toml b/packages/udp-protocol/Cargo.toml
index 31fd52af8..3bcde9a95 100644
--- a/packages/udp-protocol/Cargo.toml
+++ b/packages/udp-protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 description = "A library with the primitive types and functions for the BitTorrent UDP tracker protocol."
-keywords = ["bittorrent", "library", "primitives", "udp"]
+keywords = [ "bittorrent", "library", "primitives", "udp" ]
 name = "bittorrent-udp-tracker-protocol"
 readme = "README.md"
 
diff --git a/packages/udp-tracker-core/Cargo.toml b/packages/udp-tracker-core/Cargo.toml
index 6cf250074..45a74f93c 100644
--- a/packages/udp-tracker-core/Cargo.toml
+++ b/packages/udp-tracker-core/Cargo.toml
@@ -4,7 +4,7 @@ description = "A library with the core functionality needed to implement a BitTo
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["api", "bittorrent", "core", "library", "tracker"]
+keywords = [ "api", "bittorrent", "core", "library", "tracker" ]
 license.workspace = true
 name = "bittorrent-udp-tracker-core"
 publish.workspace = true
@@ -20,19 +20,21 @@ bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core"
 bittorrent-udp-tracker-protocol = { version = "3.0.0-develop", path = "../udp-protocol" }
 bloom = "0.3.2"
 blowfish = "0"
-cipher = "0"
-criterion = { version = "0.5.1", features = ["async_tokio"] }
+cipher = "0.5"
+criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 futures = "0"
 lazy_static = "1"
 rand = "0"
 serde = "1.0.219"
 thiserror = "2"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync", "time"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync", "time" ] }
+tokio-util = "0.7.15"
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
 torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
+torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "../swarm-coordination-registry" }
 tracing = "0"
 zerocopy = "0.7"
 
diff --git a/packages/udp-tracker-core/benches/helpers/sync.rs b/packages/udp-tracker-core/benches/helpers/sync.rs
index 1814a865e..e8ec1ce03 100644
--- a/packages/udp-tracker-core/benches/helpers/sync.rs
+++ b/packages/udp-tracker-core/benches/helpers/sync.rs
@@ -5,6 +5,7 @@ use std::time::{Duration, Instant};
 use bittorrent_udp_tracker_core::event::bus::EventBus;
 use bittorrent_udp_tracker_core::event::sender::Broadcaster;
 use bittorrent_udp_tracker_core::services::connect::ConnectService;
+use torrust_tracker_events::bus::SenderStatus;
 use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
 
 use crate::helpers::utils::{sample_ipv4_remote_addr, sample_issue_time};
@@ -16,7 +17,7 @@ pub async fn connect_once(samples: u64) -> Duration {
     let server_service_binding = ServiceBinding::new(Protocol::UDP, server_socket_addr).unwrap();
 
     let udp_core_broadcaster = Broadcaster::default();
-    let event_bus = Arc::new(EventBus::new(false, udp_core_broadcaster.clone()));
+    let event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_core_broadcaster.clone()));
 
     let udp_core_stats_event_sender = event_bus.sender();
     let connect_service = Arc::new(ConnectService::new(udp_core_stats_event_sender));
diff --git a/packages/udp-tracker-core/benches/helpers/utils.rs b/packages/udp-tracker-core/benches/helpers/utils.rs
index f04805001..1423d4bcd 100644
--- a/packages/udp-tracker-core/benches/helpers/utils.rs
+++ b/packages/udp-tracker-core/benches/helpers/utils.rs
@@ -10,7 +10,7 @@ pub(crate) fn sample_ipv4_remote_addr() -> SocketAddr {
 }
 
 pub(crate) fn sample_ipv4_socket_address() -> SocketAddr {
-    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080)
+    SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080)
 }
 
 pub(crate) fn sample_issue_time() -> f64 {
diff --git a/packages/udp-tracker-core/benches/udp_tracker_core_benchmark.rs b/packages/udp-tracker-core/benches/udp_tracker_core_benchmark.rs
index 5bd0e27c8..90fc721d0 100644
--- a/packages/udp-tracker-core/benches/udp_tracker_core_benchmark.rs
+++ b/packages/udp-tracker-core/benches/udp_tracker_core_benchmark.rs
@@ -9,7 +9,7 @@ use crate::helpers::sync;
 fn bench_connect_once(c: &mut Criterion) {
     let mut group = c.benchmark_group("udp_tracker/connect_once");
     group.warm_up_time(Duration::from_millis(500));
-    group.measurement_time(Duration::from_millis(1000));
+    group.measurement_time(Duration::from_secs(1));
 
     group.bench_function("connect_once", |b| {
         b.iter(|| sync::connect_once(100));
diff --git a/packages/udp-tracker-core/src/connection_cookie.rs b/packages/udp-tracker-core/src/connection_cookie.rs
index 31c116400..2d8e941cd 100644
--- a/packages/udp-tracker-core/src/connection_cookie.rs
+++ b/packages/udp-tracker-core/src/connection_cookie.rs
@@ -84,9 +84,8 @@ use tracing::instrument;
 use zerocopy::AsBytes;
 
 use crate::crypto::keys::CipherArrayBlowfish;
-
 /// Error returned when there was an error with the connection cookie.
-#[derive(Error, Debug, Clone)]
+#[derive(Error, Debug, Clone, PartialEq)]
 pub enum ConnectionCookieError {
     #[error("cookie value is not normal: {not_normal_value}")]
     ValueNotNormal { not_normal_value: f64 },
@@ -140,8 +139,8 @@ use std::ops::Range;
 pub fn check(cookie: &Cookie, fingerprint: u64, valid_range: Range<f64>) -> Result<f64, ConnectionCookieError> {
     assert!(valid_range.start <= valid_range.end, "range start is larger than range end");
 
-    let cookie_bytes = CipherArrayBlowfish::from_slice(cookie.0.as_bytes());
-    let cookie_bytes = decode(*cookie_bytes);
+    let cookie_bytes = CipherArrayBlowfish::try_from(cookie.0.as_bytes()).expect("it should be the same size");
+    let cookie_bytes = decode(cookie_bytes);
 
     let issue_time = disassemble(fingerprint, cookie_bytes);
 
@@ -176,7 +175,7 @@ pub fn gen_remote_fingerprint(remote_addr: &SocketAddr) -> u64 {
 }
 
 mod cookie_builder {
-    use cipher::{BlockDecrypt, BlockEncrypt};
+    use cipher::{BlockCipherDecrypt, BlockCipherEncrypt};
     use tracing::instrument;
     use zerocopy::{byteorder, AsBytes as _, NativeEndian};
 
@@ -196,7 +195,7 @@ mod cookie_builder {
         let cookie: byteorder::I64<NativeEndian> =
             *zerocopy::FromBytes::ref_from(&cookie.to_ne_bytes()).expect("it should be aligned");
 
-        *CipherArrayBlowfish::from_slice(cookie.as_bytes())
+        CipherArrayBlowfish::try_from(cookie.as_bytes()).expect("it should be the same size")
     }
 
     #[instrument()]
diff --git a/packages/udp-tracker-core/src/container.rs b/packages/udp-tracker-core/src/container.rs
index 98c01a703..1d8b1d71c 100644
--- a/packages/udp-tracker-core/src/container.rs
+++ b/packages/udp-tracker-core/src/container.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
 use bittorrent_tracker_core::container::TrackerCoreContainer;
 use tokio::sync::RwLock;
 use torrust_tracker_configuration::{Core, UdpTracker};
+use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
 
 use crate::event::bus::EventBus;
 use crate::event::sender::Broadcaster;
@@ -31,7 +32,15 @@ pub struct UdpTrackerCoreContainer {
 impl UdpTrackerCoreContainer {
     #[must_use]
     pub fn initialize(core_config: &Arc<Core>, udp_tracker_config: &Arc<UdpTracker>) -> Arc<UdpTrackerCoreContainer> {
-        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(core_config));
+        let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
+            core_config.tracker_usage_statistics.into(),
+        ));
+
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
+            core_config,
+            &swarm_coordination_registry_container,
+        ));
+
         Self::initialize_from_tracker_core(&tracker_core_container, udp_tracker_config)
     }
 
@@ -41,6 +50,7 @@ impl UdpTrackerCoreContainer {
         udp_tracker_config: &Arc<UdpTracker>,
     ) -> Arc<UdpTrackerCoreContainer> {
         let udp_tracker_core_services = UdpTrackerCoreServices::initialize_from(tracker_core_container);
+
         Self::initialize_from_services(tracker_core_container, &udp_tracker_core_services, udp_tracker_config)
     }
 
@@ -83,7 +93,7 @@ impl UdpTrackerCoreServices {
         let udp_core_broadcaster = Broadcaster::default();
         let udp_core_stats_repository = Arc::new(Repository::new());
         let event_bus = Arc::new(EventBus::new(
-            tracker_core_container.core_config.tracker_usage_statistics,
+            tracker_core_container.core_config.tracker_usage_statistics.into(),
             udp_core_broadcaster.clone(),
         ));
 
diff --git a/packages/udp-tracker-core/src/crypto/ephemeral_instance_keys.rs b/packages/udp-tracker-core/src/crypto/ephemeral_instance_keys.rs
index 58ba70562..357bdeca5 100644
--- a/packages/udp-tracker-core/src/crypto/ephemeral_instance_keys.rs
+++ b/packages/udp-tracker-core/src/crypto/ephemeral_instance_keys.rs
@@ -4,14 +4,13 @@
 //! application starts and are not persisted anywhere.
 
 use blowfish::BlowfishLE;
-use cipher::generic_array::GenericArray;
-use cipher::{BlockSizeUser, KeyInit};
+use cipher::{Block, KeyInit};
 use rand::rngs::ThreadRng;
-use rand::Rng;
+use rand::RngExt;
 
 pub type Seed = [u8; 32];
 pub type CipherBlowfish = BlowfishLE;
-pub type CipherArrayBlowfish = GenericArray<u8, <CipherBlowfish as BlockSizeUser>::BlockSize>;
+pub type CipherArrayBlowfish = Block<CipherBlowfish>;
 
 lazy_static! {
     /// The random static seed.
diff --git a/packages/udp-tracker-core/src/crypto/keys.rs b/packages/udp-tracker-core/src/crypto/keys.rs
index f9a3e361d..2faa745c3 100644
--- a/packages/udp-tracker-core/src/crypto/keys.rs
+++ b/packages/udp-tracker-core/src/crypto/keys.rs
@@ -5,6 +5,8 @@
 //!
 //! It also provides the logic for the cipher for encryption and decryption.
 
+use cipher::{BlockCipherDecrypt, BlockCipherEncrypt};
+
 use self::detail_cipher::CURRENT_CIPHER;
 use self::detail_seed::CURRENT_SEED;
 pub use crate::crypto::ephemeral_instance_keys::CipherArrayBlowfish;
@@ -13,7 +15,7 @@ use crate::crypto::ephemeral_instance_keys::{CipherBlowfish, Seed, RANDOM_CIPHER
 /// This trait is for structures that can keep and provide a seed.
 pub trait Keeper {
     type Seed: Sized + Default + AsMut<[u8]>;
-    type Cipher: cipher::BlockCipher;
+    type Cipher: BlockCipherEncrypt + BlockCipherDecrypt;
 
     /// It returns a reference to the seed that is keeping.
     fn get_seed() -> &'static Self::Seed;
@@ -135,14 +137,14 @@ mod detail_cipher {
 
     #[cfg(test)]
     mod tests {
-        use cipher::BlockEncrypt;
+        use cipher::BlockCipherEncrypt;
 
         use crate::crypto::ephemeral_instance_keys::{CipherArrayBlowfish, ZEROED_TEST_CIPHER_BLOWFISH};
         use crate::crypto::keys::detail_cipher::CURRENT_CIPHER;
 
         #[test]
         fn it_should_default_to_zeroed_seed_when_testing() {
-            let mut data: cipher::generic_array::GenericArray<u8, _> = CipherArrayBlowfish::from([0u8; 8]);
+            let mut data = CipherArrayBlowfish::from([0u8; 8]);
             let mut data_2 = CipherArrayBlowfish::from([0u8; 8]);
 
             CURRENT_CIPHER.encrypt_block(&mut data);
diff --git a/packages/udp-tracker-core/src/event.rs b/packages/udp-tracker-core/src/event.rs
index 14a4dbfb3..761b809d8 100644
--- a/packages/udp-tracker-core/src/event.rs
+++ b/packages/udp-tracker-core/src/event.rs
@@ -59,6 +59,14 @@ impl From<ConnectionContext> for LabelSet {
                 label_name!("server_binding_ip"),
                 LabelValue::new(&connection_context.server_service_binding.bind_address().ip().to_string()),
             ),
+            (
+                label_name!("server_binding_address_ip_type"),
+                LabelValue::new(&connection_context.server_service_binding.bind_address_ip_type().to_string()),
+            ),
+            (
+                label_name!("server_binding_address_ip_family"),
+                LabelValue::new(&connection_context.server_service_binding.bind_address_ip_family().to_string()),
+            ),
             (
                 label_name!("server_binding_port"),
                 LabelValue::new(&connection_context.server_service_binding.bind_address().port().to_string()),
diff --git a/packages/udp-tracker-core/src/services/announce.rs b/packages/udp-tracker-core/src/services/announce.rs
index 499da2945..a69e91d8a 100644
--- a/packages/udp-tracker-core/src/services/announce.rs
+++ b/packages/udp-tracker-core/src/services/announce.rs
@@ -78,7 +78,7 @@ impl AnnounceService {
 
         let announce_data = self
             .announce_handler
-            .announce(&info_hash, &mut peer, &remote_client_ip, &peers_wanted)
+            .handle_announcement(&info_hash, &mut peer, &remote_client_ip, &peers_wanted)
             .await?;
 
         self.send_event(info_hash, peer, client_socket_addr, server_service_binding)
@@ -119,8 +119,6 @@ impl AnnounceService {
 
             tracing::debug!(target = crate::UDP_TRACKER_LOG_TARGET, "Sending UdpAnnounce event: {event:?}");
 
-            println!("Sending UdpAnnounce event: {event:?}");
-
             udp_stats_event_sender.send(event).await;
         }
     }
diff --git a/packages/udp-tracker-core/src/services/connect.rs b/packages/udp-tracker-core/src/services/connect.rs
index 18c9fd0ba..6ba36f274 100644
--- a/packages/udp-tracker-core/src/services/connect.rs
+++ b/packages/udp-tracker-core/src/services/connect.rs
@@ -61,6 +61,7 @@ mod tests {
         use std::sync::Arc;
 
         use mockall::predicate::eq;
+        use torrust_tracker_events::bus::SenderStatus;
         use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
 
         use crate::connection_cookie::make;
@@ -79,7 +80,7 @@ mod tests {
             let server_service_binding = ServiceBinding::new(Protocol::UDP, server_socket_addr).unwrap();
 
             let udp_core_broadcaster = Broadcaster::default();
-            let event_bus = Arc::new(EventBus::new(false, udp_core_broadcaster.clone()));
+            let event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_core_broadcaster.clone()));
             let udp_core_stats_event_sender = event_bus.sender();
 
             let connect_service = Arc::new(ConnectService::new(udp_core_stats_event_sender));
@@ -100,7 +101,7 @@ mod tests {
             let server_service_binding = ServiceBinding::new(Protocol::UDP, server_socket_addr).unwrap();
 
             let udp_core_broadcaster = Broadcaster::default();
-            let event_bus = Arc::new(EventBus::new(false, udp_core_broadcaster.clone()));
+            let event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_core_broadcaster.clone()));
             let udp_core_stats_event_sender = event_bus.sender();
 
             let connect_service = Arc::new(ConnectService::new(udp_core_stats_event_sender));
@@ -122,7 +123,7 @@ mod tests {
             let server_service_binding = ServiceBinding::new(Protocol::UDP, server_socket_addr).unwrap();
 
             let udp_core_broadcaster = Broadcaster::default();
-            let event_bus = Arc::new(EventBus::new(false, udp_core_broadcaster.clone()));
+            let event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_core_broadcaster.clone()));
             let udp_core_stats_event_sender = event_bus.sender();
 
             let connect_service = Arc::new(ConnectService::new(udp_core_stats_event_sender));
diff --git a/packages/udp-tracker-core/src/services/mod.rs b/packages/udp-tracker-core/src/services/mod.rs
index 64e357b1c..56882e68f 100644
--- a/packages/udp-tracker-core/src/services/mod.rs
+++ b/packages/udp-tracker-core/src/services/mod.rs
@@ -32,11 +32,11 @@ pub(crate) mod tests {
     }
 
     pub(crate) fn sample_ipv4_socket_address() -> SocketAddr {
-        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080)
+        SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080)
     }
 
     fn sample_ipv6_socket_address() -> SocketAddr {
-        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)), 8080)
+        SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 8080)
     }
 
     pub(crate) fn sample_issue_time() -> f64 {
diff --git a/packages/udp-tracker-core/src/services/scrape.rs b/packages/udp-tracker-core/src/services/scrape.rs
index b42004f63..8551351fb 100644
--- a/packages/udp-tracker-core/src/services/scrape.rs
+++ b/packages/udp-tracker-core/src/services/scrape.rs
@@ -56,7 +56,7 @@ impl ScrapeService {
 
         let scrape_data = self
             .scrape_handler
-            .scrape(&Self::convert_from_aquatic(&request.info_hashes))
+            .handle_scrape(&Self::convert_from_aquatic(&request.info_hashes))
             .await?;
 
         self.send_event(client_socket_addr, server_service_binding).await;
diff --git a/packages/udp-tracker-core/src/statistics/event/handler.rs b/packages/udp-tracker-core/src/statistics/event/handler.rs
index 039b6b0d5..e5d2b87a7 100644
--- a/packages/udp-tracker-core/src/statistics/event/handler.rs
+++ b/packages/udp-tracker-core/src/statistics/event/handler.rs
@@ -12,19 +12,6 @@ use crate::statistics::UDP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL;
 pub async fn handle_event(event: Event, stats_repository: &Repository, now: DurationSinceUnixEpoch) {
     match event {
         Event::UdpConnect { connection: context } => {
-            // Global fixed metrics
-
-            match context.client_socket_addr.ip() {
-                std::net::IpAddr::V4(_) => {
-                    stats_repository.increase_udp4_connections().await;
-                }
-                std::net::IpAddr::V6(_) => {
-                    stats_repository.increase_udp6_connections().await;
-                }
-            }
-
-            // Extendable metrics
-
             let mut label_set = LabelSet::from(context);
             label_set.upsert(label_name!("request_kind"), LabelValue::new("connect"));
 
@@ -37,19 +24,6 @@ pub async fn handle_event(event: Event, stats_repository: &Repository, now: Dura
             };
         }
         Event::UdpAnnounce { connection: context, .. } => {
-            // Global fixed metrics
-
-            match context.client_socket_addr.ip() {
-                std::net::IpAddr::V4(_) => {
-                    stats_repository.increase_udp4_announces().await;
-                }
-                std::net::IpAddr::V6(_) => {
-                    stats_repository.increase_udp6_announces().await;
-                }
-            }
-
-            // Extendable metrics
-
             let mut label_set = LabelSet::from(context);
             label_set.upsert(label_name!("request_kind"), LabelValue::new("announce"));
 
@@ -62,19 +36,6 @@ pub async fn handle_event(event: Event, stats_repository: &Repository, now: Dura
             };
         }
         Event::UdpScrape { connection: context } => {
-            // Global fixed metrics
-
-            match context.client_socket_addr.ip() {
-                std::net::IpAddr::V4(_) => {
-                    stats_repository.increase_udp4_scrapes().await;
-                }
-                std::net::IpAddr::V6(_) => {
-                    stats_repository.increase_udp6_scrapes().await;
-                }
-            }
-
-            // Extendable metrics
-
             let mut label_set = LabelSet::from(context);
             label_set.upsert(label_name!("request_kind"), LabelValue::new("scrape"));
 
@@ -127,7 +88,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp4_connections_handled, 1);
+        assert_eq!(stats.udp4_connections_handled(), 1);
     }
 
     #[tokio::test]
@@ -154,7 +115,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp4_announces_handled, 1);
+        assert_eq!(stats.udp4_announces_handled(), 1);
     }
 
     #[tokio::test]
@@ -179,7 +140,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp4_scrapes_handled, 1);
+        assert_eq!(stats.udp4_scrapes_handled(), 1);
     }
 
     #[tokio::test]
@@ -204,7 +165,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp6_connections_handled, 1);
+        assert_eq!(stats.udp6_connections_handled(), 1);
     }
 
     #[tokio::test]
@@ -231,7 +192,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp6_announces_handled, 1);
+        assert_eq!(stats.udp6_announces_handled(), 1);
     }
 
     #[tokio::test]
@@ -256,6 +217,6 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp6_scrapes_handled, 1);
+        assert_eq!(stats.udp6_scrapes_handled(), 1);
     }
 }
diff --git a/packages/udp-tracker-core/src/statistics/event/listener.rs b/packages/udp-tracker-core/src/statistics/event/listener.rs
index 9b6f2e574..b11bcce85 100644
--- a/packages/udp-tracker-core/src/statistics/event/listener.rs
+++ b/packages/udp-tracker-core/src/statistics/event/listener.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
 use torrust_tracker_clock::clock::Time;
 use torrust_tracker_events::receiver::RecvError;
 
@@ -10,28 +11,29 @@ use crate::statistics::repository::Repository;
 use crate::{CurrentClock, UDP_TRACKER_LOG_TARGET};
 
 #[must_use]
-pub fn run_event_listener(receiver: Receiver, repository: &Arc<Repository>) -> JoinHandle<()> {
+pub fn run_event_listener(
+    receiver: Receiver,
+    cancellation_token: CancellationToken,
+    repository: &Arc<Repository>,
+) -> JoinHandle<()> {
     let stats_repository = repository.clone();
 
     tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Starting UDP tracker core event listener");
 
     tokio::spawn(async move {
-        dispatch_events(receiver, stats_repository).await;
+        dispatch_events(receiver, cancellation_token, stats_repository).await;
 
         tracing::info!(target: UDP_TRACKER_LOG_TARGET, "UDP tracker core event listener finished");
     })
 }
 
-async fn dispatch_events(mut receiver: Receiver, stats_repository: Arc<Repository>) {
-    let shutdown_signal = tokio::signal::ctrl_c();
-    tokio::pin!(shutdown_signal);
-
+async fn dispatch_events(mut receiver: Receiver, cancellation_token: CancellationToken, stats_repository: Arc<Repository>) {
     loop {
         tokio::select! {
             biased;
 
-            _ = &mut shutdown_signal => {
-                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Received Ctrl+C, shutting down UDP tracker core event listener.");
+            () = cancellation_token.cancelled() => {
+                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Received cancellation request, shutting down UDP tracker core event listener.");
                 break;
             }
 
@@ -41,11 +43,11 @@ async fn dispatch_events(mut receiver: Receiver, stats_repository: Arc<Repositor
                     Err(e) => {
                         match e {
                             RecvError::Closed => {
-                                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Udp core statistics receiver closed.");
+                                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Udp tracker core statistics receiver closed.");
                                 break;
                             }
                             RecvError::Lagged(n) => {
-                                tracing::warn!(target: UDP_TRACKER_LOG_TARGET, "Udp core statistics receiver lagged by {} events.", n);
+                                tracing::warn!(target: UDP_TRACKER_LOG_TARGET, "Udp tracker core statistics receiver lagged by {} events.", n);
                             }
                         }
                     }
diff --git a/packages/udp-tracker-core/src/statistics/metrics.rs b/packages/udp-tracker-core/src/statistics/metrics.rs
index 94aa7d08f..98906a596 100644
--- a/packages/udp-tracker-core/src/statistics/metrics.rs
+++ b/packages/udp-tracker-core/src/statistics/metrics.rs
@@ -1,37 +1,15 @@
 use serde::Serialize;
 use torrust_tracker_metrics::label::LabelSet;
 use torrust_tracker_metrics::metric::MetricName;
+use torrust_tracker_metrics::metric_collection::aggregate::sum::Sum;
 use torrust_tracker_metrics::metric_collection::{Error, MetricCollection};
+use torrust_tracker_metrics::metric_name;
 use torrust_tracker_primitives::DurationSinceUnixEpoch;
 
-/// Metrics collected by the tracker.
-///
-/// - Number of connections handled
-/// - Number of `announce` requests handled
-/// - Number of `scrape` request handled
-///
-/// These metrics are collected for each connection type: UDP and HTTP
-/// and also for each IP version used by the peers: IPv4 and IPv6.
+use crate::statistics::UDP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL;
+
 #[derive(Debug, PartialEq, Default, Serialize)]
 pub struct Metrics {
-    /// Total number of UDP (UDP tracker) connections from IPv4 peers.
-    pub udp4_connections_handled: u64,
-
-    /// Total number of UDP (UDP tracker) `announce` requests from IPv4 peers.
-    pub udp4_announces_handled: u64,
-
-    /// Total number of UDP (UDP tracker) `scrape` requests from IPv4 peers.
-    pub udp4_scrapes_handled: u64,
-
-    /// Total number of UDP (UDP tracker) `connection` requests from IPv6 peers.
-    pub udp6_connections_handled: u64,
-
-    /// Total number of UDP (UDP tracker) `announce` requests from IPv6 peers.
-    pub udp6_announces_handled: u64,
-
-    /// Total number of UDP (UDP tracker) `scrape` requests from IPv6 peers.
-    pub udp6_scrapes_handled: u64,
-
     /// A collection of metrics.
     pub metric_collection: MetricCollection,
 }
@@ -47,7 +25,7 @@ impl Metrics {
         labels: &LabelSet,
         now: DurationSinceUnixEpoch,
     ) -> Result<(), Error> {
-        self.metric_collection.increase_counter(metric_name, labels, now)
+        self.metric_collection.increment_counter(metric_name, labels, now)
     }
 
     /// # Errors
@@ -64,3 +42,83 @@ impl Metrics {
         self.metric_collection.set_gauge(metric_name, labels, value, now)
     }
 }
+
+impl Metrics {
+    /// Total number of UDP (UDP tracker) connections from IPv4 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp4_connections_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet"), ("request_kind", "connect")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+
+    /// Total number of UDP (UDP tracker) `announce` requests from IPv4 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp4_announces_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet"), ("request_kind", "announce")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+
+    /// Total number of UDP (UDP tracker) `scrape` requests from IPv4 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp4_scrapes_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet"), ("request_kind", "scrape")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+
+    /// Total number of UDP (UDP tracker) `connection` requests from IPv6 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp6_connections_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet6"), ("request_kind", "connect")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+
+    /// Total number of UDP (UDP tracker) `announce` requests from IPv6 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp6_announces_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet6"), ("request_kind", "announce")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+
+    /// Total number of UDP (UDP tracker) `scrape` requests from IPv6 peers.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp6_scrapes_handled(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet6"), ("request_kind", "scrape")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
+}
diff --git a/packages/udp-tracker-core/src/statistics/mod.rs b/packages/udp-tracker-core/src/statistics/mod.rs
index 9eb85d7f1..fec76069e 100644
--- a/packages/udp-tracker-core/src/statistics/mod.rs
+++ b/packages/udp-tracker-core/src/statistics/mod.rs
@@ -17,7 +17,7 @@ pub fn describe_metrics() -> Metrics {
     metrics.metric_collection.describe_counter(
         &metric_name!(UDP_TRACKER_CORE_REQUESTS_RECEIVED_TOTAL),
         Some(Unit::Count),
-        Some(&MetricDescription::new("Total number of UDP requests received")),
+        Some(MetricDescription::new("Total number of UDP requests received")),
     );
 
     metrics
diff --git a/packages/udp-tracker-core/src/statistics/repository.rs b/packages/udp-tracker-core/src/statistics/repository.rs
index c68fa14f7..ceee0e369 100644
--- a/packages/udp-tracker-core/src/statistics/repository.rs
+++ b/packages/udp-tracker-core/src/statistics/repository.rs
@@ -33,42 +33,6 @@ impl Repository {
         self.stats.read().await
     }
 
-    pub async fn increase_udp4_connections(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp4_connections_handled += 1;
-        drop(stats_lock);
-    }
-
-    pub async fn increase_udp4_announces(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp4_announces_handled += 1;
-        drop(stats_lock);
-    }
-
-    pub async fn increase_udp4_scrapes(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp4_scrapes_handled += 1;
-        drop(stats_lock);
-    }
-
-    pub async fn increase_udp6_connections(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp6_connections_handled += 1;
-        drop(stats_lock);
-    }
-
-    pub async fn increase_udp6_announces(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp6_announces_handled += 1;
-        drop(stats_lock);
-    }
-
-    pub async fn increase_udp6_scrapes(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp6_scrapes_handled += 1;
-        drop(stats_lock);
-    }
-
     /// # Errors
     ///
     /// This function will return an error if the metric collection fails to
diff --git a/packages/udp-tracker-core/src/statistics/services.rs b/packages/udp-tracker-core/src/statistics/services.rs
index c76f02040..18a80bad1 100644
--- a/packages/udp-tracker-core/src/statistics/services.rs
+++ b/packages/udp-tracker-core/src/statistics/services.rs
@@ -39,7 +39,7 @@
 use std::sync::Arc;
 
 use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
+use torrust_tracker_primitives::swarm_metadata::AggregateActiveSwarmMetadata;
 
 use crate::statistics::metrics::Metrics;
 use crate::statistics::repository::Repository;
@@ -50,7 +50,7 @@ pub struct TrackerMetrics {
     /// Domain level metrics.
     ///
     /// General metrics for all torrents (number of seeders, leechers, etcetera)
-    pub torrents_metrics: AggregateSwarmMetadata,
+    pub torrents_metrics: AggregateActiveSwarmMetadata,
 
     /// Application level metrics. Usage statistics/metrics.
     ///
@@ -63,21 +63,12 @@ pub async fn get_metrics(
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     stats_repository: Arc<Repository>,
 ) -> TrackerMetrics {
-    let torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata();
+    let torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata().await;
     let stats = stats_repository.get_stats().await;
 
     TrackerMetrics {
         torrents_metrics,
         protocol_metrics: Metrics {
-            // UDPv4
-            udp4_connections_handled: stats.udp4_connections_handled,
-            udp4_announces_handled: stats.udp4_announces_handled,
-            udp4_scrapes_handled: stats.udp4_scrapes_handled,
-            // UDPv6
-            udp6_connections_handled: stats.udp6_connections_handled,
-            udp6_announces_handled: stats.udp6_announces_handled,
-            udp6_scrapes_handled: stats.udp6_scrapes_handled,
-            // Extendable metrics
             metric_collection: stats.metric_collection.clone(),
         },
     }
@@ -89,7 +80,7 @@ mod tests {
 
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
     use bittorrent_tracker_core::{self};
-    use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
+    use torrust_tracker_primitives::swarm_metadata::AggregateActiveSwarmMetadata;
 
     use crate::statistics::describe_metrics;
     use crate::statistics::repository::Repository;
@@ -106,7 +97,7 @@ mod tests {
         assert_eq!(
             tracker_metrics,
             TrackerMetrics {
-                torrents_metrics: AggregateSwarmMetadata::default(),
+                torrents_metrics: AggregateActiveSwarmMetadata::default(),
                 protocol_metrics: describe_metrics(),
             }
         );
diff --git a/packages/udp-tracker-server/Cargo.toml b/packages/udp-tracker-server/Cargo.toml
index 4d0296461..dc66572d8 100644
--- a/packages/udp-tracker-server/Cargo.toml
+++ b/packages/udp-tracker-server/Cargo.toml
@@ -4,7 +4,7 @@ description = "The Torrust Bittorrent UDP tracker."
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
-keywords = ["axum", "bittorrent", "server", "torrust", "tracker", "udp"]
+keywords = [ "axum", "bittorrent", "server", "torrust", "tracker", "udp" ]
 license.workspace = true
 name = "torrust-udp-tracker-server"
 publish.workspace = true
@@ -19,23 +19,24 @@ bittorrent-primitives = "0.1.0"
 bittorrent-tracker-client = { version = "3.0.0-develop", path = "../tracker-client" }
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
 bittorrent-udp-tracker-core = { version = "3.0.0-develop", path = "../udp-tracker-core" }
-derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = [ "as_ref", "constructor", "from" ] }
 futures = "0"
 futures-util = "0"
 ringbuf = "0"
 serde = "1.0.219"
 thiserror = "2"
-tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
+tokio = { version = "1", features = [ "macros", "net", "rt-multi-thread", "signal", "sync" ] }
+tokio-util = "0.7.15"
 torrust-server-lib = { version = "3.0.0-develop", path = "../server-lib" }
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
-torrust-tracker-located-error = { version = "3.0.0-develop", path = "../located-error" }
 torrust-tracker-metrics = { version = "3.0.0-develop", path = "../metrics" }
 torrust-tracker-primitives = { version = "3.0.0-develop", path = "../primitives" }
+torrust-tracker-swarm-coordination-registry = { version = "3.0.0-develop", path = "../swarm-coordination-registry" }
 tracing = "0"
-url = { version = "2", features = ["serde"] }
-uuid = { version = "1", features = ["v4"] }
+url = { version = "2", features = [ "serde" ] }
+uuid = { version = "1", features = [ "v4" ] }
 zerocopy = "0.7"
 
 [dev-dependencies]
diff --git a/packages/udp-tracker-server/src/banning/event/handler.rs b/packages/udp-tracker-server/src/banning/event/handler.rs
new file mode 100644
index 000000000..4876323a8
--- /dev/null
+++ b/packages/udp-tracker-server/src/banning/event/handler.rs
@@ -0,0 +1,47 @@
+use std::sync::Arc;
+
+use bittorrent_udp_tracker_core::services::banning::BanService;
+use tokio::sync::RwLock;
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric_name;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::{ErrorKind, Event};
+use crate::statistics::repository::Repository;
+use crate::statistics::UDP_TRACKER_SERVER_IPS_BANNED_TOTAL;
+
+pub async fn handle_event(
+    event: Event,
+    ban_service: &Arc<RwLock<BanService>>,
+    repository: &Repository,
+    now: DurationSinceUnixEpoch,
+) {
+    if let Event::UdpError {
+        context,
+        kind: _,
+        error: ErrorKind::ConnectionCookie(_msg),
+    } = event
+    {
+        let mut ban_service = ban_service.write().await;
+
+        ban_service.increase_counter(&context.client_socket_addr().ip());
+
+        update_metric_for_banned_ips_total(repository, ban_service.get_banned_ips_total(), now).await;
+    }
+}
+
+#[allow(clippy::cast_precision_loss)]
+async fn update_metric_for_banned_ips_total(repository: &Repository, ips_banned_total: usize, now: DurationSinceUnixEpoch) {
+    match repository
+        .set_gauge(
+            &metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL),
+            &LabelSet::default(),
+            ips_banned_total as f64,
+            now,
+        )
+        .await
+    {
+        Ok(()) => {}
+        Err(err) => tracing::error!("Failed to increase the counter: {}", err),
+    }
+}
diff --git a/packages/udp-tracker-server/src/banning/event/listener.rs b/packages/udp-tracker-server/src/banning/event/listener.rs
new file mode 100644
index 000000000..0d579f912
--- /dev/null
+++ b/packages/udp-tracker-server/src/banning/event/listener.rs
@@ -0,0 +1,68 @@
+use std::sync::Arc;
+
+use bittorrent_udp_tracker_core::services::banning::BanService;
+use bittorrent_udp_tracker_core::UDP_TRACKER_LOG_TARGET;
+use tokio::sync::RwLock;
+use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
+use torrust_tracker_clock::clock::Time;
+use torrust_tracker_events::receiver::RecvError;
+
+use super::handler::handle_event;
+use crate::event::receiver::Receiver;
+use crate::statistics::repository::Repository;
+use crate::CurrentClock;
+
+#[must_use]
+pub fn run_event_listener(
+    receiver: Receiver,
+    cancellation_token: CancellationToken,
+    ban_service: &Arc<RwLock<BanService>>,
+    repository: &Arc<Repository>,
+) -> JoinHandle<()> {
+    let ban_service_clone = ban_service.clone();
+    let repository_clone = repository.clone();
+
+    tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Starting UDP tracker server event listener (banning)");
+
+    tokio::spawn(async move {
+        dispatch_events(receiver, cancellation_token, ban_service_clone, repository_clone).await;
+
+        tracing::info!(target: UDP_TRACKER_LOG_TARGET, "UDP tracker server event listener (banning) finished");
+    })
+}
+
+async fn dispatch_events(
+    mut receiver: Receiver,
+    cancellation_token: CancellationToken,
+    ban_service: Arc<RwLock<BanService>>,
+    repository: Arc<Repository>,
+) {
+    loop {
+        tokio::select! {
+            biased;
+
+            () = cancellation_token.cancelled() => {
+                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Received cancellation request, shutting down UDP tracker server event listener.");
+                break;
+            }
+
+            result = receiver.recv() => {
+                match result {
+                    Ok(event) => handle_event(event, &ban_service, &repository, CurrentClock::now()).await,
+                    Err(e) => {
+                        match e {
+                            RecvError::Closed => {
+                                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Udp tracker server receiver  (banning) closed.");
+                                break;
+                            }
+                            RecvError::Lagged(n) => {
+                                tracing::warn!(target: UDP_TRACKER_LOG_TARGET, "Udp tracker server receiver (banning) lagged by {} events.", n);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/packages/udp-tracker-server/src/banning/event/mod.rs b/packages/udp-tracker-server/src/banning/event/mod.rs
new file mode 100644
index 000000000..dae683398
--- /dev/null
+++ b/packages/udp-tracker-server/src/banning/event/mod.rs
@@ -0,0 +1,2 @@
+pub mod handler;
+pub mod listener;
diff --git a/packages/udp-tracker-server/src/banning/mod.rs b/packages/udp-tracker-server/src/banning/mod.rs
new file mode 100644
index 000000000..53f112654
--- /dev/null
+++ b/packages/udp-tracker-server/src/banning/mod.rs
@@ -0,0 +1 @@
+pub mod event;
diff --git a/packages/udp-tracker-server/src/container.rs b/packages/udp-tracker-server/src/container.rs
index a0bc8f35b..365db4ca7 100644
--- a/packages/udp-tracker-server/src/container.rs
+++ b/packages/udp-tracker-server/src/container.rs
@@ -39,7 +39,7 @@ impl UdpTrackerServerServices {
         let udp_server_broadcaster = Broadcaster::default();
         let udp_server_stats_repository = Arc::new(Repository::new());
         let udp_server_stats_event_bus = Arc::new(EventBus::new(
-            core_config.tracker_usage_statistics,
+            core_config.tracker_usage_statistics.into(),
             udp_server_broadcaster.clone(),
         ));
 
diff --git a/packages/udp-tracker-server/src/environment.rs b/packages/udp-tracker-server/src/environment.rs
index 962442fde..13e18ba9b 100644
--- a/packages/udp-tracker-server/src/environment.rs
+++ b/packages/udp-tracker-server/src/environment.rs
@@ -1,13 +1,13 @@
 use std::net::SocketAddr;
 use std::sync::Arc;
 
-use bittorrent_primitives::info_hash::InfoHash;
 use bittorrent_tracker_core::container::TrackerCoreContainer;
 use bittorrent_udp_tracker_core::container::UdpTrackerCoreContainer;
 use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
 use torrust_server_lib::registar::Registar;
 use torrust_tracker_configuration::{logging, Configuration, DEFAULT_TIMEOUT};
-use torrust_tracker_primitives::peer;
+use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
 
 use crate::container::UdpTrackerServerContainer;
 use crate::server::spawner::Spawner;
@@ -24,22 +24,9 @@ where
     pub registar: Registar,
     pub server: Server<S>,
     pub udp_core_event_listener_job: Option<JoinHandle<()>>,
-    pub udp_server_event_listener_job: Option<JoinHandle<()>>,
-}
-
-impl<S> Environment<S>
-where
-    S: std::fmt::Debug + std::fmt::Display,
-{
-    /// Add a torrent to the tracker
-    #[allow(dead_code)]
-    pub fn add_torrent(&self, info_hash: &InfoHash, peer: &peer::Peer) {
-        let _number_of_downloads_increased = self
-            .container
-            .tracker_core_container
-            .in_memory_torrent_repository
-            .upsert_peer(info_hash, peer, None);
-    }
+    pub udp_server_stats_event_listener_job: Option<JoinHandle<()>>,
+    pub udp_server_banning_event_listener_job: Option<JoinHandle<()>>,
+    pub cancellation_token: CancellationToken,
 }
 
 impl Environment<Stopped> {
@@ -59,7 +46,9 @@ impl Environment<Stopped> {
             registar: Registar::default(),
             server,
             udp_core_event_listener_job: None,
-            udp_server_event_listener_job: None,
+            udp_server_stats_event_listener_job: None,
+            udp_server_banning_event_listener_job: None,
+            cancellation_token: CancellationToken::new(),
         }
     }
 
@@ -71,15 +60,26 @@ impl Environment<Stopped> {
     #[allow(dead_code)]
     pub async fn start(self) -> Environment<Running> {
         let cookie_lifetime = self.container.udp_tracker_core_container.udp_tracker_config.cookie_lifetime;
+
         // Start the UDP tracker core event listener
         let udp_core_event_listener_job = Some(bittorrent_udp_tracker_core::statistics::event::listener::run_event_listener(
             self.container.udp_tracker_core_container.event_bus.receiver(),
+            self.cancellation_token.clone(),
             &self.container.udp_tracker_core_container.stats_repository,
         ));
 
-        // Start the UDP tracker server event listener
-        let udp_server_event_listener_job = Some(crate::statistics::event::listener::run_event_listener(
+        // Start the UDP tracker server event listener (statistics)
+        let udp_server_stats_event_listener_job = Some(crate::statistics::event::listener::run_event_listener(
             self.container.udp_tracker_server_container.event_bus.receiver(),
+            self.cancellation_token.clone(),
+            &self.container.udp_tracker_server_container.stats_repository,
+        ));
+
+        // Start the UDP tracker server event listener (banning)
+        let udp_server_banning_event_listener_job = Some(crate::banning::event::listener::run_event_listener(
+            self.container.udp_tracker_server_container.event_bus.receiver(),
+            self.cancellation_token.clone(),
+            &self.container.udp_tracker_core_container.ban_service,
             &self.container.udp_tracker_server_container.stats_repository,
         ));
 
@@ -100,7 +100,9 @@ impl Environment<Stopped> {
             registar: self.registar.clone(),
             server,
             udp_core_event_listener_job,
-            udp_server_event_listener_job,
+            udp_server_stats_event_listener_job,
+            udp_server_banning_event_listener_job,
+            cancellation_token: self.cancellation_token,
         }
     }
 }
@@ -129,11 +131,18 @@ impl Environment<Running> {
             udp_core_event_listener_job.abort();
         }
 
-        // Stop the UDP tracker server event listener
-        if let Some(udp_server_event_listener_job) = self.udp_server_event_listener_job {
+        // Stop the UDP tracker server event listener (statistics)
+        if let Some(udp_server_stats_event_listener_job) = self.udp_server_stats_event_listener_job {
+            // todo: send a message to the event listener to stop and wait for
+            // it to finish
+            udp_server_stats_event_listener_job.abort();
+        }
+
+        // Stop the UDP tracker server event listener (banning)
+        if let Some(udp_server_banning_event_listener_job) = self.udp_server_banning_event_listener_job {
             // todo: send a message to the event listener to stop and wait for
             // it to finish
-            udp_server_event_listener_job.abort();
+            udp_server_banning_event_listener_job.abort();
         }
 
         // Stop the UDP tracker server
@@ -147,7 +156,9 @@ impl Environment<Running> {
             registar: Registar::default(),
             server,
             udp_core_event_listener_job: None,
-            udp_server_event_listener_job: None,
+            udp_server_stats_event_listener_job: None,
+            udp_server_banning_event_listener_job: None,
+            cancellation_token: self.cancellation_token,
         }
     }
 
@@ -173,9 +184,18 @@ impl EnvContainer {
         let udp_tracker_configurations = configuration.udp_trackers.clone().expect("missing UDP tracker configuration");
         let udp_tracker_config = Arc::new(udp_tracker_configurations[0].clone());
 
-        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
+        let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
+            core_config.tracker_usage_statistics.into(),
+        ));
+
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
+            &core_config,
+            &swarm_coordination_registry_container,
+        ));
+
         let udp_tracker_core_container =
             UdpTrackerCoreContainer::initialize_from_tracker_core(&tracker_core_container, &udp_tracker_config);
+
         let udp_tracker_server_container = UdpTrackerServerContainer::initialize(&core_config);
 
         Self {
diff --git a/packages/udp-tracker-server/src/error.rs b/packages/udp-tracker-server/src/error.rs
index 93caf6853..d260ebfd4 100644
--- a/packages/udp-tracker-server/src/error.rs
+++ b/packages/udp-tracker-server/src/error.rs
@@ -1,59 +1,55 @@
 //! Error types for the UDP server.
+use std::fmt::Display;
 use std::panic::Location;
 
-use aquatic_udp_protocol::{ConnectionId, RequestParseError};
+use aquatic_udp_protocol::{ConnectionId, RequestParseError, TransactionId};
 use bittorrent_udp_tracker_core::services::announce::UdpAnnounceError;
 use bittorrent_udp_tracker_core::services::scrape::UdpScrapeError;
 use derive_more::derive::Display;
 use thiserror::Error;
-use torrust_tracker_located_error::LocatedError;
 
 #[derive(Display, Debug)]
 #[display(":?")]
 pub struct ConnectionCookie(pub ConnectionId);
 
 /// Error returned by the UDP server.
-#[derive(Error, Debug)]
+#[derive(Error, Debug, Clone)]
 pub enum Error {
     /// Error returned when the request is invalid.
-    #[error("error when phrasing request: {request_parse_error:?}")]
-    RequestParseError { request_parse_error: RequestParseError },
+    #[error("error parsing request: {request_parse_error:?}")]
+    InvalidRequest { request_parse_error: SendableRequestParseError },
 
     /// Error returned when the domain tracker returns an announce error.
     #[error("tracker announce error: {source}")]
-    UdpAnnounceError { source: UdpAnnounceError },
+    AnnounceFailed { source: UdpAnnounceError },
 
     /// Error returned when the domain tracker returns an scrape error.
     #[error("tracker scrape error: {source}")]
-    UdpScrapeError { source: UdpScrapeError },
+    ScrapeFailed { source: UdpScrapeError },
 
     /// Error returned from a third-party library (`aquatic_udp_protocol`).
     #[error("internal server error: {message}, {location}")]
-    InternalServer {
+    Internal {
         location: &'static Location<'static>,
         message: String,
     },
 
-    /// Error returned when the request is invalid.
-    #[error("bad request: {source}")]
-    BadRequest {
-        source: LocatedError<'static, dyn std::error::Error + Send + Sync>,
-    },
-
     /// Error returned when tracker requires authentication.
     #[error("domain tracker requires authentication but is not supported in current UDP implementation. Location: {location}")]
-    TrackerAuthenticationRequired { location: &'static Location<'static> },
+    AuthRequired { location: &'static Location<'static> },
 }
 
 impl From<RequestParseError> for Error {
     fn from(request_parse_error: RequestParseError) -> Self {
-        Self::RequestParseError { request_parse_error }
+        Self::InvalidRequest {
+            request_parse_error: request_parse_error.into(),
+        }
     }
 }
 
 impl From<UdpAnnounceError> for Error {
     fn from(udp_announce_error: UdpAnnounceError) -> Self {
-        Self::UdpAnnounceError {
+        Self::AnnounceFailed {
             source: udp_announce_error,
         }
     }
@@ -61,8 +57,44 @@ impl From<UdpAnnounceError> for Error {
 
 impl From<UdpScrapeError> for Error {
     fn from(udp_scrape_error: UdpScrapeError) -> Self {
-        Self::UdpScrapeError {
+        Self::ScrapeFailed {
             source: udp_scrape_error,
         }
     }
 }
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct SendableRequestParseError {
+    pub message: String,
+    pub opt_connection_id: Option<ConnectionId>,
+    pub opt_transaction_id: Option<TransactionId>,
+}
+
+impl Display for SendableRequestParseError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "SendableRequestParseError: message: {}, connection_id: {:?}, transaction_id: {:?}",
+            self.message, self.opt_connection_id, self.opt_transaction_id
+        )
+    }
+}
+
+impl From<RequestParseError> for SendableRequestParseError {
+    fn from(request_parse_error: RequestParseError) -> Self {
+        let (message, opt_connection_id, opt_transaction_id) = match request_parse_error {
+            RequestParseError::Sendable {
+                connection_id,
+                transaction_id,
+                err,
+            } => ((*err).to_string(), Some(connection_id), Some(transaction_id)),
+            RequestParseError::Unsendable { err } => (err.to_string(), None, None),
+        };
+
+        Self {
+            message,
+            opt_connection_id,
+            opt_transaction_id,
+        }
+    }
+}
diff --git a/packages/udp-tracker-server/src/event.rs b/packages/udp-tracker-server/src/event.rs
index 8aabd7ffb..a7634d58e 100644
--- a/packages/udp-tracker-server/src/event.rs
+++ b/packages/udp-tracker-server/src/event.rs
@@ -2,12 +2,18 @@ use std::fmt;
 use std::net::SocketAddr;
 use std::time::Duration;
 
+use aquatic_udp_protocol::AnnounceRequest;
+use bittorrent_tracker_core::error::{AnnounceError, ScrapeError};
+use bittorrent_udp_tracker_core::services::announce::UdpAnnounceError;
+use bittorrent_udp_tracker_core::services::scrape::UdpScrapeError;
 use torrust_tracker_metrics::label::{LabelSet, LabelValue};
 use torrust_tracker_metrics::label_name;
 use torrust_tracker_primitives::service_binding::ServiceBinding;
 
+use crate::error::Error;
+
 /// A UDP server event.
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum Event {
     UdpRequestReceived {
         context: ConnectionContext,
@@ -30,21 +36,32 @@ pub enum Event {
     UdpError {
         context: ConnectionContext,
         kind: Option<UdpRequestKind>,
+        error: ErrorKind,
     },
 }
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum UdpRequestKind {
     Connect,
-    Announce,
+    Announce { announce_request: AnnounceRequest },
     Scrape,
 }
 
+impl From<UdpRequestKind> for LabelValue {
+    fn from(kind: UdpRequestKind) -> Self {
+        match kind {
+            UdpRequestKind::Connect => LabelValue::new("connect"),
+            UdpRequestKind::Announce { .. } => LabelValue::new("announce"),
+            UdpRequestKind::Scrape => LabelValue::new("scrape"),
+        }
+    }
+}
+
 impl fmt::Display for UdpRequestKind {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let proto_str = match self {
             UdpRequestKind::Connect => "connect",
-            UdpRequestKind::Announce => "announce",
+            UdpRequestKind::Announce { .. } => "announce",
             UdpRequestKind::Scrape => "scrape",
         };
         write!(f, "{proto_str}")
@@ -101,6 +118,14 @@ impl From<ConnectionContext> for LabelSet {
                 label_name!("server_binding_ip"),
                 LabelValue::new(&connection_context.server_service_binding.bind_address().ip().to_string()),
             ),
+            (
+                label_name!("server_binding_address_ip_type"),
+                LabelValue::new(&connection_context.server_service_binding.bind_address_ip_type().to_string()),
+            ),
+            (
+                label_name!("server_binding_address_ip_family"),
+                LabelValue::new(&connection_context.server_service_binding.bind_address_ip_family().to_string()),
+            ),
             (
                 label_name!("server_binding_port"),
                 LabelValue::new(&connection_context.server_service_binding.bind_address().port().to_string()),
@@ -109,6 +134,42 @@ impl From<ConnectionContext> for LabelSet {
     }
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub enum ErrorKind {
+    RequestParse(String),
+    ConnectionCookie(String),
+    Whitelist(String),
+    Database(String),
+    InternalServer(String),
+    BadRequest(String),
+    TrackerAuthentication(String),
+}
+
+impl From<Error> for ErrorKind {
+    fn from(error: Error) -> Self {
+        match error {
+            Error::InvalidRequest { request_parse_error } => Self::RequestParse(request_parse_error.to_string()),
+            Error::AnnounceFailed { source } => match source {
+                UdpAnnounceError::ConnectionCookieError { source } => Self::ConnectionCookie(source.to_string()),
+                UdpAnnounceError::TrackerCoreAnnounceError { source } => match source {
+                    AnnounceError::Whitelist(whitelist_error) => Self::Whitelist(whitelist_error.to_string()),
+                    AnnounceError::Database(error) => Self::Database(error.to_string()),
+                },
+                UdpAnnounceError::TrackerCoreWhitelistError { source } => Self::Whitelist(source.to_string()),
+            },
+            Error::ScrapeFailed { source } => match source {
+                UdpScrapeError::ConnectionCookieError { source } => Self::ConnectionCookie(source.to_string()),
+                UdpScrapeError::TrackerCoreScrapeError { source } => match source {
+                    ScrapeError::Whitelist(whitelist_error) => Self::Whitelist(whitelist_error.to_string()),
+                },
+                UdpScrapeError::TrackerCoreWhitelistError { source } => Self::Whitelist(source.to_string()),
+            },
+            Error::Internal { location: _, message } => Self::InternalServer(message.clone()),
+            Error::AuthRequired { location } => Self::TrackerAuthentication(location.to_string()),
+        }
+    }
+}
+
 pub mod sender {
     use std::sync::Arc;
 
diff --git a/packages/udp-tracker-server/src/handlers/announce.rs b/packages/udp-tracker-server/src/handlers/announce.rs
index 5311531aa..ea19611ce 100644
--- a/packages/udp-tracker-server/src/handlers/announce.rs
+++ b/packages/udp-tracker-server/src/handlers/announce.rs
@@ -44,7 +44,9 @@ pub async fn handle_announce(
         udp_server_stats_event_sender
             .send(Event::UdpRequestAccepted {
                 context: ConnectionContext::new(client_socket_addr, server_service_binding.clone()),
-                kind: UdpRequestKind::Announce,
+                kind: UdpRequestKind::Announce {
+                    announce_request: *request,
+                },
             })
             .await;
     }
@@ -52,7 +54,15 @@ pub async fn handle_announce(
     let announce_data = announce_service
         .handle_announce(client_socket_addr, server_service_binding, request, cookie_valid_range)
         .await
-        .map_err(|e| (e.into(), request.transaction_id, UdpRequestKind::Announce))?;
+        .map_err(|e| {
+            (
+                e.into(),
+                request.transaction_id,
+                UdpRequestKind::Announce {
+                    announce_request: *request,
+                },
+            )
+        })?;
 
     Ok(build_response(client_socket_addr, request, core_config, &announce_data))
 }
@@ -118,9 +128,9 @@ fn build_response(
 }
 
 #[cfg(test)]
-mod tests {
+pub(crate) mod tests {
 
-    mod announce_request {
+    pub mod announce_request {
 
         use std::net::Ipv4Addr;
         use std::num::NonZeroU16;
@@ -133,7 +143,7 @@ mod tests {
 
         use crate::handlers::tests::{sample_ipv4_remote_addr_fingerprint, sample_issue_time};
 
-        struct AnnounceRequestBuilder {
+        pub struct AnnounceRequestBuilder {
             request: AnnounceRequest,
         }
 
@@ -206,6 +216,8 @@ mod tests {
             use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
             use bittorrent_udp_tracker_core::connection_cookie::{gen_remote_fingerprint, make};
             use mockall::predicate::eq;
+            use torrust_tracker_events::bus::SenderStatus;
+            use torrust_tracker_primitives::peer::fixture::PeerBuilder;
             use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
 
             use crate::event::{ConnectionContext, Event, UdpRequestKind};
@@ -215,7 +227,6 @@ mod tests {
                 initialize_core_tracker_services_for_default_tracker_configuration,
                 initialize_core_tracker_services_for_public_tracker, sample_cookie_valid_range, sample_ipv4_socket_address,
                 sample_issue_time, CoreTrackerServices, CoreUdpTrackerServices, MockUdpServerStatsEventSender,
-                TorrentPeerBuilder,
             };
 
             #[tokio::test]
@@ -254,10 +265,11 @@ mod tests {
 
                 let peers = core_tracker_services
                     .in_memory_torrent_repository
-                    .get_torrent_peers(&info_hash.0.into());
+                    .get_torrent_peers(&info_hash.0.into())
+                    .await;
 
-                let expected_peer = TorrentPeerBuilder::new()
-                    .with_peer_id(peer_id)
+                let expected_peer = PeerBuilder::default()
+                    .with_peer_id(&peer_id)
                     .with_peer_address(SocketAddr::new(IpAddr::V4(client_ip), client_port))
                     .updated_on(peers[0].updated)
                     .into();
@@ -348,12 +360,13 @@ mod tests {
 
                 let peers = core_tracker_services
                     .in_memory_torrent_repository
-                    .get_torrent_peers(&info_hash.0.into());
+                    .get_torrent_peers(&info_hash.0.into())
+                    .await;
 
                 assert_eq!(peers[0].peer_addr, SocketAddr::new(IpAddr::V4(remote_client_ip), client_port));
             }
 
-            fn add_a_torrent_peer_using_ipv6(in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>) {
+            async fn add_a_torrent_peer_using_ipv6(in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>) {
                 let info_hash = AquaticInfoHash([0u8; 20]);
 
                 let client_ip_v4 = Ipv4Addr::new(126, 0, 0, 1);
@@ -361,13 +374,14 @@ mod tests {
                 let client_port = 8080;
                 let peer_id = AquaticPeerId([255u8; 20]);
 
-                let peer_using_ipv6 = TorrentPeerBuilder::new()
-                    .with_peer_id(peer_id)
+                let peer_using_ipv6 = PeerBuilder::default()
+                    .with_peer_id(&peer_id)
                     .with_peer_address(SocketAddr::new(IpAddr::V6(client_ip_v6), client_port))
                     .into();
 
-                let _number_of_downloads_increased =
-                    in_memory_torrent_repository.upsert_peer(&info_hash.0.into(), &peer_using_ipv6, None);
+                in_memory_torrent_repository
+                    .handle_announcement(&info_hash.0.into(), &peer_using_ipv6, None)
+                    .await;
             }
 
             async fn announce_a_new_peer_using_ipv4(
@@ -375,7 +389,10 @@ mod tests {
                 core_udp_tracker_services: Arc<CoreUdpTrackerServices>,
             ) -> Response {
                 let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
-                let event_bus = Arc::new(crate::event::bus::EventBus::new(false, udp_server_broadcaster.clone()));
+                let event_bus = Arc::new(crate::event::bus::EventBus::new(
+                    SenderStatus::Disabled,
+                    udp_server_broadcaster.clone(),
+                ));
 
                 let udp_server_stats_event_sender = event_bus.sender();
 
@@ -405,7 +422,7 @@ mod tests {
                 let (core_tracker_services, core_udp_tracker_services, _server_udp_tracker_services) =
                     initialize_core_tracker_services_for_public_tracker();
 
-                add_a_torrent_peer_using_ipv6(&core_tracker_services.in_memory_torrent_repository);
+                add_a_torrent_peer_using_ipv6(&core_tracker_services.in_memory_torrent_repository).await;
 
                 let response =
                     announce_a_new_peer_using_ipv4(Arc::new(core_tracker_services), Arc::new(core_udp_tracker_services)).await;
@@ -424,13 +441,14 @@ mod tests {
                 let client_socket_addr = sample_ipv4_socket_address();
                 let server_socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969);
                 let server_service_binding = ServiceBinding::new(Protocol::UDP, server_socket_addr).unwrap();
+                let announce_request = AnnounceRequestBuilder::default().into();
 
                 let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
                 udp_server_stats_event_sender_mock
                     .expect_send()
                     .with(eq(Event::UdpRequestAccepted {
                         context: ConnectionContext::new(client_socket_addr, server_service_binding.clone()),
-                        kind: UdpRequestKind::Announce,
+                        kind: UdpRequestKind::Announce { announce_request },
                     }))
                     .times(1)
                     .returning(|_| Box::pin(future::ready(Some(Ok(1)))));
@@ -444,7 +462,7 @@ mod tests {
                     &core_udp_tracker_services.announce_service,
                     client_socket_addr,
                     server_service_binding,
-                    &AnnounceRequestBuilder::default().into(),
+                    &announce_request,
                     &core_tracker_services.core_config,
                     &udp_server_stats_event_sender,
                     sample_cookie_valid_range(),
@@ -459,13 +477,13 @@ mod tests {
 
                 use aquatic_udp_protocol::{InfoHash as AquaticInfoHash, PeerId as AquaticPeerId};
                 use bittorrent_udp_tracker_core::connection_cookie::{gen_remote_fingerprint, make};
+                use torrust_tracker_primitives::peer::fixture::PeerBuilder;
                 use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
 
                 use crate::handlers::announce::tests::announce_request::AnnounceRequestBuilder;
                 use crate::handlers::handle_announce;
                 use crate::handlers::tests::{
                     initialize_core_tracker_services_for_public_tracker, sample_cookie_valid_range, sample_issue_time,
-                    TorrentPeerBuilder,
                 };
 
                 #[tokio::test]
@@ -473,7 +491,7 @@ mod tests {
                     let (core_tracker_services, core_udp_tracker_services, server_udp_tracker_services) =
                         initialize_core_tracker_services_for_public_tracker();
 
-                    let client_ip = Ipv4Addr::new(127, 0, 0, 1);
+                    let client_ip = Ipv4Addr::LOCALHOST;
                     let client_port = 8080;
                     let info_hash = AquaticInfoHash([0u8; 20]);
                     let peer_id = AquaticPeerId([255u8; 20]);
@@ -504,12 +522,13 @@ mod tests {
 
                     let peers = core_tracker_services
                         .in_memory_torrent_repository
-                        .get_torrent_peers(&info_hash.0.into());
+                        .get_torrent_peers(&info_hash.0.into())
+                        .await;
 
                     let external_ip_in_tracker_configuration = core_tracker_services.core_config.net.external_ip.unwrap();
 
-                    let expected_peer = TorrentPeerBuilder::new()
-                        .with_peer_id(peer_id)
+                    let expected_peer = PeerBuilder::default()
+                        .with_peer_id(&peer_id)
                         .with_peer_address(SocketAddr::new(external_ip_in_tracker_configuration, client_port))
                         .updated_on(peers[0].updated)
                         .into();
@@ -538,6 +557,8 @@ mod tests {
             use bittorrent_udp_tracker_core::services::announce::AnnounceService;
             use mockall::predicate::eq;
             use torrust_tracker_configuration::Core;
+            use torrust_tracker_events::bus::SenderStatus;
+            use torrust_tracker_primitives::peer::fixture::PeerBuilder;
             use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
 
             use crate::event::{ConnectionContext, Event, UdpRequestKind};
@@ -546,7 +567,7 @@ mod tests {
             use crate::handlers::tests::{
                 initialize_core_tracker_services_for_default_tracker_configuration,
                 initialize_core_tracker_services_for_public_tracker, sample_cookie_valid_range, sample_ipv6_remote_addr,
-                sample_issue_time, MockUdpServerStatsEventSender, TorrentPeerBuilder,
+                sample_issue_time, MockUdpServerStatsEventSender,
             };
 
             #[tokio::test]
@@ -586,10 +607,11 @@ mod tests {
 
                 let peers = core_tracker_services
                     .in_memory_torrent_repository
-                    .get_torrent_peers(&info_hash.0.into());
+                    .get_torrent_peers(&info_hash.0.into())
+                    .await;
 
-                let expected_peer = TorrentPeerBuilder::new()
-                    .with_peer_id(peer_id)
+                let expected_peer = PeerBuilder::default()
+                    .with_peer_id(&peer_id)
                     .with_peer_address(SocketAddr::new(IpAddr::V6(client_ip_v6), client_port))
                     .updated_on(peers[0].updated)
                     .into();
@@ -683,26 +705,28 @@ mod tests {
 
                 let peers = core_tracker_services
                     .in_memory_torrent_repository
-                    .get_torrent_peers(&info_hash.0.into());
+                    .get_torrent_peers(&info_hash.0.into())
+                    .await;
 
                 // When using IPv6 the tracker converts the remote client ip into a IPv4 address
                 assert_eq!(peers[0].peer_addr, SocketAddr::new(IpAddr::V6(remote_client_ip), client_port));
             }
 
-            fn add_a_torrent_peer_using_ipv4(in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>) {
+            async fn add_a_torrent_peer_using_ipv4(in_memory_torrent_repository: &Arc<InMemoryTorrentRepository>) {
                 let info_hash = AquaticInfoHash([0u8; 20]);
 
                 let client_ip_v4 = Ipv4Addr::new(126, 0, 0, 1);
                 let client_port = 8080;
                 let peer_id = AquaticPeerId([255u8; 20]);
 
-                let peer_using_ipv4 = TorrentPeerBuilder::new()
-                    .with_peer_id(peer_id)
+                let peer_using_ipv4 = PeerBuilder::default()
+                    .with_peer_id(&peer_id)
                     .with_peer_address(SocketAddr::new(IpAddr::V4(client_ip_v4), client_port))
                     .into();
 
-                let _number_of_downloads_increased =
-                    in_memory_torrent_repository.upsert_peer(&info_hash.0.into(), &peer_using_ipv4, None);
+                in_memory_torrent_repository
+                    .handle_announcement(&info_hash.0.into(), &peer_using_ipv4, None)
+                    .await;
             }
 
             async fn announce_a_new_peer_using_ipv6(
@@ -711,11 +735,14 @@ mod tests {
                 whitelist_authorization: Arc<whitelist::authorization::WhitelistAuthorization>,
             ) -> Response {
                 let udp_core_broadcaster = Broadcaster::default();
-                let core_event_bus = Arc::new(EventBus::new(false, udp_core_broadcaster.clone()));
+                let core_event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_core_broadcaster.clone()));
                 let udp_core_stats_event_sender = core_event_bus.sender();
 
                 let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
-                let server_event_bus = Arc::new(crate::event::bus::EventBus::new(false, udp_server_broadcaster.clone()));
+                let server_event_bus = Arc::new(crate::event::bus::EventBus::new(
+                    SenderStatus::Disabled,
+                    udp_server_broadcaster.clone(),
+                ));
 
                 let udp_server_stats_event_sender = server_event_bus.sender();
 
@@ -755,7 +782,7 @@ mod tests {
                 let (core_tracker_services, _core_udp_tracker_services, _server_udp_tracker_services) =
                     initialize_core_tracker_services_for_public_tracker();
 
-                add_a_torrent_peer_using_ipv4(&core_tracker_services.in_memory_torrent_repository);
+                add_a_torrent_peer_using_ipv4(&core_tracker_services.in_memory_torrent_repository).await;
 
                 let response = announce_a_new_peer_using_ipv6(
                     core_tracker_services.core_config.clone(),
@@ -779,12 +806,16 @@ mod tests {
                 let server_socket_addr = SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969);
                 let server_service_binding = ServiceBinding::new(Protocol::UDP, server_socket_addr).unwrap();
 
+                let announce_request = AnnounceRequestBuilder::default()
+                    .with_connection_id(make(gen_remote_fingerprint(&client_socket_addr), sample_issue_time()).unwrap())
+                    .into();
+
                 let mut udp_server_stats_event_sender_mock = MockUdpServerStatsEventSender::new();
                 udp_server_stats_event_sender_mock
                     .expect_send()
                     .with(eq(Event::UdpRequestAccepted {
                         context: ConnectionContext::new(client_socket_addr, server_service_binding.clone()),
-                        kind: UdpRequestKind::Announce,
+                        kind: UdpRequestKind::Announce { announce_request },
                     }))
                     .times(1)
                     .returning(|_| Box::pin(future::ready(Some(Ok(1)))));
@@ -794,10 +825,6 @@ mod tests {
                 let (core_tracker_services, core_udp_tracker_services, _server_udp_tracker_services) =
                     initialize_core_tracker_services_for_default_tracker_configuration();
 
-                let announce_request = AnnounceRequestBuilder::default()
-                    .with_connection_id(make(gen_remote_fingerprint(&client_socket_addr), sample_issue_time()).unwrap())
-                    .into();
-
                 handle_announce(
                     &core_udp_tracker_services.announce_service,
                     client_socket_addr,
@@ -819,8 +846,8 @@ mod tests {
                 use aquatic_udp_protocol::{InfoHash as AquaticInfoHash, PeerId as AquaticPeerId};
                 use bittorrent_tracker_core::announce_handler::AnnounceHandler;
                 use bittorrent_tracker_core::databases::setup::initialize_database;
+                use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
                 use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-                use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
                 use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
                 use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
                 use bittorrent_udp_tracker_core::connection_cookie::{gen_remote_fingerprint, make};
@@ -842,8 +869,8 @@ mod tests {
                 async fn the_peer_ip_should_be_changed_to_the_external_ip_in_the_tracker_configuration() {
                     let config = Arc::new(TrackerConfigurationBuilder::default().with_external_ip("::126.0.0.1").into());
 
-                    let loopback_ipv4 = Ipv4Addr::new(127, 0, 0, 1);
-                    let loopback_ipv6 = Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1);
+                    let loopback_ipv4 = Ipv4Addr::LOCALHOST;
+                    let loopback_ipv6 = Ipv6Addr::LOCALHOST;
 
                     let client_ip_v4 = loopback_ipv4;
                     let client_ip_v6 = loopback_ipv6;
@@ -869,7 +896,15 @@ mod tests {
                     let whitelist_authorization =
                         Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
                     let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-                    let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
+                    let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
+
+                    let request = AnnounceRequestBuilder::default()
+                        .with_connection_id(make(gen_remote_fingerprint(&client_socket_addr), sample_issue_time()).unwrap())
+                        .with_info_hash(info_hash)
+                        .with_peer_id(peer_id)
+                        .with_ip_address(client_ip_v4)
+                        .with_port(client_port)
+                        .into();
 
                     let mut udp_core_stats_event_sender_mock = MockUdpCoreStatsEventSender::new();
                     udp_core_stats_event_sender_mock
@@ -896,7 +931,9 @@ mod tests {
                         .expect_send()
                         .with(eq(Event::UdpRequestAccepted {
                             context: ConnectionContext::new(client_socket_addr, server_service_binding_clone.clone()),
-                            kind: UdpRequestKind::Announce,
+                            kind: UdpRequestKind::Announce {
+                                announce_request: request,
+                            },
                         }))
                         .times(1)
                         .returning(|_| Box::pin(future::ready(Some(Ok(1)))));
@@ -907,17 +944,9 @@ mod tests {
                         &config.core,
                         &whitelist_authorization,
                         &in_memory_torrent_repository,
-                        &db_torrent_repository,
+                        &db_downloads_metric_repository,
                     ));
 
-                    let request = AnnounceRequestBuilder::default()
-                        .with_connection_id(make(gen_remote_fingerprint(&client_socket_addr), sample_issue_time()).unwrap())
-                        .with_info_hash(info_hash)
-                        .with_peer_id(peer_id)
-                        .with_ip_address(client_ip_v4)
-                        .with_port(client_port)
-                        .into();
-
                     let core_config = Arc::new(config.core.clone());
 
                     let announce_service = Arc::new(AnnounceService::new(
@@ -938,7 +967,7 @@ mod tests {
                     .await
                     .unwrap();
 
-                    let peers = in_memory_torrent_repository.get_torrent_peers(&info_hash.0.into());
+                    let peers = in_memory_torrent_repository.get_torrent_peers(&info_hash.0.into()).await;
 
                     let external_ip_in_tracker_configuration = core_config.net.external_ip.unwrap();
 
diff --git a/packages/udp-tracker-server/src/handlers/connect.rs b/packages/udp-tracker-server/src/handlers/connect.rs
index 1244a6a3b..961189945 100644
--- a/packages/udp-tracker-server/src/handlers/connect.rs
+++ b/packages/udp-tracker-server/src/handlers/connect.rs
@@ -63,6 +63,7 @@ mod tests {
         use bittorrent_udp_tracker_core::event::sender::Broadcaster;
         use bittorrent_udp_tracker_core::services::connect::ConnectService;
         use mockall::predicate::eq;
+        use torrust_tracker_events::bus::SenderStatus;
         use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
 
         use crate::event::{ConnectionContext, Event, UdpRequestKind};
@@ -84,11 +85,14 @@ mod tests {
             let server_service_binding = ServiceBinding::new(Protocol::UDP, server_socket_addr).unwrap();
 
             let udp_core_broadcaster = Broadcaster::default();
-            let core_event_bus = Arc::new(EventBus::new(false, udp_core_broadcaster.clone()));
+            let core_event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_core_broadcaster.clone()));
             let udp_core_stats_event_sender = core_event_bus.sender();
 
             let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
-            let server_event_bus = Arc::new(crate::event::bus::EventBus::new(false, udp_server_broadcaster.clone()));
+            let server_event_bus = Arc::new(crate::event::bus::EventBus::new(
+                SenderStatus::Disabled,
+                udp_server_broadcaster.clone(),
+            ));
 
             let udp_server_stats_event_sender = server_event_bus.sender();
 
@@ -123,11 +127,14 @@ mod tests {
             let server_service_binding = ServiceBinding::new(Protocol::UDP, server_socket_addr).unwrap();
 
             let udp_core_broadcaster = Broadcaster::default();
-            let core_event_bus = Arc::new(EventBus::new(false, udp_core_broadcaster.clone()));
+            let core_event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_core_broadcaster.clone()));
             let udp_core_stats_event_sender = core_event_bus.sender();
 
             let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
-            let server_event_bus = Arc::new(crate::event::bus::EventBus::new(false, udp_server_broadcaster.clone()));
+            let server_event_bus = Arc::new(crate::event::bus::EventBus::new(
+                SenderStatus::Disabled,
+                udp_server_broadcaster.clone(),
+            ));
 
             let udp_server_stats_event_sender = server_event_bus.sender();
 
@@ -162,12 +169,15 @@ mod tests {
             let server_service_binding = ServiceBinding::new(Protocol::UDP, server_socket_addr).unwrap();
 
             let udp_core_broadcaster = Broadcaster::default();
-            let core_event_bus = Arc::new(EventBus::new(false, udp_core_broadcaster.clone()));
+            let core_event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_core_broadcaster.clone()));
 
             let udp_core_stats_event_sender = core_event_bus.sender();
 
             let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
-            let server_event_bus = Arc::new(crate::event::bus::EventBus::new(false, udp_server_broadcaster.clone()));
+            let server_event_bus = Arc::new(crate::event::bus::EventBus::new(
+                SenderStatus::Disabled,
+                udp_server_broadcaster.clone(),
+            ));
 
             let udp_server_stats_event_sender = server_event_bus.sender();
 
diff --git a/packages/udp-tracker-server/src/handlers/error.rs b/packages/udp-tracker-server/src/handlers/error.rs
index 6259e26ca..7fb4141b2 100644
--- a/packages/udp-tracker-server/src/handlers/error.rs
+++ b/packages/udp-tracker-server/src/handlers/error.rs
@@ -2,8 +2,7 @@
 use std::net::SocketAddr;
 use std::ops::Range;
 
-use aquatic_udp_protocol::{ErrorResponse, RequestParseError, Response, TransactionId};
-use bittorrent_udp_tracker_core::connection_cookie::{check, gen_remote_fingerprint};
+use aquatic_udp_protocol::{ErrorResponse, Response, TransactionId};
 use bittorrent_udp_tracker_core::{self, UDP_TRACKER_LOG_TARGET};
 use torrust_tracker_primitives::service_binding::ServiceBinding;
 use tracing::{instrument, Level};
@@ -22,55 +21,62 @@ pub async fn handle_error(
     request_id: Uuid,
     opt_udp_server_stats_event_sender: &crate::event::sender::Sender,
     cookie_valid_range: Range<f64>,
-    e: &Error,
-    transaction_id: Option<TransactionId>,
+    error: &Error,
+    opt_transaction_id: Option<TransactionId>,
 ) -> Response {
     tracing::trace!("handle error");
 
     let server_socket_addr = server_service_binding.bind_address();
 
-    match transaction_id {
+    log_error(error, client_socket_addr, server_socket_addr, opt_transaction_id, request_id);
+
+    trigger_udp_error_event(
+        error,
+        client_socket_addr,
+        server_service_binding,
+        opt_udp_server_stats_event_sender,
+        req_kind,
+    )
+    .await;
+
+    Response::from(ErrorResponse {
+        transaction_id: opt_transaction_id.unwrap_or(TransactionId(I32::new(0))),
+        message: error.to_string().into(),
+    })
+}
+
+fn log_error(
+    error: &Error,
+    client_socket_addr: SocketAddr,
+    server_socket_addr: SocketAddr,
+    opt_transaction_id: Option<TransactionId>,
+    request_id: Uuid,
+) {
+    match opt_transaction_id {
         Some(transaction_id) => {
             let transaction_id = transaction_id.0.to_string();
-            tracing::error!(target: UDP_TRACKER_LOG_TARGET, error = %e, %client_socket_addr, %server_socket_addr, %request_id, %transaction_id, "response error");
+            tracing::error!(target: UDP_TRACKER_LOG_TARGET, error = %error, %client_socket_addr, %server_socket_addr, %request_id, %transaction_id, "response error");
         }
         None => {
-            tracing::error!(target: UDP_TRACKER_LOG_TARGET, error = %e, %client_socket_addr, %server_socket_addr, %request_id, "response error");
+            tracing::error!(target: UDP_TRACKER_LOG_TARGET, error = %error, %client_socket_addr, %server_socket_addr, %request_id, "response error");
         }
     }
+}
 
-    let e = if let Error::RequestParseError { request_parse_error } = e {
-        match request_parse_error {
-            RequestParseError::Sendable {
-                connection_id,
-                transaction_id,
-                err,
-            } => {
-                if let Err(e) = check(connection_id, gen_remote_fingerprint(&client_socket_addr), cookie_valid_range) {
-                    (e.to_string(), Some(*transaction_id))
-                } else {
-                    ((*err).to_string(), Some(*transaction_id))
-                }
-            }
-            RequestParseError::Unsendable { err } => (err.to_string(), transaction_id),
-        }
-    } else {
-        (e.to_string(), transaction_id)
-    };
-
-    if e.1.is_some() {
-        if let Some(udp_server_stats_event_sender) = opt_udp_server_stats_event_sender.as_deref() {
-            udp_server_stats_event_sender
-                .send(Event::UdpError {
-                    context: ConnectionContext::new(client_socket_addr, server_service_binding),
-                    kind: req_kind,
-                })
-                .await;
-        }
+async fn trigger_udp_error_event(
+    error: &Error,
+    client_socket_addr: SocketAddr,
+    server_service_binding: ServiceBinding,
+    opt_udp_server_stats_event_sender: &crate::event::sender::Sender,
+    req_kind: Option<UdpRequestKind>,
+) {
+    if let Some(udp_server_stats_event_sender) = opt_udp_server_stats_event_sender.as_deref() {
+        udp_server_stats_event_sender
+            .send(Event::UdpError {
+                context: ConnectionContext::new(client_socket_addr, server_service_binding),
+                kind: req_kind,
+                error: error.clone().into(),
+            })
+            .await;
     }
-
-    Response::from(ErrorResponse {
-        transaction_id: e.1.unwrap_or(TransactionId(I32::new(0))),
-        message: e.0.into(),
-    })
 }
diff --git a/packages/udp-tracker-server/src/handlers/mod.rs b/packages/udp-tracker-server/src/handlers/mod.rs
index d39ad0972..add576a89 100644
--- a/packages/udp-tracker-server/src/handlers/mod.rs
+++ b/packages/udp-tracker-server/src/handlers/mod.rs
@@ -13,7 +13,6 @@ use announce::handle_announce;
 use aquatic_udp_protocol::{Request, Response, TransactionId};
 use bittorrent_tracker_core::MAX_SCRAPE_TORRENTS;
 use bittorrent_udp_tracker_core::container::UdpTrackerCoreContainer;
-use bittorrent_udp_tracker_core::services::announce::UdpAnnounceError;
 use connect::handle_connect;
 use error::handle_error;
 use scrape::handle_scrape;
@@ -29,7 +28,7 @@ use crate::event::UdpRequestKind;
 use crate::CurrentClock;
 
 #[derive(Debug, Clone, PartialEq)]
-pub(super) struct CookieTimeValues {
+pub struct CookieTimeValues {
     pub(super) issue_time: f64,
     pub(super) valid_range: Range<f64>,
 }
@@ -84,15 +83,6 @@ pub(crate) async fn handle_packet(
             {
                 Ok((response, req_kid)) => return (response, Some(req_kid)),
                 Err((error, transaction_id, req_kind)) => {
-                    if let Error::UdpAnnounceError {
-                        source: UdpAnnounceError::ConnectionCookieError { .. },
-                    } = error
-                    {
-                        // code-review: should we include `RequestParseError` and `BadRequest`?
-                        let mut ban_service = udp_tracker_core_container.ban_service.write().await;
-                        ban_service.increase_counter(&udp_request.from.ip());
-                    }
-
                     let response = handle_error(
                         Some(req_kind.clone()),
                         udp_request.from,
@@ -109,6 +99,14 @@ pub(crate) async fn handle_packet(
                 }
             },
             Err(e) => {
+                // The request payload could not be parsed, so we handle it as an error.
+
+                let opt_transaction_id = if let Error::InvalidRequest { request_parse_error } = e.clone() {
+                    request_parse_error.opt_transaction_id
+                } else {
+                    None
+                };
+
                 let response = handle_error(
                     None,
                     udp_request.from,
@@ -117,7 +115,7 @@ pub(crate) async fn handle_packet(
                     &udp_tracker_server_container.stats_event_sender,
                     cookie_time_values.valid_range.clone(),
                     &e,
-                    None,
+                    opt_transaction_id,
                 )
                 .await;
 
@@ -179,7 +177,7 @@ pub async fn handle_request(
             )
             .await
             {
-                Ok(response) => Ok((response, UdpRequestKind::Announce)),
+                Ok(response) => Ok((response, UdpRequestKind::Announce { announce_request })),
                 Err(err) => Err(err),
             }
         }
@@ -208,12 +206,11 @@ pub(crate) mod tests {
     use std::ops::Range;
     use std::sync::Arc;
 
-    use aquatic_udp_protocol::{NumberOfBytes, PeerId};
     use bittorrent_tracker_core::announce_handler::AnnounceHandler;
     use bittorrent_tracker_core::databases::setup::initialize_database;
     use bittorrent_tracker_core::scrape_handler::ScrapeHandler;
+    use bittorrent_tracker_core::statistics::persisted::downloads::DatabaseDownloadsMetricRepository;
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-    use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
     use bittorrent_tracker_core::whitelist;
     use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
     use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
@@ -225,13 +222,12 @@ pub(crate) mod tests {
     use bittorrent_udp_tracker_core::{self, event as core_event};
     use futures::future::BoxFuture;
     use mockall::mock;
-    use torrust_tracker_clock::clock::Time;
     use torrust_tracker_configuration::{Configuration, Core};
+    use torrust_tracker_events::bus::SenderStatus;
     use torrust_tracker_events::sender::SendError;
-    use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
     use torrust_tracker_test_helpers::configuration;
 
-    use crate::{event as server_event, CurrentClock};
+    use crate::event as server_event;
 
     pub(crate) struct CoreTrackerServices {
         pub core_config: Arc<Core>,
@@ -277,21 +273,24 @@ pub(crate) mod tests {
         let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
         let whitelist_authorization = Arc::new(WhitelistAuthorization::new(&config.core, &in_memory_whitelist.clone()));
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let db_torrent_repository = Arc::new(DatabasePersistentTorrentRepository::new(&database));
+        let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
         let announce_handler = Arc::new(AnnounceHandler::new(
             &config.core,
             &whitelist_authorization,
             &in_memory_torrent_repository,
-            &db_torrent_repository,
+            &db_downloads_metric_repository,
         ));
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
 
         let udp_core_broadcaster = Broadcaster::default();
-        let core_event_bus = Arc::new(EventBus::new(false, udp_core_broadcaster.clone()));
+        let core_event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_core_broadcaster.clone()));
         let udp_core_stats_event_sender = core_event_bus.sender();
 
         let udp_server_broadcaster = crate::event::sender::Broadcaster::default();
-        let server_event_bus = Arc::new(crate::event::bus::EventBus::new(false, udp_server_broadcaster.clone()));
+        let server_event_bus = Arc::new(crate::event::bus::EventBus::new(
+            SenderStatus::Disabled,
+            udp_server_broadcaster.clone(),
+        ));
 
         let udp_server_stats_event_sender = server_event_bus.sender();
 
@@ -341,11 +340,11 @@ pub(crate) mod tests {
     }
 
     pub(crate) fn sample_ipv4_socket_address() -> SocketAddr {
-        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080)
+        SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 8080)
     }
 
     fn sample_ipv6_socket_address() -> SocketAddr {
-        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)), 8080)
+        SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 8080)
     }
 
     pub(crate) fn sample_issue_time() -> f64 {
@@ -356,52 +355,6 @@ pub(crate) mod tests {
         sample_issue_time() - 10.0..sample_issue_time() + 10.0
     }
 
-    #[derive(Debug, Default)]
-    pub(crate) struct TorrentPeerBuilder {
-        peer: peer::Peer,
-    }
-
-    impl TorrentPeerBuilder {
-        #[must_use]
-        pub fn new() -> Self {
-            Self {
-                peer: peer::Peer {
-                    updated: CurrentClock::now(),
-                    ..Default::default()
-                },
-            }
-        }
-
-        #[must_use]
-        pub fn with_peer_address(mut self, peer_addr: SocketAddr) -> Self {
-            self.peer.peer_addr = peer_addr;
-            self
-        }
-
-        #[must_use]
-        pub fn with_peer_id(mut self, peer_id: PeerId) -> Self {
-            self.peer.peer_id = peer_id;
-            self
-        }
-
-        #[must_use]
-        pub fn with_number_of_bytes_left(mut self, left: i64) -> Self {
-            self.peer.left = NumberOfBytes::new(left);
-            self
-        }
-
-        #[must_use]
-        pub fn updated_on(mut self, updated: DurationSinceUnixEpoch) -> Self {
-            self.peer.updated = updated;
-            self
-        }
-
-        #[must_use]
-        pub fn into(self) -> peer::Peer {
-            self.peer
-        }
-    }
-
     pub(crate) struct TrackerConfigurationBuilder {
         configuration: Configuration,
     }
diff --git a/packages/udp-tracker-server/src/handlers/scrape.rs b/packages/udp-tracker-server/src/handlers/scrape.rs
index 5cc84acd6..8bac05c1e 100644
--- a/packages/udp-tracker-server/src/handlers/scrape.rs
+++ b/packages/udp-tracker-server/src/handlers/scrape.rs
@@ -92,6 +92,8 @@ mod tests {
         };
         use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
         use bittorrent_udp_tracker_core::connection_cookie::{gen_remote_fingerprint, make};
+        use torrust_tracker_events::bus::SenderStatus;
+        use torrust_tracker_primitives::peer::fixture::PeerBuilder;
         use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
 
         use crate::event::bus::EventBus;
@@ -99,7 +101,7 @@ mod tests {
         use crate::handlers::handle_scrape;
         use crate::handlers::tests::{
             initialize_core_tracker_services_for_public_tracker, sample_cookie_valid_range, sample_ipv4_remote_addr,
-            sample_issue_time, CoreTrackerServices, CoreUdpTrackerServices, TorrentPeerBuilder,
+            sample_issue_time, CoreTrackerServices, CoreUdpTrackerServices,
         };
 
         fn zeroed_torrent_statistics() -> TorrentScrapeStatistics {
@@ -157,13 +159,15 @@ mod tests {
         ) {
             let peer_id = PeerId([255u8; 20]);
 
-            let peer = TorrentPeerBuilder::new()
-                .with_peer_id(peer_id)
+            let peer = PeerBuilder::default()
+                .with_peer_id(&peer_id)
                 .with_peer_address(*remote_addr)
-                .with_number_of_bytes_left(0)
+                .with_bytes_left_to_download(0)
                 .into();
 
-            let _number_of_downloads_increased = in_memory_torrent_repository.upsert_peer(&info_hash.0.into(), &peer, None);
+            in_memory_torrent_repository
+                .handle_announcement(&info_hash.0.into(), &peer, None)
+                .await;
         }
 
         fn build_scrape_request(remote_addr: &SocketAddr, info_hash: &InfoHash) -> ScrapeRequest {
@@ -181,7 +185,7 @@ mod tests {
             core_udp_tracker_services: Arc<CoreUdpTrackerServices>,
         ) -> Response {
             let udp_server_broadcaster = Broadcaster::default();
-            let event_bus = Arc::new(EventBus::new(false, udp_server_broadcaster.clone()));
+            let event_bus = Arc::new(EventBus::new(SenderStatus::Disabled, udp_server_broadcaster.clone()));
 
             let udp_server_stats_event_sender = event_bus.sender();
 
diff --git a/packages/udp-tracker-server/src/lib.rs b/packages/udp-tracker-server/src/lib.rs
index 996c41917..58a3830e1 100644
--- a/packages/udp-tracker-server/src/lib.rs
+++ b/packages/udp-tracker-server/src/lib.rs
@@ -634,6 +634,7 @@
 //! documentation by [Arvid Norberg](https://github.com/arvidn) was very
 //! supportive in the development of this documentation. Some descriptions were
 //! taken from the [libtorrent](https://www.rasterbar.com/products/libtorrent/udp_tracker_protocol.html).
+pub mod banning;
 pub mod container;
 pub mod environment;
 pub mod error;
diff --git a/packages/udp-tracker-server/src/server/launcher.rs b/packages/udp-tracker-server/src/server/launcher.rs
index a514921cc..4fd3a95d9 100644
--- a/packages/udp-tracker-server/src/server/launcher.rs
+++ b/packages/udp-tracker-server/src/server/launcher.rs
@@ -54,7 +54,7 @@ impl Launcher {
             panic!("it should not use udp if using authentication");
         }
 
-        let socket = tokio::time::timeout(Duration::from_millis(5000), BoundSocket::new(bind_to))
+        let socket = tokio::time::timeout(Duration::from_secs(5), BoundSocket::new(bind_to))
             .await
             .expect("it should bind to the socket within five seconds");
 
diff --git a/packages/udp-tracker-server/src/server/processor.rs b/packages/udp-tracker-server/src/server/processor.rs
index 6b877f85b..dd6ba633d 100644
--- a/packages/udp-tracker-server/src/server/processor.rs
+++ b/packages/udp-tracker-server/src/server/processor.rs
@@ -87,16 +87,15 @@ impl Processor {
         };
 
         let udp_response_kind = match &response {
-            Response::Connect(_) => event::UdpResponseKind::Ok {
-                req_kind: event::UdpRequestKind::Connect,
-            },
-            Response::AnnounceIpv4(_) | Response::AnnounceIpv6(_) => event::UdpResponseKind::Ok {
-                req_kind: event::UdpRequestKind::Announce,
-            },
-            Response::Scrape(_) => event::UdpResponseKind::Ok {
-                req_kind: event::UdpRequestKind::Scrape,
-            },
             Response::Error(_e) => event::UdpResponseKind::Error { opt_req_kind: None },
+            _ => {
+                if let Some(req_kind) = opt_req_kind {
+                    event::UdpResponseKind::Ok { req_kind }
+                } else {
+                    // code-review: this case should never happen.
+                    event::UdpResponseKind::Error { opt_req_kind }
+                }
+            }
         };
 
         let mut writer = Cursor::new(Vec::with_capacity(200));
diff --git a/packages/udp-tracker-server/src/statistics/event/handler.rs b/packages/udp-tracker-server/src/statistics/event/handler.rs
deleted file mode 100644
index 1e1502339..000000000
--- a/packages/udp-tracker-server/src/statistics/event/handler.rs
+++ /dev/null
@@ -1,663 +0,0 @@
-use torrust_tracker_metrics::label::{LabelSet, LabelValue};
-use torrust_tracker_metrics::{label_name, metric_name};
-use torrust_tracker_primitives::DurationSinceUnixEpoch;
-
-use crate::event::{Event, UdpRequestKind, UdpResponseKind};
-use crate::statistics::repository::Repository;
-use crate::statistics::{
-    UDP_TRACKER_SERVER_ERRORS_TOTAL, UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS,
-    UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL, UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL,
-    UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL, UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL,
-    UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL,
-};
-
-/// # Panics
-///
-/// This function panics if the client IP version does not match the expected
-/// version.
-#[allow(clippy::too_many_lines)]
-pub async fn handle_event(event: Event, stats_repository: &Repository, now: DurationSinceUnixEpoch) {
-    match event {
-        Event::UdpRequestAborted { context } => {
-            // Global fixed metrics
-            stats_repository.increase_udp_requests_aborted().await;
-
-            // Extendable metrics
-            match stats_repository
-                .increase_counter(
-                    &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL),
-                    &LabelSet::from(context),
-                    now,
-                )
-                .await
-            {
-                Ok(()) => {}
-                Err(err) => tracing::error!("Failed to increase the counter: {}", err),
-            };
-        }
-        Event::UdpRequestBanned { context } => {
-            // Global fixed metrics
-            stats_repository.increase_udp_requests_banned().await;
-
-            // Extendable metrics
-            match stats_repository
-                .increase_counter(
-                    &metric_name!(UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL),
-                    &LabelSet::from(context),
-                    now,
-                )
-                .await
-            {
-                Ok(()) => {}
-                Err(err) => tracing::error!("Failed to increase the counter: {}", err),
-            };
-        }
-        Event::UdpRequestReceived { context } => {
-            // Global fixed metrics
-            match context.client_socket_addr().ip() {
-                std::net::IpAddr::V4(_) => {
-                    stats_repository.increase_udp4_requests().await;
-                }
-                std::net::IpAddr::V6(_) => {
-                    stats_repository.increase_udp6_requests().await;
-                }
-            }
-
-            // Extendable metrics
-            match stats_repository
-                .increase_counter(
-                    &metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL),
-                    &LabelSet::from(context),
-                    now,
-                )
-                .await
-            {
-                Ok(()) => {}
-                Err(err) => tracing::error!("Failed to increase the counter: {}", err),
-            };
-        }
-        Event::UdpRequestAccepted { context, kind } => {
-            // Global fixed metrics
-            match kind {
-                UdpRequestKind::Connect => match context.client_socket_addr().ip() {
-                    std::net::IpAddr::V4(_) => {
-                        stats_repository.increase_udp4_connections().await;
-                    }
-                    std::net::IpAddr::V6(_) => {
-                        stats_repository.increase_udp6_connections().await;
-                    }
-                },
-                UdpRequestKind::Announce => match context.client_socket_addr().ip() {
-                    std::net::IpAddr::V4(_) => {
-                        stats_repository.increase_udp4_announces().await;
-                    }
-                    std::net::IpAddr::V6(_) => {
-                        stats_repository.increase_udp6_announces().await;
-                    }
-                },
-                UdpRequestKind::Scrape => match context.client_socket_addr().ip() {
-                    std::net::IpAddr::V4(_) => {
-                        stats_repository.increase_udp4_scrapes().await;
-                    }
-                    std::net::IpAddr::V6(_) => {
-                        stats_repository.increase_udp6_scrapes().await;
-                    }
-                },
-            }
-
-            // Extendable metrics
-
-            let mut label_set = LabelSet::from(context);
-
-            label_set.upsert(label_name!("request_kind"), LabelValue::new(&kind.to_string()));
-
-            match stats_repository
-                .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &label_set, now)
-                .await
-            {
-                Ok(()) => {}
-                Err(err) => tracing::error!("Failed to increase the counter: {}", err),
-            };
-        }
-        Event::UdpResponseSent {
-            context,
-            kind,
-            req_processing_time,
-        } => {
-            // Global fixed metrics
-            match context.client_socket_addr().ip() {
-                std::net::IpAddr::V4(_) => {
-                    stats_repository.increase_udp4_responses().await;
-                }
-                std::net::IpAddr::V6(_) => {
-                    stats_repository.increase_udp6_responses().await;
-                }
-            }
-
-            let (result_label_value, kind_label_value) = match kind {
-                UdpResponseKind::Ok { req_kind } => match req_kind {
-                    UdpRequestKind::Connect => {
-                        let new_avg = stats_repository
-                            .recalculate_udp_avg_connect_processing_time_ns(req_processing_time)
-                            .await;
-
-                        // Extendable metrics
-
-                        let mut label_set = LabelSet::from(context.clone());
-                        label_set.upsert(label_name!("request_kind"), LabelValue::new(&req_kind.to_string()));
-
-                        match stats_repository
-                            .set_gauge(
-                                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
-                                &label_set,
-                                new_avg,
-                                now,
-                            )
-                            .await
-                        {
-                            Ok(()) => {}
-                            Err(err) => tracing::error!("Failed to set gauge: {}", err),
-                        }
-
-                        (LabelValue::new("ok"), LabelValue::new(&UdpRequestKind::Connect.to_string()))
-                    }
-                    UdpRequestKind::Announce => {
-                        let new_avg = stats_repository
-                            .recalculate_udp_avg_announce_processing_time_ns(req_processing_time)
-                            .await;
-
-                        // Extendable metrics
-
-                        let mut label_set = LabelSet::from(context.clone());
-                        label_set.upsert(label_name!("request_kind"), LabelValue::new(&req_kind.to_string()));
-
-                        match stats_repository
-                            .set_gauge(
-                                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
-                                &label_set,
-                                new_avg,
-                                now,
-                            )
-                            .await
-                        {
-                            Ok(()) => {}
-                            Err(err) => tracing::error!("Failed to set gauge: {}", err),
-                        }
-
-                        (LabelValue::new("ok"), LabelValue::new(&UdpRequestKind::Announce.to_string()))
-                    }
-                    UdpRequestKind::Scrape => {
-                        let new_avg = stats_repository
-                            .recalculate_udp_avg_scrape_processing_time_ns(req_processing_time)
-                            .await;
-
-                        // Extendable metrics
-
-                        let mut label_set = LabelSet::from(context.clone());
-                        label_set.upsert(label_name!("request_kind"), LabelValue::new(&req_kind.to_string()));
-
-                        match stats_repository
-                            .set_gauge(
-                                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
-                                &label_set,
-                                new_avg,
-                                now,
-                            )
-                            .await
-                        {
-                            Ok(()) => {}
-                            Err(err) => tracing::error!("Failed to set gauge: {}", err),
-                        }
-
-                        (LabelValue::new("ok"), LabelValue::new(&UdpRequestKind::Scrape.to_string()))
-                    }
-                },
-                UdpResponseKind::Error { opt_req_kind: _ } => (LabelValue::new("error"), LabelValue::ignore()),
-            };
-
-            // Extendable metrics
-
-            let mut label_set = LabelSet::from(context);
-
-            if result_label_value == LabelValue::new("ok") {
-                label_set.upsert(label_name!("request_kind"), kind_label_value);
-            }
-            label_set.upsert(label_name!("result"), result_label_value);
-
-            match stats_repository
-                .increase_counter(&metric_name!(UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL), &label_set, now)
-                .await
-            {
-                Ok(()) => {}
-                Err(err) => tracing::error!("Failed to increase the counter: {}", err),
-            };
-        }
-        Event::UdpError { context, kind } => {
-            // Global fixed metrics
-            match context.client_socket_addr().ip() {
-                std::net::IpAddr::V4(_) => {
-                    stats_repository.increase_udp4_errors().await;
-                }
-                std::net::IpAddr::V6(_) => {
-                    stats_repository.increase_udp6_errors().await;
-                }
-            }
-
-            // Extendable metrics
-
-            let mut label_set = LabelSet::from(context);
-
-            if let Some(kind) = kind {
-                label_set.upsert(label_name!("request_kind"), kind.to_string().into());
-            }
-
-            match stats_repository
-                .increase_counter(&metric_name!(UDP_TRACKER_SERVER_ERRORS_TOTAL), &label_set, now)
-                .await
-            {
-                Ok(()) => {}
-                Err(err) => tracing::error!("Failed to increase the counter: {}", err),
-            };
-        }
-    }
-
-    tracing::debug!("stats: {:?}", stats_repository.get_stats().await);
-}
-
-#[cfg(test)]
-mod tests {
-    use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
-
-    use torrust_tracker_clock::clock::Time;
-    use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
-
-    use crate::event::{ConnectionContext, Event, UdpRequestKind};
-    use crate::statistics::event::handler::handle_event;
-    use crate::statistics::repository::Repository;
-    use crate::CurrentClock;
-
-    #[tokio::test]
-    async fn should_increase_the_number_of_aborted_requests_when_it_receives_a_udp_request_aborted_event() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestAborted {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp_requests_aborted, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_number_of_banned_requests_when_it_receives_a_udp_request_banned_event() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestBanned {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp_requests_banned, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_number_of_incoming_requests_when_it_receives_a_udp4_incoming_request_event() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestReceived {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp4_requests, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp_abort_counter_when_it_receives_a_udp_abort_event() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestAborted {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-        let stats = stats_repository.get_stats().await;
-        assert_eq!(stats.udp_requests_aborted, 1);
-    }
-    #[tokio::test]
-    async fn should_increase_the_udp_ban_counter_when_it_receives_a_udp_banned_event() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestBanned {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-        let stats = stats_repository.get_stats().await;
-        assert_eq!(stats.udp_requests_banned, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp4_connect_requests_counter_when_it_receives_a_udp4_request_event_of_connect_kind() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestAccepted {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: crate::event::UdpRequestKind::Connect,
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp4_connections_handled, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp4_announce_requests_counter_when_it_receives_a_udp4_request_event_of_announce_kind() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestAccepted {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: crate::event::UdpRequestKind::Announce,
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp4_announces_handled, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp4_scrape_requests_counter_when_it_receives_a_udp4_request_event_of_scrape_kind() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestAccepted {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: crate::event::UdpRequestKind::Scrape,
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp4_scrapes_handled, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp4_responses_counter_when_it_receives_a_udp4_response_event() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpResponseSent {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: crate::event::UdpResponseKind::Ok {
-                    req_kind: UdpRequestKind::Announce,
-                },
-                req_processing_time: std::time::Duration::from_secs(1),
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp4_responses, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp4_errors_counter_when_it_receives_a_udp4_error_event() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpError {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: None,
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp4_errors_handled, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp6_connect_requests_counter_when_it_receives_a_udp6_request_event_of_connect_kind() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestAccepted {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: crate::event::UdpRequestKind::Connect,
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp6_connections_handled, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp6_announce_requests_counter_when_it_receives_a_udp6_request_event_of_announce_kind() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestAccepted {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: crate::event::UdpRequestKind::Announce,
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp6_announces_handled, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp6_scrape_requests_counter_when_it_receives_a_udp6_request_event_of_scrape_kind() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpRequestAccepted {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: crate::event::UdpRequestKind::Scrape,
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp6_scrapes_handled, 1);
-    }
-
-    #[tokio::test]
-    async fn should_increase_the_udp6_response_counter_when_it_receives_a_udp6_response_event() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpResponseSent {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: crate::event::UdpResponseKind::Ok {
-                    req_kind: UdpRequestKind::Announce,
-                },
-                req_processing_time: std::time::Duration::from_secs(1),
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp6_responses, 1);
-    }
-    #[tokio::test]
-    async fn should_increase_the_udp6_errors_counter_when_it_receives_a_udp6_error_event() {
-        let stats_repository = Repository::new();
-
-        handle_event(
-            Event::UdpError {
-                context: ConnectionContext::new(
-                    SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
-                    ServiceBinding::new(
-                        Protocol::UDP,
-                        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
-                    )
-                    .unwrap(),
-                ),
-                kind: None,
-            },
-            &stats_repository,
-            CurrentClock::now(),
-        )
-        .await;
-
-        let stats = stats_repository.get_stats().await;
-
-        assert_eq!(stats.udp6_errors_handled, 1);
-    }
-}
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/error.rs b/packages/udp-tracker-server/src/statistics/event/handler/error.rs
new file mode 100644
index 000000000..63e480ca5
--- /dev/null
+++ b/packages/udp-tracker-server/src/statistics/event/handler/error.rs
@@ -0,0 +1,142 @@
+use aquatic_udp_protocol::PeerClient;
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::{label_name, metric_name};
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::{ConnectionContext, ErrorKind, UdpRequestKind};
+use crate::statistics::repository::Repository;
+use crate::statistics::{UDP_TRACKER_SERVER_CONNECTION_ID_ERRORS_TOTAL, UDP_TRACKER_SERVER_ERRORS_TOTAL};
+
+pub async fn handle_event(
+    connection_context: ConnectionContext,
+    opt_udp_request_kind: Option<UdpRequestKind>,
+    error_kind: ErrorKind,
+    repository: &Repository,
+    now: DurationSinceUnixEpoch,
+) {
+    update_extendable_metrics(&connection_context, opt_udp_request_kind, error_kind, repository, now).await;
+}
+
+async fn update_extendable_metrics(
+    connection_context: &ConnectionContext,
+    opt_udp_request_kind: Option<UdpRequestKind>,
+    error_kind: ErrorKind,
+    repository: &Repository,
+    now: DurationSinceUnixEpoch,
+) {
+    update_all_errors_counter(connection_context, opt_udp_request_kind.clone(), repository, now).await;
+    update_connection_id_errors_counter(opt_udp_request_kind, error_kind, repository, now).await;
+}
+
+async fn update_all_errors_counter(
+    connection_context: &ConnectionContext,
+    opt_udp_request_kind: Option<UdpRequestKind>,
+    repository: &Repository,
+    now: DurationSinceUnixEpoch,
+) {
+    let mut label_set = LabelSet::from(connection_context.clone());
+
+    if let Some(kind) = opt_udp_request_kind.clone() {
+        label_set.upsert(label_name!("request_kind"), kind.to_string().into());
+    }
+
+    match repository
+        .increase_counter(&metric_name!(UDP_TRACKER_SERVER_ERRORS_TOTAL), &label_set, now)
+        .await
+    {
+        Ok(()) => {}
+        Err(err) => tracing::error!("Failed to increase the counter: {}", err),
+    }
+}
+
+async fn update_connection_id_errors_counter(
+    opt_udp_request_kind: Option<UdpRequestKind>,
+    error_kind: ErrorKind,
+    repository: &Repository,
+    now: DurationSinceUnixEpoch,
+) {
+    if let ErrorKind::ConnectionCookie(_) = error_kind {
+        if let Some(UdpRequestKind::Announce { announce_request }) = opt_udp_request_kind {
+            let (client_software_name, client_software_version) = extract_name_and_version(&announce_request.peer_id.client());
+
+            let label_set = LabelSet::from([
+                (label_name!("client_software_name"), client_software_name.into()),
+                (label_name!("client_software_version"), client_software_version.into()),
+            ]);
+
+            match repository
+                .increase_counter(&metric_name!(UDP_TRACKER_SERVER_CONNECTION_ID_ERRORS_TOTAL), &label_set, now)
+                .await
+            {
+                Ok(()) => {}
+                Err(err) => tracing::error!("Failed to increase the counter: {}", err),
+            };
+        }
+    }
+}
+
+fn extract_name_and_version(peer_client: &PeerClient) -> (String, String) {
+    match peer_client {
+        PeerClient::BitTorrent(compact_string) => ("BitTorrent".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::Deluge(compact_string) => ("Deluge".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::LibTorrentRakshasa(compact_string) => ("lt (rakshasa)".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::LibTorrentRasterbar(compact_string) => ("lt (rasterbar)".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::QBitTorrent(compact_string) => ("QBitTorrent".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::Transmission(compact_string) => ("Transmission".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::UTorrent(compact_string) => ("µTorrent".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::UTorrentEmbedded(compact_string) => ("µTorrent Emb.".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::UTorrentMac(compact_string) => ("µTorrent Mac".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::UTorrentWeb(compact_string) => ("µTorrent Web".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::Vuze(compact_string) => ("Vuze".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::WebTorrent(compact_string) => ("WebTorrent".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::WebTorrentDesktop(compact_string) => ("WebTorrent Desktop".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::Mainline(compact_string) => ("Mainline".to_string(), compact_string.as_str().to_owned()),
+        PeerClient::OtherWithPrefixAndVersion { prefix, version } => {
+            (format!("Other ({})", prefix.as_str()), version.as_str().to_owned())
+        }
+        PeerClient::OtherWithPrefix(compact_string) => (format!("Other ({compact_string})"), String::new()),
+        PeerClient::Other => ("Other".to_string(), String::new()),
+        _ => ("Unknown".to_string(), String::new()),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+
+    use torrust_tracker_clock::clock::Time;
+    use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
+
+    use crate::event::{ConnectionContext, Event};
+    use crate::statistics::event::handler::error::ErrorKind;
+    use crate::statistics::event::handler::handle_event;
+    use crate::statistics::repository::Repository;
+    use crate::CurrentClock;
+
+    #[tokio::test]
+    async fn should_increase_the_udp4_errors_counter_when_it_receives_a_udp4_error_event() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpError {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+                kind: None,
+                error: ErrorKind::RequestParse("Invalid request format".to_string()),
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp4_errors_total(), 1);
+    }
+}
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/mod.rs b/packages/udp-tracker-server/src/statistics/event/handler/mod.rs
new file mode 100644
index 000000000..9e7f5cd47
--- /dev/null
+++ b/packages/udp-tracker-server/src/statistics/event/handler/mod.rs
@@ -0,0 +1,40 @@
+mod error;
+mod request_aborted;
+mod request_accepted;
+mod request_banned;
+mod request_received;
+mod response_sent;
+
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::Event;
+use crate::statistics::repository::Repository;
+
+pub async fn handle_event(event: Event, stats_repository: &Repository, now: DurationSinceUnixEpoch) {
+    match event {
+        Event::UdpRequestAborted { context } => {
+            request_aborted::handle_event(context, stats_repository, now).await;
+        }
+        Event::UdpRequestBanned { context } => {
+            request_banned::handle_event(context, stats_repository, now).await;
+        }
+        Event::UdpRequestReceived { context } => {
+            request_received::handle_event(context, stats_repository, now).await;
+        }
+        Event::UdpRequestAccepted { context, kind } => {
+            request_accepted::handle_event(context, kind, stats_repository, now).await;
+        }
+        Event::UdpResponseSent {
+            context,
+            kind,
+            req_processing_time,
+        } => {
+            response_sent::handle_event(context, kind, req_processing_time, stats_repository, now).await;
+        }
+        Event::UdpError { context, kind, error } => {
+            error::handle_event(context, kind, error, stats_repository, now).await;
+        }
+    }
+
+    tracing::debug!("stats: {:?}", stats_repository.get_stats().await);
+}
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/request_aborted.rs b/packages/udp-tracker-server/src/statistics/event/handler/request_aborted.rs
new file mode 100644
index 000000000..f340fe51a
--- /dev/null
+++ b/packages/udp-tracker-server/src/statistics/event/handler/request_aborted.rs
@@ -0,0 +1,82 @@
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric_name;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::ConnectionContext;
+use crate::statistics::repository::Repository;
+use crate::statistics::UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL;
+
+pub async fn handle_event(context: ConnectionContext, stats_repository: &Repository, now: DurationSinceUnixEpoch) {
+    match stats_repository
+        .increase_counter(
+            &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL),
+            &LabelSet::from(context),
+            now,
+        )
+        .await
+    {
+        Ok(()) => {}
+        Err(err) => tracing::error!("Failed to increase the counter: {}", err),
+    };
+}
+
+#[cfg(test)]
+mod tests {
+    use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+
+    use torrust_tracker_clock::clock::Time;
+    use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
+
+    use crate::event::{ConnectionContext, Event};
+    use crate::statistics::event::handler::handle_event;
+    use crate::statistics::repository::Repository;
+    use crate::CurrentClock;
+
+    #[tokio::test]
+    async fn should_increase_the_number_of_aborted_requests_when_it_receives_a_udp_request_aborted_event() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestAborted {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp_requests_aborted_total(), 1);
+    }
+
+    #[tokio::test]
+    async fn should_increase_the_udp_abort_counter_when_it_receives_a_udp_abort_event() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestAborted {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+        let stats = stats_repository.get_stats().await;
+        assert_eq!(stats.udp_requests_aborted_total(), 1);
+    }
+}
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/request_accepted.rs b/packages/udp-tracker-server/src/statistics/event/handler/request_accepted.rs
new file mode 100644
index 000000000..33971926e
--- /dev/null
+++ b/packages/udp-tracker-server/src/statistics/event/handler/request_accepted.rs
@@ -0,0 +1,200 @@
+use torrust_tracker_metrics::label::{LabelSet, LabelValue};
+use torrust_tracker_metrics::{label_name, metric_name};
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::{ConnectionContext, UdpRequestKind};
+use crate::statistics::repository::Repository;
+use crate::statistics::UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL;
+
+pub async fn handle_event(
+    context: ConnectionContext,
+    kind: UdpRequestKind,
+    stats_repository: &Repository,
+    now: DurationSinceUnixEpoch,
+) {
+    let mut label_set = LabelSet::from(context);
+    label_set.upsert(label_name!("request_kind"), LabelValue::new(&kind.to_string()));
+    match stats_repository
+        .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &label_set, now)
+        .await
+    {
+        Ok(()) => {
+            tracing::debug!("Successfully increased the counter for UDP requests accepted: {}", label_set);
+        }
+        Err(err) => tracing::error!("Failed to increase the counter: {}", err),
+    };
+}
+
+#[cfg(test)]
+mod tests {
+    use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
+
+    use torrust_tracker_clock::clock::Time;
+    use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
+
+    use crate::event::{ConnectionContext, Event};
+    use crate::handlers::announce::tests::announce_request::AnnounceRequestBuilder;
+    use crate::statistics::event::handler::handle_event;
+    use crate::statistics::repository::Repository;
+    use crate::CurrentClock;
+
+    #[tokio::test]
+    async fn should_increase_the_udp4_connect_requests_counter_when_it_receives_a_udp4_request_event_of_connect_kind() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestAccepted {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+                kind: crate::event::UdpRequestKind::Connect,
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp4_connect_requests_accepted_total(), 1);
+    }
+
+    #[tokio::test]
+    async fn should_increase_the_udp4_announce_requests_counter_when_it_receives_a_udp4_request_event_of_announce_kind() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestAccepted {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+                kind: crate::event::UdpRequestKind::Announce {
+                    announce_request: AnnounceRequestBuilder::default().into(),
+                },
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp4_announce_requests_accepted_total(), 1);
+    }
+
+    #[tokio::test]
+    async fn should_increase_the_udp4_scrape_requests_counter_when_it_receives_a_udp4_request_event_of_scrape_kind() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestAccepted {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+                kind: crate::event::UdpRequestKind::Scrape,
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp4_scrape_requests_accepted_total(), 1);
+    }
+
+    #[tokio::test]
+    async fn should_increase_the_udp6_connect_requests_counter_when_it_receives_a_udp6_request_event_of_connect_kind() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestAccepted {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+                kind: crate::event::UdpRequestKind::Connect,
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp6_connect_requests_accepted_total(), 1);
+    }
+
+    #[tokio::test]
+    async fn should_increase_the_udp6_announce_requests_counter_when_it_receives_a_udp6_request_event_of_announce_kind() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestAccepted {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+                kind: crate::event::UdpRequestKind::Announce {
+                    announce_request: AnnounceRequestBuilder::default().into(),
+                },
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp6_announce_requests_accepted_total(), 1);
+    }
+
+    #[tokio::test]
+    async fn should_increase_the_udp6_scrape_requests_counter_when_it_receives_a_udp6_request_event_of_scrape_kind() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestAccepted {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+                kind: crate::event::UdpRequestKind::Scrape,
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp6_scrape_requests_accepted_total(), 1);
+    }
+}
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/request_banned.rs b/packages/udp-tracker-server/src/statistics/event/handler/request_banned.rs
new file mode 100644
index 000000000..10f6cad88
--- /dev/null
+++ b/packages/udp-tracker-server/src/statistics/event/handler/request_banned.rs
@@ -0,0 +1,82 @@
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric_name;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::ConnectionContext;
+use crate::statistics::repository::Repository;
+use crate::statistics::UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL;
+
+pub async fn handle_event(context: ConnectionContext, stats_repository: &Repository, now: DurationSinceUnixEpoch) {
+    match stats_repository
+        .increase_counter(
+            &metric_name!(UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL),
+            &LabelSet::from(context),
+            now,
+        )
+        .await
+    {
+        Ok(()) => {}
+        Err(err) => tracing::error!("Failed to increase the counter: {}", err),
+    };
+}
+
+#[cfg(test)]
+mod tests {
+    use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+
+    use torrust_tracker_clock::clock::Time;
+    use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
+
+    use crate::event::{ConnectionContext, Event};
+    use crate::statistics::event::handler::handle_event;
+    use crate::statistics::repository::Repository;
+    use crate::CurrentClock;
+
+    #[tokio::test]
+    async fn should_increase_the_number_of_banned_requests_when_it_receives_a_udp_request_banned_event() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestBanned {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp_requests_banned_total(), 1);
+    }
+
+    #[tokio::test]
+    async fn should_increase_the_udp_ban_counter_when_it_receives_a_udp_banned_event() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestBanned {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+        let stats = stats_repository.get_stats().await;
+        assert_eq!(stats.udp_requests_banned_total(), 1);
+    }
+}
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/request_received.rs b/packages/udp-tracker-server/src/statistics/event/handler/request_received.rs
new file mode 100644
index 000000000..148b9d8da
--- /dev/null
+++ b/packages/udp-tracker-server/src/statistics/event/handler/request_received.rs
@@ -0,0 +1,59 @@
+use torrust_tracker_metrics::label::LabelSet;
+use torrust_tracker_metrics::metric_name;
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::ConnectionContext;
+use crate::statistics::repository::Repository;
+use crate::statistics::UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL;
+
+pub async fn handle_event(context: ConnectionContext, stats_repository: &Repository, now: DurationSinceUnixEpoch) {
+    match stats_repository
+        .increase_counter(
+            &metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL),
+            &LabelSet::from(context),
+            now,
+        )
+        .await
+    {
+        Ok(()) => {}
+        Err(err) => tracing::error!("Failed to increase the counter: {}", err),
+    };
+}
+
+#[cfg(test)]
+mod tests {
+    use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+
+    use torrust_tracker_clock::clock::Time;
+    use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
+
+    use crate::event::{ConnectionContext, Event};
+    use crate::statistics::event::handler::handle_event;
+    use crate::statistics::repository::Repository;
+    use crate::CurrentClock;
+
+    #[tokio::test]
+    async fn should_increase_the_number_of_incoming_requests_when_it_receives_a_udp4_incoming_request_event() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpRequestReceived {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp4_requests_received_total(), 1);
+    }
+}
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/response_sent.rs b/packages/udp-tracker-server/src/statistics/event/handler/response_sent.rs
new file mode 100644
index 000000000..b1a046b5b
--- /dev/null
+++ b/packages/udp-tracker-server/src/statistics/event/handler/response_sent.rs
@@ -0,0 +1,141 @@
+use torrust_tracker_metrics::label::{LabelSet, LabelValue};
+use torrust_tracker_metrics::{label_name, metric_name};
+use torrust_tracker_primitives::DurationSinceUnixEpoch;
+
+use crate::event::{ConnectionContext, UdpRequestKind, UdpResponseKind};
+use crate::statistics::repository::Repository;
+use crate::statistics::UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL;
+
+pub async fn handle_event(
+    context: ConnectionContext,
+    kind: UdpResponseKind,
+    req_processing_time: std::time::Duration,
+    stats_repository: &Repository,
+    now: DurationSinceUnixEpoch,
+) {
+    let (result_label_value, kind_label_value) = match kind {
+        UdpResponseKind::Ok { req_kind } => match req_kind {
+            UdpRequestKind::Connect => {
+                let mut label_set = LabelSet::from(context.clone());
+                label_set.upsert(label_name!("request_kind"), LabelValue::new(&req_kind.to_string()));
+
+                let _new_avg = stats_repository
+                    .recalculate_udp_avg_processing_time_ns(req_processing_time, &label_set, now)
+                    .await;
+
+                (LabelValue::new("ok"), UdpRequestKind::Connect.into())
+            }
+            UdpRequestKind::Announce { announce_request } => {
+                let mut label_set = LabelSet::from(context.clone());
+                label_set.upsert(label_name!("request_kind"), LabelValue::new(&req_kind.to_string()));
+
+                let _new_avg = stats_repository
+                    .recalculate_udp_avg_processing_time_ns(req_processing_time, &label_set, now)
+                    .await;
+
+                (LabelValue::new("ok"), UdpRequestKind::Announce { announce_request }.into())
+            }
+            UdpRequestKind::Scrape => {
+                let mut label_set = LabelSet::from(context.clone());
+                label_set.upsert(label_name!("request_kind"), LabelValue::new(&req_kind.to_string()));
+
+                let _new_avg = stats_repository
+                    .recalculate_udp_avg_processing_time_ns(req_processing_time, &label_set, now)
+                    .await;
+
+                (LabelValue::new("ok"), LabelValue::new(&UdpRequestKind::Scrape.to_string()))
+            }
+        },
+        UdpResponseKind::Error { opt_req_kind: _ } => (LabelValue::new("error"), LabelValue::ignore()),
+    };
+
+    // Increase the number of responses sent
+    let mut label_set = LabelSet::from(context);
+    if result_label_value == LabelValue::new("ok") {
+        label_set.upsert(label_name!("request_kind"), kind_label_value);
+    }
+    label_set.upsert(label_name!("result"), result_label_value);
+    match stats_repository
+        .increase_counter(&metric_name!(UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL), &label_set, now)
+        .await
+    {
+        Ok(()) => {}
+        Err(err) => tracing::error!("Failed to increase the counter: {}", err),
+    };
+}
+
+#[cfg(test)]
+mod tests {
+    use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
+
+    use torrust_tracker_clock::clock::Time;
+    use torrust_tracker_primitives::service_binding::{Protocol, ServiceBinding};
+
+    use crate::event::{ConnectionContext, Event};
+    use crate::handlers::announce::tests::announce_request::AnnounceRequestBuilder;
+    use crate::statistics::event::handler::handle_event;
+    use crate::statistics::repository::Repository;
+    use crate::CurrentClock;
+
+    #[tokio::test]
+    async fn should_increase_the_udp4_responses_counter_when_it_receives_a_udp4_response_event() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpResponseSent {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+                kind: crate::event::UdpResponseKind::Ok {
+                    req_kind: crate::event::UdpRequestKind::Announce {
+                        announce_request: AnnounceRequestBuilder::default().into(),
+                    },
+                },
+                req_processing_time: std::time::Duration::from_secs(1),
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp4_responses_sent_total(), 1);
+    }
+
+    #[tokio::test]
+    async fn should_increase_the_udp6_response_counter_when_it_receives_a_udp6_response_event() {
+        let stats_repository = Repository::new();
+
+        handle_event(
+            Event::UdpResponseSent {
+                context: ConnectionContext::new(
+                    SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 195)), 8080),
+                    ServiceBinding::new(
+                        Protocol::UDP,
+                        SocketAddr::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 203, 0, 113, 196)), 6969),
+                    )
+                    .unwrap(),
+                ),
+                kind: crate::event::UdpResponseKind::Ok {
+                    req_kind: crate::event::UdpRequestKind::Announce {
+                        announce_request: AnnounceRequestBuilder::default().into(),
+                    },
+                },
+                req_processing_time: std::time::Duration::from_secs(1),
+            },
+            &stats_repository,
+            CurrentClock::now(),
+        )
+        .await;
+
+        let stats = stats_repository.get_stats().await;
+
+        assert_eq!(stats.udp6_responses_sent_total(), 1);
+    }
+}
diff --git a/packages/udp-tracker-server/src/statistics/event/listener.rs b/packages/udp-tracker-server/src/statistics/event/listener.rs
index d805cc87f..caaf5a2bc 100644
--- a/packages/udp-tracker-server/src/statistics/event/listener.rs
+++ b/packages/udp-tracker-server/src/statistics/event/listener.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use bittorrent_udp_tracker_core::UDP_TRACKER_LOG_TARGET;
 use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
 use torrust_tracker_clock::clock::Time;
 use torrust_tracker_events::receiver::RecvError;
 
@@ -11,28 +12,29 @@ use crate::statistics::repository::Repository;
 use crate::CurrentClock;
 
 #[must_use]
-pub fn run_event_listener(receiver: Receiver, repository: &Arc<Repository>) -> JoinHandle<()> {
-    let stats_repository = repository.clone();
+pub fn run_event_listener(
+    receiver: Receiver,
+    cancellation_token: CancellationToken,
+    repository: &Arc<Repository>,
+) -> JoinHandle<()> {
+    let repository_clone = repository.clone();
 
     tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Starting UDP tracker server event listener");
 
     tokio::spawn(async move {
-        dispatch_events(receiver, stats_repository).await;
+        dispatch_events(receiver, cancellation_token, repository_clone).await;
 
         tracing::info!(target: UDP_TRACKER_LOG_TARGET, "UDP tracker server event listener finished");
     })
 }
 
-async fn dispatch_events(mut receiver: Receiver, stats_repository: Arc<Repository>) {
-    let shutdown_signal = tokio::signal::ctrl_c();
-    tokio::pin!(shutdown_signal);
-
+async fn dispatch_events(mut receiver: Receiver, cancellation_token: CancellationToken, stats_repository: Arc<Repository>) {
     loop {
         tokio::select! {
             biased;
 
-            _ = &mut shutdown_signal => {
-                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Received Ctrl+C, shutting down UDP tracker server event listener.");
+            () = cancellation_token.cancelled() => {
+                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Received cancellation request, shutting down UDP tracker server event listener.");
                 break;
             }
 
@@ -42,11 +44,11 @@ async fn dispatch_events(mut receiver: Receiver, stats_repository: Arc<Repositor
                     Err(e) => {
                         match e {
                             RecvError::Closed => {
-                                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Udp server statistics receiver closed.");
+                                tracing::info!(target: UDP_TRACKER_LOG_TARGET, "Udp tracker server statistics receiver closed.");
                                 break;
                             }
                             RecvError::Lagged(n) => {
-                                tracing::warn!(target: UDP_TRACKER_LOG_TARGET, "Udp server statistics receiver lagged by {} events.", n);
+                                tracing::warn!(target: UDP_TRACKER_LOG_TARGET, "Udp tracker server statistics receiver lagged by {} events.", n);
                             }
                         }
                     }
diff --git a/packages/udp-tracker-server/src/statistics/metrics.rs b/packages/udp-tracker-server/src/statistics/metrics.rs
index 7b18f6418..e167dc5ae 100644
--- a/packages/udp-tracker-server/src/statistics/metrics.rs
+++ b/packages/udp-tracker-server/src/statistics/metrics.rs
@@ -1,96 +1,1315 @@
+use std::time::Duration;
+
 use serde::Serialize;
 use torrust_tracker_metrics::label::LabelSet;
 use torrust_tracker_metrics::metric::MetricName;
+use torrust_tracker_metrics::metric_collection::aggregate::avg::Avg;
+use torrust_tracker_metrics::metric_collection::aggregate::sum::Sum;
 use torrust_tracker_metrics::metric_collection::{Error, MetricCollection};
+use torrust_tracker_metrics::metric_name;
 use torrust_tracker_primitives::DurationSinceUnixEpoch;
 
+use crate::statistics::{
+    UDP_TRACKER_SERVER_ERRORS_TOTAL, UDP_TRACKER_SERVER_IPS_BANNED_TOTAL,
+    UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSED_REQUESTS_TOTAL, UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS,
+    UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL, UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL,
+    UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL, UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL,
+    UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL,
+};
+
 /// Metrics collected by the UDP tracker server.
 #[derive(Debug, PartialEq, Default, Serialize)]
 pub struct Metrics {
+    /// A collection of metrics.
+    pub metric_collection: MetricCollection,
+}
+
+impl Metrics {
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn increase_counter(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.increment_counter(metric_name, labels, now)
+    }
+
+    /// # Errors
+    ///
+    /// Returns an error if the metric does not exist and it cannot be created.
+    pub fn set_gauge(
+        &mut self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        value: f64,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
+        self.metric_collection.set_gauge(metric_name, labels, value, now)
+    }
+}
+
+impl Metrics {
+    #[allow(clippy::cast_precision_loss)]
+    pub fn recalculate_udp_avg_processing_time_ns(
+        &mut self,
+        req_processing_time: Duration,
+        label_set: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> f64 {
+        self.increment_udp_processed_requests_total(label_set, now);
+
+        let processed_requests_total = self.udp_processed_requests_total(label_set) as f64;
+        let previous_avg = self.udp_avg_processing_time_ns(label_set);
+        let req_processing_time = req_processing_time.as_nanos() as f64;
+
+        // Moving average: https://en.wikipedia.org/wiki/Moving_average
+        let new_avg = previous_avg as f64 + (req_processing_time - previous_avg as f64) / processed_requests_total;
+
+        tracing::debug!(
+            "Recalculated UDP average processing time for labels {}: {} ns (previous: {} ns, req_processing_time: {} ns, request_processed_total: {})",
+            label_set,
+            new_avg,
+            previous_avg,
+            req_processing_time,
+            processed_requests_total
+        );
+
+        self.update_udp_avg_processing_time_ns(new_avg, label_set, now);
+
+        new_avg
+    }
+
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    fn udp_avg_processing_time_ns(&self, label_set: &LabelSet) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                label_set,
+            )
+            .unwrap_or_default() as u64
+    }
+
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp_request_accepted_total(&self, label_set: &LabelSet) -> u64 {
+        self.metric_collection
+            .sum(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), label_set)
+            .unwrap_or_default() as u64
+    }
+
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    fn udp_processed_requests_total(&self, label_set: &LabelSet) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSED_REQUESTS_TOTAL),
+                label_set,
+            )
+            .unwrap_or_default() as u64
+    }
+
+    fn update_udp_avg_processing_time_ns(&mut self, new_avg: f64, label_set: &LabelSet, now: DurationSinceUnixEpoch) {
+        tracing::debug!(
+            "Updating average processing time metric to {} ns for label set {}",
+            new_avg,
+            label_set,
+        );
+
+        match self.set_gauge(
+            &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+            label_set,
+            new_avg,
+            now,
+        ) {
+            Ok(()) => {}
+            Err(err) => tracing::error!("Failed to set gauge: {}", err),
+        }
+    }
+
+    fn increment_udp_processed_requests_total(&mut self, label_set: &LabelSet, now: DurationSinceUnixEpoch) {
+        tracing::debug!("Incrementing processed requests total for label set {}", label_set,);
+
+        match self.increase_counter(
+            &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSED_REQUESTS_TOTAL),
+            label_set,
+            now,
+        ) {
+            Ok(()) => {}
+            Err(err) => tracing::error!("Failed to increment counter: {}", err),
+        }
+    }
+
     // UDP
     /// Total number of UDP (UDP tracker) requests aborted.
-    pub udp_requests_aborted: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp_requests_aborted_total(&self) -> u64 {
+        self.metric_collection
+            .sum(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL), &LabelSet::empty())
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) requests banned.
-    pub udp_requests_banned: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp_requests_banned_total(&self) -> u64 {
+        self.metric_collection
+            .sum(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL), &LabelSet::empty())
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of banned IPs.
-    pub udp_banned_ips_total: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp_banned_ips_total(&self) -> u64 {
+        self.metric_collection
+            .sum(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &LabelSet::empty())
+            .unwrap_or_default() as u64
+    }
 
-    /// Average rounded time spent processing UDP connect requests.
-    pub udp_avg_connect_processing_time_ns: u64,
+    /// Average processing time for UDP connect requests across all servers (in nanoseconds).
+    /// This calculates the average of all gauge samples for connect requests.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp_avg_connect_processing_time_ns_averaged(&self) -> u64 {
+        self.metric_collection
+            .avg(
+                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                &[("request_kind", "connect")].into(),
+            )
+            .unwrap_or(0.0) as u64
+    }
 
-    /// Average rounded time spent processing UDP announce requests.
-    pub udp_avg_announce_processing_time_ns: u64,
+    /// Average processing time for UDP announce requests across all servers (in nanoseconds).
+    /// This calculates the average of all gauge samples for announce requests.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp_avg_announce_processing_time_ns_averaged(&self) -> u64 {
+        self.metric_collection
+            .avg(
+                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                &[("request_kind", "announce")].into(),
+            )
+            .unwrap_or(0.0) as u64
+    }
 
-    /// Average rounded time spent processing UDP scrape requests.
-    pub udp_avg_scrape_processing_time_ns: u64,
+    /// Average processing time for UDP scrape requests across all servers (in nanoseconds).
+    /// This calculates the average of all gauge samples for scrape requests.
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp_avg_scrape_processing_time_ns_averaged(&self) -> u64 {
+        self.metric_collection
+            .avg(
+                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                &[("request_kind", "scrape")].into(),
+            )
+            .unwrap_or(0.0) as u64
+    }
 
     // UDPv4
     /// Total number of UDP (UDP tracker) requests from IPv4 peers.
-    pub udp4_requests: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp4_requests_received_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) connections from IPv4 peers.
-    pub udp4_connections_handled: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp4_connect_requests_accepted_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                &[("server_binding_address_ip_family", "inet"), ("request_kind", "connect")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) `announce` requests from IPv4 peers.
-    pub udp4_announces_handled: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp4_announce_requests_accepted_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                &[("server_binding_address_ip_family", "inet"), ("request_kind", "announce")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) `scrape` requests from IPv4 peers.
-    pub udp4_scrapes_handled: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp4_scrape_requests_accepted_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                &[("server_binding_address_ip_family", "inet"), ("request_kind", "scrape")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) responses from IPv4 peers.
-    pub udp4_responses: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp4_responses_sent_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL),
+                &[("server_binding_address_ip_family", "inet")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) `error` requests from IPv4 peers.
-    pub udp4_errors_handled: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp4_errors_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_ERRORS_TOTAL),
+                &[("server_binding_address_ip_family", "inet")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     // UDPv6
     /// Total number of UDP (UDP tracker) requests from IPv6 peers.
-    pub udp6_requests: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp6_requests_received_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL),
+                &[("server_binding_address_ip_family", "inet6")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) `connection` requests from IPv6 peers.
-    pub udp6_connections_handled: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp6_connect_requests_accepted_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                &[("server_binding_address_ip_family", "inet6"), ("request_kind", "connect")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) `announce` requests from IPv6 peers.
-    pub udp6_announces_handled: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp6_announce_requests_accepted_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                &[("server_binding_address_ip_family", "inet6"), ("request_kind", "announce")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) `scrape` requests from IPv6 peers.
-    pub udp6_scrapes_handled: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp6_scrape_requests_accepted_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                &[("server_binding_address_ip_family", "inet6"), ("request_kind", "scrape")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) responses from IPv6 peers.
-    pub udp6_responses: u64,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp6_responses_sent_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL),
+                &[("server_binding_address_ip_family", "inet6")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 
     /// Total number of UDP (UDP tracker) `error` requests from IPv6 peers.
-    pub udp6_errors_handled: u64,
-
-    /// A collection of metrics.
-    pub metric_collection: MetricCollection,
+    #[must_use]
+    #[allow(clippy::cast_sign_loss)]
+    #[allow(clippy::cast_possible_truncation)]
+    pub fn udp6_errors_total(&self) -> u64 {
+        self.metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_ERRORS_TOTAL),
+                &[("server_binding_address_ip_family", "inet6")].into(),
+            )
+            .unwrap_or_default() as u64
+    }
 }
 
-impl Metrics {
-    /// # Errors
-    ///
-    /// Returns an error if the metric does not exist and it cannot be created.
-    pub fn increase_counter(
-        &mut self,
-        metric_name: &MetricName,
-        labels: &LabelSet,
-        now: DurationSinceUnixEpoch,
-    ) -> Result<(), Error> {
-        self.metric_collection.increase_counter(metric_name, labels, now)
+#[cfg(test)]
+mod tests {
+    use torrust_tracker_clock::clock::Time;
+    use torrust_tracker_metrics::metric_name;
+
+    use super::*;
+    use crate::statistics::{
+        UDP_TRACKER_SERVER_ERRORS_TOTAL, UDP_TRACKER_SERVER_IPS_BANNED_TOTAL,
+        UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSED_REQUESTS_TOTAL, UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS,
+        UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL, UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL,
+        UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL, UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL,
+        UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL,
+    };
+    use crate::CurrentClock;
+
+    #[test]
+    fn it_should_implement_default() {
+        let metrics = Metrics::default();
+        // MetricCollection starts with empty collections
+        assert_eq!(metrics, Metrics::default());
     }
 
-    /// # Errors
-    ///
-    /// Returns an error if the metric does not exist and it cannot be created.
-    pub fn set_gauge(
-        &mut self,
-        metric_name: &MetricName,
-        labels: &LabelSet,
-        value: f64,
-        now: DurationSinceUnixEpoch,
-    ) -> Result<(), Error> {
-        self.metric_collection.set_gauge(metric_name, labels, value, now)
+    #[test]
+    fn it_should_implement_debug() {
+        let metrics = Metrics::default();
+        let debug_string = format!("{metrics:?}");
+        assert!(debug_string.contains("Metrics"));
+        assert!(debug_string.contains("metric_collection"));
+    }
+
+    #[test]
+    fn it_should_implement_partial_eq() {
+        let metrics1 = Metrics::default();
+        let metrics2 = Metrics::default();
+        assert_eq!(metrics1, metrics2);
+    }
+
+    #[test]
+    fn it_should_increase_counter_metric() {
+        let mut metrics = Metrics::default();
+        let now = CurrentClock::now();
+        let labels = LabelSet::empty();
+
+        let result = metrics.increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL), &labels, now);
+
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn it_should_increase_counter_metric_with_labels() {
+        let mut metrics = Metrics::default();
+        let now = CurrentClock::now();
+        let labels = LabelSet::from([("server_binding_address_ip_family", "inet")]);
+
+        let result = metrics.increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL), &labels, now);
+
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn it_should_set_gauge_metric() {
+        let mut metrics = Metrics::default();
+        let now = CurrentClock::now();
+        let labels = LabelSet::empty();
+
+        let result = metrics.set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 42.0, now);
+
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn it_should_set_gauge_metric_with_labels() {
+        let mut metrics = Metrics::default();
+        let now = CurrentClock::now();
+        let labels = LabelSet::from([("request_kind", "connect")]);
+
+        let result = metrics.set_gauge(
+            &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+            &labels,
+            1000.0,
+            now,
+        );
+
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn it_should_return_zero_for_udp_processed_requests_total_when_no_data() {
+        let metrics = Metrics::default();
+        let labels = LabelSet::from([("request_kind", "connect")]);
+        assert_eq!(metrics.udp_processed_requests_total(&labels), 0);
+    }
+
+    #[test]
+    fn it_should_increment_processed_requests_total() {
+        let mut metrics = Metrics::default();
+        let now = CurrentClock::now();
+        let labels = LabelSet::from([("request_kind", "connect")]);
+
+        // Directly increment the counter using the public method
+        metrics
+            .increase_counter(
+                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSED_REQUESTS_TOTAL),
+                &labels,
+                now,
+            )
+            .unwrap();
+
+        assert_eq!(metrics.udp_processed_requests_total(&labels), 1);
+    }
+
+    mod udp_general_metrics {
+        use super::*;
+
+        #[test]
+        fn it_should_return_zero_for_udp_requests_aborted_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp_requests_aborted_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp_requests_aborted() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            metrics
+                .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL), &labels, now)
+                .unwrap();
+            metrics
+                .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL), &labels, now)
+                .unwrap();
+
+            assert_eq!(metrics.udp_requests_aborted_total(), 2);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp_requests_banned_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp_requests_banned_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp_requests_banned() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            for _ in 0..3 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp_requests_banned_total(), 3);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp_banned_ips_total_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp_banned_ips_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_gauge_value_for_udp_banned_ips_total() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            metrics
+                .set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 10.0, now)
+                .unwrap();
+
+            assert_eq!(metrics.udp_banned_ips_total(), 10);
+        }
+    }
+
+    mod udpv4_metrics {
+        use super::*;
+
+        #[test]
+        fn it_should_return_zero_for_udp4_requests_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp4_requests_received_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp4_requests() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet")]);
+
+            for _ in 0..5 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp4_requests_received_total(), 5);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp4_connections_handled_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp4_connect_requests_accepted_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp4_connections_handled() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet"), ("request_kind", "connect")]);
+
+            for _ in 0..3 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp4_connect_requests_accepted_total(), 3);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp4_announces_handled_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp4_announce_requests_accepted_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp4_announces_handled() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet"), ("request_kind", "announce")]);
+
+            for _ in 0..7 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp4_announce_requests_accepted_total(), 7);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp4_scrapes_handled_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp4_scrape_requests_accepted_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp4_scrapes_handled() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet"), ("request_kind", "scrape")]);
+
+            for _ in 0..4 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp4_scrape_requests_accepted_total(), 4);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp4_responses_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp4_responses_sent_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp4_responses() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet")]);
+
+            for _ in 0..6 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp4_responses_sent_total(), 6);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp4_errors_handled_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp4_errors_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp4_errors_handled() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet")]);
+
+            for _ in 0..2 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_ERRORS_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp4_errors_total(), 2);
+        }
+    }
+
+    mod udpv6_metrics {
+        use super::*;
+
+        #[test]
+        fn it_should_return_zero_for_udp6_requests_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp6_requests_received_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp6_requests() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet6")]);
+
+            for _ in 0..8 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp6_requests_received_total(), 8);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp6_connections_handled_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp6_connect_requests_accepted_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp6_connections_handled() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet6"), ("request_kind", "connect")]);
+
+            for _ in 0..4 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp6_connect_requests_accepted_total(), 4);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp6_announces_handled_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp6_announce_requests_accepted_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp6_announces_handled() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet6"), ("request_kind", "announce")]);
+
+            for _ in 0..9 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp6_announce_requests_accepted_total(), 9);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp6_scrapes_handled_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp6_scrape_requests_accepted_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp6_scrapes_handled() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet6"), ("request_kind", "scrape")]);
+
+            for _ in 0..6 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp6_scrape_requests_accepted_total(), 6);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp6_responses_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp6_responses_sent_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp6_responses() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet6")]);
+
+            for _ in 0..11 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp6_responses_sent_total(), 11);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp6_errors_handled_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp6_errors_total(), 0);
+        }
+
+        #[test]
+        fn it_should_return_sum_of_udp6_errors_handled() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("server_binding_address_ip_family", "inet6")]);
+
+            for _ in 0..3 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_ERRORS_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp6_errors_total(), 3);
+        }
+    }
+
+    mod combined_metrics {
+        use super::*;
+
+        #[test]
+        fn it_should_distinguish_between_ipv4_and_ipv6_metrics() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+
+            let ipv4_labels = LabelSet::from([("server_binding_address_ip_family", "inet")]);
+            let ipv6_labels = LabelSet::from([("server_binding_address_ip_family", "inet6")]);
+
+            // Add different counts for IPv4 and IPv6
+            for _ in 0..3 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL), &ipv4_labels, now)
+                    .unwrap();
+            }
+
+            for _ in 0..7 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL), &ipv6_labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp4_requests_received_total(), 3);
+            assert_eq!(metrics.udp6_requests_received_total(), 7);
+        }
+
+        #[test]
+        fn it_should_distinguish_between_different_request_kinds() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+
+            let connect_labels = LabelSet::from([("server_binding_address_ip_family", "inet"), ("request_kind", "connect")]);
+            let announce_labels = LabelSet::from([("server_binding_address_ip_family", "inet"), ("request_kind", "announce")]);
+            let scrape_labels = LabelSet::from([("server_binding_address_ip_family", "inet"), ("request_kind", "scrape")]);
+
+            // Add different counts for different request kinds
+            for _ in 0..2 {
+                metrics
+                    .increase_counter(
+                        &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                        &connect_labels,
+                        now,
+                    )
+                    .unwrap();
+            }
+
+            for _ in 0..5 {
+                metrics
+                    .increase_counter(
+                        &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                        &announce_labels,
+                        now,
+                    )
+                    .unwrap();
+            }
+
+            for _ in 0..1 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &scrape_labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp4_connect_requests_accepted_total(), 2);
+            assert_eq!(metrics.udp4_announce_requests_accepted_total(), 5);
+            assert_eq!(metrics.udp4_scrape_requests_accepted_total(), 1);
+        }
+
+        #[test]
+        fn it_should_handle_mixed_ipv4_and_ipv6_for_different_request_kinds() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+
+            let ipv4_connect_labels = LabelSet::from([("server_binding_address_ip_family", "inet"), ("request_kind", "connect")]);
+            let ipv6_connect_labels =
+                LabelSet::from([("server_binding_address_ip_family", "inet6"), ("request_kind", "connect")]);
+            let ipv4_announce_labels =
+                LabelSet::from([("server_binding_address_ip_family", "inet"), ("request_kind", "announce")]);
+            let ipv6_announce_labels =
+                LabelSet::from([("server_binding_address_ip_family", "inet6"), ("request_kind", "announce")]);
+
+            // Add mixed IPv4/IPv6 counts
+            for _ in 0..3 {
+                metrics
+                    .increase_counter(
+                        &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                        &ipv4_connect_labels,
+                        now,
+                    )
+                    .unwrap();
+            }
+
+            for _ in 0..2 {
+                metrics
+                    .increase_counter(
+                        &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                        &ipv6_connect_labels,
+                        now,
+                    )
+                    .unwrap();
+            }
+
+            for _ in 0..4 {
+                metrics
+                    .increase_counter(
+                        &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                        &ipv4_announce_labels,
+                        now,
+                    )
+                    .unwrap();
+            }
+
+            for _ in 0..6 {
+                metrics
+                    .increase_counter(
+                        &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
+                        &ipv6_announce_labels,
+                        now,
+                    )
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp4_connect_requests_accepted_total(), 3);
+            assert_eq!(metrics.udp6_connect_requests_accepted_total(), 2);
+            assert_eq!(metrics.udp4_announce_requests_accepted_total(), 4);
+            assert_eq!(metrics.udp6_announce_requests_accepted_total(), 6);
+        }
+    }
+
+    mod edge_cases {
+        use super::*;
+
+        #[test]
+        fn it_should_handle_large_counter_values() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            // Add a large number of increments
+            for _ in 0..1000 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL), &labels, now)
+                    .unwrap();
+            }
+
+            assert_eq!(metrics.udp_requests_aborted_total(), 1000);
+        }
+
+        #[test]
+        fn it_should_handle_large_gauge_values() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            // Set a large gauge value
+            metrics
+                .set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 999_999.0, now)
+                .unwrap();
+
+            assert_eq!(metrics.udp_banned_ips_total(), 999_999);
+        }
+
+        #[test]
+        fn it_should_handle_zero_gauge_values() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            metrics
+                .set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 0.0, now)
+                .unwrap();
+
+            assert_eq!(metrics.udp_banned_ips_total(), 0);
+        }
+
+        #[test]
+        fn it_should_overwrite_gauge_values_when_set_multiple_times() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            // Set initial value
+            metrics
+                .set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 50.0, now)
+                .unwrap();
+
+            assert_eq!(metrics.udp_banned_ips_total(), 50);
+
+            // Overwrite with new value
+            metrics
+                .set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 75.0, now)
+                .unwrap();
+
+            assert_eq!(metrics.udp_banned_ips_total(), 75);
+        }
+
+        #[test]
+        fn it_should_handle_empty_label_sets() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let empty_labels = LabelSet::empty();
+
+            let result = metrics.increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL), &empty_labels, now);
+
+            assert!(result.is_ok());
+            assert_eq!(metrics.udp_requests_aborted_total(), 1);
+        }
+
+        #[test]
+        fn it_should_handle_multiple_labels_on_same_metric() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+
+            let labels1 = LabelSet::from([("server_binding_address_ip_family", "inet")]);
+            let labels2 = LabelSet::from([("server_binding_address_ip_family", "inet6")]);
+
+            // Add to same metric with different labels
+            for _ in 0..3 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL), &labels1, now)
+                    .unwrap();
+            }
+
+            for _ in 0..5 {
+                metrics
+                    .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL), &labels2, now)
+                    .unwrap();
+            }
+
+            // Should return labeled sums correctly
+            assert_eq!(metrics.udp4_requests_received_total(), 3);
+            assert_eq!(metrics.udp6_requests_received_total(), 5);
+        }
+    }
+
+    mod error_handling {
+        use super::*;
+
+        #[test]
+        fn it_should_return_ok_result_for_valid_counter_operations() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            let result = metrics.increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL), &labels, now);
+
+            assert!(result.is_ok());
+        }
+
+        #[test]
+        fn it_should_return_ok_result_for_valid_gauge_operations() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            let result = metrics.set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 42.0, now);
+
+            assert!(result.is_ok());
+        }
+
+        #[test]
+        fn it_should_handle_unknown_metric_names_gracefully() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::empty();
+
+            // This should still work as metrics are created on demand
+            let result = metrics.increase_counter(&metric_name!("unknown_metric"), &labels, now);
+
+            assert!(result.is_ok());
+        }
+    }
+
+    mod averaged_processing_time_metrics {
+        use super::*;
+
+        #[test]
+        fn it_should_return_zero_for_udp_avg_connect_processing_time_ns_averaged_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp_avg_connect_processing_time_ns_averaged(), 0);
+        }
+
+        #[test]
+        fn it_should_return_averaged_value_for_udp_avg_connect_processing_time_ns_averaged() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels1 = LabelSet::from([("request_kind", "connect"), ("server_id", "server1")]);
+            let labels2 = LabelSet::from([("request_kind", "connect"), ("server_id", "server2")]);
+
+            // Set different gauge values for connect requests from different servers
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels1,
+                    1000.0,
+                    now,
+                )
+                .unwrap();
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels2,
+                    2000.0,
+                    now,
+                )
+                .unwrap();
+
+            // Should return the average: (1000 + 2000) / 2 = 1500
+            assert_eq!(metrics.udp_avg_connect_processing_time_ns_averaged(), 1500);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp_avg_announce_processing_time_ns_averaged_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp_avg_announce_processing_time_ns_averaged(), 0);
+        }
+
+        #[test]
+        fn it_should_return_averaged_value_for_udp_avg_announce_processing_time_ns_averaged() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels1 = LabelSet::from([("request_kind", "announce"), ("server_id", "server1")]);
+            let labels2 = LabelSet::from([("request_kind", "announce"), ("server_id", "server2")]);
+            let labels3 = LabelSet::from([("request_kind", "announce"), ("server_id", "server3")]);
+
+            // Set different gauge values for announce requests from different servers
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels1,
+                    1500.0,
+                    now,
+                )
+                .unwrap();
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels2,
+                    2500.0,
+                    now,
+                )
+                .unwrap();
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels3,
+                    3000.0,
+                    now,
+                )
+                .unwrap();
+
+            // Should return the average: (1500 + 2500 + 3000) / 3 = 2333 (truncated)
+            assert_eq!(metrics.udp_avg_announce_processing_time_ns_averaged(), 2333);
+        }
+
+        #[test]
+        fn it_should_return_zero_for_udp_avg_scrape_processing_time_ns_averaged_when_no_data() {
+            let metrics = Metrics::default();
+            assert_eq!(metrics.udp_avg_scrape_processing_time_ns_averaged(), 0);
+        }
+
+        #[test]
+        fn it_should_return_averaged_value_for_udp_avg_scrape_processing_time_ns_averaged() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels1 = LabelSet::from([("request_kind", "scrape"), ("server_id", "server1")]);
+            let labels2 = LabelSet::from([("request_kind", "scrape"), ("server_id", "server2")]);
+
+            // Set different gauge values for scrape requests from different servers
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels1,
+                    500.0,
+                    now,
+                )
+                .unwrap();
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels2,
+                    1500.0,
+                    now,
+                )
+                .unwrap();
+
+            // Should return the average: (500 + 1500) / 2 = 1000
+            assert_eq!(metrics.udp_avg_scrape_processing_time_ns_averaged(), 1000);
+        }
+
+        #[test]
+        fn it_should_handle_fractional_averages_with_truncation() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels1 = LabelSet::from([("request_kind", "connect"), ("server_id", "server1")]);
+            let labels2 = LabelSet::from([("request_kind", "connect"), ("server_id", "server2")]);
+            let labels3 = LabelSet::from([("request_kind", "connect"), ("server_id", "server3")]);
+
+            // Set values that will result in a fractional average
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels1,
+                    1000.0,
+                    now,
+                )
+                .unwrap();
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels2,
+                    1001.0,
+                    now,
+                )
+                .unwrap();
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels3,
+                    1001.0,
+                    now,
+                )
+                .unwrap();
+
+            // Should return the average: (1000 + 1001 + 1001) / 3 = 1000.666... → 1000 (truncated)
+            assert_eq!(metrics.udp_avg_connect_processing_time_ns_averaged(), 1000);
+        }
+
+        #[test]
+        fn it_should_only_average_matching_request_kinds() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+
+            // Set values for different request kinds with the same server_id
+            let connect_labels = LabelSet::from([("request_kind", "connect"), ("server_id", "server1")]);
+            let announce_labels = LabelSet::from([("request_kind", "announce"), ("server_id", "server1")]);
+            let scrape_labels = LabelSet::from([("request_kind", "scrape"), ("server_id", "server1")]);
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &connect_labels,
+                    1000.0,
+                    now,
+                )
+                .unwrap();
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &announce_labels,
+                    2000.0,
+                    now,
+                )
+                .unwrap();
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &scrape_labels,
+                    3000.0,
+                    now,
+                )
+                .unwrap();
+
+            // Each function should only return the value for its specific request kind
+            assert_eq!(metrics.udp_avg_connect_processing_time_ns_averaged(), 1000);
+            assert_eq!(metrics.udp_avg_announce_processing_time_ns_averaged(), 2000);
+            assert_eq!(metrics.udp_avg_scrape_processing_time_ns_averaged(), 3000);
+        }
+
+        #[test]
+        fn it_should_handle_single_server_averaged_metrics() {
+            let mut metrics = Metrics::default();
+            let now = CurrentClock::now();
+            let labels = LabelSet::from([("request_kind", "connect"), ("server_id", "single_server")]);
+
+            metrics
+                .set_gauge(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                    &labels,
+                    1234.0,
+                    now,
+                )
+                .unwrap();
+
+            // With only one server, the average should be the same as the single value
+            assert_eq!(metrics.udp_avg_connect_processing_time_ns_averaged(), 1234);
+        }
     }
 }
diff --git a/packages/udp-tracker-server/src/statistics/mod.rs b/packages/udp-tracker-server/src/statistics/mod.rs
index 8f6e9becf..6bd35b9a1 100644
--- a/packages/udp-tracker-server/src/statistics/mod.rs
+++ b/packages/udp-tracker-server/src/statistics/mod.rs
@@ -8,13 +8,17 @@ use torrust_tracker_metrics::metric::description::MetricDescription;
 use torrust_tracker_metrics::metric_name;
 use torrust_tracker_metrics::unit::Unit;
 
-const UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL: &str = "udp_tracker_server_requests_aborted_total";
-const UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL: &str = "udp_tracker_server_requests_banned_total";
-const UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL: &str = "udp_tracker_server_requests_received_total";
-const UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL: &str = "udp_tracker_server_requests_accepted_total";
-const UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL: &str = "udp_tracker_server_responses_sent_total";
-const UDP_TRACKER_SERVER_ERRORS_TOTAL: &str = "udp_tracker_server_errors_total";
-const UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS: &str = "udp_tracker_server_performance_avg_processing_time_ns";
+pub const UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL: &str = "udp_tracker_server_requests_aborted_total";
+pub const UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL: &str = "udp_tracker_server_requests_banned_total";
+pub const UDP_TRACKER_SERVER_IPS_BANNED_TOTAL: &str = "udp_tracker_server_ips_banned_total";
+pub const UDP_TRACKER_SERVER_CONNECTION_ID_ERRORS_TOTAL: &str = "udp_tracker_server_connection_id_errors_total";
+pub const UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL: &str = "udp_tracker_server_requests_received_total";
+pub const UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL: &str = "udp_tracker_server_requests_accepted_total";
+pub const UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL: &str = "udp_tracker_server_responses_sent_total";
+pub const UDP_TRACKER_SERVER_ERRORS_TOTAL: &str = "udp_tracker_server_errors_total";
+pub const UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS: &str = "udp_tracker_server_performance_avg_processing_time_ns";
+pub const UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSED_REQUESTS_TOTAL: &str =
+    "udp_tracker_server_performance_avg_processed_requests_total";
 
 #[must_use]
 pub fn describe_metrics() -> Metrics {
@@ -23,44 +27,62 @@ pub fn describe_metrics() -> Metrics {
     metrics.metric_collection.describe_counter(
         &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL),
         Some(Unit::Count),
-        Some(&MetricDescription::new("Total number of UDP requests aborted")),
+        Some(MetricDescription::new("Total number of UDP requests aborted")),
     );
 
     metrics.metric_collection.describe_counter(
         &metric_name!(UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL),
         Some(Unit::Count),
-        Some(&MetricDescription::new("Total number of UDP requests banned")),
+        Some(MetricDescription::new("Total number of UDP requests banned")),
+    );
+
+    metrics.metric_collection.describe_gauge(
+        &metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("Total number of IPs banned from UDP requests")),
+    );
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(UDP_TRACKER_SERVER_CONNECTION_ID_ERRORS_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new("Total number of requests with connection ID errors")),
     );
 
     metrics.metric_collection.describe_counter(
         &metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL),
         Some(Unit::Count),
-        Some(&MetricDescription::new("Total number of UDP requests received")),
+        Some(MetricDescription::new("Total number of UDP requests received")),
     );
 
     metrics.metric_collection.describe_counter(
         &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL),
         Some(Unit::Count),
-        Some(&MetricDescription::new("Total number of UDP requests accepted")),
+        Some(MetricDescription::new("Total number of UDP requests accepted")),
     );
 
     metrics.metric_collection.describe_counter(
         &metric_name!(UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL),
         Some(Unit::Count),
-        Some(&MetricDescription::new("Total number of UDP responses sent")),
+        Some(MetricDescription::new("Total number of UDP responses sent")),
     );
 
     metrics.metric_collection.describe_counter(
         &metric_name!(UDP_TRACKER_SERVER_ERRORS_TOTAL),
         Some(Unit::Count),
-        Some(&MetricDescription::new("Total number of errors processing UDP requests")),
+        Some(MetricDescription::new("Total number of errors processing UDP requests")),
     );
 
     metrics.metric_collection.describe_gauge(
         &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
         Some(Unit::Nanoseconds),
-        Some(&MetricDescription::new(
-            "Average time to process a UDP connect request in nanoseconds",
+        Some(MetricDescription::new("Average time to process a UDP request in nanoseconds")),
+    );
+
+    metrics.metric_collection.describe_counter(
+        &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSED_REQUESTS_TOTAL),
+        Some(Unit::Count),
+        Some(MetricDescription::new(
+            "Total number of UDP requests processed for the average performance metrics",
         )),
     );
 
diff --git a/packages/udp-tracker-server/src/statistics/repository.rs b/packages/udp-tracker-server/src/statistics/repository.rs
index 1a1db89c7..c4c995b8a 100644
--- a/packages/udp-tracker-server/src/statistics/repository.rs
+++ b/packages/udp-tracker-server/src/statistics/repository.rs
@@ -34,190 +34,742 @@ impl Repository {
         self.stats.read().await
     }
 
-    pub async fn increase_udp_requests_aborted(&self) {
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// increase the counter.
+    pub async fn increase_counter(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
         let mut stats_lock = self.stats.write().await;
-        stats_lock.udp_requests_aborted += 1;
-        drop(stats_lock);
-    }
 
-    pub async fn increase_udp_requests_banned(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp_requests_banned += 1;
-        drop(stats_lock);
-    }
+        let result = stats_lock.increase_counter(metric_name, labels, now);
 
-    pub async fn increase_udp4_requests(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp4_requests += 1;
         drop(stats_lock);
-    }
 
-    pub async fn increase_udp4_connections(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp4_connections_handled += 1;
-        drop(stats_lock);
+        result
     }
 
-    pub async fn increase_udp4_announces(&self) {
+    /// # Errors
+    ///
+    /// This function will return an error if the metric collection fails to
+    /// increase the counter.
+    pub async fn set_gauge(
+        &self,
+        metric_name: &MetricName,
+        labels: &LabelSet,
+        value: f64,
+        now: DurationSinceUnixEpoch,
+    ) -> Result<(), Error> {
         let mut stats_lock = self.stats.write().await;
-        stats_lock.udp4_announces_handled += 1;
+
+        let result = stats_lock.set_gauge(metric_name, labels, value, now);
+
         drop(stats_lock);
+
+        result
     }
 
-    pub async fn increase_udp4_scrapes(&self) {
+    pub async fn recalculate_udp_avg_processing_time_ns(
+        &self,
+        req_processing_time: Duration,
+        label_set: &LabelSet,
+        now: DurationSinceUnixEpoch,
+    ) -> f64 {
         let mut stats_lock = self.stats.write().await;
-        stats_lock.udp4_scrapes_handled += 1;
+
+        let new_avg = stats_lock.recalculate_udp_avg_processing_time_ns(req_processing_time, label_set, now);
+
         drop(stats_lock);
+
+        new_avg
     }
+}
 
-    pub async fn increase_udp4_responses(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp4_responses += 1;
-        drop(stats_lock);
+#[cfg(test)]
+mod tests {
+    use core::f64;
+    use std::time::Duration;
+
+    use torrust_tracker_clock::clock::Time;
+    use torrust_tracker_metrics::metric_collection::aggregate::sum::Sum;
+    use torrust_tracker_metrics::metric_name;
+
+    use super::*;
+    use crate::statistics::*;
+    use crate::CurrentClock;
+
+    #[test]
+    fn it_should_implement_default() {
+        let repo = Repository::default();
+        assert!(!std::ptr::eq(&repo.stats, &Repository::new().stats));
     }
 
-    pub async fn increase_udp4_errors(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp4_errors_handled += 1;
-        drop(stats_lock);
+    #[test]
+    fn it_should_be_cloneable() {
+        let repo = Repository::new();
+        let cloned_repo = repo.clone();
+        assert!(!std::ptr::eq(&repo.stats, &cloned_repo.stats));
     }
 
-    #[allow(clippy::cast_precision_loss)]
-    #[allow(clippy::cast_possible_truncation)]
-    #[allow(clippy::cast_sign_loss)]
-    pub async fn recalculate_udp_avg_connect_processing_time_ns(&self, req_processing_time: Duration) -> f64 {
-        let mut stats_lock = self.stats.write().await;
+    #[tokio::test]
+    async fn it_should_be_initialized_with_described_metrics() {
+        let repo = Repository::new();
+        let stats = repo.get_stats().await;
+
+        // Check that the described metrics are present
+        assert!(stats
+            .metric_collection
+            .contains_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL)));
+        assert!(stats
+            .metric_collection
+            .contains_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL)));
+        assert!(stats
+            .metric_collection
+            .contains_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL)));
+        assert!(stats
+            .metric_collection
+            .contains_counter(&metric_name!(UDP_TRACKER_SERVER_CONNECTION_ID_ERRORS_TOTAL)));
+        assert!(stats
+            .metric_collection
+            .contains_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL)));
+        assert!(stats
+            .metric_collection
+            .contains_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL)));
+        assert!(stats
+            .metric_collection
+            .contains_counter(&metric_name!(UDP_TRACKER_SERVER_RESPONSES_SENT_TOTAL)));
+        assert!(stats
+            .metric_collection
+            .contains_counter(&metric_name!(UDP_TRACKER_SERVER_ERRORS_TOTAL)));
+        assert!(stats
+            .metric_collection
+            .contains_gauge(&metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS)));
+    }
 
-        let req_processing_time = req_processing_time.as_nanos() as f64;
-        let udp_connections_handled = (stats_lock.udp4_connections_handled + stats_lock.udp6_connections_handled) as f64;
+    #[tokio::test]
+    async fn it_should_return_a_read_guard_to_metrics() {
+        let repo = Repository::new();
+        let stats = repo.get_stats().await;
 
-        let previous_avg = stats_lock.udp_avg_connect_processing_time_ns;
+        // Should be able to read metrics through the guard
+        assert_eq!(stats.udp_requests_aborted_total(), 0);
+        assert_eq!(stats.udp_requests_banned_total(), 0);
+    }
 
-        // Moving average: https://en.wikipedia.org/wiki/Moving_average
-        let new_avg = previous_avg as f64 + (req_processing_time - previous_avg as f64) / udp_connections_handled;
+    #[tokio::test]
+    async fn it_should_allow_increasing_a_counter_metric_successfully() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+        let labels = LabelSet::empty();
 
-        stats_lock.udp_avg_connect_processing_time_ns = new_avg.ceil() as u64;
+        // Increase a counter metric
+        let result = repo
+            .increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL), &labels, now)
+            .await;
 
-        drop(stats_lock);
+        assert!(result.is_ok());
 
-        new_avg
+        // Verify the counter was incremented
+        let stats = repo.get_stats().await;
+        assert_eq!(stats.udp_requests_aborted_total(), 1);
     }
 
-    #[allow(clippy::cast_precision_loss)]
-    #[allow(clippy::cast_possible_truncation)]
-    #[allow(clippy::cast_sign_loss)]
-    pub async fn recalculate_udp_avg_announce_processing_time_ns(&self, req_processing_time: Duration) -> f64 {
-        let mut stats_lock = self.stats.write().await;
+    #[tokio::test]
+    async fn it_should_allow_increasing_a_counter_multiple_times() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+        let labels = LabelSet::empty();
+
+        // Increase counter multiple times
+        for _ in 0..5 {
+            repo.increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL), &labels, now)
+                .await
+                .unwrap();
+        }
 
-        let req_processing_time = req_processing_time.as_nanos() as f64;
+        // Verify the counter was incremented correctly
+        let stats = repo.get_stats().await;
+        assert_eq!(stats.udp_requests_aborted_total(), 5);
+    }
 
-        let udp_announces_handled = (stats_lock.udp4_announces_handled + stats_lock.udp6_announces_handled) as f64;
+    #[tokio::test]
+    async fn it_should_allow_increasing_a_counter_with_different_labels() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
 
-        let previous_avg = stats_lock.udp_avg_announce_processing_time_ns;
+        let labels_ipv4 = LabelSet::from([("server_binding_address_ip_family", "inet")]);
+        let labels_ipv6 = LabelSet::from([("server_binding_address_ip_family", "inet6")]);
 
-        // Moving average: https://en.wikipedia.org/wiki/Moving_average
-        let new_avg = previous_avg as f64 + (req_processing_time - previous_avg as f64) / udp_announces_handled;
+        // Increase counters with different labels
+        repo.increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL), &labels_ipv4, now)
+            .await
+            .unwrap();
 
-        stats_lock.udp_avg_announce_processing_time_ns = new_avg.ceil() as u64;
+        repo.increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_RECEIVED_TOTAL), &labels_ipv6, now)
+            .await
+            .unwrap();
 
-        drop(stats_lock);
-
-        new_avg
+        // Verify both labeled metrics
+        let stats = repo.get_stats().await;
+        assert_eq!(stats.udp4_requests_received_total(), 1);
+        assert_eq!(stats.udp6_requests_received_total(), 1);
     }
 
-    #[allow(clippy::cast_precision_loss)]
-    #[allow(clippy::cast_possible_truncation)]
-    #[allow(clippy::cast_sign_loss)]
-    pub async fn recalculate_udp_avg_scrape_processing_time_ns(&self, req_processing_time: Duration) -> f64 {
-        let mut stats_lock = self.stats.write().await;
+    #[tokio::test]
+    async fn it_should_set_a_gauge_metric_successfully() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+        let labels = LabelSet::empty();
 
-        let req_processing_time = req_processing_time.as_nanos() as f64;
-        let udp_scrapes_handled = (stats_lock.udp4_scrapes_handled + stats_lock.udp6_scrapes_handled) as f64;
+        // Set a gauge metric
+        let result = repo
+            .set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 42.0, now)
+            .await;
 
-        let previous_avg = stats_lock.udp_avg_scrape_processing_time_ns;
+        assert!(result.is_ok());
 
-        // Moving average: https://en.wikipedia.org/wiki/Moving_average
-        let new_avg = previous_avg as f64 + (req_processing_time - previous_avg as f64) / udp_scrapes_handled;
+        // Verify the gauge was set
+        let stats = repo.get_stats().await;
+        assert_eq!(stats.udp_banned_ips_total(), 42);
+    }
 
-        stats_lock.udp_avg_scrape_processing_time_ns = new_avg.ceil() as u64;
+    #[tokio::test]
+    async fn it_should_overwrite_previous_value_when_setting_a_gauge_with_a_previous_value() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+        let labels = LabelSet::empty();
+
+        // Set gauge to initial value
+        repo.set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 10.0, now)
+            .await
+            .unwrap();
+
+        // Overwrite with new value
+        repo.set_gauge(&metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL), &labels, 25.0, now)
+            .await
+            .unwrap();
+
+        // Verify the gauge has the new value
+        let stats = repo.get_stats().await;
+        assert_eq!(stats.udp_banned_ips_total(), 25);
+    }
 
-        drop(stats_lock);
+    #[tokio::test]
+    async fn it_should_allow_setting_a_gauge_with_different_labels() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+
+        let labels_connect = LabelSet::from([("request_kind", "connect")]);
+        let labels_announce = LabelSet::from([("request_kind", "announce")]);
+
+        // Set gauges with different labels
+        repo.set_gauge(
+            &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+            &labels_connect,
+            1000.0,
+            now,
+        )
+        .await
+        .unwrap();
+
+        repo.set_gauge(
+            &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+            &labels_announce,
+            2000.0,
+            now,
+        )
+        .await
+        .unwrap();
+
+        // Verify both labeled metrics
+        let stats = repo.get_stats().await;
+
+        #[allow(clippy::cast_sign_loss)]
+        #[allow(clippy::cast_possible_truncation)]
+        let udp_avg_connect_processing_time_ns = stats
+            .metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                &[("request_kind", "connect")].into(),
+            )
+            .unwrap_or_default() as u64;
+
+        #[allow(clippy::cast_sign_loss)]
+        #[allow(clippy::cast_possible_truncation)]
+        let udp_avg_announce_processing_time_ns = stats
+            .metric_collection
+            .sum(
+                &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+                &[("request_kind", "announce")].into(),
+            )
+            .unwrap_or_default() as u64;
+
+        assert_eq!(udp_avg_connect_processing_time_ns, 1000);
+        assert_eq!(udp_avg_announce_processing_time_ns, 2000);
+    }
 
-        new_avg
+    #[tokio::test]
+    async fn it_should_recalculate_the_udp_average_connect_processing_time_in_nanoseconds_using_moving_average() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+
+        // Set initial average to 1000ns
+        let connect_labels = LabelSet::from([("request_kind", "connect")]);
+        repo.set_gauge(
+            &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+            &connect_labels,
+            1000.0,
+            now,
+        )
+        .await
+        .unwrap();
+
+        // Calculate new average with processing time of 2000ns
+        // This will increment the processed requests counter from 0 to 1
+        let processing_time = Duration::from_micros(2);
+        let new_avg = repo
+            .recalculate_udp_avg_processing_time_ns(processing_time, &connect_labels, now)
+            .await;
+
+        // Moving average: previous_avg + (new_value - previous_avg) / processed_requests_total
+        // With processed_requests_total = 1 (incremented during the call):
+        // 1000 + (2000 - 1000) / 1 = 1000 + 1000 = 2000
+        let expected_avg = 1000.0 + (2000.0 - 1000.0) / 1.0;
+        assert!(
+            (new_avg - expected_avg).abs() < 0.01,
+            "Expected {expected_avg}, got {new_avg}"
+        );
     }
 
-    pub async fn increase_udp6_requests(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp6_requests += 1;
-        drop(stats_lock);
+    #[tokio::test]
+    async fn it_should_recalculate_the_udp_average_announce_processing_time_in_nanoseconds_using_moving_average() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+
+        // Set initial average to 500ns
+        let announce_labels = LabelSet::from([("request_kind", "announce")]);
+        repo.set_gauge(
+            &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+            &announce_labels,
+            500.0,
+            now,
+        )
+        .await
+        .unwrap();
+
+        // Calculate new average with processing time of 1500ns
+        // This will increment the processed requests counter from 0 to 1
+        let processing_time = Duration::from_nanos(1500);
+        let new_avg = repo
+            .recalculate_udp_avg_processing_time_ns(processing_time, &announce_labels, now)
+            .await;
+
+        // Moving average: previous_avg + (new_value - previous_avg) / processed_requests_total
+        // With processed_requests_total = 1 (incremented during the call):
+        // 500 + (1500 - 500) / 1 = 500 + 1000 = 1500
+        let expected_avg = 500.0 + (1500.0 - 500.0) / 1.0;
+        assert!(
+            (new_avg - expected_avg).abs() < 0.01,
+            "Expected {expected_avg}, got {new_avg}"
+        );
     }
 
-    pub async fn increase_udp6_connections(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp6_connections_handled += 1;
-        drop(stats_lock);
+    #[tokio::test]
+    async fn it_should_recalculate_the_udp_average_scrape_processing_time_in_nanoseconds_using_moving_average() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+
+        // Set initial average to 800ns
+        let scrape_labels = LabelSet::from([("request_kind", "scrape")]);
+        repo.set_gauge(
+            &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS),
+            &scrape_labels,
+            800.0,
+            now,
+        )
+        .await
+        .unwrap();
+
+        // Calculate new average with processing time of 1200ns
+        // This will increment the processed requests counter from 0 to 1
+        let processing_time = Duration::from_nanos(1200);
+        let new_avg = repo
+            .recalculate_udp_avg_processing_time_ns(processing_time, &scrape_labels, now)
+            .await;
+
+        // Moving average: previous_avg + (new_value - previous_avg) / processed_requests_total
+        // With processed_requests_total = 1 (incremented during the call):
+        // 800 + (1200 - 800) / 1 = 800 + 400 = 1200
+        let expected_avg = 800.0 + (1200.0 - 800.0) / 1.0;
+        assert!(
+            (new_avg - expected_avg).abs() < 0.01,
+            "Expected {expected_avg}, got {new_avg}"
+        );
     }
 
-    pub async fn increase_udp6_announces(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp6_announces_handled += 1;
-        drop(stats_lock);
+    #[tokio::test]
+    async fn recalculate_average_methods_should_handle_zero_connections_gracefully() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+
+        // Test with zero connections (should not panic, should handle division by zero)
+        let processing_time = Duration::from_micros(1);
+
+        let connect_labels = LabelSet::from([("request_kind", "connect")]);
+        let connect_avg = repo
+            .recalculate_udp_avg_processing_time_ns(processing_time, &connect_labels, now)
+            .await;
+
+        let announce_labels = LabelSet::from([("request_kind", "announce")]);
+        let announce_avg = repo
+            .recalculate_udp_avg_processing_time_ns(processing_time, &announce_labels, now)
+            .await;
+
+        let scrape_labels = LabelSet::from([("request_kind", "scrape")]);
+        let scrape_avg = repo
+            .recalculate_udp_avg_processing_time_ns(processing_time, &scrape_labels, now)
+            .await;
+
+        // With 0 total connections, the formula becomes 0 + (1000 - 0) / 0
+        // This should handle the division by zero case gracefully
+        assert!((connect_avg - 1000.0).abs() < f64::EPSILON);
+        assert!((announce_avg - 1000.0).abs() < f64::EPSILON);
+        assert!((scrape_avg - 1000.0).abs() < f64::EPSILON);
     }
 
-    pub async fn increase_udp6_scrapes(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp6_scrapes_handled += 1;
-        drop(stats_lock);
+    #[tokio::test]
+    async fn it_should_handle_concurrent_access() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+
+        // Spawn multiple concurrent tasks
+        let mut handles = vec![];
+
+        for i in 0..10 {
+            let repo_clone = repo.clone();
+            let handle = tokio::spawn(async move {
+                for _ in 0..5 {
+                    repo_clone
+                        .increase_counter(
+                            &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL),
+                            &LabelSet::empty(),
+                            now,
+                        )
+                        .await
+                        .unwrap();
+                }
+                i
+            });
+            handles.push(handle);
+        }
+
+        // Wait for all tasks to complete
+        for handle in handles {
+            handle.await.unwrap();
+        }
+
+        // Verify all increments were properly recorded
+        let stats = repo.get_stats().await;
+        assert_eq!(stats.udp_requests_aborted_total(), 50); // 10 tasks * 5 increments each
     }
 
-    pub async fn increase_udp6_responses(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp6_responses += 1;
-        drop(stats_lock);
+    #[tokio::test]
+    async fn it_should_handle_large_processing_times() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+
+        // Set up a connection
+        let ipv4_labels = LabelSet::from([("server_binding_address_ip_family", "inet"), ("request_kind", "connect")]);
+        repo.increase_counter(&metric_name!(UDP_TRACKER_SERVER_REQUESTS_ACCEPTED_TOTAL), &ipv4_labels, now)
+            .await
+            .unwrap();
+
+        // Test with very large processing time
+        let large_duration = Duration::from_secs(1); // 1 second = 1,000,000,000 ns
+        let connect_labels = LabelSet::from([("request_kind", "connect")]);
+        let new_avg = repo
+            .recalculate_udp_avg_processing_time_ns(large_duration, &connect_labels, now)
+            .await;
+
+        // Should handle large numbers without overflow
+        assert!(new_avg > 0.0);
+        assert!(new_avg.is_finite());
     }
 
-    pub async fn increase_udp6_errors(&self) {
-        let mut stats_lock = self.stats.write().await;
-        stats_lock.udp6_errors_handled += 1;
-        drop(stats_lock);
+    #[tokio::test]
+    async fn it_should_maintain_consistency_across_operations() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+
+        // Perform a series of operations
+        repo.increase_counter(
+            &metric_name!(UDP_TRACKER_SERVER_REQUESTS_ABORTED_TOTAL),
+            &LabelSet::empty(),
+            now,
+        )
+        .await
+        .unwrap();
+
+        repo.set_gauge(
+            &metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL),
+            &LabelSet::empty(),
+            10.0,
+            now,
+        )
+        .await
+        .unwrap();
+
+        repo.increase_counter(
+            &metric_name!(UDP_TRACKER_SERVER_REQUESTS_BANNED_TOTAL),
+            &LabelSet::empty(),
+            now,
+        )
+        .await
+        .unwrap();
+
+        // Check final state
+        let stats = repo.get_stats().await;
+        assert_eq!(stats.udp_requests_aborted_total(), 1);
+        assert_eq!(stats.udp_banned_ips_total(), 10);
+        assert_eq!(stats.udp_requests_banned_total(), 1);
     }
 
-    /// # Errors
-    ///
-    /// This function will return an error if the metric collection fails to
-    /// increase the counter.
-    pub async fn increase_counter(
-        &self,
-        metric_name: &MetricName,
-        labels: &LabelSet,
-        now: DurationSinceUnixEpoch,
-    ) -> Result<(), Error> {
-        let mut stats_lock = self.stats.write().await;
+    #[tokio::test]
+    async fn it_should_handle_error_cases_gracefully() {
+        let repo = Repository::new();
+        let now = CurrentClock::now();
+
+        // Test with invalid metric name (this should still work as metrics are created dynamically)
+        let result = repo
+            .increase_counter(&metric_name!("non_existent_metric"), &LabelSet::empty(), now)
+            .await;
+
+        // Should succeed as metrics are created on demand
+        assert!(result.is_ok());
+
+        // Test with NaN value for gauge
+        let result = repo
+            .set_gauge(
+                &metric_name!(UDP_TRACKER_SERVER_IPS_BANNED_TOTAL),
+                &LabelSet::empty(),
+                f64::NAN,
+                now,
+            )
+            .await;
+
+        // Should handle NaN values
+        assert!(result.is_ok());
+    }
 
-        let result = stats_lock.increase_counter(metric_name, labels, now);
+    mod race_conditions {
 
-        drop(stats_lock);
+        use core::f64;
+        use std::time::Duration;
 
-        result
-    }
+        use tokio::task::JoinHandle;
+        use torrust_tracker_clock::clock::Time;
+        use torrust_tracker_metrics::metric_name;
 
-    /// # Errors
-    ///
-    /// This function will return an error if the metric collection fails to
-    /// increase the counter.
-    pub async fn set_gauge(
-        &self,
-        metric_name: &MetricName,
-        labels: &LabelSet,
-        value: f64,
-        now: DurationSinceUnixEpoch,
-    ) -> Result<(), Error> {
-        let mut stats_lock = self.stats.write().await;
+        use super::*;
+        use crate::CurrentClock;
 
-        let result = stats_lock.set_gauge(metric_name, labels, value, now);
+        #[tokio::test]
+        async fn it_should_handle_race_conditions_when_updating_udp_performance_metrics_in_parallel() {
+            const REQUESTS_PER_SERVER: usize = 100;
 
-        drop(stats_lock);
+            // ** Set up test data and environment **
 
-        result
+            let repo = Repository::new();
+            let now = CurrentClock::now();
+
+            let server1_labels = create_server_metric_labels("6868");
+            let server2_labels = create_server_metric_labels("6969");
+
+            // ** Execute concurrent metric updates **
+
+            // Spawn concurrent tasks for server 1 with processing times [1000, 2000, 3000, 4000, 5000] ns
+            let server1_handles = spawn_server_tasks(&repo, &server1_labels, 1000, now, REQUESTS_PER_SERVER);
+
+            // Spawn concurrent tasks for server 2 with processing times [2000, 3000, 4000, 5000, 6000] ns
+            let server2_handles = spawn_server_tasks(&repo, &server2_labels, 2000, now, REQUESTS_PER_SERVER);
+
+            // Wait for both servers' results
+            let (server1_results, server2_results) = tokio::join!(
+                collect_concurrent_task_results(server1_handles),
+                collect_concurrent_task_results(server2_handles)
+            );
+
+            // ** Verify results and metrics **
+
+            // Verify correctness of concurrent operations
+            assert_server_results_are_valid(&server1_results, "Server 1", REQUESTS_PER_SERVER);
+            assert_server_results_are_valid(&server2_results, "Server 2", REQUESTS_PER_SERVER);
+
+            let stats = repo.get_stats().await;
+
+            // Verify each server's metrics individually
+            let server1_avg = assert_server_metrics_are_correct(&stats, &server1_labels, "Server 1", REQUESTS_PER_SERVER, 3000.0);
+            let server2_avg = assert_server_metrics_are_correct(&stats, &server2_labels, "Server 2", REQUESTS_PER_SERVER, 4000.0);
+
+            // Verify relationship between servers
+            assert_server_metrics_relationship(server1_avg, server2_avg);
+
+            // Verify each server's result consistency individually
+            assert_server_result_matches_stored_average(&server1_results, &stats, &server1_labels, "Server 1");
+            assert_server_result_matches_stored_average(&server2_results, &stats, &server2_labels, "Server 2");
+
+            // Verify metric collection integrity
+            assert_metric_collection_integrity(&stats);
+        }
+
+        // Test helper functions to hide implementation details
+
+        fn create_server_metric_labels(port: &str) -> LabelSet {
+            LabelSet::from([
+                ("request_kind", "connect"),
+                ("server_binding_address_ip_family", "inet"),
+                ("server_port", port),
+            ])
+        }
+
+        fn spawn_server_tasks(
+            repo: &Repository,
+            labels: &LabelSet,
+            base_processing_time_ns: usize,
+            now: DurationSinceUnixEpoch,
+            requests_per_server: usize,
+        ) -> Vec<JoinHandle<f64>> {
+            let mut handles = vec![];
+
+            for i in 0..requests_per_server {
+                let repo_clone = repo.clone();
+                let labels_clone = labels.clone();
+                let handle = tokio::spawn(async move {
+                    let processing_time_ns = base_processing_time_ns + (i % 5) * 1000;
+                    let processing_time = Duration::from_nanos(processing_time_ns as u64);
+                    repo_clone
+                        .recalculate_udp_avg_processing_time_ns(processing_time, &labels_clone, now)
+                        .await
+                });
+                handles.push(handle);
+            }
+
+            handles
+        }
+
+        async fn collect_concurrent_task_results(handles: Vec<tokio::task::JoinHandle<f64>>) -> Vec<f64> {
+            let mut server_results = Vec::new();
+
+            for handle in handles {
+                let result = handle.await.unwrap();
+                server_results.push(result);
+            }
+
+            server_results
+        }
+
+        fn assert_server_results_are_valid(results: &[f64], server_name: &str, expected_count: usize) {
+            // Verify all tasks completed
+            assert_eq!(
+                results.len(),
+                expected_count,
+                "{server_name} should have {expected_count} results"
+            );
+
+            // Verify all results are valid numbers
+            for result in results {
+                assert!(result.is_finite(), "{server_name} result should be finite: {result}");
+                assert!(*result > 0.0, "{server_name} result should be positive: {result}");
+            }
+        }
+
+        fn assert_server_metrics_are_correct(
+            stats: &Metrics,
+            labels: &LabelSet,
+            server_name: &str,
+            expected_request_count: usize,
+            expected_avg_ns: f64,
+        ) -> f64 {
+            // Verify request count
+            let processed_requests = get_processed_requests_count(stats, labels);
+            assert_eq!(
+                processed_requests, expected_request_count as u64,
+                "{server_name} should have processed {expected_request_count} requests"
+            );
+
+            // Verify average processing time is within expected range
+            let avg_processing_time = get_average_processing_time(stats, labels);
+            assert!(
+                (avg_processing_time - expected_avg_ns).abs() < 50.0,
+                "{server_name} average should be ~{expected_avg_ns}ns (±50ns), got {avg_processing_time}ns"
+            );
+
+            avg_processing_time
+        }
+
+        fn assert_server_metrics_relationship(server1_avg: f64, server2_avg: f64) {
+            const MIN_DIFFERENCE_NS: f64 = 950.0;
+
+            assert_averages_are_significantly_different(server1_avg, server2_avg, MIN_DIFFERENCE_NS);
+            assert_server_ordering_is_correct(server1_avg, server2_avg);
+        }
+
+        fn assert_averages_are_significantly_different(avg1: f64, avg2: f64, min_difference: f64) {
+            let difference = (avg1 - avg2).abs();
+            assert!(
+                difference > min_difference,
+                "Server averages should differ by more than {min_difference}ns, but difference was {difference}ns"
+            );
+        }
+
+        fn assert_server_ordering_is_correct(server1_avg: f64, server2_avg: f64) {
+            // Server 2 should have higher average since it has higher processing times [2000-6000] vs [1000-5000]
+            assert!(
+            server2_avg > server1_avg,
+            "Server 2 average ({server2_avg}ns) should be higher than Server 1 ({server1_avg}ns) due to higher processing time ranges"
+        );
+        }
+
+        fn assert_server_result_matches_stored_average(results: &[f64], stats: &Metrics, labels: &LabelSet, server_name: &str) {
+            let final_avg = get_average_processing_time(stats, labels);
+            let last_result = results.last().copied().unwrap();
+
+            assert!(
+                (last_result - final_avg).abs() <= f64::EPSILON,
+                "{server_name} last result ({last_result}) should match final average ({final_avg}) exactly"
+            );
+        }
+
+        fn assert_metric_collection_integrity(stats: &Metrics) {
+            assert!(stats
+                .metric_collection
+                .contains_gauge(&metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS)));
+            assert!(stats
+                .metric_collection
+                .contains_counter(&metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSED_REQUESTS_TOTAL)));
+        }
+
+        fn get_processed_requests_count(stats: &Metrics, labels: &LabelSet) -> u64 {
+            stats
+                .metric_collection
+                .get_counter_value(
+                    &metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSED_REQUESTS_TOTAL),
+                    labels,
+                )
+                .unwrap()
+                .value()
+        }
+
+        fn get_average_processing_time(stats: &Metrics, labels: &LabelSet) -> f64 {
+            stats
+                .metric_collection
+                .get_gauge_value(&metric_name!(UDP_TRACKER_SERVER_PERFORMANCE_AVG_PROCESSING_TIME_NS), labels)
+                .unwrap()
+                .value()
+        }
     }
 }
diff --git a/packages/udp-tracker-server/src/statistics/services.rs b/packages/udp-tracker-server/src/statistics/services.rs
index a2215067b..0eac01270 100644
--- a/packages/udp-tracker-server/src/statistics/services.rs
+++ b/packages/udp-tracker-server/src/statistics/services.rs
@@ -39,9 +39,7 @@
 use std::sync::Arc;
 
 use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
-use bittorrent_udp_tracker_core::services::banning::BanService;
-use tokio::sync::RwLock;
-use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
+use torrust_tracker_primitives::swarm_metadata::AggregateActiveSwarmMetadata;
 
 use crate::statistics::metrics::Metrics;
 use crate::statistics::repository::Repository;
@@ -52,7 +50,7 @@ pub struct TrackerMetrics {
     /// Domain level metrics.
     ///
     /// General metrics for all torrents (number of seeders, leechers, etcetera)
-    pub torrents_metrics: AggregateSwarmMetadata,
+    pub torrents_metrics: AggregateActiveSwarmMetadata,
 
     /// Application level metrics. Usage statistics/metrics.
     ///
@@ -63,38 +61,14 @@ pub struct TrackerMetrics {
 /// It returns all the [`TrackerMetrics`]
 pub async fn get_metrics(
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
-    ban_service: Arc<RwLock<BanService>>,
     stats_repository: Arc<Repository>,
 ) -> TrackerMetrics {
-    let torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata();
+    let torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata().await;
     let stats = stats_repository.get_stats().await;
-    let udp_banned_ips_total = ban_service.read().await.get_banned_ips_total();
 
     TrackerMetrics {
         torrents_metrics,
         protocol_metrics: Metrics {
-            // UDP
-            udp_requests_aborted: stats.udp_requests_aborted,
-            udp_requests_banned: stats.udp_requests_banned,
-            udp_banned_ips_total: udp_banned_ips_total as u64,
-            udp_avg_connect_processing_time_ns: stats.udp_avg_connect_processing_time_ns,
-            udp_avg_announce_processing_time_ns: stats.udp_avg_announce_processing_time_ns,
-            udp_avg_scrape_processing_time_ns: stats.udp_avg_scrape_processing_time_ns,
-            // UDPv4
-            udp4_requests: stats.udp4_requests,
-            udp4_connections_handled: stats.udp4_connections_handled,
-            udp4_announces_handled: stats.udp4_announces_handled,
-            udp4_scrapes_handled: stats.udp4_scrapes_handled,
-            udp4_responses: stats.udp4_responses,
-            udp4_errors_handled: stats.udp4_errors_handled,
-            // UDPv6
-            udp6_requests: stats.udp6_requests,
-            udp6_connections_handled: stats.udp6_connections_handled,
-            udp6_announces_handled: stats.udp6_announces_handled,
-            udp6_scrapes_handled: stats.udp6_scrapes_handled,
-            udp6_responses: stats.udp6_responses,
-            udp6_errors_handled: stats.udp6_errors_handled,
-            // Extendable metrics
             metric_collection: stats.metric_collection.clone(),
         },
     }
@@ -106,10 +80,7 @@ mod tests {
 
     use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
     use bittorrent_tracker_core::{self};
-    use bittorrent_udp_tracker_core::services::banning::BanService;
-    use bittorrent_udp_tracker_core::MAX_CONNECTION_ID_ERRORS_PER_IP;
-    use tokio::sync::RwLock;
-    use torrust_tracker_primitives::swarm_metadata::AggregateSwarmMetadata;
+    use torrust_tracker_primitives::swarm_metadata::AggregateActiveSwarmMetadata;
 
     use crate::statistics::describe_metrics;
     use crate::statistics::repository::Repository;
@@ -118,21 +89,15 @@ mod tests {
     #[tokio::test]
     async fn the_statistics_service_should_return_the_tracker_metrics() {
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
-        let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
         let stats_repository = Arc::new(Repository::new());
 
-        let tracker_metrics = get_metrics(
-            in_memory_torrent_repository.clone(),
-            ban_service.clone(),
-            stats_repository.clone(),
-        )
-        .await;
+        let tracker_metrics = get_metrics(in_memory_torrent_repository.clone(), stats_repository.clone()).await;
 
         assert_eq!(
             tracker_metrics,
             TrackerMetrics {
-                torrents_metrics: AggregateSwarmMetadata::default(),
+                torrents_metrics: AggregateActiveSwarmMetadata::default(),
                 protocol_metrics: describe_metrics(),
             }
         );
diff --git a/packages/udp-tracker-server/tests/server/contract.rs b/packages/udp-tracker-server/tests/server/contract.rs
index 860fd1f0b..350f3b8eb 100644
--- a/packages/udp-tracker-server/tests/server/contract.rs
+++ b/packages/udp-tracker-server/tests/server/contract.rs
@@ -32,7 +32,7 @@ async fn send_connection_request(transaction_id: TransactionId, client: &UdpTrac
 
     match response {
         Response::Connect(connect_response) => connect_response.connection_id,
-        _ => panic!("error connecting to udp server {:?}", response),
+        _ => panic!("error connecting to udp server {response:?}"),
     }
 }
 
@@ -59,7 +59,9 @@ async fn should_return_a_bad_request_response_when_the_client_sends_an_empty_req
 
     let response = Response::parse_bytes(&response, true).unwrap();
 
-    assert_eq!(get_error_response_message(&response).unwrap(), "Protocol identifier missing");
+    assert!(get_error_response_message(&response)
+        .unwrap()
+        .contains("Protocol identifier missing"));
 
     env.stop().await;
 }
@@ -165,7 +167,7 @@ mod receiving_an_announce_request {
             bytes_uploaded: NumberOfBytes(0i64.into()),
             bytes_left: NumberOfBytes(0i64.into()),
             event: AnnounceEvent::Started.into(),
-            ip_address: Ipv4Addr::new(0, 0, 0, 0).into(),
+            ip_address: Ipv4Addr::UNSPECIFIED.into(),
             key: PeerKey::new(0i32),
             peers_wanted: NumberOfPeers(1i32.into()),
             port: Port(port.into()),
@@ -249,7 +251,7 @@ mod receiving_an_announce_request {
             let transaction_id = tx_id.0.to_string();
 
             assert!(
-                logs_contains_a_line_with(&["ERROR", "UDP TRACKER", &transaction_id.to_string()]),
+                logs_contains_a_line_with(&["ERROR", "UDP TRACKER", &transaction_id]),
                 "Expected logs to contain: ERROR ... UDP TRACKER ... transaction_id={transaction_id}"
             );
         }
@@ -271,7 +273,7 @@ mod receiving_an_announce_request {
             .stats_repository
             .get_stats()
             .await
-            .udp_requests_banned;
+            .udp_requests_banned_total();
 
         // This should return a timeout error
         match client.send(announce_request.into()).await {
@@ -287,7 +289,7 @@ mod receiving_an_announce_request {
             .stats_repository
             .get_stats()
             .await
-            .udp_requests_banned;
+            .udp_requests_banned_total();
         let udp_banned_ips_total_after = ban_service.read().await.get_banned_ips_total();
 
         // UDP counter for banned requests should be increased by 1
diff --git a/project-words.txt b/project-words.txt
new file mode 100644
index 000000000..48c9565cc
--- /dev/null
+++ b/project-words.txt
@@ -0,0 +1,252 @@
+Addrs
+adduser
+alekitto
+appuser
+Arvid
+ASMS
+asyn
+autoclean
+AUTOINCREMENT
+automock
+Avicora
+Azureus
+bdecode
+bencode
+bencoded
+bencoding
+beps
+binascii
+binstall
+Bitflu
+bools
+Bragilevsky
+bufs
+buildid
+Buildx
+byteorder
+callgrind
+camino
+canonicalize
+canonicalized
+certbot
+chrono
+Cinstrument
+ciphertext
+clippy
+cloneable
+codecov
+codegen
+completei
+Condvar
+connectionless
+Containerfile
+conv
+curr
+cvar
+Cyberneering
+dashmap
+datagram
+datetime
+debuginfo
+Deque
+Dijke
+distroless
+dockerhub
+downloadedi
+dtolnay
+elif
+endianness
+Eray
+filesd
+flamegraph
+formatjson
+Freebox
+Frostegård
+gecos
+Gibibytes
+Grcov
+hasher
+healthcheck
+heaptrack
+hexlify
+hlocalhost
+Hydranode
+hyperthread
+Icelake
+iiiiiiiiiiiiiiiiiiiid
+imdl
+impls
+incompletei
+infohash
+infohashes
+infoschema
+Intermodal
+intervali
+Joakim
+kallsyms
+Karatay
+kcachegrind
+kexec
+keyout
+Kibibytes
+kptr
+lcov
+leecher
+leechers
+libsqlite
+libtorrent
+libz
+LOGNAME
+Lphant
+matchmakes
+Mebibytes
+metainfo
+middlewares
+misresolved
+mockall
+multimap
+myacicontext
+ñaca
+Naim
+nanos
+newkey
+nextest
+nocapture
+nologin
+nonroot
+Norberg
+numwant
+nvCFlJCq7fz7Qx6KoKTDiMZvns8l5Kw7
+oneshot
+ostr
+Pando
+peekable
+peerlist
+programatik
+proot
+proto
+Quickstart
+Radeon
+Rakshasa
+Rasterbar
+realpath
+reannounce
+Registar
+repr
+reqs
+reqwest
+rerequests
+ringbuf
+ringsize
+rngs
+rosegment
+routable
+rstest
+rusqlite
+rustc
+RUSTDOCFLAGS
+RUSTFLAGS
+rustfmt
+Rustls
+Ryzen
+Seedable
+serde
+Shareaza
+sharktorrent
+SHLVL
+skiplist
+slowloris
+socketaddr
+sqllite
+subsec
+Swatinem
+Swiftbit
+taiki
+tdyne
+Tebibytes
+tempfile
+testcontainers
+thiserror
+tlsv
+Torrentstorm
+torrust
+torrustracker
+trackerid
+Trackon
+typenum
+udpv
+Unamed
+underflows
+Unsendable
+untuple
+uroot
+Vagaa
+valgrind
+Vitaly
+vmlinux
+Vuze
+Weidendorfer
+Werror
+whitespaces
+Xacrimon
+XBTT
+Xdebug
+Xeon
+Xtorrent
+Xunlei
+xxxxxxxxxxxxxxxxxxxxd
+yyyyyyyyyyyyyyyyyyyyd
+zerocopy
+Aideq
+autoremove
+CALLSITE
+Dihc
+Dmqcd
+QJSF
+Glrg
+Irwe
+Uninit
+Unparker
+eventfd
+fastrand
+fdbased
+fdget
+fput
+iiiiiiiiiiiiiiiippe
+iiiiiiiiiiiiiiiipp
+iiiiiiiiiiiiiiip
+iipp
+iiiipp
+jdbe
+ksys
+llist
+mmap
+mprotect
+nonblocking
+peersld
+pkey
+porti
+prealloc
+println
+shellcheck
+sockfd
+subkey
+sysmalloc
+sysret
+timespec
+toki
+torru
+ttwu
+uninit
+unparked
+unsync
+vtable
+wakelist
+wakeup
+actix
+iterationsadd
+josecelano
+mysqladmin
+setgroups
+taplo
+trixie
diff --git a/share/default/config/tracker.container.mysql.toml b/share/default/config/tracker.container.mysql.toml
index 865ea224e..33fcf713a 100644
--- a/share/default/config/tracker.container.mysql.toml
+++ b/share/default/config/tracker.container.mysql.toml
@@ -12,6 +12,9 @@ private = false
 
 [core.database]
 driver = "mysql"
+# If the MySQL password includes reserved URL characters (for example + or /),
+# percent-encode it in the DSN password component.
+# Example: password a+b/c -> a%2Bb%2Fc
 path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker"
 
 # Uncomment to enable services
diff --git a/share/default/config/tracker.development.sqlite3.toml b/share/default/config/tracker.development.sqlite3.toml
index 333c6d66c..17a73a1d2 100644
--- a/share/default/config/tracker.development.sqlite3.toml
+++ b/share/default/config/tracker.development.sqlite3.toml
@@ -7,9 +7,15 @@ schema_version = "2.0.0"
 threshold = "info"
 
 [core]
+inactive_peer_cleanup_interval = 120
 listed = false
 private = false
 
+[core.tracker_policy]
+max_peer_timeout = 60
+persistent_torrent_completed_stat = true
+remove_peerless_torrents = true
+
 [[udp_trackers]]
 bind_address = "0.0.0.0:6868"
 tracker_usage_statistics = true
diff --git a/src/app.rs b/src/app.rs
index 8f5c6ca4c..2149a6d4c 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -23,13 +23,17 @@
 //! - Tracker REST API: the tracker API can be enabled/disabled.
 use std::sync::Arc;
 
+use torrust_tracker_clock::clock::Time;
 use torrust_tracker_configuration::{Configuration, HttpTracker, UdpTracker};
 use tracing::instrument;
 
 use crate::bootstrap::jobs::manager::JobManager;
-use crate::bootstrap::jobs::{self, health_check_api, http_tracker, torrent_cleanup, tracker_apis, udp_tracker};
+use crate::bootstrap::jobs::{
+    self, activity_metrics_updater, health_check_api, http_tracker, torrent_cleanup, tracker_apis, udp_tracker,
+};
 use crate::bootstrap::{self};
 use crate::container::AppContainer;
+use crate::CurrentClock;
 
 pub async fn run() -> (Arc<AppContainer>, JobManager) {
     let (config, app_container) = bootstrap::app::setup();
@@ -61,18 +65,26 @@ pub async fn start(config: &Configuration, app_container: &Arc<AppContainer>) ->
 async fn load_data_from_database(config: &Configuration, app_container: &Arc<AppContainer>) {
     load_peer_keys(config, app_container).await;
     load_whitelisted_torrents(config, app_container).await;
+    load_torrent_metrics(config, app_container).await;
 }
 
 async fn start_jobs(config: &Configuration, app_container: &Arc<AppContainer>) -> JobManager {
     let mut job_manager = JobManager::new();
 
+    start_swarm_coordination_registry_event_listener(config, app_container, &mut job_manager);
+    start_tracker_core_event_listener(config, app_container, &mut job_manager);
     start_http_core_event_listener(config, app_container, &mut job_manager);
     start_udp_core_event_listener(config, app_container, &mut job_manager);
-    start_udp_server_event_listener(config, app_container, &mut job_manager);
+    start_udp_server_stats_event_listener(config, app_container, &mut job_manager);
+    start_udp_server_banning_event_listener(app_container, &mut job_manager);
+
     start_the_udp_instances(config, app_container, &mut job_manager).await;
     start_the_http_instances(config, app_container, &mut job_manager).await;
-    start_the_http_api(config, app_container, &mut job_manager).await;
+
     start_torrent_cleanup(config, app_container, &mut job_manager);
+    start_peers_inactivity_update(config, app_container, &mut job_manager);
+
+    start_the_http_api(config, app_container, &mut job_manager).await;
     start_health_check_api(config, app_container, &mut job_manager).await;
 
     job_manager
@@ -109,28 +121,66 @@ async fn load_whitelisted_torrents(config: &Configuration, app_container: &Arc<A
     }
 }
 
-fn start_http_core_event_listener(config: &Configuration, app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
-    let opt_handle = jobs::http_tracker_core::start_event_listener(config, app_container);
-
-    if let Some(handle) = opt_handle {
-        job_manager.push("http_core_event_listener", handle);
+async fn load_torrent_metrics(config: &Configuration, app_container: &Arc<AppContainer>) {
+    if config.core.tracker_policy.persistent_torrent_completed_stat {
+        bittorrent_tracker_core::statistics::persisted::load_persisted_metrics(
+            &app_container.tracker_core_container.stats_repository,
+            &app_container.tracker_core_container.db_downloads_metric_repository,
+            CurrentClock::now(),
+        )
+        .await
+        .expect("Could not load persisted metrics from database.");
     }
 }
 
-fn start_udp_core_event_listener(config: &Configuration, app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
-    let opt_handle = jobs::udp_tracker_core::start_event_listener(config, app_container);
+fn start_swarm_coordination_registry_event_listener(
+    config: &Configuration,
+    app_container: &Arc<AppContainer>,
+    job_manager: &mut JobManager,
+) {
+    job_manager.push_opt(
+        "swarm_coordination_registry_event_listener",
+        jobs::torrent_repository::start_event_listener(config, app_container, job_manager.new_cancellation_token()),
+    );
+}
 
-    if let Some(handle) = opt_handle {
-        job_manager.push("udp_core_event_listener", handle);
-    }
+fn start_tracker_core_event_listener(config: &Configuration, app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
+    job_manager.push_opt(
+        "tracker_core_event_listener",
+        jobs::tracker_core::start_event_listener(config, app_container, job_manager.new_cancellation_token()),
+    );
 }
 
-fn start_udp_server_event_listener(config: &Configuration, app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
-    let opt_handle = jobs::udp_tracker_server::start_event_listener(config, app_container);
+fn start_http_core_event_listener(config: &Configuration, app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
+    job_manager.push_opt(
+        "http_core_event_listener",
+        jobs::http_tracker_core::start_event_listener(config, app_container, job_manager.new_cancellation_token()),
+    );
+}
 
-    if let Some(handle) = opt_handle {
-        job_manager.push("udp_server_event_listener", handle);
-    }
+fn start_udp_core_event_listener(config: &Configuration, app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
+    job_manager.push_opt(
+        "udp_core_event_listener",
+        jobs::udp_tracker_core::start_event_listener(config, app_container, job_manager.new_cancellation_token()),
+    );
+}
+
+fn start_udp_server_stats_event_listener(
+    config: &Configuration,
+    app_container: &Arc<AppContainer>,
+    job_manager: &mut JobManager,
+) {
+    job_manager.push_opt(
+        "udp_server_stats_event_listener",
+        jobs::udp_tracker_server::start_stats_event_listener(config, app_container, job_manager.new_cancellation_token()),
+    );
+}
+
+fn start_udp_server_banning_event_listener(app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
+    job_manager.push(
+        "udp_server_banning_event_listener",
+        jobs::udp_tracker_server::start_banning_event_listener(app_container, job_manager.new_cancellation_token()),
+    );
 }
 
 async fn start_the_udp_instances(config: &Configuration, app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
@@ -229,6 +279,16 @@ fn start_torrent_cleanup(config: &Configuration, app_container: &Arc<AppContaine
     }
 }
 
+fn start_peers_inactivity_update(config: &Configuration, app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
+    if config.core.tracker_usage_statistics {
+        let handle = activity_metrics_updater::start_job(config, app_container);
+
+        job_manager.push("peers_inactivity_update", handle);
+    } else {
+        tracing::info!("Peers inactivity update job is disabled.");
+    }
+}
+
 async fn start_health_check_api(config: &Configuration, app_container: &Arc<AppContainer>, job_manager: &mut JobManager) {
     let handle = health_check_api::start_job(&config.health_check_api, app_container.registar.entries()).await;
 
diff --git a/src/bootstrap/jobs/activity_metrics_updater.rs b/src/bootstrap/jobs/activity_metrics_updater.rs
new file mode 100644
index 000000000..9bbdc3f9b
--- /dev/null
+++ b/src/bootstrap/jobs/activity_metrics_updater.rs
@@ -0,0 +1,27 @@
+//! Job that runs a task on intervals to update peers' activity metrics.
+use std::sync::Arc;
+use std::time::Duration;
+
+use tokio::task::JoinHandle;
+use torrust_tracker_clock::clock::Time;
+use torrust_tracker_configuration::Configuration;
+
+use crate::container::AppContainer;
+use crate::CurrentClock;
+
+#[must_use]
+pub fn start_job(config: &Configuration, app_container: &Arc<AppContainer>) -> JoinHandle<()> {
+    torrust_tracker_swarm_coordination_registry::statistics::activity_metrics_updater::start_job(
+        &app_container.swarm_coordination_registry_container.swarms.clone(),
+        &app_container.swarm_coordination_registry_container.stats_repository.clone(),
+        peer_inactivity_cutoff_timestamp(config.core.tracker_policy.max_peer_timeout),
+    )
+}
+
+/// Returns the timestamp of the cutoff for inactive peers.
+///
+/// Peers that has not been updated for more than `max_peer_timeout` seconds are
+/// considered inactive.
+fn peer_inactivity_cutoff_timestamp(max_peer_timeout: u32) -> Duration {
+    CurrentClock::now_sub(&Duration::from_secs(u64::from(max_peer_timeout))).unwrap_or_default()
+}
diff --git a/src/bootstrap/jobs/http_tracker_core.rs b/src/bootstrap/jobs/http_tracker_core.rs
index 952c80b40..ab71b9a0f 100644
--- a/src/bootstrap/jobs/http_tracker_core.rs
+++ b/src/bootstrap/jobs/http_tracker_core.rs
@@ -1,14 +1,20 @@
 use std::sync::Arc;
 
 use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
 use torrust_tracker_configuration::Configuration;
 
 use crate::container::AppContainer;
 
-pub fn start_event_listener(config: &Configuration, app_container: &Arc<AppContainer>) -> Option<JoinHandle<()>> {
+pub fn start_event_listener(
+    config: &Configuration,
+    app_container: &Arc<AppContainer>,
+    cancellation_token: CancellationToken,
+) -> Option<JoinHandle<()>> {
     if config.core.tracker_usage_statistics {
         let job = bittorrent_http_tracker_core::statistics::event::listener::run_event_listener(
             app_container.http_tracker_core_services.event_bus.receiver(),
+            cancellation_token,
             &app_container.http_tracker_core_services.stats_repository,
         );
 
diff --git a/src/bootstrap/jobs/manager.rs b/src/bootstrap/jobs/manager.rs
index 5beab3224..565cd7b73 100644
--- a/src/bootstrap/jobs/manager.rs
+++ b/src/bootstrap/jobs/manager.rs
@@ -2,13 +2,14 @@ use std::time::Duration;
 
 use tokio::task::JoinHandle;
 use tokio::time::timeout;
+use tokio_util::sync::CancellationToken;
 use tracing::{info, warn};
 
 /// Represents a named background job.
 #[derive(Debug)]
 pub struct Job {
-    pub name: String,
-    pub handle: JoinHandle<()>,
+    name: String,
+    handle: JoinHandle<()>,
 }
 
 impl Job {
@@ -24,18 +25,47 @@ impl Job {
 #[derive(Debug, Default)]
 pub struct JobManager {
     jobs: Vec<Job>,
+    cancellation_token: CancellationToken,
 }
 
 impl JobManager {
     #[must_use]
     pub fn new() -> Self {
-        Self { jobs: Vec::new() }
+        Self {
+            jobs: Vec::new(),
+            cancellation_token: CancellationToken::new(),
+        }
     }
 
     pub fn push<N: Into<String>>(&mut self, name: N, handle: JoinHandle<()>) {
         self.jobs.push(Job::new(name, handle));
     }
 
+    pub fn push_opt<N: Into<String>>(&mut self, name: N, handle: Option<JoinHandle<()>>) {
+        if let Some(handle) = handle {
+            self.push(name, handle);
+        }
+    }
+
+    #[must_use]
+    pub fn new_cancellation_token(&self) -> CancellationToken {
+        self.cancellation_token.clone()
+    }
+
+    /// Cancels all jobs using the shared cancellation token.
+    ///
+    /// Notice that this does not cancel the jobs immediately, but rather
+    /// signals them to stop. The jobs themselves must handle the cancellation
+    /// token appropriately.
+    ///
+    /// Notice jobs might be pushed into the manager without a cancellation
+    /// token, so this method will not cancel those jobs. Some tasks might
+    /// decide to listen for CTRL+c signal directly, or implement their own
+    /// cancellation logic.
+    pub fn cancel(&self) {
+        self.cancellation_token.cancel();
+    }
+
     /// Waits sequentially for all jobs to complete, with a graceful timeout per
     /// job.
     pub async fn wait_for_all(mut self, grace_period: Duration) {
diff --git a/src/bootstrap/jobs/mod.rs b/src/bootstrap/jobs/mod.rs
index 2e3d798ad..0e9c912af 100644
--- a/src/bootstrap/jobs/mod.rs
+++ b/src/bootstrap/jobs/mod.rs
@@ -6,12 +6,15 @@
 //! 2. Launch all the application services as concurrent jobs.
 //!
 //! This modules contains all the functions needed to start those jobs.
+pub mod activity_metrics_updater;
 pub mod health_check_api;
 pub mod http_tracker;
 pub mod http_tracker_core;
 pub mod manager;
 pub mod torrent_cleanup;
+pub mod torrent_repository;
 pub mod tracker_apis;
+pub mod tracker_core;
 pub mod udp_tracker;
 pub mod udp_tracker_core;
 pub mod udp_tracker_server;
diff --git a/src/bootstrap/jobs/torrent_cleanup.rs b/src/bootstrap/jobs/torrent_cleanup.rs
index 54b1eeef7..8a3a71a44 100644
--- a/src/bootstrap/jobs/torrent_cleanup.rs
+++ b/src/bootstrap/jobs/torrent_cleanup.rs
@@ -28,6 +28,7 @@ use tracing::instrument;
 pub fn start_job(config: &Core, torrents_manager: &Arc<TorrentsManager>) -> JoinHandle<()> {
     let weak_torrents_manager = std::sync::Arc::downgrade(torrents_manager);
     let interval = config.inactive_peer_cleanup_interval;
+    let interval_in_secs = interval;
 
     tokio::spawn(async move {
         let interval = std::time::Duration::from_secs(interval);
@@ -43,9 +44,9 @@ pub fn start_job(config: &Core, torrents_manager: &Arc<TorrentsManager>) -> Join
                 _ = interval.tick() => {
                     if let Some(torrents_manager) = weak_torrents_manager.upgrade() {
                         let start_time = Utc::now().time();
-                        tracing::info!("Cleaning up torrents..");
-                        torrents_manager.cleanup_torrents();
-                        tracing::info!("Cleaned up torrents in: {}ms", (Utc::now().time() - start_time).num_milliseconds());
+                        tracing::info!("Cleaning up torrents (executed every {} secs) ...", interval_in_secs);
+                        torrents_manager.cleanup_torrents().await;
+                        tracing::info!("Cleaned up torrents in: {} ms", (Utc::now().time() - start_time).num_milliseconds());
                     } else {
                         break;
                     }
diff --git a/src/bootstrap/jobs/torrent_repository.rs b/src/bootstrap/jobs/torrent_repository.rs
new file mode 100644
index 000000000..e49323735
--- /dev/null
+++ b/src/bootstrap/jobs/torrent_repository.rs
@@ -0,0 +1,26 @@
+use std::sync::Arc;
+
+use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
+use torrust_tracker_configuration::Configuration;
+
+use crate::container::AppContainer;
+
+pub fn start_event_listener(
+    config: &Configuration,
+    app_container: &Arc<AppContainer>,
+    cancellation_token: CancellationToken,
+) -> Option<JoinHandle<()>> {
+    if config.core.tracker_usage_statistics {
+        let job = torrust_tracker_swarm_coordination_registry::statistics::event::listener::run_event_listener(
+            app_container.swarm_coordination_registry_container.event_bus.receiver(),
+            cancellation_token,
+            &app_container.swarm_coordination_registry_container.stats_repository,
+        );
+
+        Some(job)
+    } else {
+        tracing::info!("Torrent repository package event listener job is disabled.");
+        None
+    }
+}
diff --git a/src/bootstrap/jobs/tracker_core.rs b/src/bootstrap/jobs/tracker_core.rs
new file mode 100644
index 000000000..d881f4cd2
--- /dev/null
+++ b/src/bootstrap/jobs/tracker_core.rs
@@ -0,0 +1,32 @@
+use std::sync::Arc;
+
+use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
+use torrust_tracker_configuration::Configuration;
+
+use crate::container::AppContainer;
+
+pub fn start_event_listener(
+    config: &Configuration,
+    app_container: &Arc<AppContainer>,
+    cancellation_token: CancellationToken,
+) -> Option<JoinHandle<()>> {
+    if config.core.tracker_usage_statistics || config.core.tracker_policy.persistent_torrent_completed_stat {
+        let job = bittorrent_tracker_core::statistics::event::listener::run_event_listener(
+            app_container.swarm_coordination_registry_container.event_bus.receiver(),
+            cancellation_token,
+            &app_container.tracker_core_container.stats_repository,
+            &app_container.tracker_core_container.db_downloads_metric_repository,
+            app_container
+                .tracker_core_container
+                .core_config
+                .tracker_policy
+                .persistent_torrent_completed_stat,
+        );
+
+        Some(job)
+    } else {
+        tracing::info!("Tracker core event listener job is disabled.");
+        None
+    }
+}
diff --git a/src/bootstrap/jobs/udp_tracker_core.rs b/src/bootstrap/jobs/udp_tracker_core.rs
index 689fa8301..dd7e8c165 100644
--- a/src/bootstrap/jobs/udp_tracker_core.rs
+++ b/src/bootstrap/jobs/udp_tracker_core.rs
@@ -1,14 +1,20 @@
 use std::sync::Arc;
 
 use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
 use torrust_tracker_configuration::Configuration;
 
 use crate::container::AppContainer;
 
-pub fn start_event_listener(config: &Configuration, app_container: &Arc<AppContainer>) -> Option<JoinHandle<()>> {
+pub fn start_event_listener(
+    config: &Configuration,
+    app_container: &Arc<AppContainer>,
+    cancellation_token: CancellationToken,
+) -> Option<JoinHandle<()>> {
     if config.core.tracker_usage_statistics {
         let job = bittorrent_udp_tracker_core::statistics::event::listener::run_event_listener(
             app_container.udp_tracker_core_services.event_bus.receiver(),
+            cancellation_token,
             &app_container.udp_tracker_core_services.stats_repository,
         );
         Some(job)
diff --git a/src/bootstrap/jobs/udp_tracker_server.rs b/src/bootstrap/jobs/udp_tracker_server.rs
index 42ac2d03e..fc6df9c16 100644
--- a/src/bootstrap/jobs/udp_tracker_server.rs
+++ b/src/bootstrap/jobs/udp_tracker_server.rs
@@ -1,14 +1,20 @@
 use std::sync::Arc;
 
 use tokio::task::JoinHandle;
+use tokio_util::sync::CancellationToken;
 use torrust_tracker_configuration::Configuration;
 
 use crate::container::AppContainer;
 
-pub fn start_event_listener(config: &Configuration, app_container: &Arc<AppContainer>) -> Option<JoinHandle<()>> {
+pub fn start_stats_event_listener(
+    config: &Configuration,
+    app_container: &Arc<AppContainer>,
+    cancellation_token: CancellationToken,
+) -> Option<JoinHandle<()>> {
     if config.core.tracker_usage_statistics {
         let job = torrust_udp_tracker_server::statistics::event::listener::run_event_listener(
             app_container.udp_tracker_server_container.event_bus.receiver(),
+            cancellation_token,
             &app_container.udp_tracker_server_container.stats_repository,
         );
         Some(job)
@@ -17,3 +23,13 @@ pub fn start_event_listener(config: &Configuration, app_container: &Arc<AppConta
         None
     }
 }
+
+#[must_use]
+pub fn start_banning_event_listener(app_container: &Arc<AppContainer>, cancellation_token: CancellationToken) -> JoinHandle<()> {
+    torrust_udp_tracker_server::banning::event::listener::run_event_listener(
+        app_container.udp_tracker_server_container.event_bus.receiver(),
+        cancellation_token,
+        &app_container.udp_tracker_core_services.ban_service,
+        &app_container.udp_tracker_server_container.stats_repository,
+    )
+}
diff --git a/src/console/ci/e2e/docker.rs b/src/console/ci/e2e/docker.rs
index ce2b1aa99..89d258d2c 100644
--- a/src/console/ci/e2e/docker.rs
+++ b/src/console/ci/e2e/docker.rs
@@ -82,7 +82,7 @@ impl Docker {
         let mut port_args: Vec<String> = vec![];
         for port in &options.ports {
             port_args.push("--publish".to_string());
-            port_args.push(port.to_string());
+            port_args.push(port.clone());
         }
 
         let args = [initial_args, env_var_args, port_args, [image.to_string()].to_vec()].concat();
diff --git a/src/console/ci/e2e/runner.rs b/src/console/ci/e2e/runner.rs
index 624878c70..6275c144b 100644
--- a/src/console/ci/e2e/runner.rs
+++ b/src/console/ci/e2e/runner.rs
@@ -77,7 +77,7 @@ pub fn run() -> anyhow::Result<()> {
     // Besides, if we don't use port 0 we should get the port numbers from the tracker configuration.
     // We could not use docker, but the intention was to create E2E tests including containerization.
     let options = RunOptions {
-        env_vars: vec![("TORRUST_TRACKER_CONFIG_TOML".to_string(), tracker_config.to_string())],
+        env_vars: vec![("TORRUST_TRACKER_CONFIG_TOML".to_string(), tracker_config.clone())],
         ports: vec![
             "6969:6969/udp".to_string(),
             "7070:7070/tcp".to_string(),
diff --git a/src/console/ci/e2e/tracker_container.rs b/src/console/ci/e2e/tracker_container.rs
index a3845c103..1a7717a41 100644
--- a/src/console/ci/e2e/tracker_container.rs
+++ b/src/console/ci/e2e/tracker_container.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use rand::distr::Alphanumeric;
-use rand::Rng;
+use rand::RngExt;
 
 use super::docker::{RunOptions, RunningContainer};
 use super::logs_parser::RunningServices;
diff --git a/src/container.rs b/src/container.rs
index 93f1fb4d7..7112a54e8 100644
--- a/src/container.rs
+++ b/src/container.rs
@@ -9,6 +9,7 @@ use bittorrent_udp_tracker_core::{self};
 use torrust_rest_tracker_api_core::container::TrackerHttpApiCoreContainer;
 use torrust_server_lib::registar::Registar;
 use torrust_tracker_configuration::{Configuration, HttpApi};
+use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
 use torrust_udp_tracker_server::container::UdpTrackerServerContainer;
 use tracing::instrument;
 
@@ -28,6 +29,9 @@ pub struct AppContainer {
     // Registar
     pub registar: Arc<Registar>,
 
+    // Swarm Coordination Registry Container
+    pub swarm_coordination_registry_container: Arc<SwarmCoordinationRegistryContainer>,
+
     // Core
     pub tracker_core_container: Arc<TrackerCoreContainer>,
 
@@ -54,9 +58,18 @@ impl AppContainer {
 
         let registar = Arc::new(Registar::default());
 
+        // Swarm Coordination Registry Container
+
+        let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
+            core_config.tracker_usage_statistics.into(),
+        ));
+
         // Core
 
-        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
+        let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
+            &core_config,
+            &swarm_coordination_registry_container,
+        ));
 
         // HTTP
 
@@ -84,6 +97,9 @@ impl AppContainer {
             // Registar
             registar,
 
+            // Swarm Coordination Registry Container
+            swarm_coordination_registry_container,
+
             // Core
             tracker_core_container,
 
@@ -128,10 +144,15 @@ impl AppContainer {
     #[must_use]
     pub fn tracker_http_api_container(&self, http_api_config: &Arc<HttpApi>) -> Arc<TrackerHttpApiCoreContainer> {
         TrackerHttpApiCoreContainer {
-            tracker_core_container: self.tracker_core_container.clone(),
             http_api_config: http_api_config.clone(),
-            ban_service: self.udp_tracker_core_services.ban_service.clone(),
+
+            swarm_coordination_registry_container: self.swarm_coordination_registry_container.clone(),
+
+            tracker_core_container: self.tracker_core_container.clone(),
+
             http_stats_repository: self.http_tracker_core_services.stats_repository.clone(),
+
+            ban_service: self.udp_tracker_core_services.ban_service.clone(),
             udp_core_stats_repository: self.udp_tracker_core_services.stats_repository.clone(),
             udp_server_stats_repository: self.udp_tracker_server_container.stats_repository.clone(),
         }
diff --git a/src/lib.rs b/src/lib.rs
index b26960899..791c0d928 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -88,6 +88,12 @@
 //!
 //! The tracker has some system dependencies:
 //!
+//! First, you need to install the build tools:
+//!
+//! ```text
+//! sudo apt-get install build-essential
+//! ```
+//!
 //! Since we are using the `openssl` crate with the [vendored feature](https://docs.rs/openssl/latest/openssl/#vendored),
 //! enabled, you will need to install the following dependencies:
 //!
diff --git a/src/main.rs b/src/main.rs
index a49c3aeba..7012ecaa7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,6 +10,8 @@ async fn main() {
         _ = tokio::signal::ctrl_c() => {
             tracing::info!("Torrust tracker shutting down ...");
 
+            jobs.cancel();
+
             jobs.wait_for_all(Duration::from_secs(10)).await;
 
             tracing::info!("Torrust tracker successfully shutdown.");