Skip to content

Commit 955d83c

Browse files
committed
change RejectedSpans to int64 to fit proto
1 parent 86aa993 commit 955d83c

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

app/vtinsert/opentelemetry/grpc.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func getProtobufData(r *http.Request) ([]byte, error) {
4040
}
4141

4242
// https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#message-encoding
43-
func writeExportTraceResponses(w http.ResponseWriter, rejectedSpans uint64, errorMessage string) {
43+
func writeExportTraceResponses(w http.ResponseWriter, rejectedSpans int64, errorMessage string) {
4444
resp := pb.ExportTraceServiceResponse{
4545
ExportTracePartialSuccess: pb.ExportTracePartialSuccess{
4646
RejectedSpans: rejectedSpans,
@@ -51,13 +51,7 @@ func writeExportTraceResponses(w http.ResponseWriter, rejectedSpans uint64, erro
5151
grpcRespData := make([]byte, 5+len(respData))
5252
grpcRespData[0] = 0
5353
binary.BigEndian.PutUint32(grpcRespData[1:5], uint32(len(respData)))
54-
for i := 0; i < len(grpcRespData); i++ {
55-
print(grpcRespData[i])
56-
}
5754
copy(grpcRespData[5:], respData)
58-
for i := 0; i < len(grpcRespData); i++ {
59-
print(grpcRespData[i])
60-
}
6155
w.Header().Set("Content-Type", "application/grpc+proto")
6256
w.Header().Set("Trailer", "grpc-status, grpc-message")
6357

app/vtinsert/opentelemetry/opentelemetry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func pushFieldsFromScopeSpans(ss *otelpb.ScopeSpans, commonFields []logstorage.F
232232

233233
func pushFieldsFromSpan(span *otelpb.Span, scopeCommonFields []logstorage.Field, lmp insertutil.LogMessageProcessor) []logstorage.Field {
234234
fields := scopeCommonFields
235-
235+
println(span.TraceID)
236236
fields = append(fields,
237237
logstorage.Field{Name: otelpb.TraceIDField, Value: span.TraceID},
238238
logstorage.Field{Name: otelpb.SpanIDField, Value: span.SpanID},

lib/protoparser/opentelemetry/pb/traces.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (r *ExportTraceServiceResponse) marshalProtobuf(mm *easyproto.MessageMarsha
115115
// ExportTracePartialSuccess represent partial success description in grpc response
116116
// https://github.com/open-telemetry/opentelemetry-proto/blob/v1.8.0/opentelemetry/proto/collector/trace/v1/trace_service.proto#L62
117117
type ExportTracePartialSuccess struct {
118-
RejectedSpans uint64
118+
RejectedSpans int64
119119
ErrorMessage string
120120
}
121121

@@ -124,7 +124,7 @@ func (ps *ExportTracePartialSuccess) marshalProtobuf(mm *easyproto.MessageMarsha
124124
// int64 rejected_spans = 1;
125125
// string error_message = 2;
126126
//}
127-
mm.AppendFixed64(1, ps.RejectedSpans)
127+
mm.AppendInt64(1, ps.RejectedSpans)
128128
mm.AppendString(2, ps.ErrorMessage)
129129
}
130130

0 commit comments

Comments
 (0)