fix: Temporary "fix How containername is determined from hostname #642
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
The container name can contain '-' character, so String.indexOf is not a good way to determine it from hostname. Instead it should be substring(0, <second to last '-'>), which is what this fix is doing.
product-auto-label
bot
added
the
api: logging
google-cla
bot
added
the
cla: yes
simonz130
approved these changes
Sep 8, 2021
|
@wildhemp - there were github changes to ubuntu image that affected our CI. As a result, your PR failed on CI. I mitigated it by updating the CI but now you need to sync your form with latest changes to our fork master and then your PR will pass the CI and I'll merge it. |
simonz130
added
the
automerge
|
Merge-on-green attempted to merge your PR for 6 hours, but it was not mergeable because either one of your required status checks failed, one of your required reviews was not approved, or there is a do not merge label. Learn more about your required status checks here: https://help.github.com/en/github/administering-a-repository/enabling-required-status-checks. You can remove and reapply the label to re-run the bot. |
gcf-merge-on-green
bot
removed
the
automerge
minherz
requested changes
Sep 12, 2021
google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
Outdated
Show resolved
Hide resolved
The container name can contain '-' character, so String.indexOf is not a good way to determine it from hostname. Instead it should be substring(0, <second to last '-'>), which is what this fix is doing. This also makes sure we only do this when the last '-' is 6 to last character. Otherwise we it just returns the host name because the original host naming can be overriden in which case we don't want to do this magic and instead just return the host name. Note, this is a temporary 'fix' and a proper solution would send the container name down to the pod rather then trying to deduce it from the host name. This simply makes things a bit better for when defaults are being used.
The container name can contain '-' character, so String.indexOf is not a good way to determine it from hostname. Instead it should be substring(0, <second to last '-'>), which is what this fix is doing. This also makes sure we only do this when the last '-' is 6 to last character. Otherwise we it just returns the host name because the original host naming can be overriden in which case we don't want to do this magic and instead just return the host name. Note, this is a temporary 'fix' and a proper solution would send the container name down to the pod rather then trying to deduce it from the host name. This simply makes things a bit better for when defaults are being used.
The container name can contain '-' character, so String.indexOf is not a good way to determine it from hostname. Instead it should be substring(0, <second to last '-'>), which is what this fix is doing. This also makes sure we only do this when the last '-' is 6 to last character. Otherwise we it just returns the host name because the original host naming can be overriden in which case we don't want to do this magic and instead just return the host name. Note, this is a temporary 'fix' and a proper solution would send the container name down to the pod rather then trying to deduce it from the host name. This simply makes things a bit better for when defaults are being used.
simonz130
reviewed
Sep 21, 2021
google-cloud-logging/src/main/java/com/google/cloud/logging/K8sContainerUtil.java
Outdated
Show resolved
Hide resolved
google-cloud-logging/src/main/java/com/google/cloud/logging/K8sContainerUtil.java
Show resolved
Hide resolved
google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
Outdated
Show resolved
Hide resolved
google-cloud-logging/src/test/java/com/google/cloud/logging/K8sContainerUtilTest.java
Outdated
Show resolved
Hide resolved
google-cloud-logging/src/test/java/com/google/cloud/logging/K8sContainerUtilTest.java
Show resolved
Hide resolved
The container name can contain '-' character, so String.indexOf is not a good way to determine it from hostname. Instead it should be substring(0, <second to last '-'>), which is what this fix is doing. This also makes sure we only do this when the last '-' is 6 to last character. Otherwise we it just returns the host name because the original host naming can be overriden in which case we don't want to do this magic and instead just return the host name. Note, this is a temporary 'fix' and a proper solution would send the container name down to the pod rather then trying to deduce it from the host name. This simply makes things a bit better for when defaults are being used.
minherz
requested changes
Sep 26, 2021
| value = MetadataConfig.getContainerName(); | ||
| value = MetadataConfig.getContainerName(); | ||
| if (value == null && resourceType.equals("k8s_container")) { | ||
| value = getContainerNameFromHostName(System.getenv("HOSTNAME")); |
There was a problem hiding this comment.
This code retrieves pod name and not container name. By default containers receive the same hostname which is a pod name if the pod is launched as standalone or the name is generated following the template REPLICASET-????? where REPLICASET is a name of the replicaset build as PODNAME-HASH and ????? are 5 alphanumeric identifier.
So, when you extract the first part of the hostname you get the pod name and not container name.
Comment on lines
+39
to
+47
| int lastDashIndex = hostName.length() - 6; | ||
| if (lastDashIndex > 0 && hostName.charAt(lastDashIndex) == '-') { | ||
| int secondToLastIndex = hostName.lastIndexOf("-", lastDashIndex - 1); | ||
| if (secondToLastIndex > 0) { | ||
| return hostName.substring(0, secondToLastIndex); | ||
| } | ||
| } | ||
| return hostName; | ||
| } |
There was a problem hiding this comment.
It is not easy to understand the implementation logic. Would it be simpler to use a regexp? For example something like:
const String pattern = "([a-z0-9]*)-[a-z0-9]{9}-[a-z0-9]{5}";
Pattern r = Pattern.compile(pattern);
Matcher m = r.matcher("myservice-bc8d57467-tgcbj");
if (m.find( )) {
System.out.println("Pod name: " + m.group(0));
} else {
System.out.println("unknown");
}
|
Closing due to lack of feedback and the fact that the same topic is handled in #708 |
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.
The container name can contain '-' character, so String.indexOf is not a good way to determine it from hostname. Instead it should be substring(0, <second to last '-'>), which is what this fix is doing.
Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
Fixes #494