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

[jaeger] Convert Timeevents to errors #3085

Merged
merged 3 commits into from
Jan 6, 2020

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Dec 20, 2019

Parse TimeEvents from Jaeger spans and convert to elastic error events if they describe an error. Set as much contextual information as available from transactions and spans.

This PR changes the test input files in the beater package to also contain errors as TimeEvents. To avoid any manual merge issue and reflect realistic data the whole testdata files were replaced.

Fixes #3007

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

Fixes elastic#3007
@simitt simitt requested a review from axw December 20, 2019 08:35
@simitt
Copy link
Contributor Author

simitt commented Dec 20, 2019

jenkins run the tests please

@codecov-io
Copy link

codecov-io commented Dec 20, 2019

Codecov Report

Merging #3085 into jaeger will increase coverage by 0.24%.
The diff coverage is 96.73%.

@@            Coverage Diff            @@
##           jaeger   #3085      +/-   ##
=========================================
+ Coverage   79.45%   79.7%   +0.24%     
=========================================
  Files         103     103              
  Lines        5365    5439      +74     
=========================================
+ Hits         4263    4335      +72     
- Misses       1102    1104       +2
Impacted Files Coverage Δ
processor/otel/consumer.go 92.83% <96.73%> (+1.04%) ⬆️

Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just wondering about the other fields from OT semantic conventions

processor/otel/consumer.go Outdated Show resolved Hide resolved
processor/otel/consumer.go Show resolved Hide resolved
Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should probably log when we drop error time events without the minimum requirements, but open to other ideas too. Otherwise LGTM.

processor/otel/consumer.go Show resolved Hide resolved
@simitt simitt merged commit 7c4145f into elastic:jaeger Jan 6, 2020
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
* [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 added a commit to simitt/apm-server that referenced this pull request Jan 14, 2020
* [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 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]>
@simitt simitt deleted the 3007-jaeger-errors branch February 10, 2020 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants