Move default hostname logic from the aggregator to the sender and dsd #2334
Conversation
This file contains 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
xvello
force-pushed
the
xvello/nohostname
branch
from
ce085e7 to
8946bc6
Compare
xvello
changed the title
xvello
changed the title
xvello
force-pushed
the
xvello/nohostname
branch
from
64a62e5 to
80328dd
Compare
xvello
force-pushed
the
xvello/nohostname
branch
from
80328dd to
62e946b
Compare
- move the default hostname responsibility from the aggregator / sampler to the sender - add a DisableDefaultHostname method to the Sender interface - make dogstatsd handle hostname for events and service checks
This reverts commit a99fc330ad7ae60c18ab21071428008fe3747b2b.
xvello
force-pushed
the
xvello/nohostname
branch
from
8feebce to
3eafdaa
Compare
|
Added end-to-end testing, to ensure dsd hostname cases are handled. They'll be extended on #2351 to add a check with default hostname disabled too |
xvello
force-pushed
the
xvello/nohostname
branch
from
567d441 to
9bc084d
Compare
hush-hush
previously approved these changes
Sep 27, 2018
mfpierre
previously approved these changes
Sep 28, 2018
pkg/aggregator/sender_test.go
Outdated
|
|
||
| assert.Equal(t, "testhostname", checksender.defaultHostname) | ||
| assert.Equal(t, false, checksender.defaultHostnameDisabled) | ||
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
In order to allow cluster checks to submit metrics / events / servicechecks with an empty hostname, this PR moves the default hostname injection logic responsibility from the aggregator to the sender / source:
checkSampler(for metrics) and theBufferedAggregator(for events / SCs)defaultHostnamefield fromdistSamplerandtimeSamplercheckSenderitself, allow checks to disable it via the newDisableDefaultHostnamemethodhost:tag to remove the hostname, as is done with metrics.The collector part will come in a second PR.