src/encoding/text: Do not separate labels with spaces

Author: mxinden

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.11.2] - 2021-06-09
+### Fixed
+- Do not separate labels with spaces.
+
 ## [0.11.1] - 2021-06-08
 ### Fixed
 - Encode Info metric labels.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "open-metrics-client"
-version = "0.11.1"
+version = "0.11.2"
 authors = ["Max Inden <mail@max-inden.de>"]
 edition = "2018"
 description = "Open Metrics client library allowing users to natively instrument applications."

src/encoding/text.rs

@@ -244,7 +244,7 @@ impl<'a, 'b> Encoder<'a, 'b> {
 
     // TODO: Consider caching the encoded labels for Histograms as they stay the
     // same but are currently encoded multiple times.
-    pub(self) fn encode_labels(&mut self) -> Result<BucketEncoder, std::io::Error> {
+    fn encode_labels(&mut self) -> Result<BucketEncoder, std::io::Error> {
         if let Some(labels) = &self.labels {
             self.writer.write_all(b"{")?;
             labels.encode(self.writer)?;
@@ -282,7 +282,7 @@ pub struct BucketEncoder<'a> {
 impl<'a> BucketEncoder<'a> {
     fn encode_bucket(&mut self, upper_bound: f64) -> Result<ValueEncoder, std::io::Error> {
         if self.opened_curly_brackets {
-            self.writer.write_all(b", ")?;
+            self.writer.write_all(b",")?;
         } else {
             self.writer.write_all(b"{")?;
         }
@@ -654,7 +654,10 @@ mod tests {
         registry.register("my_counter_family", "My counter family", family.clone());
 
         family
-            .get_or_create(&vec![("method".to_string(), "GET".to_string())])
+            .get_or_create(&vec![
+                ("method".to_string(), "GET".to_string()),
+                ("status".to_string(), "200".to_string()),
+            ])
             .inc();
 
         let mut encoded = Vec::new();
@@ -696,6 +699,26 @@ mod tests {
         parse_with_python_client(String::from_utf8(encoded).unwrap());
     }
 
+    #[test]
+    fn encode_histogram_family() {
+        let mut registry = Registry::default();
+        let family =
+            Family::new_with_constructor(|| Histogram::new(exponential_buckets(1.0, 2.0, 10)));
+        registry.register("my_histogram", "My histogram", family.clone());
+        family
+            .get_or_create(&vec![
+                ("method".to_string(), "GET".to_string()),
+                ("status".to_string(), "200".to_string()),
+            ])
+            .observe(1.0);
+
+        let mut encoded = Vec::new();
+
+        encode(&mut encoded, &registry).unwrap();
+
+        parse_with_python_client(String::from_utf8(encoded).unwrap());
+    }
+
     #[test]
     fn encode_histogram_with_exemplars() {
         let mut registry = Registry::default();