Skip to content
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

[7.x] Jaeger integration #3158

Merged
merged 7 commits into from
Jan 14, 2020
Merged

[7.x] Jaeger integration #3158

merged 7 commits into from
Jan 14, 2020

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Jan 14, 2020

backports #3130

simitt and others added 7 commits January 14, 2020 11:52
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]>
…lastic#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 elastic#3307
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

Parse Timeevents from Jaeger spans and convert to elastic error events
if they describe an error.

Fixes elastic#3007
* tests/system: system test for Jaeger Thrift/HTTP
@simitt simitt added the v7.6.0 label Jan 14, 2020
@simitt simitt requested a review from axw January 14, 2020 11:30
@simitt simitt merged commit 88be1f6 into elastic:7.x Jan 14, 2020
@simitt simitt deleted the 7.x-jaeger branch February 10, 2020 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants