decompose metrics services

finos · Sep 20, 2023 · 38df22c · 38df22c
1 parent 0d005c8
commit 38df22c
Show file tree

Hide file tree

Showing 54 changed files with 460 additions and 222 deletions.
diff --git a/legend-depot-artifacts-services/pom.xml b/legend-depot-artifacts-services/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.finos.legend.depot</groupId>
-            <artifactId>legend-depot-store-metrics</artifactId>
+            <artifactId>legend-depot-metrics-query-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.depot</groupId>
@@ -163,6 +163,16 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.depot</groupId>
+            <artifactId>legend-depot-metrics-query-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.finos.legend.depot</groupId>
+            <artifactId>legend-depot-metrics-query-store-mongo</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>de.bwaldvogel</groupId>
             <artifactId>mongo-java-server</artifactId>

diff --git a/.../main/java/org/finos/legend/depot/services/artifacts/purge/ArtifactsPurgeServiceImpl.java b/.../main/java/org/finos/legend/depot/services/artifacts/purge/ArtifactsPurgeServiceImpl.java
@@ -17,16 +17,16 @@
 
 import org.finos.legend.depot.domain.VersionedData;
 import org.finos.legend.depot.domain.api.MetadataEventResponse;
+import org.finos.legend.depot.domain.artifacts.repository.ArtifactType;
 import org.finos.legend.depot.domain.project.ProjectVersion;
+import org.finos.legend.depot.services.api.artifacts.handlers.ProjectArtifactHandlerFactory;
+import org.finos.legend.depot.services.api.artifacts.handlers.ProjectArtifactsHandler;
 import org.finos.legend.depot.services.api.artifacts.purge.ArtifactsPurgeService;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsService;
 import org.finos.legend.depot.services.api.projects.ManageProjectsService;
-import org.finos.legend.depot.domain.artifacts.repository.ArtifactType;
 import org.finos.legend.depot.services.api.projects.ProjectsVersionsReconciliationService;
-import org.finos.legend.depot.store.metrics.services.QueryMetricsHandler;
 import org.finos.legend.depot.store.model.projects.StoreProjectData;
 import org.finos.legend.depot.store.model.projects.StoreProjectVersionData;
-import org.finos.legend.depot.services.api.artifacts.handlers.ProjectArtifactHandlerFactory;
-import org.finos.legend.depot.services.api.artifacts.handlers.ProjectArtifactsHandler;
 import org.finos.legend.depot.tracing.services.TracerFactory;
 import org.finos.legend.depot.tracing.services.prometheus.PrometheusMetricsFactory;
 import org.slf4j.Logger;
@@ -61,10 +61,10 @@ public class ArtifactsPurgeServiceImpl implements ArtifactsPurgeService
 
     private final ManageProjectsService projects;
     private final ProjectsVersionsReconciliationService versionsMismatchService;
-    private final QueryMetricsHandler metrics;
+    private final QueryMetricsService metrics;
 
     @Inject
-    public ArtifactsPurgeServiceImpl(ManageProjectsService projects, ProjectsVersionsReconciliationService versionsMismatchService, QueryMetricsHandler metrics)
+    public ArtifactsPurgeServiceImpl(ManageProjectsService projects, ProjectsVersionsReconciliationService versionsMismatchService, QueryMetricsService metrics)
     {
         this.projects = projects;
         this.metrics = metrics;

diff --git a/...g/finos/legend/depot/services/artifacts/handlers/generations/TestGenerationsProvider.java b/...g/finos/legend/depot/services/artifacts/handlers/generations/TestGenerationsProvider.java
@@ -17,8 +17,6 @@
 
 import org.finos.legend.depot.services.api.artifacts.repository.ArtifactRepository;
 import org.finos.legend.depot.domain.artifacts.repository.ArtifactType;
-import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationHandlerImpl;
-import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationsProvider;
 import org.finos.legend.depot.services.artifacts.repository.maven.TestMavenArtifactsRepository;
 import org.finos.legend.depot.domain.api.MetadataEventResponse;
 import org.finos.legend.depot.domain.generation.DepotGeneration;
@@ -33,7 +31,7 @@
 import org.finos.legend.depot.store.api.projects.UpdateProjects;
 import org.finos.legend.depot.store.api.projects.UpdateProjectsVersions;
 import org.finos.legend.depot.services.api.artifacts.handlers.generations.FileGenerationsArtifactsProvider;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.store.mongo.TestStoreMongo;
 import org.finos.legend.depot.store.mongo.generations.FileGenerationsMongo;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;

diff --git a/.../test/java/org/finos/legend/depot/services/artifacts/purge/TestArtifactsPurgeService.java b/.../test/java/org/finos/legend/depot/services/artifacts/purge/TestArtifactsPurgeService.java
@@ -16,7 +16,8 @@
 package org.finos.legend.depot.services.artifacts.purge;
 
 import org.finos.legend.depot.services.TestBaseServices;
-import org.finos.legend.depot.domain.metrics.VersionQueryMetric;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsService;
+import org.finos.legend.depot.store.model.metrics.query.VersionQueryMetric;
 import org.finos.legend.depot.services.api.artifacts.repository.ArtifactRepository;
 import org.finos.legend.depot.domain.artifacts.repository.ArtifactType;
 import org.finos.legend.depot.domain.version.VersionMismatch;
@@ -41,10 +42,10 @@
 import org.finos.legend.depot.services.artifacts.handlers.entities.EntityProvider;
 import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationHandlerImpl;
 import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationsProvider;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
-import org.finos.legend.depot.store.metrics.services.InMemoryQueryMetricsRegistry;
-import org.finos.legend.depot.store.metrics.services.QueryMetricsHandler;
-import org.finos.legend.depot.store.metrics.store.mongo.QueryMetricsMongo;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
+import org.finos.legend.depot.services.metrics.query.InMemoryQueryMetricsRegistry;
+import org.finos.legend.depot.services.metrics.query.QueryMetricsServiceImpl;
+import org.finos.legend.depot.store.mongo.metrics.query.QueryMetricsMongo;
 import org.finos.legend.depot.store.mongo.entities.EntitiesMongo;
 import org.finos.legend.depot.store.mongo.entities.test.EntitiesMongoTestUtils;
 import org.finos.legend.depot.store.mongo.generations.FileGenerationsMongo;
@@ -78,7 +79,7 @@ public class TestArtifactsPurgeService extends TestBaseServices
     protected UpdateProjectsVersions projectsVersionsStore = new ProjectsVersionsMongo(mongoProvider);
     private final QueryMetricsMongo metrics = new QueryMetricsMongo(mongoProvider);
     private final QueryMetricsRegistry metricsRegistry = new InMemoryQueryMetricsRegistry();
-    private final QueryMetricsHandler metricHandler = new QueryMetricsHandler(metrics, metricsRegistry);
+    private final QueryMetricsService metricHandler = new QueryMetricsServiceImpl(metrics);
     private final Queue queue = mock(Queue.class);
     protected ManageProjectsService projectsService = new ManageProjectsServiceImpl(projectsVersionsStore, projectsStore, metricsRegistry, queue, new ProjectsConfiguration("master"));
     protected UpdateEntities entitiesStore = new EntitiesMongo(mongoProvider);

diff --git a/...t/java/org/finos/legend/depot/services/artifacts/refresh/TestArtifactsRefreshService.java b/...t/java/org/finos/legend/depot/services/artifacts/refresh/TestArtifactsRefreshService.java
@@ -43,11 +43,11 @@
 import org.finos.legend.depot.services.artifacts.handlers.entities.EntityProvider;
 import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationHandlerImpl;
 import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationsProvider;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.store.model.projects.StoreProjectData;
 import org.finos.legend.depot.store.model.projects.StoreProjectVersionData;
 import org.finos.legend.depot.store.mongo.TestStoreMongo;
-import org.finos.legend.depot.store.mongo.admin.artifacts.ArtifactsFilesMongo;
+import org.finos.legend.depot.store.mongo.artifacts.ArtifactsFilesMongo;
 import org.finos.legend.depot.store.mongo.entities.EntitiesMongo;
 import org.finos.legend.depot.store.mongo.generations.FileGenerationsMongo;
 import org.finos.legend.depot.store.mongo.projects.ProjectsMongo;

diff --git a/...gend/depot/services/artifacts/refresh/TestArtifactsRefreshServiceExceptionEscenarios.java b/...gend/depot/services/artifacts/refresh/TestArtifactsRefreshServiceExceptionEscenarios.java
@@ -36,10 +36,10 @@
 import org.finos.legend.depot.services.artifacts.handlers.entities.EntityProvider;
 import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationHandlerImpl;
 import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationsProvider;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.store.model.projects.StoreProjectData;
 import org.finos.legend.depot.store.mongo.TestStoreMongo;
-import org.finos.legend.depot.store.mongo.admin.artifacts.ArtifactsFilesMongo;
+import org.finos.legend.depot.store.mongo.artifacts.ArtifactsFilesMongo;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;
 import org.finos.legend.depot.store.notifications.queue.store.mongo.NotificationsQueueMongo;
 import org.finos.legend.depot.services.api.artifacts.handlers.ProjectArtifactHandlerFactory;

diff --git a/...g/finos/legend/depot/services/artifacts/refresh/TestArtifactsRefreshServiceWithMocks.java b/...g/finos/legend/depot/services/artifacts/refresh/TestArtifactsRefreshServiceWithMocks.java
@@ -33,11 +33,11 @@
 import org.finos.legend.depot.services.artifacts.handlers.entities.EntityProvider;
 import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationHandlerImpl;
 import org.finos.legend.depot.services.artifacts.handlers.generations.FileGenerationsProvider;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.store.model.projects.StoreProjectData;
 import org.finos.legend.depot.store.model.projects.StoreProjectVersionData;
 import org.finos.legend.depot.store.mongo.TestStoreMongo;
-import org.finos.legend.depot.store.mongo.admin.artifacts.ArtifactsFilesMongo;
+import org.finos.legend.depot.store.mongo.artifacts.ArtifactsFilesMongo;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;
 import org.finos.legend.depot.store.notifications.queue.store.mongo.NotificationsQueueMongo;
 import org.finos.legend.depot.services.api.artifacts.handlers.ProjectArtifactHandlerFactory;

diff --git a/...a/org/finos/legend/depot/services/artifacts/refresh/TestProjectVersionRefreshHandler.java b/...a/org/finos/legend/depot/services/artifacts/refresh/TestProjectVersionRefreshHandler.java
@@ -36,11 +36,11 @@
 import org.finos.legend.depot.domain.artifacts.repository.ArtifactType;
 import org.finos.legend.depot.services.artifacts.handlers.entities.EntitiesHandlerImpl;
 import org.finos.legend.depot.services.artifacts.handlers.entities.EntityProvider;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.store.model.projects.StoreProjectData;
 import org.finos.legend.depot.store.model.projects.StoreProjectVersionData;
 import org.finos.legend.depot.store.mongo.TestStoreMongo;
-import org.finos.legend.depot.store.mongo.admin.artifacts.ArtifactsFilesMongo;
+import org.finos.legend.depot.store.mongo.artifacts.ArtifactsFilesMongo;
 import org.finos.legend.depot.store.mongo.entities.EntitiesMongo;
 import org.finos.legend.depot.store.mongo.projects.ProjectsVersionsMongo;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;

diff --git a/.../admin/artifacts/ArtifactsFilesMongo.java → .../mongo/artifacts/ArtifactsFilesMongo.java b/.../admin/artifacts/ArtifactsFilesMongo.java → .../mongo/artifacts/ArtifactsFilesMongo.java
@@ -13,7 +13,7 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.store.mongo.admin.artifacts;
+package org.finos.legend.depot.store.mongo.artifacts;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...dmin/guice/ArtifactsStoreMongoModule.java → ...ongo/guice/ArtifactsStoreMongoModule.java b/...dmin/guice/ArtifactsStoreMongoModule.java → ...ongo/guice/ArtifactsStoreMongoModule.java
@@ -13,14 +13,14 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.store.mongo.admin.guice;
+package org.finos.legend.depot.store.mongo.guice;
 
 import com.google.inject.PrivateModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import org.finos.legend.depot.store.api.admin.artifacts.ArtifactsFilesStore;
 import org.finos.legend.depot.store.mongo.admin.MongoAdminStore;
-import org.finos.legend.depot.store.mongo.admin.artifacts.ArtifactsFilesMongo;
+import org.finos.legend.depot.store.mongo.artifacts.ArtifactsFilesMongo;
 
 import javax.inject.Named;
 

diff --git a/...go/admin/artifacts/TestArtifactMongo.java → ...re/mongo/artifacts/TestArtifactMongo.java b/...go/admin/artifacts/TestArtifactMongo.java → ...re/mongo/artifacts/TestArtifactMongo.java
@@ -13,11 +13,12 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.store.mongo.admin.artifacts;
+package org.finos.legend.depot.store.mongo.artifacts;
 
 import org.finos.legend.depot.store.api.admin.artifacts.ArtifactsFilesStore;
 import org.finos.legend.depot.store.model.admin.artifacts.ArtifactFile;
 import org.finos.legend.depot.store.mongo.TestStoreMongo;
+import org.finos.legend.depot.store.mongo.artifacts.ArtifactsFilesMongo;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/.../admin/artifacts/TestMongoAdminStore.java → .../mongo/artifacts/TestMongoAdminStore.java b/.../admin/artifacts/TestMongoAdminStore.java → .../mongo/artifacts/TestMongoAdminStore.java
@@ -13,11 +13,12 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.store.mongo.admin.artifacts;
+package org.finos.legend.depot.store.mongo.artifacts;
 
 import org.bson.Document;
 import org.finos.legend.depot.store.mongo.TestStoreMongo;
 import org.finos.legend.depot.store.mongo.admin.MongoAdminStore;
+import org.finos.legend.depot.store.mongo.artifacts.ArtifactsFilesMongo;
 import org.finos.legend.depot.store.mongo.core.BaseMongo;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/legend-depot-core-data-services/pom.xml b/legend-depot-core-data-services/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>org.finos.legend.depot</groupId>
-            <artifactId>legend-depot-store-metrics</artifactId>
+            <artifactId>legend-depot-metrics-query-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.depot</groupId>

diff --git a/...ces/src/main/java/org/finos/legend/depot/services/projects/ManageProjectsServiceImpl.java b/...ces/src/main/java/org/finos/legend/depot/services/projects/ManageProjectsServiceImpl.java
@@ -23,7 +23,7 @@
 import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
 import org.finos.legend.depot.store.api.projects.UpdateProjects;
 import org.finos.legend.depot.store.api.projects.UpdateProjectsVersions;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;
 
 import javax.inject.Inject;

diff --git a/...-services/src/main/java/org/finos/legend/depot/services/projects/ProjectsServiceImpl.java b/...-services/src/main/java/org/finos/legend/depot/services/projects/ProjectsServiceImpl.java
@@ -36,7 +36,7 @@
 import org.finos.legend.depot.store.api.projects.ProjectsVersions;
 import org.finos.legend.depot.store.api.projects.UpdateProjectsVersions;
 import org.finos.legend.depot.store.api.projects.UpdateProjects;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;
 import org.finos.legend.sdlc.domain.model.version.VersionId;
 

diff --git a/...-services/src/test/java/org/finos/legend/depot/server/resources/TestProjectsResource.java b/...-services/src/test/java/org/finos/legend/depot/server/resources/TestProjectsResource.java
@@ -18,7 +18,7 @@
 import org.finos.legend.depot.server.resources.projects.ProjectsResource;
 import org.finos.legend.depot.services.TestBaseServices;
 import org.finos.legend.depot.services.projects.ProjectsServiceImpl;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;
 import org.junit.Assert;

diff --git a/...s/src/test/java/org/finos/legend/depot/server/resources/TestProjectsVersionsResource.java b/...s/src/test/java/org/finos/legend/depot/server/resources/TestProjectsVersionsResource.java
@@ -20,7 +20,7 @@
 import org.finos.legend.depot.services.TestBaseServices;
 import org.finos.legend.depot.services.projects.ProjectsServiceImpl;
 import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/...test/java/org/finos/legend/depot/services/dependencies/TestManageDependenciesService.java b/...test/java/org/finos/legend/depot/services/dependencies/TestManageDependenciesService.java
@@ -22,7 +22,7 @@
 import org.finos.legend.depot.store.api.projects.UpdateProjects;
 import org.finos.legend.depot.store.api.projects.UpdateProjectsVersions;
 import org.finos.legend.depot.services.api.artifacts.repository.ArtifactRepository;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.store.model.projects.StoreProjectData;
 import org.finos.legend.depot.store.model.projects.StoreProjectVersionData;
 import org.finos.legend.depot.store.mongo.CoreDataMongoStoreTests;

diff --git a/...-services/src/test/java/org/finos/legend/depot/services/projects/TestProjectsService.java b/...-services/src/test/java/org/finos/legend/depot/services/projects/TestProjectsService.java
@@ -28,7 +28,7 @@
 import org.finos.legend.depot.domain.project.dependencies.VersionDependencyReport;
 import org.finos.legend.depot.services.TestBaseServices;
 import org.finos.legend.depot.services.api.projects.ManageProjectsService;
-import org.finos.legend.depot.store.metrics.api.QueryMetricsRegistry;
+import org.finos.legend.depot.services.api.metrics.query.QueryMetricsRegistry;
 import org.finos.legend.depot.services.projects.configuration.ProjectsConfiguration;
 import org.finos.legend.depot.store.notifications.queue.api.Queue;
 import org.finos.legend.depot.store.notifications.queue.store.mongo.NotificationsQueueMongo;

diff --git a/...uice/ManageSchedulesStoreMongoModule.java → ...uice/ManageSchedulesStoreMongoModule.java b/...uice/ManageSchedulesStoreMongoModule.java → ...uice/ManageSchedulesStoreMongoModule.java
@@ -13,13 +13,13 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.store.mongo.admin.guice;
+package org.finos.legend.depot.store.mongo.guice;
 
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import org.finos.legend.depot.store.mongo.admin.MongoAdminStore;
-import org.finos.legend.depot.store.mongo.admin.schedules.ScheduleInstancesMongo;
-import org.finos.legend.depot.store.mongo.admin.schedules.SchedulesMongo;
+import org.finos.legend.depot.store.mongo.schedules.ScheduleInstancesMongo;
+import org.finos.legend.depot.store.mongo.schedules.SchedulesMongo;
 
 import javax.inject.Named;
 

diff --git a/...dmin/guice/SchedulesStoreMongoModule.java → ...ongo/guice/SchedulesStoreMongoModule.java b/...dmin/guice/SchedulesStoreMongoModule.java → ...ongo/guice/SchedulesStoreMongoModule.java
@@ -13,13 +13,13 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.store.mongo.admin.guice;
+package org.finos.legend.depot.store.mongo.guice;
 
 import com.google.inject.PrivateModule;
 import org.finos.legend.depot.store.api.admin.schedules.ScheduleInstancesStore;
 import org.finos.legend.depot.store.api.admin.schedules.SchedulesStore;
-import org.finos.legend.depot.store.mongo.admin.schedules.ScheduleInstancesMongo;
-import org.finos.legend.depot.store.mongo.admin.schedules.SchedulesMongo;
+import org.finos.legend.depot.store.mongo.schedules.ScheduleInstancesMongo;
+import org.finos.legend.depot.store.mongo.schedules.SchedulesMongo;
 
 public class SchedulesStoreMongoModule extends PrivateModule
 {

diff --git a/...min/schedules/ScheduleInstancesMongo.java → ...ngo/schedules/ScheduleInstancesMongo.java b/...min/schedules/ScheduleInstancesMongo.java → ...ngo/schedules/ScheduleInstancesMongo.java
@@ -13,7 +13,7 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.store.mongo.admin.schedules;
+package org.finos.legend.depot.store.mongo.schedules;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...mongo/admin/schedules/SchedulesMongo.java → ...store/mongo/schedules/SchedulesMongo.java b/...mongo/admin/schedules/SchedulesMongo.java → ...store/mongo/schedules/SchedulesMongo.java
@@ -13,7 +13,7 @@
 //  limitations under the License.
 //
 
-package org.finos.legend.depot.store.mongo.admin.schedules;
+package org.finos.legend.depot.store.mongo.schedules;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/legend-depot-entities-services/pom.xml b/legend-depot-entities-services/pom.xml
@@ -119,6 +119,16 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.depot</groupId>
+            <artifactId>legend-depot-metrics-query-store-mongo</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.finos.legend.depot</groupId>
+            <artifactId>legend-depot-metrics-query-services</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>