beater: run gmuxed gRPC server by default#4618
Merged
axw merged 10 commits intoelastic:masterfrom Jan 20, 2021
Merged
Conversation
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Steps errors
Expand to view the steps failures
|
simitt
reviewed
Jan 13, 2021
Contributor
simitt
left a comment
There was a problem hiding this comment.
Looks great! Only left nit comments.
Use gmux to run a gRPC server on the same port as the Elastic APM HTTP server, and register the Jaeger services by default. When auth is enabled, it is necessary to configure Jaeger to send an agent tag called "elastic-apm-auth". This cannot be changed.
Self-signed certificate and key copied from https://github.com/golang/go/blob/master/src/net/http/internal/testcert.go
Codecov Report
@@ Coverage Diff @@
## master #4618 +/- ##
==========================================
- Coverage 75.77% 75.75% -0.02%
==========================================
Files 162 162
Lines 9811 9842 +31
==========================================
+ Hits 7434 7456 +22
- Misses 2377 2386 +9
|
Member
Author
|
Thanks for the review @simitt! I've addressed your comments, and this PR is now ready for final review. |
simitt
reviewed
Jan 18, 2021
simitt
approved these changes
Jan 20, 2021
axw
added a commit
to axw/apm-server
that referenced
this pull request
Feb 18, 2021
* beater: run gmuxed gRPC server by default Use gmux to run a gRPC server on the same port as the Elastic APM HTTP server, and register the Jaeger services by default. When auth is enabled, it is necessary to configure Jaeger to send an agent tag called "elastic-apm-auth". This cannot be changed. * systemtest/apmservertest: add TLS support Self-signed certificate and key copied from https://github.com/golang/go/blob/master/src/net/http/internal/testcert.go * systemtest: add test for muxed Jaeger+TLS * beater/jaeger: fix comment * beater/jager: add deprecation notice * Add changelog entry * jaeger config will be removed in 8.0 * Add "Deprecated" changelog entry # Conflicts: # NOTICE.txt # changelogs/head.asciidoc
axw
added a commit
to axw/apm-server
that referenced
this pull request
Feb 18, 2021
* beater: run gmuxed gRPC server by default Use gmux to run a gRPC server on the same port as the Elastic APM HTTP server, and register the Jaeger services by default. When auth is enabled, it is necessary to configure Jaeger to send an agent tag called "elastic-apm-auth". This cannot be changed. * systemtest/apmservertest: add TLS support Self-signed certificate and key copied from https://github.com/golang/go/blob/master/src/net/http/internal/testcert.go * systemtest: add test for muxed Jaeger+TLS * beater/jaeger: fix comment * beater/jager: add deprecation notice * Add changelog entry * jaeger config will be removed in 8.0 * Add "Deprecated" changelog entry # Conflicts: # NOTICE.txt # changelogs/head.asciidoc
axw
added a commit
that referenced
this pull request
Feb 18, 2021
[7.x] beater: run gmuxed gRPC server by default (#4618)
Contributor
|
Tested with |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Motivation/summary
Use gmux to run a gRPC server on the same port as the Elastic APM HTTP server, and register the Jaeger services by default.
When auth is enabled, it is necessary to configure Jaeger to send an agent tag called "elastic-apm-auth".
This cannot be changed.
Checklist
- [ ] Documentation has been updatedLet's do this in a followup, after we have a discussion about the UX around auth tags.How to test these changes
jaeger-agentwith--reporter.grpc.host-port=localhost:8200Related issues
Closes #3984