Looking at how to move the metrics-service.

Author: jzonthemtn

phileas-core/pom.xml

@@ -11,6 +11,33 @@
 	</parent>
 	<artifactId>phileas-core</artifactId>
 	<name>phileas-core</name>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>fully.qualified.MainClass</mainClass>
+						</manifest>
+					</archive>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<finalName>phileas-core-with-dependencies</finalName>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<dependency>
 			<groupId>ai.philterd</groupId>
@@ -37,16 +64,6 @@
 			<artifactId>phileas-processors-unstructured</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<!--<dependency>
-			<groupId>ai.philterd</groupId>
-			<artifactId>phileas-processors-images</artifactId>
-			<version>${project.version}</version>
-		</dependency>-->
-		<dependency>
-			<groupId>ai.philterd</groupId>
-			<artifactId>phileas-services-metrics</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>ai.philterd</groupId>
 			<artifactId>phileas-services-disambiguation</artifactId>

phileas-core/src/main/java/ai/philterd/phileas/services/FilterPolicyLoader.java

@@ -65,7 +65,7 @@ public FilterPolicyLoader(final AlertService alertService, final AnonymizationCa
         this.alertService = alertService;
         this.anonymizationCacheService = anonymizationCacheService;
         this.metricsService = metricsService;
-        this.stats = new HashMap<>();
+        this.stats = stats;
 
         this.phileasConfiguration = phileasConfiguration;
 

phileas-core/src/main/java/ai/philterd/phileas/services/LoggerMetricsService.java

@@ -0,0 +1,28 @@
+package ai.philterd.phileas.services;
+
+import ai.philterd.phileas.model.enums.FilterType;
+import ai.philterd.phileas.model.services.MetricsService;
+
+public class LoggerMetricsService implements MetricsService {
+
+    @Override
+    public void incrementProcessed() {
+
+    }
+
+    @Override
+    public void incrementProcessed(final long count) {
+
+    }
+
+    @Override
+    public void incrementFilterType(final FilterType filterType) {
+
+    }
+
+    @Override
+    public void logFilterTime(final FilterType filterType, long timeMs) {
+
+    }
+
+}

phileas-core/src/main/java/ai/philterd/phileas/services/PhileasFilterService.java

@@ -15,7 +15,6 @@
  */
 package ai.philterd.phileas.services;
 
-import ai.philterd.phileas.metrics.PhileasMetricsService;
 import ai.philterd.phileas.model.configuration.PhileasConfiguration;
 import ai.philterd.phileas.model.domain.Domain;
 import ai.philterd.phileas.model.domain.HealthDomain;
@@ -72,10 +71,11 @@ public class PhileasFilterService implements FilterService {
     // A map that gives each filter profile its own cache of filters.
     private final Map<String, Map<FilterType, Filter>> filterCache;
 
-    // PHL-223: Face recognition
-    //private final ImageProcessor imageProcessor;
-
     public PhileasFilterService(final PhileasConfiguration phileasConfiguration) throws IOException {
+        this(phileasConfiguration, new LoggerMetricsService());
+    }
+
+    public PhileasFilterService(final PhileasConfiguration phileasConfiguration, MetricsService metricsService) throws IOException {
 
         LOGGER.info("Initializing Phileas engine.");
 
@@ -86,9 +86,6 @@ public PhileasFilterService(final PhileasConfiguration phileasConfiguration) thr
         gsonBuilder.registerTypeAdapter(String.class, new PlaceholderDeserializer());
         final Gson gson = gsonBuilder.create();
 
-        // Configure metrics.
-        MetricsService metricsService = new PhileasMetricsService(phileasConfiguration);
-
         // Set the policy services.
         this.policyService = buildPolicyService(phileasConfiguration);
         this.policyUtils = new PolicyUtils(policyService, gson);
@@ -100,7 +97,7 @@ public PhileasFilterService(final PhileasConfiguration phileasConfiguration) thr
         this.alertService = AlertServiceFactory.getAlertService(phileasConfiguration);
 
         // Instantiate the stats.
-        Map<String, DescriptiveStatistics> stats = new HashMap<>();
+        final Map<String, DescriptiveStatistics> stats = new HashMap<>();
 
         // The filter loader for policies.
         this.filterPolicyLoader = new FilterPolicyLoader(alertService, anonymizationCacheService, metricsService, stats, phileasConfiguration);