-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add initial implementation of pdatagrcp #3231
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need an interface? I assume there will be only one implementation ever. Should we simply, delete the interface and just have the struct?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can either expose the struct or the interface. I think exposing the interface is more future proof, because we can offer alternative implementations in the future. Not a big thing though, so if you feel strong I can change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a strong opinion. Works either way.