dont use time.Duration which doesnt have Equal() method in proto

Signed-off-by: Owen Diehl <ow.diehl@gmail.com>
grafana · Apr 16, 2024 · edc19be · edc19be
1 parent 2292b40
commit edc19be
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 101 deletions.
diff --git a/pkg/logql/metrics.go b/pkg/logql/metrics.go
@@ -203,7 +203,7 @@ func RecordRangeAndInstantQueryMetrics(
 		"index_total_chunks", stats.Index.TotalChunks,
 		"index_post_bloom_filter_chunks", stats.Index.PostFilterChunks,
 		"index_bloom_filter_ratio", fmt.Sprintf("%.2f", bloomRatio),
-		"index_shard_resolver_duration", stats.Index.ShardsDuration,
+		"index_shard_resolver_duration", time.Duration(stats.Index.ShardsDuration),
 	}...)
 
 	logValues = append(logValues, tagsToKeyValues(queryTags)...)

diff --git a/pkg/logqlmodel/stats/stats.pb.go b/pkg/logqlmodel/stats/stats.pb.go
diff --git a/pkg/logqlmodel/stats/stats.proto b/pkg/logqlmodel/stats/stats.proto
@@ -109,11 +109,7 @@ message Index {
   // Post-filtered chunks
   int64 postFilterChunks = 2 [(gogoproto.jsontag) = "postFilterChunks"];
   // Nanosecond duration spent fetching shards
-  int64 shardsDuration = 3 [
-    (gogoproto.jsontag) = "shardsDuration",
-    (gogoproto.customtype) = "time.Duration",
-    (gogoproto.nullable) = false
-  ];
+  int64 shardsDuration = 3 [(gogoproto.jsontag) = "shardsDuration"];
 }
 
 message Querier {

diff --git a/pkg/storage/stores/index/index.go b/pkg/storage/stores/index/index.go
@@ -170,7 +170,7 @@ func (m MonitoredReaderWriter) GetShards(
 			// 2) when we resolve shards from the index + blooms
 			// NB(owen-d): since this is measured by the callee, it does not include time in queue,
 			// over the wire, etc.
-			shards.Statistics.Index.ShardsDuration = time.Since(start)
+			shards.Statistics.Index.ShardsDuration = int64(time.Since(start))
 		}
 
 		return err