-
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 <[email protected]>
- Loading branch information
1 parent
127293d
commit 5e2b9cb
Showing
20 changed files
with
4,721 additions
and
42 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // 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" | ||
| ) | ||
|
|
||
| // RegisterGRPCGateway registers api_v3 endpoints into provided mux. | ||
| func RegisterGRPCGateway(r *mux.Router, grpcEndpoint string) error { | ||
| jsonpb := &runtime.JSONPb{} | ||
| 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,98 @@ | ||
| // 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/grpc-ecosystem/grpc-gateway/runtime" | ||
| "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 := &runtime.JSONPb{} | ||
| var envelope envelope | ||
| err = json.Unmarshal(buf.Bytes(), &envelope) | ||
| require.NoError(t, err) | ||
| var spansResponse api_v3.SpansResponseChunk | ||
| err = jsonpb.Unmarshal(envelope.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].GetTraceId()) | ||
| } | ||
|
|
||
| // see https://github.com/grpc-ecosystem/grpc-gateway/issues/2189 | ||
| type envelope struct { | ||
| Result json.RawMessage `json:"result"` | ||
| } |
Oops, something went wrong.