Skip to content

Remove cortex_dynamo_query_retry_count histogram #1362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions pkg/chunk/aws/dynamodb_storage_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,13 @@ var (
// metric names.
Buckets: prometheus.ExponentialBuckets(1, 4, 6),
})
dynamoQueryRetryCount = prometheus.NewHistogramVec(prometheus.HistogramOpts{
Namespace: "cortex",
Name: "dynamo_query_retry_count",
Help: "Number of retries per DynamoDB operation.",
Buckets: prometheus.LinearBuckets(0, 1, 21),
}, []string{"operation"})
)

func init() {
dynamoRequestDuration.Register()
prometheus.MustRegister(dynamoConsumedCapacity)
prometheus.MustRegister(dynamoFailures)
prometheus.MustRegister(dynamoQueryPagesCount)
prometheus.MustRegister(dynamoQueryRetryCount)
prometheus.MustRegister(dynamoDroppedRequests)
}

Expand Down Expand Up @@ -212,9 +205,6 @@ func (a dynamoDBStorageClient) BatchWrite(ctx context.Context, input chunk.Write
unprocessed := dynamoDBWriteBatch{}

backoff := util.NewBackoff(ctx, a.cfg.backoffConfig)
defer func() {
dynamoQueryRetryCount.WithLabelValues("BatchWrite").Observe(float64(backoff.NumRetries()))
}()

for outstanding.Len()+unprocessed.Len() > 0 && backoff.Ongoing() {
requests := dynamoDBWriteBatch{}
Expand Down Expand Up @@ -354,9 +344,6 @@ func (a dynamoDBStorageClient) query(ctx context.Context, query chunk.IndexQuery

func (a dynamoDBStorageClient) queryPage(ctx context.Context, input *dynamodb.QueryInput, page dynamoDBRequest, hashValue string, pageCount int) (*dynamoDBReadResponse, error) {
backoff := util.NewBackoff(ctx, a.cfg.backoffConfig)
defer func() {
dynamoQueryRetryCount.WithLabelValues("queryPage").Observe(float64(backoff.NumRetries()))
}()

var err error
for backoff.Ongoing() {
Expand Down Expand Up @@ -533,9 +520,6 @@ func (a dynamoDBStorageClient) getDynamoDBChunks(ctx context.Context, chunks []c
result := []chunk.Chunk{}
unprocessed := dynamoDBReadRequest{}
backoff := util.NewBackoff(ctx, a.cfg.backoffConfig)
defer func() {
dynamoQueryRetryCount.WithLabelValues("getDynamoDBChunks").Observe(float64(backoff.NumRetries()))
}()

for outstanding.Len()+unprocessed.Len() > 0 && backoff.Ongoing() {
requests := dynamoDBReadRequest{}
Expand Down