This repository has been archived by the owner on Aug 19, 2019. It is now read-only.
Don't add labels to container metadata if the pod has no labels. #48
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
igorpeshansky
suggested changes
Jan 3, 2018
src/kubernetes.cc
Outdated
| try { | ||
| labels = metadata->Get<json::Object>("labels"); | ||
| } catch (const json::Exception& e) { | ||
| labels = new json::Object({}); |
There was a problem hiding this comment.
This will leak. Let's instead handle it by not sending the "labels" component at all...
| @@ -263,7 +263,12 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetContainerMetadata( | |||
| const std::string created_str = | |||
| metadata->Get<json::String>("creationTimestamp"); | |||
| Timestamp created_at = rfc3339::FromString(created_str); | |||
| const json::Object* labels = metadata->Get<json::Object>("labels"); | |||
There was a problem hiding this comment.
Might as well also delete this from line 199...
…as labels. Use a Has test instead of catching the exception.
|
Your changes LGTM. |
igorpeshansky
changed the title
igorpeshansky
approved these changes
Jan 3, 2018
| @@ -263,7 +263,12 @@ MetadataUpdater::ResourceMetadata KubernetesReader::GetContainerMetadata( | |||
| const std::string created_str = | |||
| metadata->Get<json::String>("creationTimestamp"); | |||
| Timestamp created_at = rfc3339::FromString(created_str); | |||
| const json::Object* labels = metadata->Get<json::Object>("labels"); | |||
src/kubernetes.cc
Outdated
| try { | ||
| labels = metadata->Get<json::Object>("labels"); | ||
| } catch (const json::Exception& e) { | ||
| labels = new json::Object({}); |
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.
No description provided.