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.

Sign up for GitHub

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

Jump to bottom

[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

Commits on Jan 14, 2020

  1. Integrate Jaeger gRPC collector (elastic#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 elastic#2962

Co-Authored-By: Andrew Wilkins <[email protected]>
    @simitt @axw
    simitt and axw committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    72623a1 View commit details
    Browse the repository at this point in the history

  2. [Jaeger] Add otel consumer converting batches to Elastic APM events (e… 

    …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
    @simitt
    simitt committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    e953cb9 View commit details
    Browse the repository at this point in the history

  3. Jaeger http thrift (elastic#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.
    @axw @simitt
    axw authored and simitt committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    d4e3822 View commit details
    Browse the repository at this point in the history

  4. [jaeger] Convert Timeevents to errors (elastic#3085) 

    * [jaeger] Convert Timeevents to errors

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

Fixes elastic#3007
    @simitt
    simitt committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    a16d9be View commit details
    Browse the repository at this point in the history

  5. Add experimental flag to Jaeger integration (elastic#3121)

    @simitt
    simitt committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    9e8b11d View commit details
    Browse the repository at this point in the history

  6. tests/system: system test for Jaeger Thrift/HTTP (elastic#3114) 

    * tests/system: system test for Jaeger Thrift/HTTP
    @axw @simitt
    axw authored and simitt committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    6a7416b View commit details
    Browse the repository at this point in the history

  7. tests/system: system test for Jaeger gRPC

    @axw @simitt
    axw authored and simitt committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    48fd8b3 View commit details
    Browse the repository at this point in the history