Rename filter module to filter-api (#118)

pavolloffay · web-flow · commit f301e05f31c6 · 2020-11-16T20:08:38.000+01:00
Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;
diff --git a/filter-api/build.gradle.kts b/filter-api/build.gradle.kts
diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/FilterRegistry.java b/filter-api/src/main/java/org/hypertrace/agent/filter/FilterRegistry.java
@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.ServiceLoader;
 import org.hypertrace.agent.core.EnvironmentConfig;
+import org.hypertrace.agent.filter.api.Filter;
+import org.hypertrace.agent.filter.spi.FilterProvider;
 
 /**
  * Provides access to the {@link Filter} implementations. The {@link Filter} implementation are
diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/MultiFilter.java b/filter-api/src/main/java/org/hypertrace/agent/filter/MultiFilter.java
@@ -19,8 +19,12 @@
 import io.opentelemetry.trace.Span;
 import java.util.List;
 import java.util.Map;
+import org.hypertrace.agent.filter.api.ExecutionBlocked;
+import org.hypertrace.agent.filter.api.ExecutionNotBlocked;
+import org.hypertrace.agent.filter.api.Filter;
+import org.hypertrace.agent.filter.api.FilterResult;
 
-public class MultiFilter implements Filter {
+class MultiFilter implements Filter {
 
   private final List<Filter> filters;
 
diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/api/ExecutionBlocked.java b/filter-api/src/main/java/org/hypertrace/agent/filter/api/ExecutionBlocked.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.hypertrace.agent.filter;
+package org.hypertrace.agent.filter.api;
 
 /** Indicates that the execution should be blocked. */
 public class ExecutionBlocked implements FilterResult {
diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/api/ExecutionNotBlocked.java b/filter-api/src/main/java/org/hypertrace/agent/filter/api/ExecutionNotBlocked.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.hypertrace.agent.filter;
+package org.hypertrace.agent.filter.api;
 
 public class ExecutionNotBlocked implements FilterResult {
 
diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/api/Filter.java b/filter-api/src/main/java/org/hypertrace/agent/filter/api/Filter.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.hypertrace.agent.filter;
+package org.hypertrace.agent.filter.api;
 
 import io.opentelemetry.trace.Span;
 import java.util.Map;
+import org.hypertrace.agent.filter.FilterRegistry;
 
 /**
  * {@link Filter} evaluates given request/RPC and the result is used to block further processing of
diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/api/FilterResult.java b/filter-api/src/main/java/org/hypertrace/agent/filter/api/FilterResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.hypertrace.agent.filter;
+package org.hypertrace.agent.filter.api;
 
 /** Result of filter evaluation from {@link Filter} */
 public interface FilterResult {
diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilter.java b/filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilter.java
@@ -18,13 +18,13 @@
 
 import io.opentelemetry.trace.Span;
 import java.util.Map;
-import org.hypertrace.agent.filter.ExecutionBlocked;
-import org.hypertrace.agent.filter.ExecutionNotBlocked;
-import org.hypertrace.agent.filter.Filter;
-import org.hypertrace.agent.filter.FilterResult;
+import org.hypertrace.agent.filter.api.ExecutionBlocked;
+import org.hypertrace.agent.filter.api.ExecutionNotBlocked;
+import org.hypertrace.agent.filter.api.Filter;
+import org.hypertrace.agent.filter.api.FilterResult;
 
 /** Mock filter, blocks execution if an attribute with "mockblock" key is present. */
-public class MockFilter implements Filter {
+class MockFilter implements Filter {
 
   MockFilter() {}
 
diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilterProvider.java b/filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilterProvider.java
@@ -17,8 +17,8 @@
 package org.hypertrace.agent.filter.mock;
 
 import com.google.auto.service.AutoService;
-import org.hypertrace.agent.filter.Filter;
-import org.hypertrace.agent.filter.FilterProvider;
+import org.hypertrace.agent.filter.api.Filter;
+import org.hypertrace.agent.filter.spi.FilterProvider;
 
 @AutoService(FilterProvider.class)
 public class MockFilterProvider implements FilterProvider {
diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/spi/FilterProvider.java b/filter-api/src/main/java/org/hypertrace/agent/filter/spi/FilterProvider.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.hypertrace.agent.filter;
+package org.hypertrace.agent.filter.spi;
+
+import org.hypertrace.agent.filter.api.Filter;
 
 /**
  * {@link FilterProvider} creates {@link Filter}.
diff --git a/filter-custom-opa/build.gradle.kts b/filter-custom-opa/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":filter"))
+    implementation(project(":filter-api"))
     implementation("org.slf4j:slf4j-api:1.7.30")
     implementation("com.squareup.okhttp3:okhttp:3.14.9")
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
diff --git a/filter-custom-opa/src/main/java/org/hypertrace/agent/filter/opa/custom/CustomOpaLib.java b/filter-custom-opa/src/main/java/org/hypertrace/agent/filter/opa/custom/CustomOpaLib.java
@@ -25,10 +25,10 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.hypertrace.agent.filter.ExecutionBlocked;
-import org.hypertrace.agent.filter.ExecutionNotBlocked;
-import org.hypertrace.agent.filter.Filter;
-import org.hypertrace.agent.filter.FilterResult;
+import org.hypertrace.agent.filter.api.ExecutionBlocked;
+import org.hypertrace.agent.filter.api.ExecutionNotBlocked;
+import org.hypertrace.agent.filter.api.Filter;
+import org.hypertrace.agent.filter.api.FilterResult;
 import org.hypertrace.agent.filter.opa.custom.evaluator.ICustomPolicyEvaluator;
 import org.hypertrace.agent.filter.opa.custom.evaluator.IpAddressPolicyEvaluator;
 import org.slf4j.Logger;
diff --git a/filter-custom-opa/src/main/java/org/hypertrace/agent/filter/opa/custom/CustomOpaLibProvider.java b/filter-custom-opa/src/main/java/org/hypertrace/agent/filter/opa/custom/CustomOpaLibProvider.java
@@ -18,9 +18,9 @@
 
 import com.google.auto.service.AutoService;
 import org.hypertrace.agent.core.EnvironmentConfig;
-import org.hypertrace.agent.filter.Filter;
-import org.hypertrace.agent.filter.FilterProvider;
 import org.hypertrace.agent.filter.FilterRegistry;
+import org.hypertrace.agent.filter.api.Filter;
+import org.hypertrace.agent.filter.spi.FilterProvider;
 
 @AutoService(FilterProvider.class)
 public class CustomOpaLibProvider implements FilterProvider {
diff --git a/instrumentation/build.gradle.kts b/instrumentation/build.gradle.kts
@@ -14,7 +14,7 @@ subprojects {
         implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")
         implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:0.9.0")
         implementation(project(":javaagent-core"))
-        implementation(project(":filter"))
+        implementation(project(":filter-api"))
     }
 
     // This ensures to build jars for all dependencies in instrumentation module for ByteBuddy
diff --git a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java b/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java
@@ -34,7 +34,7 @@
 import org.hypertrace.agent.core.HypertraceConfig;
 import org.hypertrace.agent.core.HypertraceSemanticAttributes;
 import org.hypertrace.agent.filter.FilterRegistry;
-import org.hypertrace.agent.filter.FilterResult;
+import org.hypertrace.agent.filter.api.FilterResult;
 
 public class GrpcServerInterceptor implements ServerInterceptor {
 
diff --git a/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentation.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentation.java
@@ -44,7 +44,7 @@
 import org.hypertrace.agent.core.HypertraceConfig;
 import org.hypertrace.agent.core.HypertraceSemanticAttributes;
 import org.hypertrace.agent.filter.FilterRegistry;
-import org.hypertrace.agent.filter.FilterResult;
+import org.hypertrace.agent.filter.api.FilterResult;
 
 /**
  * Body capture for servlet 2.3. Note that OTEL servlet instrumentation is compatible with servlet
diff --git a/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0/Servlet30BodyInstrumentation.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0/Servlet30BodyInstrumentation.java
@@ -44,7 +44,7 @@
 import org.hypertrace.agent.core.HypertraceConfig;
 import org.hypertrace.agent.core.HypertraceSemanticAttributes;
 import org.hypertrace.agent.filter.FilterRegistry;
-import org.hypertrace.agent.filter.FilterResult;
+import org.hypertrace.agent.filter.api.FilterResult;
 
 @AutoService(Instrumenter.class)
 public class Servlet30BodyInstrumentation extends Instrumenter.Default {
diff --git a/instrumentation/servlet/servlet-3.1/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_1/Servlet31Advice.java b/instrumentation/servlet/servlet-3.1/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_1/Servlet31Advice.java
@@ -31,7 +31,7 @@
 import org.hypertrace.agent.core.HypertraceConfig;
 import org.hypertrace.agent.core.HypertraceSemanticAttributes;
 import org.hypertrace.agent.filter.FilterRegistry;
-import org.hypertrace.agent.filter.FilterResult;
+import org.hypertrace.agent.filter.api.FilterResult;
 
 public class Servlet31Advice {
 
diff --git a/javaagent-bootstrap/build.gradle.kts b/javaagent-bootstrap/build.gradle.kts
@@ -8,5 +8,5 @@ dependencies{
     api("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:0.9.0")
     api("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
     implementation(project(":javaagent-core"))
-    implementation(project(":filter"))
+    implementation(project(":filter-api"))
 }
diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     // https://dl.bintray.com/open-telemetry/maven/
     implementation("io.opentelemetry.javaagent", "opentelemetry-javaagent", version = "0.9.0", classifier = "all")
     implementation(project(":javaagent-core"))
-    implementation(project(":filter"))
+    implementation(project(":filter-api"))
     implementation(project(":filter-custom-opa"))
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -25,7 +25,7 @@ findProject(":instrumentation:servlet:servlet-3.1")?.name = "servlet-3.1"
 include("instrumentation:spark-web-framework-2.3")
 findProject(":instrumentation:spark-web-framework-2.3")?.name = "spark-web-framework-2.3"
 include("smoke-tests")
-include("filter")
+include("filter-api")
 include("javaagent-tooling")
 include("javaagent-bootstrap")
 include("javaagent-core")
