Skip to content
Snippets Groups Projects
Unverified Commit e4009234 authored by Daniel Nelson's avatar Daniel Nelson
Browse files

Fix HashID conflicts in pathological cases

Use "\n" as delimiter as it cannot occur in the series name.
parent 8d516d26
No related branches found
No related tags found
No related merge requests found
...@@ -232,9 +232,12 @@ func (m *metric) IsAggregate() bool { ...@@ -232,9 +232,12 @@ func (m *metric) IsAggregate() bool {
func (m *metric) HashID() uint64 { func (m *metric) HashID() uint64 {
h := fnv.New64a() h := fnv.New64a()
h.Write([]byte(m.name)) h.Write([]byte(m.name))
h.Write([]byte("\n"))
for _, tag := range m.tags { for _, tag := range m.tags {
h.Write([]byte(tag.Key)) h.Write([]byte(tag.Key))
h.Write([]byte("\n"))
h.Write([]byte(tag.Value)) h.Write([]byte(tag.Value))
h.Write([]byte("\n"))
} }
return h.Sum64() return h.Sum64()
} }
......
...@@ -267,6 +267,32 @@ func TestHashID_Consistency(t *testing.T) { ...@@ -267,6 +267,32 @@ func TestHashID_Consistency(t *testing.T) {
assert.Equal(t, m2.HashID(), m3.HashID()) assert.Equal(t, m2.HashID(), m3.HashID())
} }
func TestHashID_Delimiting(t *testing.T) {
m1, _ := New(
"cpu",
map[string]string{
"a": "x",
"b": "y",
"c": "z",
},
map[string]interface{}{
"value": float64(1),
},
time.Now(),
)
m2, _ := New(
"cpu",
map[string]string{
"a": "xbycz",
},
map[string]interface{}{
"value": float64(1),
},
time.Now(),
)
assert.NotEqual(t, m1.HashID(), m2.HashID())
}
func TestSetName(t *testing.T) { func TestSetName(t *testing.T) {
m := baseMetric() m := baseMetric()
m.SetName("foo") m.SetName("foo")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment