Fix prometheus metric duplication panic (#975)

jaegertracing · Aug 13, 2018 · c77bb1d · c77bb1d
1 parent b088909
commit c77bb1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/ingester/app/consumer/offset/manager.go b/cmd/ingester/app/consumer/offset/manager.go
@@ -54,8 +54,8 @@ func NewManager(minOffset int64, markOffset MarkOffset, partition int32, factory
 	return &Manager{
 		markOffsetFunction:  markOffset,
 		close:               make(chan struct{}),
-		offsetCommitCount:   factory.Counter("offset-commit", map[string]string{"partition": strconv.Itoa(int(partition))}),
-		lastCommittedOffset: factory.Gauge("offset-commit", map[string]string{"partition": strconv.Itoa(int(partition))}),
+		offsetCommitCount:   factory.Counter("offset-commits-total", map[string]string{"partition": strconv.Itoa(int(partition))}),
+		lastCommittedOffset: factory.Gauge("last-committed-offset", map[string]string{"partition": strconv.Itoa(int(partition))}),
 		list:                newConcurrentList(minOffset),
 	}
 }

diff --git a/cmd/ingester/app/consumer/offset/manager_test.go b/cmd/ingester/app/consumer/offset/manager_test.go
@@ -44,6 +44,6 @@ func TestHandleReset(t *testing.T) {
 
 	assert.Equal(t, offset, captureOffset)
 	cnt, g := m.Snapshot()
-	assert.Equal(t, int64(1), cnt["offset-commit|partition=1"])
-	assert.Equal(t, int64(offset), g["offset-commit|partition=1"])
+	assert.Equal(t, int64(1), cnt["offset-commits-total|partition=1"])
+	assert.Equal(t, int64(offset), g["last-committed-offset|partition=1"])
 }