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

[APM] Instrument beat pipeline #17938

Merged
merged 37 commits into from
May 4, 2020
Merged

[APM] Instrument beat pipeline #17938

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f1f46d6
instrument output client
graphaelli Mar 26, 2020
e915775
capture publish errors
graphaelli Mar 26, 2020
5d874d6
clean up some missed tests
graphaelli Mar 26, 2020
7f8baae
Merge branch 'master' into publisher-apm
graphaelli Mar 31, 2020
7197c08
remove unused Tracer reference
graphaelli Mar 31, 2020
a6ac9fa
create tracer with beat and share with output
graphaelli Apr 2, 2020
dbc936e
Merge branch 'master' into publisher-apm
graphaelli Apr 13, 2020
e592c1f
Merge remote-tracking branch 'elastic/master' into publisher-apm
jalvz Apr 20, 2020
4cac58e
allow the tracer to be nil
jalvz Apr 20, 2020
974cdb5
add comments
jalvz Apr 20, 2020
0a6eb4f
capture reporting errors
jalvz Apr 21, 2020
7d37861
fix pointer?
jalvz Apr 21, 2020
ede34e0
add transaction and spans tests
jalvz Apr 21, 2020
2305281
Merge remote-tracking branch 'elastic/master' into publisher-apm
jalvz Apr 22, 2020
e48a29b
fix bad merge
jalvz Apr 22, 2020
1f0643b
remove SetTracer
jalvz Apr 23, 2020
c4c11b1
remove other SetTracer and mage fmt
jalvz Apr 23, 2020
037830f
Merge remote-tracking branch 'elastic/master' into publisher-apm
jalvz Apr 23, 2020
b29798e
sync vendor
jalvz Apr 24, 2020
d23b84a
make update
jalvz Apr 24, 2020
890617c
add more context
jalvz Apr 24, 2020
f1f66bd
Update changelog
jalvz Apr 27, 2020
c706d8f
Merge remote-tracking branch 'elastic/master' into publisher-apm
jalvz Apr 27, 2020
10c042b
Update libbeat/outputs/elasticsearch/client_integration_test.go
jalvz Apr 28, 2020
aec9c01
Code review comments
jalvz Apr 28, 2020
1e7ed3a
Update dependencies
jalvz Apr 28, 2020
f540358
Update changelog
jalvz Apr 28, 2020
8d2833a
update notice
jalvz Apr 28, 2020
2f8c946
Add docs
jalvz Apr 28, 2020
b3a36d1
Merge remote-tracking branch 'elastic/master' into publisher-apm
jalvz Apr 30, 2020
df01669
fix merge
jalvz Apr 30, 2020
d79f144
fix tests
jalvz Apr 30, 2020
e307d6f
fix test again
jalvz Apr 30, 2020
f6c682b
more mage fmt
jalvz Apr 30, 2020
ce740a4
add comment
jalvz Apr 30, 2020
5bf5bb1
re-add build tag
jalvz May 4, 2020
a1c5d3a
Merge remote-tracking branch 'elastic/master' into publisher-apm
jalvz May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libbeat/esleg/eslegclient/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ func NewConnection(s ConnectionSettings) (*Connection, error) {
}

var httpClient esHTTPClient
// when dropping the legacy client in favour of the official Go client, it should be instrumented
// eg, like in https://github.com/elastic/apm-server/blob/7.7/elasticsearch/client.go
Copy link
Contributor

@ycombinator ycombinator Apr 30, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

❤️

httpClient = &http.Client{
Transport: apmelasticsearch.WrapRoundTripper(&http.Transport{
Dial: dialer.Dial,
Expand Down