Merge pull request #14 from jaapio/master

Remove space between labels
openmetrics-php · Jul 16, 2024 · 8c77eba · 8c77eba
2 parents 6c06fa2 + ec93a2b
commit 8c77eba
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/Collections/LabelCollection.php b/src/Collections/LabelCollection.php
@@ -87,6 +87,6 @@ static function ( ProvidesNamedValue $label )
 			$this->labels
 		);
 
-		return '{' . implode( ', ', $labelStrings ) . '}';
+		return '{' . implode( ',', $labelStrings ) . '}';
 	}
 }
diff --git a/tests/Integration/OpenMetrics/PythonParserTest.php b/tests/Integration/OpenMetrics/PythonParserTest.php
@@ -78,17 +78,17 @@ private function assertParsedMetricOutput( string $expectedParserOutput, Provide
 	public function testCanParseGaugeMetricsWithPythonParser() : void
 	{
 		$expectedParserOutput = "Name: gauge Labels: {'foo': 'bar'} Value: 1.01 Timestamp: 1234567.000000000\n"
-		                        . "Name: gauge Labels: {'bar': 'foo'} Value: 2.0202 Timestamp: 1234567.000000000\n"
+		                        . "Name: gauge Labels: {'foobar': 'foo', 'bar': 'foo'} Value: 2.0202 Timestamp: 1234567.000000000\n"
 		                        . "Name: gauge Labels: {} Value: 3.0302 Timestamp: None\n";
 
 		$collection = GaugeCollection::fromGauges(
 			MetricName::fromString( 'gauge' ),
 			Gauge::fromValueAndTimestamp( 1.01, 1234567 )->withLabels(
 				Label::fromNameAndValue( 'foo', 'bar' )
 			),
-			Gauge::fromValueAndTimestamp( 2.0202, 1234567 )->withLabels(
-				Label::fromNameAndValue( 'bar', 'foo' )
-			),
+			Gauge::fromValueAndTimestamp( 2.0202, 1234567 )
+            ->withLabels(Label::fromNameAndValue( 'foobar', 'foo' ))
+            ->withLabels(Label::fromNameAndValue( 'bar', 'foo' ) ),
 			Gauge::fromValue( 3.0302 )
 		);
 

diff --git a/tests/Unit/Collections/LabelCollectionTest.php b/tests/Unit/Collections/LabelCollectionTest.php
@@ -86,7 +86,7 @@ public function testCanGetLabelsAsCombinedLabelString() : void
 		/** @var ProvidesNamedValue $secondLabelStub */
 		$collection->add( $secondLabelStub );
 
-		$this->assertSame( '{name1="value1", name2="value2"}', $collection->getCombinedLabelString() );
+		$this->assertSame( '{name1="value1",name2="value2"}', $collection->getCombinedLabelString() );
 	}
 
 	/**
@@ -139,7 +139,7 @@ public function testCanAddMultipleLabels() : void
 		$collection->add( $firstLabelStub, $secondLabelStub );
 
 		$this->assertCount( 2, $collection );
-		$this->assertSame( '{name1="value1", name2="value2"}', $collection->getCombinedLabelString() );
+		$this->assertSame( '{name1="value1",name2="value2"}', $collection->getCombinedLabelString() );
 	}
 
 	/**
@@ -158,7 +158,7 @@ public function testCanGetInstanceFromAssocArray() : void
 
 		$this->assertCount( 2, $labels );
 
-		$expectedLabelString = '{unit="test", test="unit"}';
+		$expectedLabelString = '{unit="test",test="unit"}';
 
 		$this->assertSame( $expectedLabelString, $labels->getCombinedLabelString() );
 	}

diff --git a/tests/Unit/Metrics/CounterTest.php b/tests/Unit/Metrics/CounterTest.php
@@ -68,7 +68,7 @@ public function testAddLabels() : void
 	{
 		$expectedSampleStringWithoutLabels   = '_total 1.000000';
 		$expectedSampleStringWithOneLabel    = '_total{unit_test="123"} 1.000000';
-		$expectedSampleStringWithThreeLabels = '_total{unit_test="123", test_unit="456", label_last="789"} 1.000000';
+		$expectedSampleStringWithThreeLabels = '_total{unit_test="123",test_unit="456",label_last="789"} 1.000000';
 
 		$gauge = Counter::fromValue( 1 );
 
@@ -99,7 +99,7 @@ public function testCanGetCounterWithLabels() : void
 			                Label::fromNameAndValue( 'test', 'unit' )
 		                );
 
-		$expectedSampleString = '_total{unit="test", test="unit"} 12.300000';
+		$expectedSampleString = '_total{unit="test",test="unit"} 12.300000';
 
 		$this->assertSame( $expectedSampleString, $gauge->getSampleString() );
 	}
@@ -121,7 +121,7 @@ public function testCanGetCounterWithLabelCollection() : void
 			                )
 		                );
 
-		$expectedSampleString = '_total{unit="test", test="unit"} 12.300000';
+		$expectedSampleString = '_total{unit="test",test="unit"} 12.300000';
 
 		$this->assertSame( $expectedSampleString, $gauge->getSampleString() );
 	}

diff --git a/tests/Unit/Metrics/GaugeTest.php b/tests/Unit/Metrics/GaugeTest.php
@@ -65,7 +65,7 @@ public function testAddLabels() : void
 	{
 		$expectedSampleStringWithoutLabels   = ' 1.230000';
 		$expectedSampleStringWithOneLabel    = '{unit_test="123"} 1.230000';
-		$expectedSampleStringWithThreeLabels = '{unit_test="123", test_unit="456", label_last="789"} 1.230000';
+		$expectedSampleStringWithThreeLabels = '{unit_test="123",test_unit="456",label_last="789"} 1.230000';
 
 		$gauge = Gauge::fromValue( 1.23 );
 
@@ -97,7 +97,7 @@ public function testCanGetGaugeWithLabels() : void
 			Label::fromNameAndValue( 'test', 'unit' )
 		);
 
-		$expectedSampleString = '{unit="test", test="unit"} 12.300000';
+		$expectedSampleString = '{unit="test",test="unit"} 12.300000';
 
 		$this->assertSame( $expectedSampleString, $gauge->getSampleString() );
 	}
@@ -120,7 +120,7 @@ public function testCanGetGaugeWithLabelCollection() : void
 			)
 		);
 
-		$expectedSampleString = '{unit="test", test="unit"} 12.300000';
+		$expectedSampleString = '{unit="test",test="unit"} 12.300000';
 
 		$this->assertSame( $expectedSampleString, $gauge->getSampleString() );
 	}