Add endpoints to allow uploading OTLP traces

cmd/query/app/apiv3/otlp_translator.go

@@ -17,8 +17,10 @@ package apiv3
 import (
 	"fmt"
 
+	"github.com/gogo/protobuf/jsonpb"
 	"github.com/gogo/protobuf/proto"
 	model2otel "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
+	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp"
 
 	"github.com/jaegertracing/jaeger/model"
@@ -45,3 +47,26 @@ func modelToOTLP(spans []*model.Span) ([]*tracev1.ResourceSpans, error) {
 	}
 	return chunk.ResourceSpans, nil
 }
+
+func OTLP2model(OTLPSpans []byte) ([]model.Trace, error) {
+	ptrace_unmarshaler := ptrace.JSONUnmarshaler{}
+	otlp_traces, err := ptrace_unmarshaler.UnmarshalTraces(OTLPSpans)
+	if err != nil {
+		fmt.Println(err)
+		return nil, fmt.Errorf("cannot marshal OTLP : %w", err)
+	}
+	batches, err := model2otel.ProtoFromTraces(otlp_traces)
+   fmt.Println(otlp_traces.ResourceSpans())
+	if err != nil {
+		fmt.Println(err)
+		return nil, fmt.Errorf("cannot marshal OTLP : %w", err)
+	}
+   jaeger_traces := make([]model.Trace, len(batches) )
+	for _, v := range batches {
+		mar := jsonpb.Marshaler{}
+		fmt.Println(mar.MarshalToString(v))
+      jaeger_trace := v.ConvertToTraces()
+      jaeger_traces = append(jaeger_traces, *jaeger_trace)
+	}
+	return jaeger_traces, nil
+}

cmd/query/app/http_handler.go

@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -31,6 +32,7 @@ import (
 	"go.opentelemetry.io/otel/propagation"
 	"go.uber.org/zap"
 
+	"github.com/jaegertracing/jaeger/cmd/query/app/apiv3"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
 	"github.com/jaegertracing/jaeger/model"
 	uiconv "github.com/jaegertracing/jaeger/model/converter/json"
@@ -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)
 	aH.handleFunc(router, aH.archiveTrace, "/archive/{%s}", traceIDParam).Methods(http.MethodPost)
 	aH.handleFunc(router, aH.search, "/traces").Methods(http.MethodGet)
 	aH.handleFunc(router, aH.getServices, "/services").Methods(http.MethodGet)
@@ -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) {
+	body, err := ioutil.ReadAll(r.Body)
+	if aH.handleError(w, err, http.StatusBadRequest) {
+		return
+	}
+
+	if aH.handleError(w, err, http.StatusInternalServerError) {
+		return
+	}
+	var uiErrors []structuredError
+	traces, err := apiv3.OTLP2model(body)
+
+	if aH.handleError(w, err, http.StatusInternalServerError) {
+		return
+	}
+
+	uiTraces := make([]*ui.Trace, len(traces))
+	for i, v := range traces {
+		uiTrace, uiErr := aH.convertModelToUI(&v, false)
+		if uiErr != nil {
+			uiErrors = append(uiErrors, *uiErr)
+		}
+		uiTraces[i] = uiTrace
+	}
+
+	structuredRes := structuredResponse{
+		Data:   uiTraces,
+		Errors: uiErrors,
+	}
+   aH.writeJSON(w,r,structuredRes)
+
+}
+
 func (aH *APIHandler) getServices(w http.ResponseWriter, r *http.Request) {
 	services, err := aH.queryService.GetServices(r.Context())
 	if aH.handleError(w, err, http.StatusInternalServerError) {