Integrate Jaeger gRPC collector #2976
Merged
Conversation
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
axw
reviewed
Nov 29, 2019
There was a problem hiding this comment.
After looking more into what is missing, I now went down the road of not using the jaegerreceiver directly, but implementing the jaeger protobuf contract and starting a grpc server on our own. We still use some open-telemetry functions, but have full control over the grpc server. This is still only a draft, to see which direction we should go.
@axw please let me know what you think
(GitHub won't let me respond inline...)
I think that's the best option, at least for the near term.
Co-Authored-By: Andrew Wilkins <[email protected]>
This reverts commit 3ccd8ff.
This reverts commit d7ec4f6.
Codecov Report
@@ Coverage Diff @@
## jaeger #2976 +/- ##
=========================================
Coverage ? 78.01%
=========================================
Files ? 93
Lines ? 4735
Branches ? 0
=========================================
Hits ? 3694
Misses ? 1041
Partials ? 0
|
axw
requested changes
Dec 3, 2019
axw
approved these changes
Dec 4, 2019
Co-Authored-By: Andrew Wilkins <[email protected]>
Co-Authored-By: Andrew Wilkins <[email protected]>
axw
added a commit
that referenced
this pull request
Jan 9, 2020
* Integrate Jaeger gRPC collector (#2976) Add support for Jaeger gRPC Trace Intake Collector. The gRPC endpoint collects monitoring metrics and supports TLS communication, by reusing the `apm-server.ssl.*` configuration. By default the gRPC endpoint is disabled. closes #2962 Co-Authored-By: Andrew Wilkins <[email protected]> * [Jaeger] Add otel consumer converting batches to Elastic APM events (#3066) Add consumer converting incoming otel batches to Elastic APM format. Add integration tests covering incoming gRPC requests being transformed to beat events. partially implements #3307 * Jaeger http thrift (#3081) Add an HTTP handler, muxer, and server, in beater/jaeger for accepting Thrift-encoded trace data over HTTP. Refactor beater/jaeger.GRPCServer into Server, which now encapsulates both gRPC and HTTP servers. Move beater/api/jaeger code into beater/jaeger, which is the only user of GRPCCollector. If the beater/jaeger code grows significantly, we might consider having subpackages like beater/jaeger/grpc, beater/jaeger/http, etc. * [jaeger] Convert Timeevents to errors (#3085) * [jaeger] Convert Timeevents to errors Parse Timeevents from Jaeger spans and convert to elastic error events if they describe an error. Fixes #3007 * Add experimental flag to Jaeger integration (#3121) * tests/system: system test for Jaeger Thrift/HTTP (#3114) * tests/system: system test for Jaeger Thrift/HTTP * tests/system: system test for Jaeger gRPC * processor/otel: update approvals Co-authored-by: Silvia Mitter <[email protected]>
simitt
added a commit
to simitt/apm-server
that referenced
this pull request
Jan 14, 2020
Add support for Jaeger gRPC Trace Intake Collector. The gRPC endpoint collects monitoring metrics and supports TLS communication, by reusing the `apm-server.ssl.*` configuration. By default the gRPC endpoint is disabled. closes elastic#2962 Co-Authored-By: Andrew Wilkins <[email protected]>
simitt
added a commit
that referenced
this pull request
Jan 14, 2020
* Integrate Jaeger gRPC collector (#2976) Add support for Jaeger gRPC Trace Intake Collector. The gRPC endpoint collects monitoring metrics and supports TLS communication, by reusing the `apm-server.ssl.*` configuration. By default the gRPC endpoint is disabled. closes #2962 Co-Authored-By: Andrew Wilkins <[email protected]> * [Jaeger] Add otel consumer converting batches to Elastic APM events (#3066) Add consumer converting incoming otel batches to Elastic APM format. Add integration tests covering incoming gRPC requests being transformed to beat events. partially implements #3307 * Jaeger http thrift (#3081) Add an HTTP handler, muxer, and server, in beater/jaeger for accepting Thrift-encoded trace data over HTTP. Refactor beater/jaeger.GRPCServer into Server, which now encapsulates both gRPC and HTTP servers. Move beater/api/jaeger code into beater/jaeger, which is the only user of GRPCCollector. If the beater/jaeger code grows significantly, we might consider having subpackages like beater/jaeger/grpc, beater/jaeger/http, etc. * [jaeger] Convert Timeevents to errors (#3085) * [jaeger] Convert Timeevents to errors Parse Timeevents from Jaeger spans and convert to elastic error events if they describe an error. Fixes #3007 * Add experimental flag to Jaeger integration (#3121) * tests/system: system test for Jaeger Thrift/HTTP (#3114) * tests/system: system test for Jaeger Thrift/HTTP * tests/system: system test for Jaeger gRPC Co-authored-by: Andrew Wilkins <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #2962
TODO:
Switched to implement the jaeger collector ourselves instead of using otel jaegerreceiver, allowing us to have more control over the gRPC server.
Points to consider from Jaeger collectorjaegerreceiverStartTraceReceptionalways starts agent. For now just put a patch into the vendored file, will be fixed with open-telemetry PR#434startCollector always starts all receiver protocols, independent of configuration. Needs to be fixed.Improve how configuration can be created for jaeger receiver. If not using CreateDefaultConfig() all names, protocols etc need to be duplicated, since not exported and no supporter methods available.*~ Logger is unused. Figure out how to integrate with our logger once this is fixed.~
Context is unused