Skip to content

Commit

Permalink
run make proto against latest proto files (#36)
Browse files Browse the repository at this point in the history
* run make proto against latest proto files

* add package file for dep
  • Loading branch information
MatthewDolan authored and jmacd committed Mar 10, 2019
1 parent 770c9d1 commit b875161
Show file tree
Hide file tree
Showing 5 changed files with 213 additions and 157 deletions.
185 changes: 114 additions & 71 deletions golang/gogo/collectorpb/collector.pb.go

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

17 changes: 9 additions & 8 deletions golang/gogo/collectorpb/collector.proto
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import "google/protobuf/timestamp.proto";
import "google/api/annotations.proto";

message SpanContext {
uint64 trace_id = 1;
uint64 span_id = 2;
uint64 trace_id = 1 [jstype=JS_STRING];
uint64 span_id = 2 [jstype=JS_STRING];
map<string, string> baggage = 3;
}

Expand All @@ -24,7 +24,7 @@ message KeyValue {
// Holds arbitrary string data; well-formed JSON strings should go in
// json_value.
string string_value = 2;
int64 int_value = 3;
int64 int_value = 3 [jstype=JS_STRING];
double double_value = 4;
bool bool_value = 5;
// Must be a well-formed JSON value. Truncated JSON should go in
Expand Down Expand Up @@ -52,27 +52,27 @@ message Span {
string operation_name = 2;
repeated Reference references = 3;
google.protobuf.Timestamp start_timestamp = 4;
uint64 duration_micros = 5;
uint64 duration_micros = 5 [jstype=JS_STRING];
repeated KeyValue tags = 6;
repeated Log logs = 7;
}

message Reporter {
uint64 reporter_id = 1;
uint64 reporter_id = 1 [jstype=JS_STRING];
repeated KeyValue tags = 4;
}

message MetricsSample {
string name = 1;
oneof value {
int64 int_value = 2;
int64 int_value = 2 [jstype=JS_STRING];
double double_value = 3;
}
}

message InternalMetrics {
google.protobuf.Timestamp start_timestamp = 1;
uint64 duration_micros = 2;
uint64 duration_micros = 2 [jstype=JS_STRING];
repeated Log logs = 3;
repeated MetricsSample counts = 4;
repeated MetricsSample gauges = 5;
Expand All @@ -86,12 +86,13 @@ message ReportRequest {
Reporter reporter = 1;
Auth auth = 2;
repeated Span spans = 3;
int64 timestamp_offset_micros = 5;
int64 timestamp_offset_micros = 5 [jstype=JS_STRING];
InternalMetrics internal_metrics = 6;
}

message Command {
bool disable = 1;
bool dev_mode = 2;
}

message ReportResponse {
Expand Down
Loading

0 comments on commit b875161

Please sign in to comment.