Skip to content

Commit

Permalink
[proto] Use a unique package name for Prometheus Protobuf definitions (
Browse files Browse the repository at this point in the history
  • Loading branch information
jeromefroe authored Oct 29, 2019
1 parent 8e64151 commit 4a114d4
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 64 deletions.
56 changes: 28 additions & 28 deletions src/query/generated/proto/prompb/remote.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/query/generated/proto/prompb/remote.proto
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

syntax = "proto3";
package prometheus;
package m3prometheus;

option go_package = "prompb";

import "github.com/m3db/m3/src/query/generated/proto/prompb/types.proto";
import "github.com/gogo/protobuf/gogoproto/gogo.proto";

message WriteRequest {
repeated prometheus.TimeSeries timeseries = 1 [(gogoproto.nullable) = false];
repeated m3prometheus.TimeSeries timeseries = 1 [(gogoproto.nullable) = false];
}

message ReadRequest {
Expand All @@ -23,9 +23,9 @@ message ReadResponse {
message Query {
int64 start_timestamp_ms = 1;
int64 end_timestamp_ms = 2;
repeated prometheus.LabelMatcher matchers = 3;
repeated m3prometheus.LabelMatcher matchers = 3;
}

message QueryResult {
repeated prometheus.TimeSeries timeseries = 1;
repeated m3prometheus.TimeSeries timeseries = 1;
}
63 changes: 32 additions & 31 deletions src/query/generated/proto/prompb/types.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/query/generated/proto/prompb/types.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

syntax = "proto3";
package prometheus;
package m3prometheus;

option go_package = "prompb";

Expand Down

0 comments on commit 4a114d4

Please sign in to comment.