1.2.1 - split endpoint and endpoint_name labels

Author: Firaenix

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "distributed-metrics"
-version = "1.2.0"
+version = "1.2.1"
 edition = "2021"
 repository = "https://github.com/BitpingApp/distributed-metrics"
 homepage = "https://bitping.com"

flake.nix

@@ -39,9 +39,9 @@
       {
         default = pkgs.rustPlatform.buildRustPackage {
           pname = "distributed-metrics";
-          version = "1.2.0";
+          version = "1.2.1";
           src = ./.;
-          cargoHash = "sha256-Cd+jNSFPGZYiTBVoqQSJAmzMh5Irw5MymH/dCBBP3Pw=";
+          cargoHash = "sha256-AYOYM2DkGIBlOfYaUibn5HQdtW032duafQUabBd2Vjg=";
         };
       }
     );

src/collectors/dns/errors.rs

@@ -1,7 +1,4 @@
-mod errors;
-
 use super::{Collector, CollectorErrors};
-use distributed_metrics::config::{DnsConfig, LookupTypes};
 use crate::types::{
     PerformDnsBodyConfiguration, PerformDnsBodyConfigurationLookupTypesItem,
     PerformDnsBodyContinentCode, PerformDnsBodyCountryCode, PerformDnsBodyMobile,
@@ -10,6 +7,7 @@ use crate::types::{
 };
 use crate::API_CLIENT;
 use color_eyre::eyre::Result;
+use distributed_metrics::config::{DnsConfig, LookupTypes};
 use geohash::Coord;
 use metrics::{counter, gauge, histogram};
 use std::collections::hash_map::DefaultHasher;
@@ -155,12 +153,7 @@ impl Collector for DnsCollector {
     }
 
     fn handle_response(&self, response: PerformDnsResponse) -> Result<(), CollectorErrors> {
-        let endpoint = self
-            .config
-            .common_config
-            .name
-            .as_ref()
-            .unwrap_or(&self.config.common_config.endpoint);
+        let endpoint = &self.config.common_config.endpoint;
 
         let node_info = response
             .node_info
@@ -175,6 +168,9 @@ impl Collector for DnsCollector {
             ("os", node_info.operating_system.clone()),
             ("endpoint", endpoint.clone()),
         ]);
+        if let Some(name) = &self.config.common_config.name {
+            labels.insert("endpoint_name", name.clone());
+        }
         if let Ok(v) = geohash::encode(
             Coord {
                 x: node_info.lon,