Merge pull request 'Make StatsCollector work for more JDBC drivers' (#15) from feature/23653 into develop

Author: fmichielssen

pom.xml

@@ -227,6 +227,20 @@
 			<artifactId>monetdb-jdbc</artifactId>
 			<version>2.28</version>
 		</dependency>
+		<dependency>
+			<groupId>com.microsoft.sqlserver</groupId>
+			<artifactId>mssql-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		
+		
 
 		<!-- Kubernetes -->
 		<dependency>

src/main/java/eu/openanalytics/containerproxy/stat/StatCollectorRegistry.java

@@ -34,7 +34,7 @@
 import eu.openanalytics.containerproxy.service.EventService;
 import eu.openanalytics.containerproxy.service.EventService.Event;
 import eu.openanalytics.containerproxy.stat.impl.InfluxDBCollector;
-import eu.openanalytics.containerproxy.stat.impl.MonetDBCollector;
+import eu.openanalytics.containerproxy.stat.impl.JDBCCollector;
 
 @Service
 public class StatCollectorRegistry implements Consumer<Event> {
@@ -76,8 +76,8 @@ private IStatCollector findCollector(String baseURL) {
 		if (baseURL == null || baseURL.isEmpty()) return null;
 		if (baseURL.toLowerCase().contains("/write?db=")) {
 			return new InfluxDBCollector();
-		} else if (baseURL.toLowerCase().startsWith("jdbc:monetdb")) {
-			return new MonetDBCollector();
+		} else if (baseURL.toLowerCase().startsWith("jdbc")) {
+			return new JDBCCollector();
 		}
 		return null;
 	}

src/main/java/eu/openanalytics/containerproxy/stat/impl/JDBCCollector.java

@@ -0,0 +1,86 @@
+/**
+ * ContainerProxy
+ *
+ * Copyright (C) 2016-2020 Open Analytics
+ *
+ * ===========================================================================
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Apache License as published by
+ * The Apache Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * Apache License for more details.
+ *
+ * You should have received a copy of the Apache License
+ * along with this program.  If not, see <http://www.apache.org/licenses/>
+ */
+package eu.openanalytics.containerproxy.stat.impl;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+
+import org.springframework.core.env.Environment;
+
+import eu.openanalytics.containerproxy.service.EventService.Event;
+import eu.openanalytics.containerproxy.stat.IStatCollector;
+
+/**
+ * 
+ * # MonetDB, Postgresql, MySQL/MariaDB usage-stats-url:
+ * jdbc:monetdb://localhost:50000/usage_stats usage-stats-url:
+ * jdbc:postgresql://localhost/postgres usage-stats-url:
+ * jdbc:mysql://localhost/shinyproxy
+ * 
+ * Assumed table layout:
+ * 
+ * create table event( event_time timestamp, username varchar(128), type
+ * varchar(128), data text );
+ * 
+ * 
+ * # MS SQL Server usage-stats-url:
+ * jdbc:sqlserver://localhost;databaseName=shinyproxy
+ * 
+ * Assumed table layout:
+ * 
+ * create table event( event_time datetime, username varchar(128), type
+ * varchar(128), data text );
+ * 
+ */
+public class JDBCCollector implements IStatCollector {
+
+	private Connection conn;
+
+	@Override
+	public void accept(Event event, Environment env) throws IOException {
+		synchronized (this) {
+			String baseURL = env.getProperty("proxy.usage-stats-url");
+			String username = env.getProperty("proxy.usage-stats-username", "monetdb");
+			String password = env.getProperty("proxy.usage-stats-password", "monetdb");
+			try {
+				if (conn == null || conn.isClosed()) {
+					conn = DriverManager.getConnection(baseURL, username, password);
+				}
+			} catch (SQLException e) {
+				throw new IOException("Failed to connect to " + baseURL, e);
+			}
+		}
+		String sql = "INSERT INTO event(event_time, username, type, data) VALUES (?,?,?,?)";
+		try (PreparedStatement stmt = conn.prepareStatement(sql)) {
+			stmt.setTimestamp(1, new Timestamp(System.currentTimeMillis()));
+			stmt.setString(2, event.user);
+			stmt.setString(3, event.type);
+			stmt.setString(4, event.data);
+			stmt.executeUpdate();
+		} catch (SQLException e) {
+			throw new IOException("Exception while loggin stats", e);
+		}
+	}
+}