feat: Add missing fields (#3)

Dockerfile

@@ -0,0 +1,25 @@
+# Use the Trino base image
+FROM trinodb/trino:452
+
+# Create the plugin directory
+RUN mkdir -p /usr/lib/trino/plugin/trino-event-logger
+
+# Copy the plugin JAR files
+COPY /target/dependency/*.jar /usr/lib/trino/plugin/trino-event-logger/
+COPY /target/trino-event-logger*.jar /usr/lib/trino/plugin/trino-event-logger/
+
+# Create event-listener.properties file
+RUN echo "event-listener.name=telogger" > /etc/trino/event-listener.properties && \
+    echo "telogger.url=jdbc:postgresql://postgres:5432/trino_db_event_listener" >> /etc/trino/event-listener.properties && \
+    echo "telogger.user=trino_user" >> /etc/trino/event-listener.properties && \
+    echo "telogger.password=trino_password" >> /etc/trino/event-listener.properties
+
+# Create PostgreSQL catalog properties file
+RUN mkdir -p /etc/trino/catalog && \
+    echo "connector.name=postgresql" > /etc/trino/catalog/postgresql.properties && \
+    echo "connection-url=jdbc:postgresql://postgres:5432/trino_db_event_listener" >> /etc/trino/catalog/postgresql.properties && \
+    echo "connection-user=trino_user" >> /etc/trino/catalog/postgresql.properties && \
+    echo "connection-password=trino_password" >> /etc/trino/catalog/postgresql.properties
+
+# Start Trino
+CMD ["/usr/lib/trino/bin/run-trino"]

README.md

@@ -80,3 +80,8 @@ If the plugin is working correctly, you will see the following in the Trino
 2022-04-29T16:03:12.663-0400	INFO	main	io.trino.dblistener.FlywayMigration	Performed 1 migrations
 ```
 
+## Testing
+```bash
+docker compose up --build
+docker compose down -v
+```

docker-compose.yaml

@@ -0,0 +1,33 @@
+version: '3.8'
+
+services:
+  trino:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8081:8080"
+    depends_on:
+      - postgres
+    networks:
+      - trino-network
+
+  postgres:
+    image: postgres:13
+    environment:
+      POSTGRES_DB: trino_db_event_listener
+      POSTGRES_USER: trino_user
+      POSTGRES_PASSWORD: trino_password
+    ports:
+      - "5455:5432"
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    networks:
+      - trino-network
+
+networks:
+  trino-network:
+    driver: bridge
+
+volumes:
+  postgres-data:

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>cloudandthings</groupId>
   <artifactId>trino-event-logger</artifactId>
-  <version>452.1</version>
+  <version>452.4</version>
   <description>A Trino Event Logger. Supports MSSQL, MYSQL and PostGreSQL</description>
 
   <properties>

src/main/java/cloudandthings/plugin/telogger/TELogger.java

@@ -12,6 +12,7 @@
  * limitations under the License.
  */
 package cloudandthings.plugin.telogger;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
@@ -91,7 +92,13 @@ private void saveQuery(QueryCompletedEvent queryCompletedEvent, Handle handle)
                 "  cumulative_memory," +
                 "  failed_cumulative_memory," +
                 "  completed_splits," +
-                "  stage_gc_statistics" +
+                "  stage_gc_statistics," +
+                "  user_name," +
+                "  user_original," +
+                "  server_version," +
+                "  enabled_roles," +
+                "  groups," +
+                "  principal" +
                 ")" +
                 "VALUES (" +
                 "  :query_id," +
@@ -135,7 +142,13 @@ private void saveQuery(QueryCompletedEvent queryCompletedEvent, Handle handle)
                 "  :cumulative_memory," +
                 "  :failed_cumulative_memory," +
                 "  :completed_splits," +
-                "  :stage_gc_statistics" +
+                "  :stage_gc_statistics," +
+                "  :user_name," +
+                "  :user_original," +
+                "  :server_version," +
+                "  :enabled_roles," +
+                "  :groups," +
+                "  :principal" +
                 ")";
 
         QueryStatistics queryStatistics = queryCompletedEvent.getStatistics();
@@ -151,6 +164,13 @@ private void saveQuery(QueryCompletedEvent queryCompletedEvent, Handle handle)
         long outputBlockedTime = queryStatistics.getOutputBlockedTime().isPresent() ? queryStatistics.getOutputBlockedTime().get().toMillis() : 0;
         long failedOutputBlockedTime = queryStatistics.getFailedOutputBlockedTime().isPresent() ? queryStatistics.getFailedOutputBlockedTime().get().toMillis() : 0;
 
+        String contextUser = queryCompletedEvent.getContext().getUser();
+        String contextUserOriginal = queryCompletedEvent.getContext().getOriginalUser();
+        String contextServerVersion = queryCompletedEvent.getContext().getServerVersion();
+        String contextEnabledRoles = String.join(",", queryCompletedEvent.getContext().getEnabledRoles());
+        String contextGroups = String.join(",", queryCompletedEvent.getContext().getGroups());
+        String contextPrincipal = queryCompletedEvent.getContext().getPrincipal().orElse("");
+
         handle.createUpdate(sql)
                 .bind("query_id", queryCompletedEvent.getMetadata().getQueryId())
                 .bind("catalog", queryCompletedEvent.getContext().getCatalog().orElse(""))
@@ -194,6 +214,12 @@ private void saveQuery(QueryCompletedEvent queryCompletedEvent, Handle handle)
                 .bind("failed_cumulative_memory", queryStatistics.getFailedCumulativeMemory())
                 .bind("completed_splits", queryStatistics.getCompletedSplits())
                 .bind("stage_gc_statistics", STAGE_GC_STATS_CODEC.toJson(queryStatistics.getStageGcStatistics()))
+                .bind("user_name", contextUser)
+                .bind("user_original", contextUserOriginal)
+                .bind("server_version", contextServerVersion)
+                .bind("enabled_roles", contextEnabledRoles)
+                .bind("groups", contextGroups)
+                .bind("principal", contextPrincipal)
                 .execute();
     }
-}
+}

src/main/resources/db/mysql/V2__add_username.sql

@@ -0,0 +1,19 @@
+ALTER TABLE queries
+ADD COLUMN user_name VARCHAR(256);
+
+ALTER TABLE queries
+ADD COLUMN user_original VARCHAR(256);
+
+ALTER TABLE queries
+ADD COLUMN server_version VARCHAR(256);
+
+ALTER TABLE queries
+ADD COLUMN enabled_roles LONGTEXT;
+
+ALTER TABLE queries
+ADD COLUMN groups LONGTEXT;
+
+ALTER TABLE queries
+ADD COLUMN principal VARCHAR(256);
+
+CREATE INDEX idx_queries_user_name ON queries (user_name);

src/main/resources/db/postgresql/V2__add_username.sql

@@ -0,0 +1,19 @@
+ALTER TABLE queries
+ADD COLUMN user_name VARCHAR(256);
+
+ALTER TABLE queries
+ADD COLUMN user_original VARCHAR(256);
+
+ALTER TABLE queries
+ADD COLUMN server_version VARCHAR(256);
+
+ALTER TABLE queries
+ADD COLUMN enabled_roles TEXT;
+
+ALTER TABLE queries
+ADD COLUMN groups TEXT;
+
+ALTER TABLE queries
+ADD COLUMN principal VARCHAR(256);
+
+CREATE INDEX idx_queries_user_name ON queries (user_name);

src/main/resources/db/sqlserver/V2__add_username.sql

@@ -0,0 +1,19 @@
+ALTER TABLE queries
+ADD user_name VARCHAR(256);
+
+ALTER TABLE queries
+ADD user_original VARCHAR(256);
+
+ALTER TABLE queries
+ADD server_version VARCHAR(256);
+
+ALTER TABLE queries
+ADD enabled_roles NVARCHAR(MAX);
+
+ALTER TABLE queries
+ADD groups NVARCHAR(MAX);
+
+ALTER TABLE queries
+ADD principal VARCHAR(256);
+
+CREATE INDEX idx_queries_user_name ON queries (user_name);