Combine events, telemetry API, and metrics modules.

io7m-com · Jun 16, 2023 · b2be579 · b2be579
1 parent b718d76
commit b2be579
Show file tree

Hide file tree

Showing 85 changed files with 246 additions and 450 deletions.
diff --git a/...store.database.postgres/src/main/java/com/io7m/idstore/database/postgres/IdDatabases.java b/...store.database.postgres/src/main/java/com/io7m/idstore/database/postgres/IdDatabases.java
@@ -23,7 +23,6 @@
 import com.io7m.idstore.database.api.IdDatabaseType;
 import com.io7m.idstore.database.postgres.internal.IdDatabase;
 import com.io7m.jmulticlose.core.CloseableCollection;
-import com.io7m.jmulticlose.core.CloseableCollectionType;
 import com.io7m.trasco.api.TrEventExecutingSQL;
 import com.io7m.trasco.api.TrEventType;
 import com.io7m.trasco.api.TrEventUpgrading;
@@ -195,8 +194,8 @@ public IdDatabaseType open(
       config.setPassword(configuration.password());
       config.setAutoCommit(false);
 
-      final var dataSource = resources.add(new HikariDataSource(config));
-      createMetricsMeters(meter, resources, dataSource);
+      final var dataSource =
+        resources.add(new HikariDataSource(config));
 
       final var parsers = new TrSchemaRevisionSetParsers();
       final TrSchemaRevisionSet revisions;
@@ -266,59 +265,6 @@ public IdDatabaseType open(
     }
   }
 
-  private static void createMetricsMeters(
-    final Meter meter,
-    final CloseableCollectionType<IdDatabaseException> resources,
-    final HikariDataSource dataSource)
-  {
-    final var dataSourceBean =
-      dataSource.getHikariPoolMXBean();
-
-    resources.add(
-      meter.gaugeBuilder("idstore_db_connections_active")
-        .setDescription("Number of active database connections.")
-        .ofLongs()
-        .buildWithCallback(measurement -> {
-          measurement.record(
-            Integer.toUnsignedLong(dataSourceBean.getActiveConnections())
-          );
-        })
-    );
-
-    resources.add(
-      meter.gaugeBuilder("idstore_db_connections_idle")
-        .setDescription("Number of idle database connections.")
-        .ofLongs()
-        .buildWithCallback(measurement -> {
-          measurement.record(
-            Integer.toUnsignedLong(dataSourceBean.getIdleConnections())
-          );
-        })
-    );
-
-    resources.add(
-      meter.gaugeBuilder("idstore_db_connections_total")
-        .setDescription("Total number of database connections.")
-        .ofLongs()
-        .buildWithCallback(measurement -> {
-          measurement.record(
-            Integer.toUnsignedLong(dataSourceBean.getTotalConnections())
-          );
-        })
-    );
-
-    resources.add(
-      meter.gaugeBuilder("idstore_db_threads_waiting")
-        .setDescription("Number of threads waiting for connections.")
-        .ofLongs()
-        .buildWithCallback(measurement -> {
-          measurement.record(
-            Integer.toUnsignedLong(dataSourceBean.getThreadsAwaitingConnection())
-          );
-        })
-    );
-  }
-
   private static void publishEvent(
     final Consumer<String> startupMessages,
     final String message)

diff --git a/...tabase.postgres/src/main/java/com/io7m/idstore/database/postgres/internal/IdDatabase.java b/...tabase.postgres/src/main/java/com/io7m/idstore/database/postgres/internal/IdDatabase.java
@@ -87,18 +87,24 @@ public IdDatabase(
     this.settings =
       new Settings().withRenderNameCase(RenderNameCase.LOWER);
 
+    final var dataSourceBean =
+      this.dataSource.getHikariPoolMXBean();
+
     this.transactions =
       meter.counterBuilder("idstore_db_transactions")
         .setDescription("The number of completed transactions.")
         .build();
+
     this.transactionCommits =
       meter.counterBuilder("idstore_db_commits")
         .setDescription("The number of database transaction commits.")
         .build();
+
     this.transactionRollbacks =
       meter.counterBuilder("idstore_db_rollbacks")
         .setDescription("The number of database transaction rollbacks.")
         .build();
+
     this.resources.add(
       meter.gaugeBuilder("idstore_db_connection_time")
         .setDescription("The amount of time a database connection is held.")
@@ -107,6 +113,50 @@ public IdDatabase(
           measurement.record(this.connectionTimeNow);
         })
     );
+
+    this.resources.add(
+      meter.gaugeBuilder("idstore_db_connections_active")
+        .setDescription("Number of active database connections.")
+        .ofLongs()
+        .buildWithCallback(measurement -> {
+          measurement.record(
+            Integer.toUnsignedLong(dataSourceBean.getActiveConnections())
+          );
+        })
+    );
+
+    this.resources.add(
+      meter.gaugeBuilder("idstore_db_connections_idle")
+        .setDescription("Number of idle database connections.")
+        .ofLongs()
+        .buildWithCallback(measurement -> {
+          measurement.record(
+            Integer.toUnsignedLong(dataSourceBean.getIdleConnections())
+          );
+        })
+    );
+
+    this.resources.add(
+      meter.gaugeBuilder("idstore_db_connections_total")
+        .setDescription("Total number of database connections.")
+        .ofLongs()
+        .buildWithCallback(measurement -> {
+          measurement.record(
+            Integer.toUnsignedLong(dataSourceBean.getTotalConnections())
+          );
+        })
+    );
+
+    this.resources.add(
+      meter.gaugeBuilder("idstore_db_threads_waiting")
+        .setDescription("Number of threads waiting for connections.")
+        .ofLongs()
+        .buildWithCallback(measurement -> {
+          measurement.record(
+            Integer.toUnsignedLong(dataSourceBean.getThreadsAwaitingConnection())
+          );
+        })
+    );
   }
 
   LongCounter counterTransactions()

diff --git a/com.io7m.idstore.server.admin_v1/pom.xml b/com.io7m.idstore.server.admin_v1/pom.xml
@@ -56,11 +56,6 @@
       <artifactId>com.io7m.idstore.server.service.clock</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>com.io7m.idstore.server.service.metrics</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>com.io7m.idstore.protocol.admin.cb</artifactId>

diff --git a/...7m.idstore.server.admin_v1/src/main/java/com/io7m/idstore/server/admin_v1/IdA1Server.java b/...7m.idstore.server.admin_v1/src/main/java/com/io7m/idstore/server/admin_v1/IdA1Server.java
@@ -23,7 +23,7 @@
 import com.io7m.idstore.server.http.IdServletHolders;
 import com.io7m.idstore.server.service.clock.IdServerClock;
 import com.io7m.idstore.server.service.configuration.IdServerConfigurationService;
-import com.io7m.idstore.server.service.metrics.IdMetricsServiceType;
+import com.io7m.idstore.server.service.telemetry.api.IdMetricsServiceType;
 import com.io7m.repetoir.core.RPServiceDirectoryType;
 import org.eclipse.jetty.server.ForwardedRequestCustomizer;
 import org.eclipse.jetty.server.HttpConfiguration.ConnectionFactory;

diff --git a/com.io7m.idstore.server.admin_v1/src/main/java/module-info.java b/com.io7m.idstore.server.admin_v1/src/main/java/module-info.java
@@ -33,7 +33,6 @@
   requires com.io7m.idstore.server.service.clock;
   requires com.io7m.idstore.server.service.configuration;
   requires com.io7m.idstore.server.service.health;
-  requires com.io7m.idstore.server.service.metrics;
   requires com.io7m.idstore.server.service.reqlimit;
   requires com.io7m.idstore.server.service.sessions;
   requires com.io7m.idstore.server.service.telemetry.api;

diff --git a/com.io7m.idstore.server.controller/pom.xml b/com.io7m.idstore.server.controller/pom.xml
@@ -69,11 +69,6 @@
       <artifactId>com.io7m.idstore.server.service.sessions</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>com.io7m.idstore.server.service.events</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>com.io7m.idstore.server.security</artifactId>

diff --git a/...ontroller/src/main/java/com/io7m/idstore/server/controller/admin/IdAdminLoginService.java b/...ontroller/src/main/java/com/io7m/idstore/server/controller/admin/IdAdminLoginService.java
@@ -25,10 +25,10 @@
 import com.io7m.idstore.server.controller.IdServerStrings;
 import com.io7m.idstore.server.controller.command_exec.IdCommandExecutionFailure;
 import com.io7m.idstore.server.service.clock.IdServerClock;
-import com.io7m.idstore.server.service.events.IdEventAdminLoggedIn;
-import com.io7m.idstore.server.service.events.IdEventAdminLoginAuthenticationFailed;
-import com.io7m.idstore.server.service.events.IdEventAdminLoginRateLimitExceeded;
-import com.io7m.idstore.server.service.events.IdEventServiceType;
+import com.io7m.idstore.server.service.telemetry.api.IdEventAdminLoggedIn;
+import com.io7m.idstore.server.service.telemetry.api.IdEventAdminLoginAuthenticationFailed;
+import com.io7m.idstore.server.service.telemetry.api.IdEventAdminLoginRateLimitExceeded;
+import com.io7m.idstore.server.service.telemetry.api.IdEventServiceType;
 import com.io7m.idstore.server.service.ratelimit.IdRateLimitAdminLoginServiceType;
 import com.io7m.idstore.server.service.sessions.IdSessionAdminService;
 import com.io7m.repetoir.core.RPServiceType;

diff --git a/...controller/src/main/java/com/io7m/idstore/server/controller/user/IdUCmdEmailAddBegin.java b/...controller/src/main/java/com/io7m/idstore/server/controller/user/IdUCmdEmailAddBegin.java
@@ -33,8 +33,8 @@
 import com.io7m.idstore.server.security.IdSecUserActionEmailAddBegin;
 import com.io7m.idstore.server.service.branding.IdServerBrandingServiceType;
 import com.io7m.idstore.server.service.configuration.IdServerConfigurationService;
-import com.io7m.idstore.server.service.events.IdEventServiceType;
-import com.io7m.idstore.server.service.events.IdEventUserEmailVerificationRateLimitExceeded;
+import com.io7m.idstore.server.service.telemetry.api.IdEventServiceType;
+import com.io7m.idstore.server.service.telemetry.api.IdEventUserEmailVerificationRateLimitExceeded;
 import com.io7m.idstore.server.service.mail.IdServerMailServiceType;
 import com.io7m.idstore.server.service.ratelimit.IdRateLimitEmailVerificationServiceType;
 import com.io7m.idstore.server.service.templating.IdFMEmailVerificationData;

diff --git a/...troller/src/main/java/com/io7m/idstore/server/controller/user/IdUCmdEmailRemoveBegin.java b/...troller/src/main/java/com/io7m/idstore/server/controller/user/IdUCmdEmailRemoveBegin.java
@@ -34,8 +34,8 @@
 import com.io7m.idstore.server.security.IdSecUserActionEmailRemoveBegin;
 import com.io7m.idstore.server.service.branding.IdServerBrandingServiceType;
 import com.io7m.idstore.server.service.configuration.IdServerConfigurationService;
-import com.io7m.idstore.server.service.events.IdEventServiceType;
-import com.io7m.idstore.server.service.events.IdEventUserEmailVerificationRateLimitExceeded;
+import com.io7m.idstore.server.service.telemetry.api.IdEventServiceType;
+import com.io7m.idstore.server.service.telemetry.api.IdEventUserEmailVerificationRateLimitExceeded;
 import com.io7m.idstore.server.service.mail.IdServerMailServiceType;
 import com.io7m.idstore.server.service.ratelimit.IdRateLimitEmailVerificationServiceType;
 import com.io7m.idstore.server.service.templating.IdFMEmailVerificationData;

diff --git a/....controller/src/main/java/com/io7m/idstore/server/controller/user/IdUserLoginService.java b/....controller/src/main/java/com/io7m/idstore/server/controller/user/IdUserLoginService.java
@@ -27,10 +27,10 @@
 import com.io7m.idstore.server.controller.command_exec.IdCommandExecutionFailure;
 import com.io7m.idstore.server.service.clock.IdServerClock;
 import com.io7m.idstore.server.service.configuration.IdServerConfigurationService;
-import com.io7m.idstore.server.service.events.IdEventServiceType;
-import com.io7m.idstore.server.service.events.IdEventUserLoggedIn;
-import com.io7m.idstore.server.service.events.IdEventUserLoginAuthenticationFailed;
-import com.io7m.idstore.server.service.events.IdEventUserLoginRateLimitExceeded;
+import com.io7m.idstore.server.service.telemetry.api.IdEventServiceType;
+import com.io7m.idstore.server.service.telemetry.api.IdEventUserLoggedIn;
+import com.io7m.idstore.server.service.telemetry.api.IdEventUserLoginAuthenticationFailed;
+import com.io7m.idstore.server.service.telemetry.api.IdEventUserLoginRateLimitExceeded;
 import com.io7m.idstore.server.service.ratelimit.IdRateLimitUserLoginServiceType;
 import com.io7m.idstore.server.service.sessions.IdSessionUserService;
 import com.io7m.repetoir.core.RPServiceType;

diff --git a/...main/java/com/io7m/idstore/server/controller/user_pwreset/IdUserPasswordResetService.java b/...main/java/com/io7m/idstore/server/controller/user_pwreset/IdUserPasswordResetService.java
@@ -34,8 +34,8 @@
 import com.io7m.idstore.server.controller.command_exec.IdCommandExecutionFailure;
 import com.io7m.idstore.server.service.branding.IdServerBrandingServiceType;
 import com.io7m.idstore.server.service.clock.IdServerClock;
-import com.io7m.idstore.server.service.events.IdEventServiceType;
-import com.io7m.idstore.server.service.events.IdEventUserPasswordResetRateLimitExceeded;
+import com.io7m.idstore.server.service.telemetry.api.IdEventServiceType;
+import com.io7m.idstore.server.service.telemetry.api.IdEventUserPasswordResetRateLimitExceeded;
 import com.io7m.idstore.server.service.mail.IdServerMailServiceType;
 import com.io7m.idstore.server.service.ratelimit.IdRateLimitPasswordResetServiceType;
 import com.io7m.idstore.server.service.telemetry.api.IdServerTelemetryServiceType;

diff --git a/com.io7m.idstore.server.controller/src/main/java/module-info.java b/com.io7m.idstore.server.controller/src/main/java/module-info.java
@@ -32,7 +32,6 @@
   requires com.io7m.idstore.server.service.branding;
   requires com.io7m.idstore.server.service.clock;
   requires com.io7m.idstore.server.service.configuration;
-  requires com.io7m.idstore.server.service.events;
   requires com.io7m.idstore.server.service.mail;
   requires com.io7m.idstore.server.service.ratelimit;
   requires com.io7m.idstore.server.service.sessions;

diff --git a/com.io7m.idstore.server.http/pom.xml b/com.io7m.idstore.server.http/pom.xml
@@ -34,11 +34,6 @@
       <artifactId>com.io7m.idstore.server.service.telemetry.api</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>com.io7m.idstore.server.service.metrics</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>com.io7m.idstore.server.service.clock</artifactId>

diff --git a/...store.server.http/src/main/java/com/io7m/idstore/server/http/IdHTTPRequestTimeFilter.java b/...store.server.http/src/main/java/com/io7m/idstore/server/http/IdHTTPRequestTimeFilter.java
@@ -19,7 +19,7 @@
 
 import com.io7m.idstore.model.IdUserDomain;
 import com.io7m.idstore.server.service.clock.IdServerClock;
-import com.io7m.idstore.server.service.metrics.IdMetricsServiceType;
+import com.io7m.idstore.server.service.telemetry.api.IdMetricsServiceType;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;

diff --git a/...server.http/src/main/java/com/io7m/idstore/server/http/IdHTTPServletCoreInstrumented.java b/...server.http/src/main/java/com/io7m/idstore/server/http/IdHTTPServletCoreInstrumented.java
@@ -18,7 +18,7 @@
 package com.io7m.idstore.server.http;
 
 import com.io7m.idstore.model.IdUserDomain;
-import com.io7m.idstore.server.service.metrics.IdMetricsServiceType;
+import com.io7m.idstore.server.service.telemetry.api.IdMetricsServiceType;
 import com.io7m.idstore.server.service.telemetry.api.IdServerTelemetryServiceType;
 import com.io7m.repetoir.core.RPServiceDirectoryType;
 import io.opentelemetry.api.trace.SpanKind;

diff --git a/com.io7m.idstore.server.http/src/main/java/module-info.java b/com.io7m.idstore.server.http/src/main/java/module-info.java
@@ -24,7 +24,6 @@
   requires static org.osgi.annotation.versioning;
 
   requires com.io7m.idstore.server.service.telemetry.api;
-  requires com.io7m.idstore.server.service.metrics;
   requires com.io7m.idstore.server.service.clock;
 
   requires io.opentelemetry.api;

diff --git a/com.io7m.idstore.server.service.configuration/pom.xml b/com.io7m.idstore.server.service.configuration/pom.xml
@@ -31,7 +31,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>com.io7m.idstore.server.service.metrics</artifactId>
+      <artifactId>com.io7m.idstore.server.service.telemetry.api</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/...main/java/com/io7m/idstore/server/service/configuration/IdServerConfigurationService.java b/...main/java/com/io7m/idstore/server/service/configuration/IdServerConfigurationService.java
@@ -17,7 +17,7 @@
 package com.io7m.idstore.server.service.configuration;
 
 import com.io7m.idstore.server.api.IdServerConfiguration;
-import com.io7m.idstore.server.service.metrics.IdMetricsServiceType;
+import com.io7m.idstore.server.service.telemetry.api.IdMetricsServiceType;
 import com.io7m.repetoir.core.RPServiceType;
 
 import java.util.Objects;

diff --git a/com.io7m.idstore.server.service.configuration/src/main/java/module-info.java b/com.io7m.idstore.server.service.configuration/src/main/java/module-info.java
@@ -24,7 +24,7 @@
   requires static org.osgi.annotation.bundle;
 
   requires transitive com.io7m.idstore.server.api;
-  requires com.io7m.idstore.server.service.metrics;
+  requires com.io7m.idstore.server.service.telemetry.api;
 
   requires jakarta.xml.bind;
   requires com.io7m.cxbutton.core;

diff --git a/com.io7m.idstore.server.service.events/pom.xml b/com.io7m.idstore.server.service.events/pom.xml