Improve ContainerInfo coverage to enable check on new module

Alex Ciminian · Alex Ciminian · commit 6e703e7d680f · 2020-06-12T12:06:04.000+01:00
diff --git a/utils/container-utils/container-utils.gradle b/utils/container-utils/container-utils.gradle
@@ -1,10 +1,5 @@
 apply from: "$rootDir/gradle/java.gradle"
 
-// TODO: add more tests
-excludedClassesCoverage += [
-  'datadog.common.exec*'
-]
-
 dependencies {
   compile deps.slf4j
 
diff --git a/utils/container-utils/src/main/java/datadog/common/container/ContainerInfo.java b/utils/container-utils/src/main/java/datadog/common/container/ContainerInfo.java
@@ -70,7 +70,11 @@ public static boolean isRunningInContainer() {
   }
 
   public static ContainerInfo fromDefaultProcFile() throws IOException, ParseException {
-    final String content = new String(Files.readAllBytes(CGROUP_DEFAULT_PROCFILE));
+    return fromProcFile(CGROUP_DEFAULT_PROCFILE);
+  }
+
+  static ContainerInfo fromProcFile(Path path) throws IOException, ParseException {
+    final String content = new String(Files.readAllBytes(path));
     if (content.isEmpty()) {
       log.debug("Proc file is empty");
       return new ContainerInfo();
diff --git a/utils/container-utils/src/test/groovy/ContainerInfoTest.groovy b/utils/container-utils/src/test/groovy/ContainerInfoTest.groovy
@@ -1,14 +1,19 @@
 package datadog.trace.core
 
+import datadog.common.container.ContainerInfo
 import datadog.trace.util.test.DDSpecification
 import spock.lang.Unroll
 
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.text.ParseException
+
 class ContainerInfoTest extends DDSpecification {
 
   @Unroll
   def "CGroupInfo is parsed from individual lines"() {
     when:
-    datadog.common.container.ContainerInfo.CGroupInfo cGroupInfo = datadog.common.container.ContainerInfo.parseLine(line)
+    ContainerInfo.CGroupInfo cGroupInfo = ContainerInfo.parseLine(line)
 
     then:
     cGroupInfo.getId() == id
@@ -83,7 +88,7 @@ class ContainerInfoTest extends DDSpecification {
   @Unroll
   def "Container info parsed from file content"() {
     when:
-    datadog.common.container.ContainerInfo containerInfo = datadog.common.container.ContainerInfo.parse(content)
+    ContainerInfo containerInfo = ContainerInfo.parse(content)
 
     then:
     containerInfo.getContainerId() == containerId
@@ -144,4 +149,46 @@ class ContainerInfoTest extends DDSpecification {
 2:memory:/ecs/55091c13-b8cf-4801-b527-f4601742204d/432624d2150b349fe35ba397284dea788c2bf66b885d14dfc1569b01890ca7da
 1:name=systemd:/ecs/55091c13-b8cf-4801-b527-f4601742204d/432624d2150b349fe35ba397284dea788c2bf66b885d14dfc1569b01890ca7da"""
   }
+
+  def "ContainerInfo from empty file is empty"() {
+    when:
+    File f = File.createTempFile("container-info-test-", "-empty-file")
+    f.deleteOnExit()
+    Path p = Paths.get(f.path)
+    ContainerInfo containerInfo = ContainerInfo.fromProcFile(p)
+
+
+    then:
+    containerInfo.getContainerId() == null
+    containerInfo.getPodId() == null
+    containerInfo.getCGroups().size() == 0
+  }
+
+  def "ContainerInfo throws java.text.ParseException when given malformed procfile"() {
+    when:
+    File f = File.createTempFile("container-info-test-", "-malformed-file")
+    f.deleteOnExit()
+    f.write("This is not valid")
+    Path p = Paths.get(f.path)
+    ContainerInfo.fromProcFile(p)
+    f.deleteOnExit()
+
+    then:
+    thrown(ParseException)
+  }
+
+  def "ContainerInfo tolerates missing container id and pod id in procfile"() {
+    when:
+    File f = File.createTempFile("container-info-test-", "-missing-container-id")
+    f.deleteOnExit()
+    f.write("1:cpuset:fake-path")
+    Path p = Paths.get(f.path)
+    ContainerInfo containerInfo = ContainerInfo.fromProcFile(p)
+    f.deleteOnExit()
+
+    then:
+    containerInfo.getContainerId() == null
+    containerInfo.getPodId() == null
+    containerInfo.getCGroups().size() == 1
+  }
 }
