Add endpoints to allow uploading OTLP traces #5138
Conversation
Signed-off-by: Navin Shrinivas <karupal2002@gmail.com> partial work for issue jaegertracing#4949
| if aH.handleError(w, err, http.StatusBadRequest) { | ||
| return | ||
| } | ||
|
|
||
| if aH.handleError(w, err, http.StatusInternalServerError) { | ||
| return | ||
| } |
| fmt.Println(err) | ||
| return nil, fmt.Errorf("cannot marshal OTLP : %w", err) |
There was a problem hiding this comment.
| fmt.Println(err) | |
| return nil, fmt.Errorf("cannot marshal OTLP : %w", err) | |
| return nil, fmt.Errorf("cannot unmarshal OTLP: %w", err) |
| fmt.Println(otlp_traces.ResourceSpans()) | ||
| if err != nil { | ||
| fmt.Println(err) | ||
| return nil, fmt.Errorf("cannot marshal OTLP : %w", err) |
There was a problem hiding this comment.
| return nil, fmt.Errorf("cannot marshal OTLP : %w", err) | |
| return nil, fmt.Errorf("cannot transform OTLP to Jaeger: %w", err) |
| @@ -597,6 +597,22 @@ func (*Batch) ProtoMessage() {} | |||
| func (*Batch) Descriptor() ([]byte, []int) { | |||
| return fileDescriptor_4c16552f9fdb66d8, []int{6} | |||
| } | |||
|
|
|||
| func (m *Batch)ConvertToTraces()(*Trace){ | |||
There was a problem hiding this comment.
this is auto-generated file, cannot change it manually. Also, I am not sure why you need it - batch is just a collection of spans with a shared Process, and the HTTP handler already has code to translate a list of spans into UI-compatible output.
There was a problem hiding this comment.
the fromDomain function that is used by convertModelToUI tries to deref Span.Process (I get a nil pointer derefencing error) :
fromDomain function instead?
There was a problem hiding this comment.
you need to prepare data for that function by denormalizing Batch.Process -> Span.Process
There was a problem hiding this comment.
That is what im trying to do in this function by copying m.Process into v.process
There was a problem hiding this comment.
I know, but (a) you cannot do this in this file, and (b) that's not all you're doing, L607-610 don't make sense, it's already being done on the GET /v1/trace code path.
There was a problem hiding this comment.
Ahhh, that makes sense, thanks! I'll revert back with the changes :)
There was a problem hiding this comment.
Yikes! I forgot models.pb is a file generated by protoc from grpc definitions...
| @@ -158,6 +161,39 @@ func (aH *APIHandler) formatRoute(route string, args ...interface{}) string { | |||
| return fmt.Sprintf("/%s"+route, args...) | |||
| } | |||
|
|
|||
| func (aH *APIHandler) transformOTLP(w http.ResponseWriter, r *http.Request) { | |||
There was a problem hiding this comment.
please move the function to a place in the file so that it reflects its relative position in RegisterRoutes
| @@ -121,6 +123,7 @@ func NewAPIHandler(queryService *querysvc.QueryService, tm *tenancy.Manager, opt | |||
| // RegisterRoutes registers routes for this handler on the given router | |||
| func (aH *APIHandler) RegisterRoutes(router *mux.Router) { | |||
| aH.handleFunc(router, aH.getTrace, "/traces/{%s}", traceIDParam).Methods(http.MethodGet) | |||
| aH.handleFunc(router, aH.transformOTLP, "/transform").Methods(http.MethodPost) | |||
There was a problem hiding this comment.
Please move down, after aH.getOperationsLegacy
| ptrace_unmarshaler := ptrace.JSONUnmarshaler{} | ||
| otlp_traces, err := ptrace_unmarshaler.UnmarshalTraces(OTLPSpans) |
There was a problem hiding this comment.
| ptrace_unmarshaler := ptrace.JSONUnmarshaler{} | |
| otlp_traces, err := ptrace_unmarshaler.UnmarshalTraces(OTLPSpans) | |
| ptraceUnmarshaler := ptrace.JSONUnmarshaler{} | |
| otlpTraces, err := ptrace_unmarshaler.UnmarshalTraces(OTLPSpans) |
same applies to jaeger_traces and jaeger_traces
Signed-off-by: Navin Shrinivas karupal2002@gmail.com
partial work for issue #4949
Which problem is this PR solving?
Description of the changes
How was this change tested?
idl/otel-proto/examples/traces.jsonThe commit in the PR is rather rough, looking for feedback as it's only a draft PR for now. I haven't formatted and there are some extra prints here and there that I used.
Checklist
jaeger:make lint testjaeger-ui:yarn lintandyarn test