test: test dst_labels

personio · Sep 14, 2023 · 5395783 · 5395783
1 parent f8be66a
commit 5395783
Show file tree

Hide file tree

Showing 5 changed files with 145 additions and 3 deletions.
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/linkerd/app/integration/src/tests/telemetry.rs b/linkerd/app/integration/src/tests/telemetry.rs
@@ -622,11 +622,11 @@ mod outbound_dst_labels {
         let (
             Fixture {
                 client,
-                metrics: _metrics,
+                metrics,
                 proxy: _proxy,
                 _profile,
                 dst_tx,
-                labels: _labels,
+                labels,
                 ..
             },
             addr,
@@ -647,6 +647,18 @@ mod outbound_dst_labels {
 
         info!("client.get(/)");
         assert_eq!(client.get("/").await, "hello");
+
+        let labels = labels
+            .label("dst_addr_label", "foo")
+            .label("dst_set_label", "bar");
+
+        for &metric in &[
+            "request_total",
+            "response_total",
+            "response_latency_ms_count",
+        ] {
+            labels.metric(metric).assert_in(&metrics).await;
+        }
     }
 }
 

diff --git a/linkerd/app/outbound/src/http/concrete.rs b/linkerd/app/outbound/src/http/concrete.rs
@@ -342,6 +342,7 @@ where
     T: svc::Param<Option<http::uri::Authority>>,
 {
     fn param(&self) -> OutboundEndpointLabels {
+        let original_labels = self.metadata.labels().clone();
         // self.metadata.labels() could return Err in some cases
         // if that case the dst_labels won't carry any value
         let mut dst_labels = match Arc::try_unwrap(self.metadata.labels()) {
@@ -352,8 +353,13 @@ where
         dst_labels.remove("pod");
         dst_labels.remove("pod_template_hash");
 
+        let label_iterator = match dst_labels.is_empty() {
+            true => dst_labels.iter(),
+            false => original_labels.iter()
+        };
+
         OutboundEndpointLabels {
-            labels: prefix_labels("dst", dst_labels.iter()),
+            labels: prefix_labels("dst", label_iterator),
             server_id: self.param(),
         }
     }