-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
- Loading branch information
1 parent
e15c981
commit d59f0b3
Showing
25 changed files
with
5,111 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,4 +34,6 @@ cmd/docs/*.1 | |
| cmd/docs/*.yaml | ||
| crossdock/crossdock-* | ||
| run-crossdock.log | ||
| proto-gen/.patched-otel-proto/ | ||
| __pycache__ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Copyright (c) 2021 The Jaeger Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package otel | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/gorilla/mux" | ||
| "github.com/grpc-ecosystem/grpc-gateway/runtime" | ||
| "google.golang.org/grpc" | ||
|
|
||
| "github.com/jaegertracing/jaeger/proto-gen/api_v3" | ||
| ) | ||
|
|
||
| func RegisterGRPCGateway(r *mux.Router, grpcEndpoint string) error { | ||
| jsonpb := &JSONPb{ | ||
| EmitDefaults: true, | ||
| Indent: " ", | ||
| OrigName: true, | ||
| } | ||
| grpcGatewayMux := runtime.NewServeMux( | ||
| runtime.WithMarshalerOption(runtime.MIMEWildcard, jsonpb), | ||
| ) | ||
| opts := []grpc.DialOption{grpc.WithInsecure()} | ||
| err := api_v3.RegisterQueryServiceHandlerFromEndpoint(context.Background(), grpcGatewayMux, grpcEndpoint, opts) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // TODO (pavolloffay) matching does not work when query API base path is configured | ||
| r.PathPrefix("/v3/").Handler(grpcGatewayMux) | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| // Copyright (c) 2021 The Jaeger Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package otel | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/json" | ||
| "fmt" | ||
| "net" | ||
| "net/http" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/gorilla/mux" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/mock" | ||
| "github.com/stretchr/testify/require" | ||
| "google.golang.org/grpc" | ||
|
|
||
| "github.com/jaegertracing/jaeger/cmd/query/app/querysvc" | ||
| "github.com/jaegertracing/jaeger/model" | ||
| _ "github.com/jaegertracing/jaeger/pkg/gogocodec" //force gogo codec registration | ||
| "github.com/jaegertracing/jaeger/proto-gen/api_v3" | ||
| dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks" | ||
| spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks" | ||
| ) | ||
|
|
||
| func TestGRPCGateway(t *testing.T) { | ||
| r := &spanstoremocks.Reader{} | ||
| traceID := model.NewTraceID(150, 160) | ||
| r.On("GetTrace", mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("model.TraceID")).Return( | ||
| &model.Trace{ | ||
| Spans: []*model.Span{ | ||
| { | ||
| TraceID: traceID, | ||
| SpanID: model.NewSpanID(180), | ||
| OperationName: "foobar", | ||
| }, | ||
| }, | ||
| }, nil).Once() | ||
|
|
||
| q := querysvc.NewQueryService(r, &dependencyStoreMocks.Reader{}, querysvc.QueryServiceOptions{}) | ||
| server := grpc.NewServer() | ||
| h := &Handler{ | ||
| QueryService: q, | ||
| } | ||
| api_v3.RegisterQueryServiceServer(server, h) | ||
|
|
||
| lis, _ := net.Listen("tcp", ":0") | ||
| go func() { | ||
| err := server.Serve(lis) | ||
| require.NoError(t, err) | ||
| }() | ||
|
|
||
| router := &mux.Router{} | ||
| err := RegisterGRPCGateway(router, lis.Addr().String()) | ||
| require.NoError(t, err) | ||
|
|
||
| httpLis, _ := net.Listen("tcp", ":0") | ||
| go func() { | ||
| err = http.Serve(httpLis, router) | ||
| require.NoError(t, err) | ||
| }() | ||
| req, err := http.NewRequest("GET", fmt.Sprintf("http://localhost%s/v3/traces/123", strings.Replace(httpLis.Addr().String(), "[::]", "", 1)), nil) | ||
| req.Header.Set("Content-Type", "application/json") | ||
| response, err := http.DefaultClient.Do(req) | ||
| buf := bytes.Buffer{} | ||
| _, err = buf.ReadFrom(response.Body) | ||
| require.NoError(t, err) | ||
|
|
||
| jsonpb := &JSONPb{} | ||
| var w resultWrapper | ||
| err = json.Unmarshal(buf.Bytes(), &w) | ||
| require.NoError(t, err) | ||
| var spansResponse api_v3.SpansResponseChunk | ||
| err = jsonpb.Unmarshal(w.Result, spansResponse) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, 1, len(spansResponse.GetResourceSpans())) | ||
| assert.Equal(t, uint64ToTraceID(traceID.High, traceID.Low), spansResponse.GetResourceSpans()[0].GetInstrumentationLibrarySpans()[0].GetSpans()[0].TraceId.Bytes()) | ||
| } | ||
|
|
||
| // see https://github.com/grpc-ecosystem/grpc-gateway/issues/2189 | ||
| type resultWrapper struct { | ||
| Result json.RawMessage `json:"result"` | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| // Copyright (c) 2021 The Jaeger Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package otel | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/gogo/protobuf/types" | ||
|
|
||
| "github.com/jaegertracing/jaeger/cmd/query/app/querysvc" | ||
| "github.com/jaegertracing/jaeger/model" | ||
| "github.com/jaegertracing/jaeger/proto-gen/api_v3" | ||
| "github.com/jaegertracing/jaeger/storage/spanstore" | ||
| ) | ||
|
|
||
| type Handler struct { | ||
| QueryService *querysvc.QueryService | ||
| } | ||
|
|
||
| var _ api_v3.QueryServiceServer = (*Handler)(nil) | ||
|
|
||
| func (h *Handler) GetTrace(request *api_v3.GetTraceRequest, stream api_v3.QueryService_GetTraceServer) error { | ||
| traceID, err := model.TraceIDFromString(request.GetTraceId()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| trace, err := h.QueryService.GetTrace(context.Background(), traceID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| resourceSpans := jaegerSpansToOTLP(trace.GetSpans()) | ||
| return stream.Send(&api_v3.SpansResponseChunk{ | ||
| ResourceSpans: resourceSpans, | ||
| }) | ||
| } | ||
|
|
||
| func (h *Handler) GetTraces(request *api_v3.FindTracesRequest, stream api_v3.QueryService_GetTracesServer) error { | ||
| query := request.GetQuery() | ||
| queryParams := &spanstore.TraceQueryParameters{ | ||
| ServiceName: query.GetServiceName(), | ||
| OperationName: query.GetOperationName(), | ||
| Tags: query.GetAttributes(), | ||
| NumTraces: int(query.GetNumTraces()), | ||
| } | ||
| if query.GetStartTimeMin() != nil { | ||
| startTimeMin, err := types.TimestampFromProto(query.GetStartTimeMin()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| queryParams.StartTimeMin = startTimeMin | ||
| } | ||
| if query.GetStartTimeMax() != nil { | ||
| startTimeMax, err := types.TimestampFromProto(query.GetStartTimeMax()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| queryParams.StartTimeMax = startTimeMax | ||
| } | ||
| if query.GetDurationMin() != nil { | ||
| durationMin, err := types.DurationFromProto(query.GetDurationMin()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| queryParams.DurationMin = durationMin | ||
| } | ||
| if query.GetStartTimeMax() != nil { | ||
| durationMax, err := types.DurationFromProto(query.GetDurationMax()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| queryParams.DurationMax = durationMax | ||
| } | ||
|
|
||
| traces, err := h.QueryService.FindTraces(context.Background(), queryParams) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| for _, t := range traces { | ||
| resourceSpans := jaegerSpansToOTLP(t.GetSpans()) | ||
| stream.Send(&api_v3.SpansResponseChunk{ | ||
| ResourceSpans: resourceSpans, | ||
| }) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (h *Handler) GetServices(ctx context.Context, _ *api_v3.GetServicesRequest) (*api_v3.GetServicesResponse, error) { | ||
| services, err := h.QueryService.GetServices(ctx) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &api_v3.GetServicesResponse{ | ||
| Services: services, | ||
| }, nil | ||
| } | ||
|
|
||
| func (h *Handler) GetOperations(ctx context.Context, request *api_v3.GetOperationsRequest) (*api_v3.GetOperationsResponse, error) { | ||
| operations, err := h.QueryService.GetOperations(ctx, spanstore.OperationQueryParameters{ | ||
| ServiceName: request.GetService(), | ||
| SpanKind: request.GetSpanKind(), | ||
| }) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| apiOperations := make([]*api_v3.Operation, len(operations)) | ||
| for i := range operations { | ||
| apiOperations[i] = &api_v3.Operation{ | ||
| Name: operations[i].Name, | ||
| SpanKind: operations[i].SpanKind, | ||
| } | ||
| } | ||
| return &api_v3.GetOperationsResponse{ | ||
| Operations: apiOperations, | ||
| }, nil | ||
| } |
Oops, something went wrong.