-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 <ploffay@redhat.com>
- Loading branch information
1 parent
95af75f
commit 45ddf2f
Showing
11 changed files
with
203 additions
and
74 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
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 |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ EXPOSE 5778 | |
| EXPOSE 14268 | ||
|
|
||
| # Collector gRPC | ||
| EXPOSE 14270 | ||
| EXPOSE 14250 | ||
|
|
||
| # Web HTTP | ||
| EXPOSE 16686 | ||
|
|
||
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
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,71 @@ | ||
| // Copyright (c) 2018 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 grpcserver | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "net" | ||
| "os" | ||
| "strconv" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "go.uber.org/zap" | ||
| "google.golang.org/grpc" | ||
| "google.golang.org/grpc/grpclog" | ||
|
|
||
| "github.com/jaegertracing/jaeger/cmd/collector/app" | ||
| "github.com/jaegertracing/jaeger/cmd/collector/app/sampling" | ||
| "github.com/jaegertracing/jaeger/cmd/collector/app/sampling/strategystore" | ||
| "github.com/jaegertracing/jaeger/proto-gen/api_v2" | ||
| ) | ||
|
|
||
| // StartGRPCCollector configures and starts gRPC endpoints exposed by collector. | ||
| func StartGRPCCollector( | ||
| port int, | ||
| server *grpc.Server, | ||
| handler *app.GRPCHandler, | ||
| samplingStrategy strategystore.StrategyStore, | ||
| logger *zap.Logger, | ||
| serveErr func(error), | ||
| ) (net.Addr, error) { | ||
| grpcPortStr := ":" + strconv.Itoa(port) | ||
| lis, err := net.Listen("tcp", grpcPortStr) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "Failed to listen on gRPC port") | ||
| } | ||
|
|
||
| grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, os.Stderr, os.Stderr)) | ||
|
|
||
| api_v2.RegisterCollectorServiceServer(server, handler) | ||
| api_v2.RegisterSamplingManagerServer(server, sampling.NewGRPCHandler(samplingStrategy)) | ||
| starServer(server, lis, logger, serveErr) | ||
| return lis.Addr(), nil | ||
| } | ||
|
|
||
| func starServer(server *grpc.Server, lis net.Listener, logger *zap.Logger, serveErr func(error)) { | ||
| var port string | ||
| if tcpAddr, ok := lis.Addr().(*net.TCPAddr); ok { | ||
| port = strconv.Itoa(tcpAddr.Port) | ||
| } else { | ||
| port = lis.Addr().Network() | ||
| } | ||
| logger.Info("Starting jaeger-collector gRPC server", zap.String("grpc-port", port)) | ||
| go func() { | ||
| if err := server.Serve(lis); err != nil { | ||
| logger.Error("Could not launch gRPC service", zap.Error(err)) | ||
| serveErr(err) | ||
| } | ||
| }() | ||
| } |
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,90 @@ | ||
| // Copyright (c) 2018 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 grpcserver | ||
|
|
||
| import ( | ||
| "context" | ||
| "sync" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "go.uber.org/zap" | ||
| "go.uber.org/zap/zapcore" | ||
| "go.uber.org/zap/zaptest/observer" | ||
| "google.golang.org/grpc" | ||
| "google.golang.org/grpc/test/bufconn" | ||
|
|
||
| "github.com/jaegertracing/jaeger/cmd/collector/app" | ||
| "github.com/jaegertracing/jaeger/model" | ||
| "github.com/jaegertracing/jaeger/proto-gen/api_v2" | ||
| "github.com/jaegertracing/jaeger/thrift-gen/sampling" | ||
| ) | ||
|
|
||
| // test wrong port number | ||
| func TestFailToListen(t *testing.T) { | ||
| l, _ := zap.NewDevelopment() | ||
| handler := app.NewGRPCHandler(l, &mockSpanProcessor{}) | ||
| server := grpc.NewServer() | ||
| addr, err := StartGRPCCollector(1, server, handler, &mockSamplingStore{}, l, func(e error) { | ||
| }) | ||
| require.Nil(t, addr) | ||
| assert.EqualError(t, err, "Failed to listen on gRPC port: listen tcp :1: bind: permission denied") | ||
| } | ||
|
|
||
| func TestFailServe(t *testing.T) { | ||
| lis := bufconn.Listen(0) | ||
| lis.Close() | ||
| core, logs := observer.New(zap.NewAtomicLevelAt(zapcore.ErrorLevel)) | ||
| wg := &sync.WaitGroup{} | ||
| wg.Add(1) | ||
| starServer(grpc.NewServer(), lis, zap.New(core), func(e error) { | ||
| assert.Equal(t, 1, len(logs.All())) | ||
| assert.Equal(t, "Could not launch gRPC service", logs.All()[0].Message) | ||
| wg.Done() | ||
| }) | ||
| wg.Wait() | ||
| } | ||
|
|
||
| func TestSpanCollector(t *testing.T) { | ||
| l, _ := zap.NewDevelopment() | ||
| handler := app.NewGRPCHandler(l, &mockSpanProcessor{}) | ||
| server := grpc.NewServer() | ||
| addr, err := StartGRPCCollector(0, server, handler, &mockSamplingStore{}, l, func(e error) { | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| conn, err := grpc.Dial(addr.String(), grpc.WithInsecure()) | ||
| defer conn.Close() | ||
| defer server.Stop() | ||
| require.NoError(t, err) | ||
| c := api_v2.NewCollectorServiceClient(conn) | ||
| response, err := c.PostSpans(context.Background(), &api_v2.PostSpansRequest{}) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, true, response.Ok) | ||
| } | ||
|
|
||
| type mockSamplingStore struct{} | ||
|
|
||
| func (s mockSamplingStore) GetSamplingStrategy(serviceName string) (*sampling.SamplingStrategyResponse, error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| type mockSpanProcessor struct { | ||
| } | ||
|
|
||
| func (p *mockSpanProcessor) ProcessSpans(spans []*model.Span, spanFormat string) ([]bool, error) { | ||
| return []bool{}, nil | ||
| } |
Oops, something went wrong.