Merge branch 'pinterest:master' into feature/disable_logstream_fleet_…

…decider
pinterest · Jan 13, 2024 · bdb1a45 · bdb1a45
2 parents 79fafc9 + 2373420
commit bdb1a45
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.pinterest.singer</groupId>
     <artifactId>singer-package</artifactId>
-    <version>0.8.0.78</version>
+    <version>0.8.0.79</version>
     <packaging>pom</packaging>
     <description>Singer Logging Agent modules</description>
     <inceptionYear>2013</inceptionYear>

diff --git a/singer-commons/pom.xml b/singer-commons/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.pinterest.singer</groupId>
     <artifactId>singer-package</artifactId>
-    <version>0.8.0.78</version>
+    <version>0.8.0.79</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <developers>

diff --git a/singer/pom.xml b/singer/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pinterest.singer</groupId>
         <artifactId>singer-package</artifactId>
-        <version>0.8.0.78</version>
+        <version>0.8.0.79</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <licenses>

diff --git a/singer/src/main/java/com/pinterest/singer/config/Decider.java b/singer/src/main/java/com/pinterest/singer/config/Decider.java
@@ -119,16 +119,16 @@ public Map<String, Integer> getDeciderMap() {
    * @return the disable decider name if it exists, null otherwise
    */
   public String getDisableDecider(String logName) {
-    LOG.warn("Calling get disable decider");
     Set<String> disableDeciderList = new HashSet<>();
     String deciderName = null;
     for (String key : mDeciderMap.keySet()) {
       if (key.startsWith("singer_disable_" + logName + "___")) {
         disableDeciderList.add(key);
       }
     }
+    String convertedHostname = SingerUtils.HOSTNAME.replace("-", "_");
     for (String decider : disableDeciderList) {
-      if (SingerUtils.HOSTNAME.startsWith(decider.split("___")[1])) {
+      if (convertedHostname.startsWith(decider.split("___")[1])) {
         deciderName =
             deciderName != null && deciderName.length() > decider.length() ? deciderName : decider;
       }

diff --git a/singer/src/main/java/com/pinterest/singer/kubernetes/KubeService.java b/singer/src/main/java/com/pinterest/singer/kubernetes/KubeService.java
@@ -450,6 +450,7 @@ public static void reset() {
     }
 
     private boolean checkIgnoreDirectory(String podName) {
+      if (ignorePodDirectory == null || ignorePodDirectory.isEmpty()) return false;
       return Files.exists(Paths.get(podLogDirectory, podName, ignorePodDirectory));
     }
 }
diff --git a/thrift-logger/pom.xml b/thrift-logger/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.pinterest.singer</groupId>
     <artifactId>singer-package</artifactId>
-    <version>0.8.0.78</version>
+    <version>0.8.0.79</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>thrift-logger</artifactId>