-
Notifications
You must be signed in to change notification settings - Fork 525
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to google.golang.org/grpc v1.66.2
Also upgrade github.com/googleapis/enterprise-certificate-proxy to v0.3.4, to fix a checksum issue in v0.3.3. Signed-off-by: Arve Knudsen <[email protected]>
- Loading branch information
Showing
98 changed files
with
4,125 additions
and
2,501 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
// SPDX-License-Identifier: AGPL-3.0-only | ||
|
||
package querymiddleware | ||
|
||
import ( | ||
"google.golang.org/grpc/mem" | ||
|
||
"github.com/grafana/mimir/pkg/mimirpb" | ||
) | ||
|
||
var _ mimirpb.UnmarshalerV2 = &PrometheusResponse{} | ||
|
||
func (m *PrometheusResponse) SetBuffer(buf mem.Buffer) { | ||
m.buffer = buf | ||
} | ||
|
||
func (m *PrometheusResponse) FreeBuffer() { | ||
if m.buffer != nil { | ||
m.buffer.Free() | ||
m.buffer = nil | ||
} | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/pkg/frontend/querymiddleware/model.pb.go b/pkg/frontend/querymiddleware/model.pb.go | ||
index fe81fabf6..47f80838c 100644 | ||
--- a/pkg/frontend/querymiddleware/model.pb.go | ||
+++ b/pkg/frontend/querymiddleware/model.pb.go | ||
@@ -13,7 +13,6 @@ import ( | ||
types "github.com/gogo/protobuf/types" | ||
github_com_grafana_mimir_pkg_mimirpb "github.com/grafana/mimir/pkg/mimirpb" | ||
mimirpb "github.com/grafana/mimir/pkg/mimirpb" | ||
- "google.golang.org/grpc/mem" | ||
io "io" | ||
math "math" | ||
math_bits "math/bits" | ||
@@ -91,9 +90,6 @@ type PrometheusResponse struct { | ||
Headers []*PrometheusHeader `protobuf:"bytes,5,rep,name=Headers,proto3" json:"-"` | ||
Warnings []string `protobuf:"bytes,6,rep,name=Warnings,proto3" json:"warnings,omitempty"` | ||
Infos []string `protobuf:"bytes,7,rep,name=Infos,proto3" json:"infos,omitempty"` | ||
- | ||
- // Keep reference to buffer for unsafe references. | ||
- buffer mem.Buffer | ||
} | ||
|
||
func (m *PrometheusResponse) Reset() { *m = PrometheusResponse{} } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
diff --git a/pkg/ingester/client/ingester.pb.go b/pkg/ingester/client/ingester.pb.go | ||
index 36860bb02..bbefc14b1 100644 | ||
--- a/pkg/ingester/client/ingester.pb.go | ||
+++ b/pkg/ingester/client/ingester.pb.go | ||
@@ -16,7 +16,6 @@ import ( | ||
mimirpb "github.com/grafana/mimir/pkg/mimirpb" | ||
grpc "google.golang.org/grpc" | ||
codes "google.golang.org/grpc/codes" | ||
- "google.golang.org/grpc/mem" | ||
status "google.golang.org/grpc/status" | ||
io "io" | ||
math "math" | ||
@@ -584,9 +583,6 @@ func (m *ActiveSeriesRequest) GetType() ActiveSeriesRequest_RequestType { | ||
|
||
type QueryResponse struct { | ||
Timeseries []mimirpb.TimeSeries `protobuf:"bytes,1,rep,name=timeseries,proto3" json:"timeseries"` | ||
- | ||
- // Keep reference to buffer for unsafe references. | ||
- buffer mem.Buffer | ||
} | ||
|
||
func (m *QueryResponse) Reset() { *m = QueryResponse{} } | ||
@@ -642,9 +638,6 @@ type QueryStreamResponse struct { | ||
StreamingSeries []QueryStreamSeries `protobuf:"bytes,3,rep,name=streaming_series,json=streamingSeries,proto3" json:"streaming_series"` | ||
IsEndOfSeriesStream bool `protobuf:"varint,4,opt,name=is_end_of_series_stream,json=isEndOfSeriesStream,proto3" json:"is_end_of_series_stream,omitempty"` | ||
StreamingSeriesChunks []QueryStreamSeriesChunks `protobuf:"bytes,5,rep,name=streaming_series_chunks,json=streamingSeriesChunks,proto3" json:"streaming_series_chunks"` | ||
- | ||
- // Keep reference to buffer for unsafe references. | ||
- buffer mem.Buffer | ||
} | ||
|
||
func (m *QueryStreamResponse) Reset() { *m = QueryStreamResponse{} } | ||
@@ -811,9 +804,6 @@ func (m *QueryStreamSeriesChunks) GetChunks() []Chunk { | ||
|
||
type ExemplarQueryResponse struct { | ||
Timeseries []mimirpb.TimeSeries `protobuf:"bytes,1,rep,name=timeseries,proto3" json:"timeseries"` | ||
- | ||
- // Keep reference to buffer for unsafe references. | ||
- buffer mem.Buffer | ||
} | ||
|
||
func (m *ExemplarQueryResponse) Reset() { *m = ExemplarQueryResponse{} } | ||
@@ -1332,9 +1322,6 @@ func (m *MetricsForLabelMatchersRequest) GetMatchersSet() []*LabelMatchers { | ||
|
||
type MetricsForLabelMatchersResponse struct { | ||
Metric []*mimirpb.Metric `protobuf:"bytes,1,rep,name=metric,proto3" json:"metric,omitempty"` | ||
- | ||
- // Keep reference to buffer for unsafe references. | ||
- buffer mem.Buffer | ||
} | ||
|
||
func (m *MetricsForLabelMatchersResponse) Reset() { *m = MetricsForLabelMatchersResponse{} } | ||
@@ -1483,9 +1470,6 @@ type ActiveSeriesResponse struct { | ||
// bucket_count is only used when the request type was NATIVE_HISTOGRAM_SERIES. | ||
// bucket_count contains the native histogram active buckets count for each series in "metric" above. | ||
BucketCount []uint64 `protobuf:"varint,2,rep,packed,name=bucket_count,json=bucketCount,proto3" json:"bucket_count,omitempty"` | ||
- | ||
- // Keep reference to buffer for unsafe references. | ||
- buffer mem.Buffer | ||
} | ||
|
||
func (m *ActiveSeriesResponse) Reset() { *m = ActiveSeriesResponse{} } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.