Slightly generalize NameAndTags for m3 ids

m3db · Jun 27, 2017 · e53fec5 · e53fec5
1 parent 833a34a
commit e53fec5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/metric/id/m3/id.go b/metric/id/m3/id.go
@@ -135,7 +135,7 @@ func (id metricID) TagValue(tagName []byte) ([]byte, bool) {
 // NameAndTags returns the name and the tags of the given id.
 func NameAndTags(id []byte) ([]byte, []byte, error) {
 	firstSplitterIdx := bytes.IndexByte(id, componentSplitter)
-	if !bytes.Equal(m3Prefix, id[:firstSplitterIdx+1]) {
+	if !bytes.HasSuffix(id[:firstSplitterIdx+1], m3Prefix) {
 		return nil, nil, errInvalidM3Metric
 	}
 	secondSplitterIdx := bytes.IndexByte(id[firstSplitterIdx+1:], componentSplitter)

diff --git a/metric/id/m3/id_test.go b/metric/id/m3/id_test.go
@@ -126,6 +126,12 @@ func TestNameAndTags(t *testing.T) {
 		expectedTags []byte
 		expectedErr  error
 	}{
+		{
+			id:           []byte("stats.m3+foo+tagName1=tagValue1"),
+			expectedName: []byte("foo"),
+			expectedTags: []byte("tagName1=tagValue1"),
+			expectedErr:  nil,
+		},
 		{
 			id:           []byte("m3+foo+tagName1=tagValue1"),
 			expectedName: []byte("foo"),
@@ -144,6 +150,12 @@ func TestNameAndTags(t *testing.T) {
 			expectedTags: nil,
 			expectedErr:  errInvalidM3Metric,
 		},
+		{
+			id:           []byte("m34+illformed+tagName1=tagValue1"),
+			expectedName: nil,
+			expectedTags: nil,
+			expectedErr:  errInvalidM3Metric,
+		},
 		{
 			id:           []byte("m3+illformed"),
 			expectedName: nil,