-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add initial implementation of pdatagrcp (#3231)
* Add initial implementation of pdatagrcp This is needed because if we split pdata, we will nolonger be able to depend on the InternalRep or generated proto classes (raw, grpc). The pdatagrcp will eventually be public once we stabilize the API. The API in the pdatagrcp package is inspired from the grpc generated classes and redirects all calls to the generated classes. Some simple renames: * TraceService[Client|Server] -> Traces[Client|Server] * MetricsService[Client|Server] -> Metrics[Client|Server] * LogsService[Client|Server] -> Logs[Client|Server] Other changes: * Replace usages of grpc generated classes in otlpexporter to excercise this new package. * Left some TODOs for the moment until this package is used more to determine the right API. Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com> * Add details for the TODOs left Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
- Loading branch information
1 parent
437ae6f
commit f8ad9a9
Showing
5 changed files
with
276 additions
and
81 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 |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Copyright The OpenTelemetry 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 pdatagrpc | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "google.golang.org/grpc" | ||
|
|
||
| "go.opentelemetry.io/collector/consumer/pdata" | ||
| "go.opentelemetry.io/collector/internal" | ||
| otlpcollectorlogs "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1" | ||
| ) | ||
|
|
||
| // TODO: Consider to add `LogsRequest` and `LogsResponse`. Right now the funcs return interface{}, | ||
| // it would be better and future proof to create a LogsResponse empty struct and return that. | ||
| // So if we ever add things in the OTLP response I can deal with that. Similar for request if we add non pdata properties. | ||
|
|
||
| // LogsClient is the client API for OTLP-GRPC Logs service. | ||
| // | ||
| // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. | ||
| type LogsClient interface { | ||
| // Export pdata.Logs to the server. | ||
| // | ||
| // For performance reasons, it is recommended to keep this RPC | ||
| // alive for the entire life of the application. | ||
| Export(ctx context.Context, in pdata.Logs, opts ...grpc.CallOption) (interface{}, error) | ||
| } | ||
|
|
||
| type logsClient struct { | ||
| rawClient otlpcollectorlogs.LogsServiceClient | ||
| } | ||
|
|
||
| // NewLogsClient returns a new LogsClient connected using the given connection. | ||
| func NewLogsClient(cc *grpc.ClientConn) LogsClient { | ||
| return &logsClient{rawClient: otlpcollectorlogs.NewLogsServiceClient(cc)} | ||
| } | ||
|
|
||
| func (c *logsClient) Export(ctx context.Context, in pdata.Logs, opts ...grpc.CallOption) (interface{}, error) { | ||
| return c.rawClient.Export(ctx, internal.LogsToOtlp(in.InternalRep()), opts...) | ||
| } | ||
|
|
||
| // LogsServer is the server API for OTLP gRPC LogsService service. | ||
| type LogsServer interface { | ||
| // Export is called every time a new request is received. | ||
| // | ||
| // For performance reasons, it is recommended to keep this RPC | ||
| // alive for the entire life of the application. | ||
| Export(context.Context, pdata.Logs) (interface{}, error) | ||
| } | ||
|
|
||
| // RegisterLogsServer registers the LogsServer to the grpc.Server. | ||
| func RegisterLogsServer(s *grpc.Server, srv LogsServer) { | ||
| otlpcollectorlogs.RegisterLogsServiceServer(s, &rawLogsServer{srv: srv}) | ||
| } | ||
|
|
||
| type rawLogsServer struct { | ||
| srv LogsServer | ||
| } | ||
|
|
||
| func (s rawLogsServer) Export(ctx context.Context, request *otlpcollectorlogs.ExportLogsServiceRequest) (*otlpcollectorlogs.ExportLogsServiceResponse, error) { | ||
| _, err := s.srv.Export(ctx, pdata.LogsFromInternalRep(internal.LogsFromOtlp(request))) | ||
| return &otlpcollectorlogs.ExportLogsServiceResponse{}, err | ||
| } |
Oops, something went wrong.