Merge pull request #621 from data-integrations/revert-614-directive-m…

…etrics Revert "Add metrics for directives"
data-integrations · Mar 29, 2023 · 240bd32 · 240bd32
2 parents 957a171 + c5f9fe3
commit 240bd32
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 291 deletions.
diff --git a/pom.xml b/pom.xml
@@ -186,7 +186,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>3.5.0</version>
+          <version>3.3.0</version>
           <extensions>true</extensions>
           <configuration>
             <instructions>

diff --git a/wrangler-api/pom.xml b/wrangler-api/pom.xml
@@ -24,7 +24,7 @@
 
   <artifactId>wrangler-api</artifactId>
   <name>Wrangler API</name>
-  <description>Wrangler API Library.</description>
+  <description>Wrangler API Libaray.</description>
 
   <dependencies>
     <dependency>
@@ -39,12 +39,6 @@
       <version>${cdap.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>io.cdap.cdap</groupId>
-      <artifactId>cdap-watchdog-api</artifactId>
-      <version>${cdap.version}</version>
-      <scope>provided</scope>
-    </dependency>
 
   </dependencies>
 </project>
diff --git a/wrangler-api/src/main/java/io/cdap/wrangler/api/EntityMetricDef.java b/wrangler-api/src/main/java/io/cdap/wrangler/api/EntityMetricDef.java
diff --git a/wrangler-api/src/main/java/io/cdap/wrangler/api/EntityMetrics.java b/wrangler-api/src/main/java/io/cdap/wrangler/api/EntityMetrics.java
diff --git a/wrangler-core/pom.xml b/wrangler-core/pom.xml
@@ -56,11 +56,6 @@
       <artifactId>protobuf-java</artifactId>
       <version>${protobuf.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.cdap.cdap</groupId>
-      <artifactId>cdap-common</artifactId>
-      <version>${cdap.version}</version>
-    </dependency>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-api</artifactId>

diff --git a/wrangler-core/src/main/java/io/cdap/directives/aggregates/IncrementTransientVariable.java b/wrangler-core/src/main/java/io/cdap/directives/aggregates/IncrementTransientVariable.java
@@ -16,15 +16,13 @@
 
 package io.cdap.directives.aggregates;
 
-import com.google.common.collect.ImmutableList;
 import io.cdap.cdap.api.annotation.Description;
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.wrangler.api.Arguments;
 import io.cdap.wrangler.api.Directive;
 import io.cdap.wrangler.api.DirectiveExecutionException;
 import io.cdap.wrangler.api.DirectiveParseException;
-import io.cdap.wrangler.api.EntityMetricDef;
 import io.cdap.wrangler.api.ExecutorContext;
 import io.cdap.wrangler.api.Row;
 import io.cdap.wrangler.api.TransientVariableScope;
@@ -38,7 +36,6 @@
 import io.cdap.wrangler.expression.ELContext;
 import io.cdap.wrangler.expression.ELException;
 import io.cdap.wrangler.expression.ELResult;
-import io.cdap.wrangler.metrics.DirectiveJEXLCategoryMetric;
 
 import java.util.List;
 
@@ -50,7 +47,7 @@
 @Name(IncrementTransientVariable.NAME)
 @Categories(categories = { "transient"})
 @Description("Wrangler - A interactive tool for data cleansing and transformation.")
-public class IncrementTransientVariable implements Directive, DirectiveJEXLCategoryMetric {
+public class IncrementTransientVariable implements Directive {
   public static final String NAME = "increment-variable";
   private String variable;
   private long incrementBy;
@@ -111,10 +108,4 @@ public List<Row> execute(List<Row> rows, ExecutorContext context) throws Directi
   public void destroy() {
     // no-op
   }
-
-  @Override
-  public List<EntityMetricDef> getMetrics() {
-    EntityMetricDef jexlCategoryMetric = getJEXLCategoryMetric(el.getScriptParsedText());
-    return (jexlCategoryMetric == null) ? ImmutableList.of() : ImmutableList.of(jexlCategoryMetric);
-  }
 }
diff --git a/wrangler-core/src/main/java/io/cdap/directives/aggregates/SetTransientVariable.java b/wrangler-core/src/main/java/io/cdap/directives/aggregates/SetTransientVariable.java
@@ -16,15 +16,13 @@
 
 package io.cdap.directives.aggregates;
 
-import com.google.common.collect.ImmutableList;
 import io.cdap.cdap.api.annotation.Description;
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.wrangler.api.Arguments;
 import io.cdap.wrangler.api.Directive;
 import io.cdap.wrangler.api.DirectiveExecutionException;
 import io.cdap.wrangler.api.DirectiveParseException;
-import io.cdap.wrangler.api.EntityMetricDef;
 import io.cdap.wrangler.api.ExecutorContext;
 import io.cdap.wrangler.api.Row;
 import io.cdap.wrangler.api.TransientVariableScope;
@@ -37,7 +35,6 @@
 import io.cdap.wrangler.expression.ELContext;
 import io.cdap.wrangler.expression.ELException;
 import io.cdap.wrangler.expression.ELResult;
-import io.cdap.wrangler.metrics.DirectiveJEXLCategoryMetric;
 
 import java.util.List;
 
@@ -51,7 +48,7 @@
 @Name(SetTransientVariable.NAME)
 @Categories(categories = { "transient"})
 @Description("Sets the value for a transient variable for the record being processed.")
-public class SetTransientVariable implements Directive, DirectiveJEXLCategoryMetric {
+public class SetTransientVariable implements Directive {
   public static final String NAME = "set-variable";
   private EL el;
   private String variable;
@@ -99,10 +96,4 @@ public List<Row> execute(List<Row> rows, ExecutorContext context) throws Directi
     }
     return rows;
   }
-
-  @Override
-  public List<EntityMetricDef> getMetrics() {
-    EntityMetricDef jexlCategoryMetric = getJEXLCategoryMetric(el.getScriptParsedText());
-    return (jexlCategoryMetric == null) ? ImmutableList.of() : ImmutableList.of(jexlCategoryMetric);
-  }
 }
diff --git a/wrangler-core/src/main/java/io/cdap/directives/row/Fail.java b/wrangler-core/src/main/java/io/cdap/directives/row/Fail.java
@@ -16,15 +16,13 @@
 
 package io.cdap.directives.row;
 
-import com.google.common.collect.ImmutableList;
 import io.cdap.cdap.api.annotation.Description;
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.wrangler.api.Arguments;
 import io.cdap.wrangler.api.Directive;
 import io.cdap.wrangler.api.DirectiveExecutionException;
 import io.cdap.wrangler.api.DirectiveParseException;
-import io.cdap.wrangler.api.EntityMetricDef;
 import io.cdap.wrangler.api.ExecutorContext;
 import io.cdap.wrangler.api.Row;
 import io.cdap.wrangler.api.annotations.Categories;
@@ -37,7 +35,6 @@
 import io.cdap.wrangler.expression.ELContext;
 import io.cdap.wrangler.expression.ELException;
 import io.cdap.wrangler.expression.ELResult;
-import io.cdap.wrangler.metrics.DirectiveJEXLCategoryMetric;
 
 import java.util.List;
 
@@ -48,7 +45,7 @@
 @Name(Fail.NAME)
 @Categories(categories = { "row", "data-quality"})
 @Description("Fails when the condition is evaluated to true.")
-public class Fail implements Directive, Lineage, DirectiveJEXLCategoryMetric {
+public class Fail implements Directive, Lineage {
   public static final String NAME = "fail";
   private String condition;
   private EL el;
@@ -109,10 +106,4 @@ public Mutation lineage() {
     el.variables().forEach(col -> builder.relation(col, col));
     return builder.build();
   }
-
-  @Override
-  public List<EntityMetricDef> getMetrics() {
-    EntityMetricDef jexlCategoryMetric = getJEXLCategoryMetric(el.getScriptParsedText());
-    return (jexlCategoryMetric == null) ? ImmutableList.of() : ImmutableList.of(jexlCategoryMetric);
-  }
 }
diff --git a/wrangler-core/src/main/java/io/cdap/directives/row/RecordConditionFilter.java b/wrangler-core/src/main/java/io/cdap/directives/row/RecordConditionFilter.java
@@ -16,15 +16,13 @@
 
 package io.cdap.directives.row;
 
-import com.google.common.collect.ImmutableList;
 import io.cdap.cdap.api.annotation.Description;
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.wrangler.api.Arguments;
 import io.cdap.wrangler.api.Directive;
 import io.cdap.wrangler.api.DirectiveExecutionException;
 import io.cdap.wrangler.api.DirectiveParseException;
-import io.cdap.wrangler.api.EntityMetricDef;
 import io.cdap.wrangler.api.ExecutorContext;
 import io.cdap.wrangler.api.Optional;
 import io.cdap.wrangler.api.Row;
@@ -38,7 +36,6 @@
 import io.cdap.wrangler.expression.EL;
 import io.cdap.wrangler.expression.ELContext;
 import io.cdap.wrangler.expression.ELException;
-import io.cdap.wrangler.metrics.DirectiveJEXLCategoryMetric;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,7 +53,7 @@
 @Name(RecordConditionFilter.NAME)
 @Categories(categories = { "row", "data-quality"})
 @Description("Filters rows based on condition type specified.")
-public class RecordConditionFilter implements Directive, Lineage, DirectiveJEXLCategoryMetric {
+public class RecordConditionFilter implements Directive, Lineage {
   public static final String NAME = "filter-row";
   private EL el;
   private boolean isTrue;
@@ -122,10 +119,4 @@ public Mutation lineage() {
     el.variables().forEach(column -> builder.relation(column, column));
     return builder.build();
   }
-
-  @Override
-  public List<EntityMetricDef> getMetrics() {
-    EntityMetricDef jexlCategoryMetric = getJEXLCategoryMetric(el.getScriptParsedText());
-    return (jexlCategoryMetric == null) ? ImmutableList.of() : ImmutableList.of(jexlCategoryMetric);
-  }
 }
diff --git a/wrangler-core/src/main/java/io/cdap/directives/row/SendToError.java b/wrangler-core/src/main/java/io/cdap/directives/row/SendToError.java
@@ -16,15 +16,13 @@
 
 package io.cdap.directives.row;
 
-import com.google.common.collect.ImmutableList;
 import io.cdap.cdap.api.annotation.Description;
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.wrangler.api.Arguments;
 import io.cdap.wrangler.api.Directive;
 import io.cdap.wrangler.api.DirectiveExecutionException;
 import io.cdap.wrangler.api.DirectiveParseException;
-import io.cdap.wrangler.api.EntityMetricDef;
 import io.cdap.wrangler.api.ErrorRowException;
 import io.cdap.wrangler.api.ExecutorContext;
 import io.cdap.wrangler.api.Optional;
@@ -41,7 +39,6 @@
 import io.cdap.wrangler.expression.ELContext;
 import io.cdap.wrangler.expression.ELException;
 import io.cdap.wrangler.expression.ELResult;
-import io.cdap.wrangler.metrics.DirectiveJEXLCategoryMetric;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -59,7 +56,7 @@
 @Name(SendToError.NAME)
 @Categories(categories = { "row", "data-quality"})
 @Description("Send records that match condition to the error collector.")
-public class SendToError implements Directive, Lineage, DirectiveJEXLCategoryMetric {
+public class SendToError implements Directive, Lineage {
   public static final String NAME = "send-to-error";
   private EL el;
   private String condition;
@@ -141,10 +138,4 @@ public Mutation lineage() {
     el.variables().forEach(column -> builder.relation(column, column));
     return builder.build();
   }
-
-  @Override
-  public List<EntityMetricDef> getMetrics() {
-    EntityMetricDef jexlCategoryMetric = getJEXLCategoryMetric(el.getScriptParsedText());
-    return (jexlCategoryMetric == null) ? ImmutableList.of() : ImmutableList.of(jexlCategoryMetric);
-  }
 }
diff --git a/wrangler-core/src/main/java/io/cdap/directives/row/SendToErrorAndContinue.java b/wrangler-core/src/main/java/io/cdap/directives/row/SendToErrorAndContinue.java
@@ -16,15 +16,13 @@
 
 package io.cdap.directives.row;
 
-import com.google.common.collect.ImmutableList;
 import io.cdap.cdap.api.annotation.Description;
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.wrangler.api.Arguments;
 import io.cdap.wrangler.api.Directive;
 import io.cdap.wrangler.api.DirectiveExecutionException;
 import io.cdap.wrangler.api.DirectiveParseException;
-import io.cdap.wrangler.api.EntityMetricDef;
 import io.cdap.wrangler.api.ExecutorContext;
 import io.cdap.wrangler.api.Optional;
 import io.cdap.wrangler.api.ReportErrorAndProceed;
@@ -42,7 +40,6 @@
 import io.cdap.wrangler.expression.ELContext;
 import io.cdap.wrangler.expression.ELException;
 import io.cdap.wrangler.expression.ELResult;
-import io.cdap.wrangler.metrics.DirectiveJEXLCategoryMetric;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,7 +57,7 @@
 @Name(SendToErrorAndContinue.NAME)
 @Categories(categories = { "row", "data-quality"})
 @Description("Send records that match condition to the error collector and continues processing.")
-public class SendToErrorAndContinue implements Directive, Lineage, DirectiveJEXLCategoryMetric {
+public class SendToErrorAndContinue implements Directive, Lineage {
   public static final String NAME = "send-to-error-and-continue";
   private EL el;
   private String condition;
@@ -140,10 +137,4 @@ public Mutation lineage() {
     el.variables().forEach(column -> builder.relation(column, column));
     return builder.build();
   }
-
-  @Override
-  public List<EntityMetricDef> getMetrics() {
-    EntityMetricDef jexlCategoryMetric = getJEXLCategoryMetric(el.getScriptParsedText());
-    return (jexlCategoryMetric == null) ? ImmutableList.of() : ImmutableList.of(jexlCategoryMetric);
-  }
 }