Merge branch 'pinterest:master' into regex_validation

pinterest · Jun 21, 2024 · 455ec36 · 455ec36
2 parents dbd747d + f3e9f58
commit 455ec36
Show file tree

Hide file tree

Showing 6 changed files with 383 additions and 370 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.82</version>
+    <version>0.8.0.83</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.82</version>
+    <version>0.8.0.83</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.82</version>
+        <version>0.8.0.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <licenses>

diff --git a/singer/src/main/java/com/pinterest/singer/common/SingerMetrics.java b/singer/src/main/java/com/pinterest/singer/common/SingerMetrics.java
@@ -85,6 +85,7 @@ public class SingerMetrics {
 
   public static final String KUBE_PREFIX           = SINGER_PREIX + "kube.";
   public static final String KUBE_API_ERROR        = KUBE_PREFIX  + "api_error";
+  public static final String KUBE_SERVICE_ERROR = KUBE_PREFIX + "kubeservice_thread_error";
   public static final String ACTIVE_POD_DELETION_TASKS = KUBE_PREFIX + "pod_deletion_tasks_active";
   public static final String PODS_TOMBSTONE_MARKER = KUBE_PREFIX + "pod_tombstone_marker";
   public static final String PODS_DELETED = KUBE_PREFIX + "pod_deleted";