This repository has been archived by the owner on Jul 27, 2023. It is now read-only.
Add ECS metadata to CollectorProc payload #28
Merged
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
conorbranagan
force-pushed
the
conor/ecs
branch
2 times, most recently
from
4d45c89 to
3ca5cd6
Compare
|
This is ready to now as the other PRs are both merged |
shang-wang
approved these changes
Aug 2, 2017
util/ecs/ecs.go
Outdated
| globalECSUtil *ecsUtil | ||
| ) | ||
|
|
||
| // InitKubeUtil initializes a global kubeUtil used by later function calls. |
|
|
||
| func (e *ecsUtil) getMetadata() *agentpayload.ECSMetadataPayload { | ||
| payload, err := agentecs.GetPayload() | ||
| if err != nil && err.Error() != lastErr { |
There was a problem hiding this comment.
Maybe this is on purpose but if err != nil && err.Error() == lastErr, would the last return statement make sense?
There was a problem hiding this comment.
Yeah we're logging and swallowing the error on purpose. I'll add a note on that
conorbranagan
force-pushed
the
conor/ecs
branch
from
3ca5cd6 to
3f777d6
Compare
conorbranagan
force-pushed
the
conor/ecs
branch
from
3f777d6 to
4b52601
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The bulk of the interesting work is in DataDog/datadog-agent#420 and DataDog/agent-payload#10. Both are still pending but appear to be passing so we'll wait until those are merged in.