feat: add hikari logs to otel

Author: tamassoltesz

CHANGELOG.md

@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [9.0.5]
+
+- Sends hikari logs to opentelemetry
+
 ## [9.0.4]
 
 - Adds back `implementationDependencies.json` file, but now it is generated by the build process

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-version = "9.0.4"
+version = "9.0.5"
 
 repositories {
     mavenCentral()

src/main/java/io/supertokens/storage/postgresql/HikariLoggingAppender.java

@@ -25,9 +25,12 @@
 import ch.qos.logback.core.filter.Filter;
 import ch.qos.logback.core.spi.FilterReply;
 import ch.qos.logback.core.status.Status;
+import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
+import io.supertokens.pluginInterface.opentelemetry.OtelProvider;
 import io.supertokens.storage.postgresql.output.Logging;
 
 import java.util.List;
+import java.util.Map;
 
 public class HikariLoggingAppender implements Appender<ILoggingEvent> {
 
@@ -37,6 +40,8 @@ public class HikariLoggingAppender implements Appender<ILoggingEvent> {
 
     private Context context;
 
+    private OtelProvider otelProvider;
+
     HikariLoggingAppender(Start start) {
         super();
         this.start = start;
@@ -126,6 +131,10 @@ public String getName() {
     public void setName(String name) {
     }
 
+    public void setOtelProvider(OtelProvider otelProvider) {
+        this.otelProvider = otelProvider;
+    }
+
     @Override
     public void doAppend(ILoggingEvent event) throws LogbackException {
         if (event.getLevel() == Level.ERROR) {
@@ -135,7 +144,17 @@ public void doAppend(ILoggingEvent event) throws LogbackException {
         } else {
             Logging.debug(start, event.getFormattedMessage());
         }
+        appendToOtel(event);
+    }
 
+    private void appendToOtel(ILoggingEvent event) {
+        if (otelProvider != null) {
+            String logMessage = event.getFormattedMessage();
+            String logLevel = event.getLevel().toString();
+            otelProvider.createLogEvent(TenantIdentifier.BASE_TENANT, logMessage, logLevel,
+                    Map.of("loggerName", event.getLoggerName(),
+                            "threadName", event.getThreadName()));
+        }
     }
 
 }

src/main/java/io/supertokens/storage/postgresql/Start.java

@@ -68,6 +68,7 @@
 import io.supertokens.pluginInterface.oauth.OAuthStorage;
 import io.supertokens.pluginInterface.oauth.exception.DuplicateOAuthLogoutChallengeException;
 import io.supertokens.pluginInterface.oauth.exception.OAuthClientNotFoundException;
+import io.supertokens.pluginInterface.opentelemetry.OtelProvider;
 import io.supertokens.pluginInterface.passwordless.PasswordlessCode;
 import io.supertokens.pluginInterface.passwordless.PasswordlessDevice;
 import io.supertokens.pluginInterface.passwordless.PasswordlessImportUser;
@@ -218,7 +219,7 @@ public void assertThatConfigFromSameUserPoolIsNotConflicting(JsonObject otherCon
     }
 
     @Override
-    public void initFileLogging(String infoLogPath, String errorLogPath) {
+    public void initFileLogging(String infoLogPath, String errorLogPath, OtelProvider otelProvider) {
         if (Logging.isAlreadyInitialised(this)) {
             return;
         }
@@ -240,6 +241,7 @@ public void initFileLogging(String infoLogPath, String errorLogPath) {
              */
             final Logger infoLog = (Logger) LoggerFactory.getLogger("com.zaxxer.hikari");
             appender = new HikariLoggingAppender(this);
+            appender.setOtelProvider(otelProvider);
             if (infoLog.getAppender(HikariLoggingAppender.NAME) == null) {
                 infoLog.setAdditive(false);
                 infoLog.addAppender(appender);