WIP on master: 674e1b0 Improve synchronization in AuthenticationService

analytics/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>timely-analytics</artifactId>
   <!--

analytics/src/main/java/timely/analytics/flink/SummarizationJob.java

@@ -67,7 +67,7 @@ public class SummarizationJob {
         })
         .name("Metric Windows")
         .addSink(
-            new SocketClientSink<MetricHistogram>(jp.getTimelyHostname(), jp.getTimelyTcpPort(),
+    		new SocketClientSink<MetricHistogram>(jp.getTimelyHostname(), jp.getTimelyTcpPort(),
                     new MetricHistogram(), 2, true) {
 
                 private final Logger LOG = LoggerFactory

balancer/bin/timely-balancer.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -vx
 
 if [[ `uname` == "Darwin" ]]; then
         THIS_SCRIPT=`python -c 'import os,sys; print os.path.realpath(sys.argv[1])' $0`
@@ -27,14 +27,15 @@ fi
 mkdir -p ${NATIVE_DIR}
 
 pushd ${BASE_DIR}/bin
-$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-tcnative-boringssl-static*.jar META-INF/native/libnetty_tcnative_linux_x86_64.${TCNATIVE_SUFFIX}
-$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-all*.jar META-INF/native/libnetty_transport_native_epoll_x86_64.${TCNATIVE_SUFFIX}
+$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-tcnative*.jar META-INF/native/libnetty_tcnative.${TCNATIVE_SUFFIX}
+$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-transport-native-epoll*.jar META-INF/native/libnetty_transport_native_epoll_x86_64.${TCNATIVE_SUFFIX}
 popd
 
 export CLASSPATH="${CONF_DIR}:${LIB_DIR}/*:${HADOOP_CONF_DIR}"
-JVM_ARGS="-Xmx1G -Xms1G -Dio.netty.eventLoopThreads=${NUM_SERVER_THREADS} -Dlog4j.configurationFile=${CONF_DIR}/log4j2-spring.xml"
+JVM_ARGS="-Xmx1G -Xms1G -Dio.netty.eventLoopThreads=${NUM_SERVER_THREADS}"
 JVM_ARGS="${JVM_ARGS} -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
 JVM_ARGS="${JVM_ARGS} -Djava.library.path=${NATIVE_DIR}"
+JVM_ARGS="${JVM_ARGS} -Djava.library.path=${NATIVE_DIR}/libnetty-${TCNATIVE_SUFFIX}"
 
 #JVM_ARGS="${JVM_ARGS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
 

balancer/conf/security.xml

@@ -46,12 +46,9 @@
     <user-service id="usernamePasswordService">
     	<user name="test" password="test1" authorities="A,B,C" />
     </user-service>
-
-	<beans:bean id="noOpPasswordEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
-
-	<beans:bean id="UserNamePasswordAuthenticationProvider" class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
+    
+    <beans:bean id="UserNamePasswordAuthenticationProvider" class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
 		<beans:property name="userDetailsService" ref="usernamePasswordService"/>
-		<beans:property name="passwordEncoder" ref="noOpPasswordEncoder"/>
 	</beans:bean>
 	    
 	<authentication-manager alias="authenticationManager">
@@ -60,12 +57,5 @@
 		<!-- Basic authorization provider, validates provided username and password -->
 		<authentication-provider ref="UserNamePasswordAuthenticationProvider" />
 	</authentication-manager>
-
-	<util:list id="requiredRoles" value-type="java.lang.String">
-		<beans:value></beans:value>
-	</util:list>
-
-	<util:list id="requiredAuths" value-type="java.lang.String">
-		<beans:value></beans:value>
-	</util:list>
+	
 </beans:beans>

balancer/conf/timely-balancer.yml

@@ -8,8 +8,6 @@ timely-balancer:
   assignmentFile: /timely/balancer/assignments.csv
   security:
     session-max-age: 86400
-    cache-expiration-minutes: 60
-    cache-refresh-minutes: 5
     allow-anonymous-http-access: true
     allow-anonymous-ws-access: true
     serverSsl:

balancer/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>timely-balancer</artifactId>
   <dependencies>
@@ -161,7 +161,9 @@
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
+      <artifactId>netty-tcnative</artifactId>
+      <version>${version.netty-tcnative}</version>
+      <classifier>${os.detected.classifier}</classifier>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -245,8 +247,9 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>io.netty</groupId>
-                  <artifactId>netty-tcnative-boringssl-static</artifactId>
+                  <artifactId>netty-tcnative</artifactId>
                   <version>${version.netty-tcnative}</version>
+                  <classifier>${os.detected.classifier}</classifier>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/native</outputDirectory>
@@ -288,4 +291,37 @@
       </extension>
     </extensions>
   </build>
+  <profiles>
+    <profile>
+      <id>native-epoll-linux</id>
+      <activation>
+        <os>
+          <family>!mac</family>
+        </os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-epoll</artifactId>
+          <version>${version.netty}</version>
+          <classifier>linux-x86_64</classifier>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>native-epoll</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-epoll</artifactId>
+          <version>${version.netty}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

balancer/src/main/java/timely/balancer/Balancer.java

@@ -25,7 +25,6 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.WriteBufferWaterMark;
 import io.netty.channel.epoll.EpollChannelOption;
 import io.netty.channel.epoll.EpollDatagramChannel;
 import io.netty.channel.epoll.EpollEventLoopGroup;
@@ -65,7 +64,6 @@ import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import timely.auth.AuthCache;
@@ -145,7 +143,7 @@ public class Balancer {
     }
 
     protected static ConfigurableApplicationContext initializeConfiguration(String[] args) {
-        return new SpringApplicationBuilder(SpringBootstrap.class).web(WebApplicationType.NONE).run(args);
+        return new SpringApplicationBuilder(SpringBootstrap.class).web(false).run(args);
     }
 
     private void shutdownHook() {
@@ -365,7 +363,7 @@ public class Balancer {
         curatorFramework.start();
         ensureZkPaths(curatorFramework, zkPaths);
 
-        AuthCache.configure(balancerConfig.getSecurity());
+        AuthCache.setSessionMaxAge(balancerConfig.getSecurity());
         final boolean useEpoll = useEpoll();
         Class<? extends ServerSocketChannel> channelClass;
         Class<? extends Channel> datagramChannelClass;
@@ -431,8 +429,7 @@ public class Balancer {
         httpServer.group(httpBossGroup, httpWorkerGroup);
         httpServer.channel(channelClass);
         httpServer.handler(new LoggingHandler());
-        HttpClientPool httpClientPool = new HttpClientPool(balancerConfig.getSecurity(), balancerConfig.getHttp(),
-                clientSSLContext);
+        HttpClientPool httpClientPool = new HttpClientPool(balancerConfig, clientSSLContext);
         httpServer.childHandler(setupHttpChannel(balancerConfig, sslCtx, metricResolver, httpClientPool));
         httpServer.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
         httpServer.option(ChannelOption.SO_BACKLOG, 128);
@@ -451,9 +448,10 @@ public class Balancer {
         wsServer.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
         wsServer.option(ChannelOption.SO_BACKLOG, 128);
         wsServer.option(ChannelOption.SO_KEEPALIVE, true);
-        /* Not sure if next two lines are necessary */
+        /* Not sure if next three lines are necessary */
         wsServer.option(ChannelOption.SO_SNDBUF, 1048576);
-        wsServer.option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(620145, 838860));
+        wsServer.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 838860);
+        wsServer.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 620145);
         wsChannelHandle = wsServer.bind(wsIp, wsPort).sync().channel();
         final String wsAddress = ((InetSocketAddress) wsChannelHandle.localAddress()).getAddress().getHostAddress();
 
@@ -511,14 +509,15 @@ public class Balancer {
                 ch.pipeline().addLast("decoder", new HttpRequestDecoder());
                 ch.pipeline().addLast("compressor", new HttpContentCompressor());
                 ch.pipeline().addLast("decompressor", new HttpContentDecompressor());
-                ch.pipeline().addLast("aggregator", new HttpObjectAggregator(65536));
+                ch.pipeline().addLast("aggregator", new HttpObjectAggregator(8192));
                 ch.pipeline().addLast("chunker", new ChunkedWriteHandler());
                 ch.pipeline().addLast("queryDecoder", new timely.netty.http.HttpRequestDecoder(
                         balancerConfig.getSecurity(), balancerConfig.getHttp()));
                 ch.pipeline().addLast("fileServer", new HttpStaticFileServerHandler());
                 ch.pipeline().addLast("login",
                         new X509LoginRequestHandler(balancerConfig.getSecurity(), balancerConfig.getHttp()));
-                ch.pipeline().addLast("httpRelay", new HttpRelayHandler(metricResolver, httpClientPool));
+                ch.pipeline().addLast("httpRelay",
+                        new HttpRelayHandler(balancerConfig, metricResolver, httpClientPool));
                 ch.pipeline().addLast("error", new TimelyExceptionHandler());
             }
         };
@@ -532,7 +531,7 @@ public class Balancer {
                 ch.pipeline().addLast("logger", new LoggingHandler());
                 ch.pipeline().addLast("packetDecoder", new UdpPacketToByteBuf());
                 ch.pipeline().addLast("buffer", new MetricsBufferDecoder());
-                ch.pipeline().addLast("frame", new DelimiterBasedFrameDecoder(65536, true, Delimiters.lineDelimiter()));
+                ch.pipeline().addLast("frame", new DelimiterBasedFrameDecoder(8192, true, Delimiters.lineDelimiter()));
                 ch.pipeline().addLast("putDecoder", new UdpDecoder());
                 ch.pipeline().addLast("udpRelayHandler", new UdpRelayHandler(metricResolver, udpClientPool));
             }
@@ -545,7 +544,7 @@ public class Balancer {
             @Override
             protected void initChannel(SocketChannel ch) throws Exception {
                 ch.pipeline().addLast("buffer", new MetricsBufferDecoder());
-                ch.pipeline().addLast("frame", new DelimiterBasedFrameDecoder(65536, true, Delimiters.lineDelimiter()));
+                ch.pipeline().addLast("frame", new DelimiterBasedFrameDecoder(8192, true, Delimiters.lineDelimiter()));
                 ch.pipeline().addLast("putDecoder", new TcpDecoder());
                 ch.pipeline().addLast("tcpRelayHandler", new TcpRelayHandler(metricResolver, tcpClientPools));
                 ch.pipeline().addLast("versionHandler", new TcpVersionHandler());
@@ -561,13 +560,13 @@ public class Balancer {
             protected void initChannel(SocketChannel ch) throws Exception {
                 ch.pipeline().addLast("ssl", sslCtx.newHandler(ch.alloc()));
                 ch.pipeline().addLast("httpServer", new HttpServerCodec());
-                ch.pipeline().addLast("aggregator", new HttpObjectAggregator(65536));
+                ch.pipeline().addLast("aggregator", new HttpObjectAggregator(8192));
                 ch.pipeline().addLast("sessionExtractor", new WebSocketFullRequestHandler());
 
                 ch.pipeline().addLast("idle-handler",
                         new IdleStateHandler(balancerConfig.getWebsocket().getTimeout(), 0, 0));
                 ch.pipeline().addLast("ws-protocol",
-                        new WebSocketServerProtocolHandler(WS_PATH, null, true, 65536, false, true));
+                        new WebSocketServerProtocolHandler(WS_PATH, null, true, 65536, true));
                 ch.pipeline().addLast("wsDecoder", new WebSocketRequestDecoder(balancerConfig.getSecurity()));
                 ch.pipeline().addLast("httpRelay", new WsRelayHandler(balancerConfig, metricResolver, wsClientPool));
                 ch.pipeline().addLast("error", new WSTimelyExceptionHandler());

balancer/src/main/java/timely/balancer/configuration/BalancerConfiguration.java

@@ -5,10 +5,8 @@ import javax.validation.Valid;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
 import timely.configuration.Cache;
 
-@Validated
 @Component
 @ConfigurationProperties(prefix = "timely-balancer")
 public class BalancerConfiguration {

balancer/src/main/java/timely/balancer/configuration/BalancerHttp.java

@@ -3,7 +3,6 @@ package timely.balancer.configuration;
 import javax.validation.Valid;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import timely.configuration.Http;
 
@@ -11,9 +10,9 @@ public class BalancerHttp extends Http {
 
     @Valid
     @NestedConfigurationProperty
-    private GenericKeyedObjectPoolConfig<CloseableHttpClient> httpClientPool = new GenericKeyedObjectPoolConfig<>();
+    private GenericKeyedObjectPoolConfig httpClientPool = new GenericKeyedObjectPoolConfig();
 
-    public GenericKeyedObjectPoolConfig<CloseableHttpClient> getHttpClientPool() {
+    public GenericKeyedObjectPoolConfig getHttpClientPool() {
         return httpClientPool;
     }
 }

balancer/src/main/java/timely/balancer/configuration/BalancerServer.java

@@ -4,29 +4,27 @@ import javax.validation.Valid;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import timely.client.tcp.TcpClient;
-import timely.client.udp.UdpClient;
 import timely.configuration.Server;
 
 public class BalancerServer extends Server {
 
     @Valid
     @NestedConfigurationProperty
-    private GenericKeyedObjectPoolConfig<UdpClient> udpClientPool = new GenericKeyedObjectPoolConfig<>();
+    private GenericKeyedObjectPoolConfig udpClientPool = new GenericKeyedObjectPoolConfig();
 
     @Valid
     @NestedConfigurationProperty
-    private GenericKeyedObjectPoolConfig<TcpClient> tcpClientPool = new GenericKeyedObjectPoolConfig<>();
+    private GenericKeyedObjectPoolConfig tcpClientPool = new GenericKeyedObjectPoolConfig();
 
     private int numTcpPools = 1;
 
     private int tcpBufferSize = -1;
 
-    public GenericKeyedObjectPoolConfig<UdpClient> getUdpClientPool() {
+    public GenericKeyedObjectPoolConfig getUdpClientPool() {
         return udpClientPool;
     }
 
-    public GenericKeyedObjectPoolConfig<TcpClient> getTcpClientPool() {
+    public GenericKeyedObjectPoolConfig getTcpClientPool() {
         return tcpClientPool;
     }
 

balancer/src/main/java/timely/balancer/configuration/BalancerWebsocket.java

@@ -4,16 +4,15 @@ import javax.validation.Valid;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import timely.client.websocket.subscription.WebSocketSubscriptionClient;
 import timely.configuration.Websocket;
 
 public class BalancerWebsocket extends Websocket {
 
     @Valid
     @NestedConfigurationProperty
-    private GenericKeyedObjectPoolConfig<WebSocketSubscriptionClient> wsClientPool = new GenericKeyedObjectPoolConfig<>();
+    private GenericKeyedObjectPoolConfig wsClientPool = new GenericKeyedObjectPoolConfig();
 
-    public GenericKeyedObjectPoolConfig<WebSocketSubscriptionClient> getWsClientPool() {
+    public GenericKeyedObjectPoolConfig getWsClientPool() {
         return wsClientPool;
     }
 }

balancer/src/main/java/timely/balancer/connection/http/HttpClientFactory.java

@@ -5,25 +5,27 @@ import javax.net.ssl.SSLContext;
 import org.apache.commons.pool2.KeyedPooledObjectFactory;
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.CloseableHttpClient;
-import timely.balancer.configuration.BalancerSecurity;
+import timely.balancer.configuration.BalancerConfiguration;
 import timely.balancer.connection.TimelyBalancedHost;
 
 public class HttpClientFactory implements KeyedPooledObjectFactory<TimelyBalancedHost, CloseableHttpClient> {
 
     private final SSLContext sslContext;
-    private final BalancerSecurity security;
+    private final BalancerConfiguration balancerConfig;
 
-    public HttpClientFactory(BalancerSecurity security, SSLContext sslContext) {
-        this.security = security;
+    public HttpClientFactory(BalancerConfiguration balancerConfig, SSLContext sslContext) {
+        this.balancerConfig = balancerConfig;
         this.sslContext = sslContext;
     }
 
     @Override
     public PooledObject<CloseableHttpClient> makeObject(TimelyBalancedHost k) throws Exception {
-        // disable cookie management because we are sharing connections
-        return new DefaultPooledObject<>(timely.client.http.HttpClient.get(this.sslContext, null,
-                security.getClientSsl().isHostVerificationEnabled(), security.getClientSsl().isUseClientCert()));
+        BasicCookieStore cookieJar = new BasicCookieStore();
+        return new DefaultPooledObject<>(timely.client.http.HttpClient.get(this.sslContext, cookieJar,
+                balancerConfig.getSecurity().getClientSsl().isHostVerificationEnabled(),
+                balancerConfig.getSecurity().getClientSsl().isUseClientCert()));
     }
 
     @Override

balancer/src/main/java/timely/balancer/connection/http/HttpClientPool.java

@@ -4,13 +4,16 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
 import org.apache.http.impl.client.CloseableHttpClient;
-import timely.balancer.configuration.BalancerHttp;
-import timely.balancer.configuration.BalancerSecurity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import timely.balancer.configuration.BalancerConfiguration;
 import timely.balancer.connection.TimelyBalancedHost;
 
 public class HttpClientPool extends GenericKeyedObjectPool<TimelyBalancedHost, CloseableHttpClient> {
 
-    public HttpClientPool(BalancerSecurity balancerSecurity, BalancerHttp http, SSLContext sslContext) {
-        super(new HttpClientFactory(balancerSecurity, sslContext), http.getHttpClientPool());
+    private static final Logger LOG = LoggerFactory.getLogger(HttpClientPool.class);
+
+    public HttpClientPool(BalancerConfiguration balancerConfig, SSLContext sslContext) {
+        super(new HttpClientFactory(balancerConfig, sslContext), balancerConfig.getHttp().getHttpClientPool());
     }
 }

balancer/src/main/java/timely/balancer/netty/http/HttpRelayHandler.java

@@ -1,8 +1,9 @@
 package timely.balancer.netty.http;
 
-import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
+import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_LENGTH;
 
 import java.io.ByteArrayOutputStream;
+import java.net.URI;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -40,6 +41,7 @@ import timely.api.request.timeseries.QueryRequest;
 import timely.api.response.TimelyException;
 import timely.auth.util.HttpHeaderUtils;
 import timely.auth.util.ProxiedEntityUtils;
+import timely.balancer.configuration.BalancerConfiguration;
 import timely.balancer.connection.TimelyBalancedHost;
 import timely.balancer.connection.http.HttpClientPool;
 import timely.balancer.resolver.MetricResolver;
@@ -49,10 +51,13 @@ import timely.netty.http.auth.TimelyAuthenticationToken;
 public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> implements TimelyHttpHandler {
 
     private static final Logger LOG = LoggerFactory.getLogger(HttpRelayHandler.class);
+    private final BalancerConfiguration balancerConf;
     private final HttpClientPool httpClientPool;
     private MetricResolver metricResolver;
 
-    public HttpRelayHandler(MetricResolver metricResolver, HttpClientPool httpClientPool) {
+    public HttpRelayHandler(BalancerConfiguration balancerConf, MetricResolver metricResolver,
+            HttpClientPool httpClientPool) {
+        this.balancerConf = balancerConf;
         this.metricResolver = metricResolver;
         this.httpClientPool = httpClientPool;
     }
@@ -67,7 +72,7 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
         try {
             try {
                 request = msg.getHttpRequest();
-                String originalURI = request.uri();
+                String originalURI = request.getUri();
                 originalURI = encodeURI(originalURI);
 
                 String metric = null;
@@ -86,6 +91,7 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
                 } else {
                     k = metricResolver.getHostPortKey(null);
                 }
+                k = metricResolver.getHostPortKey(metric);
                 client = httpClientPool.borrowObject(k);
 
                 Multimap<String, String> headers = HttpHeaderUtils.toMultimap(request.headers());
@@ -101,7 +107,7 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
 
                 List<Header> relayedHeaderList = new ArrayList<>();
                 for (Map.Entry<String, String> h : headers.entries()) {
-                    if (!h.getKey().equals(CONTENT_LENGTH.toString())) {
+                    if (!h.getKey().equals(CONTENT_LENGTH)) {
                         relayedHeaderList.add(new BasicHeader(h.getKey(), h.getValue()));
                     }
                 }
@@ -109,14 +115,14 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
                 relayedHeaderList.toArray(headerArray);
 
                 String relayURI = "https://" + k.getHost() + ":" + k.getHttpPort() + originalURI;
-                if (request.method().equals(HttpMethod.GET)) {
+                if (request.getMethod().equals(HttpMethod.GET)) {
                     HttpUriRequest relayedRequest = new HttpGet(relayURI);
                     if (headerArray.length > 0) {
                         relayedRequest.setHeaders(headerArray);
                     }
                     relayedResponse = client.execute(relayedRequest);
 
-                } else if (request.method().equals(HttpMethod.POST)) {
+                } else if (request.getMethod().equals(HttpMethod.POST)) {
                     HttpPost relayedRequest = new HttpPost(relayURI);
 
                     String content = request.content().toString(StandardCharsets.UTF_8);
@@ -170,7 +176,7 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
             if (client != null && k != null) {
                 httpClientPool.returnObject(k, client);
             } else {
-                LOG.error("NOT RETURNING CONNECTION! " + msg.getHttpRequest().uri());
+                LOG.error("NOT RETURNING CONNECTION! " + msg.getHttpRequest().getUri());
             }
         }
     }
@@ -202,4 +208,13 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
         }
         return s;
     }
+
+    public static void main(String[] args) {
+
+        String s = "https://127.0.0.1:4243/api/query?start=1356998400000&end=1528398304000&m=sum:rate{false,100,0}:sys.thermal.gauge{class=aws}";
+        URI uri = URI.create(encodeURI(s));
+
+        System.out.println(uri.toString());
+    }
+
 }

balancer/src/main/java/timely/balancer/netty/ws/WsClientHandler.java

@@ -45,7 +45,7 @@ public class WsClientHandler extends ClientHandler {
             Multimap<String, String> proxyRequestHeaders = HashMultimap.create();
             ProxiedEntityUtils.addProxyHeaders(proxyRequestHeaders, token.getClientCert());
             for (String s : proxyRequestHeaders.keySet()) {
-                headers.put(s, new ArrayList<>(proxyRequestHeaders.get(s)));
+                headers.put(s, new ArrayList(proxyRequestHeaders.get(s)));
             }
         }
 
@@ -53,7 +53,7 @@ public class WsClientHandler extends ClientHandler {
         for (String s : originalRequestHeaders.keySet()) {
             if (!headers.containsKey(s)) {
                 // add pre-existing values if key does not exist in proxyRequest
-                headers.put(s, new ArrayList<>(originalRequestHeaders.get(s)));
+                headers.put(s, new ArrayList(originalRequestHeaders.get(s)));
             }
         }
     }

balancer/src/main/java/timely/balancer/resolver/BalancedMetricResolver.java

@@ -265,15 +265,15 @@ public class BalancedMetricResolver implements MetricResolver {
 
     private void startServiceListener(CuratorFramework curatorFramework) {
         try {
-            ServiceDiscovery<ServerDetails> discovery = ServiceDiscoveryBuilder.builder(ServerDetails.class)
-                    .client(curatorFramework).basePath(SERVICE_DISCOVERY_PATH).build();
+            ServiceDiscovery discovery = ServiceDiscoveryBuilder.builder(ServerDetails.class).client(curatorFramework)
+                    .basePath(SERVICE_DISCOVERY_PATH).build();
             discovery.start();
-            Collection<ServiceInstance<ServerDetails>> instances = discovery.queryForInstances("timely-server");
+            Collection<ServiceInstance> instances = discovery.queryForInstances("timely-server");
 
             balancerLock.writeLock().lock();
             try {
-                for (ServiceInstance<ServerDetails> si : instances) {
-                    ServerDetails pl = si.getPayload();
+                for (ServiceInstance si : instances) {
+                    ServerDetails pl = (ServerDetails) si.getPayload();
                     TimelyBalancedHost tbh = TimelyBalancedHost.of(pl.getHost(), pl.getTcpPort(), pl.getHttpPort(),
                             pl.getWsPort(), pl.getUdpPort());
                     LOG.info("adding service {} host:{} tcpPort:{} httpPort:{} wsPort:{} udpPort:{}", si.getId(),
@@ -286,8 +286,7 @@ public class BalancedMetricResolver implements MetricResolver {
                 balancerLock.writeLock().unlock();
             }
 
-            final ServiceCache<ServerDetails> serviceCache = discovery.serviceCacheBuilder().name("timely-server")
-                    .build();
+            final ServiceCache serviceCache = discovery.serviceCacheBuilder().name("timely-server").build();
             ServiceCacheListener listener = new ServiceCacheListener() {
 
                 @Override
@@ -295,9 +294,9 @@ public class BalancedMetricResolver implements MetricResolver {
                     boolean rebalanceNeeded = false;
                     balancerLock.writeLock().lock();
                     try {
-                        List<ServiceInstance<ServerDetails>> instances = serviceCache.getInstances();
+                        List<ServiceInstance> instances = serviceCache.getInstances();
                         Set<TimelyBalancedHost> availableHosts = new HashSet<>();
-                        for (ServiceInstance<ServerDetails> si : instances) {
+                        for (ServiceInstance si : instances) {
                             ServerDetails pl = (ServerDetails) si.getPayload();
                             TimelyBalancedHost tbh = TimelyBalancedHost.of(pl.getHost(), pl.getTcpPort(),
                                     pl.getHttpPort(), pl.getWsPort(), pl.getUdpPort());

client/pom.xml

@@ -4,13 +4,12 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>timely-client</artifactId>
   <properties>
     <!-- PEP 440 compliant version gets substituted into src/main/python/template/setup.py -->
-    <!-- use .dev0 instead of -SNAPSHOT -->
-    <python.client.version>1.2.5.dev0</python.client.version>
+    <python.client.version>1.1.1.dev0</python.client.version>
   </properties>
   <dependencies>
     <dependency>

client/src/main/java/timely/client/http/HttpClient.java

@@ -46,21 +46,15 @@ public class HttpClient {
 
     public static CloseableHttpClient get(SSLContext ssl, CookieStore cookieStore, boolean hostVerificationEnabled,
             boolean clientAuth) {
+        RequestConfig defaultRequestConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
         HostnameVerifier hostnameVerifier;
         if (hostVerificationEnabled) {
             hostnameVerifier = SSLConnectionSocketFactory.getDefaultHostnameVerifier();
         } else {
             hostnameVerifier = new NoopHostnameVerifier();
         }
-        RequestConfig defaultRequestConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
-        HttpClientBuilder builder;
-        if (cookieStore == null) {
-            builder = HttpClients.custom().setSSLContext(ssl).disableCookieManagement()
-                    .setDefaultRequestConfig(defaultRequestConfig).setSSLHostnameVerifier(hostnameVerifier);
-        } else {
-            builder = HttpClients.custom().setSSLContext(ssl).setDefaultCookieStore(cookieStore)
-                    .setDefaultRequestConfig(defaultRequestConfig).setSSLHostnameVerifier(hostnameVerifier);
-        }
+        HttpClientBuilder builder = HttpClients.custom().setSSLContext(ssl).setDefaultCookieStore(cookieStore)
+                .setDefaultRequestConfig(defaultRequestConfig).setSSLHostnameVerifier(hostnameVerifier);
 
         if (clientAuth) {
             SSLConnectionSocketFactory sslCSF = new SSLConnectionSocketFactory(ssl,

client/src/main/java/timely/client/tcp/TcpClient.java

@@ -47,6 +47,7 @@ public class TcpClient implements AutoCloseable {
      * 
      * @param metric
      *            newline terminated string representation of Timely metric
+     * @throws IOException
      */
     public synchronized void write(String metric) throws IOException {
         if (connect() != 0) {

client/src/main/java/timely/model/ObjectSizeOf.java

@@ -62,6 +62,7 @@ public interface ObjectSizeOf {
          * ObjectSizeOf interface and if implemented on the object will use that.
          * Otherwise it will do a simple navigation of the fields using reflection.
          *
+         * @param o
          * @return an approximation of the object size
          */
         public static long getObjectSize(Object o, boolean useSizeInBytesMethod, boolean debug) {

client/src/main/java/timely/model/Tag.java

@@ -77,6 +77,8 @@ public class Tag implements Comparable<Tag>, Serializable {
 
     /**
      * Joins key and value into key=value
+     * 
+     * @return
      */
     public String join() {
         return tagParser.combine(this);

client/src/main/java/timely/model/parse/TagListParser.java

@@ -47,6 +47,7 @@ public class TagListParser implements Parser<List<Tag>>, Combiner<Collection<Tag
      * An alternative combiner for a map of string to string instead of a list of
      * tags
      * 
+     * @param tags
      * @return string representation
      */
     public String combine(Map<String, String> tags) {

client/src/test/java/timely/api/SerializationTest.java

@@ -47,9 +47,9 @@ public class SerializationTest {
         testSerialization(remove);
     }
 
+    @SuppressWarnings("unchecked")
     private <T> void testSerialization(T o) throws Exception {
         String ser = mapper.writeValueAsString(o);
-        @SuppressWarnings("unchecked")
         T des = mapper.readValue(ser, (Class<T>) o.getClass());
         Assert.assertEquals(o, des);
     }

collectd-nsq-plugin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>collectd-nsq-plugin</artifactId>
   <dependencies>

collectd-nsq-plugin/src/main/java/timely/collectd/plugin/PooledCloseableHttpClientFactory.java

@@ -10,7 +10,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.collectd.api.OConfigItem;
 
-public class PooledCloseableHttpClientFactory implements PooledObjectFactory<CloseableHttpClient> {
+public class PooledCloseableHttpClientFactory implements PooledObjectFactory {
 
     private int connectionRequestTimeout = 10000; // 10 seconds in milliseconds
     private int connectTimeout = 30000; // 30 seconds in milliseconds
@@ -43,19 +43,19 @@ public class PooledCloseableHttpClientFactory implements PooledObjectFactory<Clo
     }
 
     @Override
-    public PooledObject<CloseableHttpClient> makeObject() throws Exception {
+    public PooledObject makeObject() throws Exception {
         RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(connectionRequestTimeout)
                 .setConnectTimeout(connectTimeout).setSocketTimeout(socketTimeout).build();
         HttpClientBuilder builder = HttpClientBuilder.create();
         builder.setDefaultRequestConfig(requestConfig);
         builder.setConnectionTimeToLive(connectionTimeToLive, TimeUnit.MILLISECONDS);
-        return new DefaultPooledObject<>(builder.build());
+        return new DefaultPooledObject(builder.build());
     }
 
     @Override
-    public void destroyObject(PooledObject<CloseableHttpClient> pooledObject) throws Exception {
+    public void destroyObject(PooledObject pooledObject) throws Exception {
         try {
-            pooledObject.getObject().close();
+            ((CloseableHttpClient) pooledObject.getObject()).close();
         } catch (Exception e) {
             // do nothing
         } finally {
@@ -65,17 +65,17 @@ public class PooledCloseableHttpClientFactory implements PooledObjectFactory<Clo
     }
 
     @Override
-    public boolean validateObject(PooledObject<CloseableHttpClient> pooledObject) {
+    public boolean validateObject(PooledObject pooledObject) {
         return pooledObject.getObject() != null;
     }
 
     @Override
-    public void activateObject(PooledObject<CloseableHttpClient> pooledObject) throws Exception {
+    public void activateObject(PooledObject pooledObject) throws Exception {
         // do nothing
     }
 
     @Override
-    public void passivateObject(PooledObject<CloseableHttpClient> pooledObject) throws Exception {
+    public void passivateObject(PooledObject pooledObject) throws Exception {
         // do nothing
     }
 

collectd-nsq-plugin/src/main/java/timely/collectd/plugin/WriteNSQPlugin.java

@@ -47,7 +47,6 @@ public class WriteNSQPlugin extends CollectDPluginParent
         Collectd.registerWrite(WriteNSQPlugin.class.getName(), this);
     }
 
-    @Override
     public int write(ValueList vl) {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream out = new DataOutputStream(baos);
@@ -111,17 +110,15 @@ public class WriteNSQPlugin extends CollectDPluginParent
         }
     }
 
-    @Override
     public int shutdown() {
         Collectd.logInfo("Shutting down connection to NSQ at " + host + ":" + port);
         clientPool.close();
         return 0;
     }
 
-    @Override
     public int config(OConfigItem config) {
         super.config(config);
-        GenericObjectPoolConfig<CloseableHttpClient> poolConfig = new GenericObjectPoolConfig<>();
+        GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
         // use max size for maxTotal and maxIdle
         // no need to activate or passivate
         poolConfig.setMaxTotal(POOL_MAX_SIZE);
@@ -159,7 +156,7 @@ public class WriteNSQPlugin extends CollectDPluginParent
             Collectd.logError("NSQ host, port, and topic must be configured");
             return -1;
         }
-        this.clientPool = new GenericObjectPool<>(pooledCloseableHttpClientFactory, poolConfig);
+        this.clientPool = new GenericObjectPool(pooledCloseableHttpClientFactory, poolConfig);
         this.endpoint = "http://" + host + ":" + port + "/mpub?topic=" + topic;
         return 0;
     }

collectd-plugin-parent/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>collectd-plugin-parent</artifactId>
   <dependencies>

collectd-timely-plugin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>collectd-timely-plugin</artifactId>
   <dependencies>

collectd-timely-plugin/src/main/java/timely/collectd/plugin/PooledSocketFactory.java

@@ -8,7 +8,7 @@ import org.apache.commons.pool2.impl.DefaultPooledObject;
 import org.collectd.api.Collectd;
 import org.collectd.api.OConfigItem;
 
-public class PooledSocketFactory implements PooledObjectFactory<Socket> {
+public class PooledSocketFactory implements PooledObjectFactory {
 
     private String host = null;
     private int port = 0;
@@ -81,12 +81,12 @@ public class PooledSocketFactory implements PooledObjectFactory<Socket> {
     }
 
     @Override
-    public PooledObject<Socket> makeObject() throws Exception {
-        return new DefaultPooledObject<>(connect());
+    public PooledObject makeObject() throws Exception {
+        return new DefaultPooledObject(connect());
     }
 
     @Override
-    public void destroyObject(PooledObject<Socket> pooledObject) throws Exception {
+    public void destroyObject(PooledObject pooledObject) throws Exception {
         try {
             Collectd.logDebug("Shutting down connection to Timely at " + host + ":" + port);
             Socket socket = (Socket) pooledObject.getObject();
@@ -103,7 +103,7 @@ public class PooledSocketFactory implements PooledObjectFactory<Socket> {
     }
 
     @Override
-    public boolean validateObject(PooledObject<Socket> pooledObject) {
+    public boolean validateObject(PooledObject pooledObject) {
         if (connectionTimeToLive > -1) {
             if (System.currentTimeMillis() > pooledObject.getCreateTime() + connectionTimeToLive) {
                 return false;
@@ -114,12 +114,12 @@ public class PooledSocketFactory implements PooledObjectFactory<Socket> {
     }
 
     @Override
-    public void activateObject(PooledObject<Socket> pooledObject) throws Exception {
+    public void activateObject(PooledObject pooledObject) throws Exception {
         // do nothing
     }
 
     @Override
-    public void passivateObject(PooledObject<Socket> pooledObject) throws Exception {
+    public void passivateObject(PooledObject pooledObject) throws Exception {
         // do nothing
     }
 }

collectd-timely-plugin/src/main/java/timely/collectd/plugin/WriteTimelyPlugin.java

@@ -86,13 +86,13 @@ public class WriteTimelyPlugin extends CollectDPluginParent
         PooledSocketFactory socketFactory = new PooledSocketFactory();
         retval = socketFactory.config(config);
         if (retval == 0) {
-            GenericObjectPoolConfig<Socket> poolConfig = new GenericObjectPoolConfig<>();
+            GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
             // use max size for maxTotal and maxIdle
             // no need to activate and passivate
             poolConfig.setMaxTotal(POOL_MAX_SIZE);
             poolConfig.setMaxIdle(POOL_MAX_SIZE);
             poolConfig.setTestOnReturn(true);
-            socketPool = new GenericObjectPool<>(socketFactory, poolConfig);
+            socketPool = new GenericObjectPool(socketFactory, poolConfig);
         }
         return retval;
     }

common/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>timely-common</artifactId>
   <dependencies>

grafana-auth/bin/grafana-auth.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-if [[ `uname` == "Darwin" ]]; then
-        THIS_SCRIPT=`python -c 'import os,sys; print os.path.realpath(sys.argv[1])' $0`
-        TCNATIVE_SUFFIX="jnilib"
-else
-        THIS_SCRIPT=`readlink -f $0`
-        TCNATIVE_SUFFIX="so"
-fi
-
-THIS_DIR="${THIS_SCRIPT%/*}"
-NATIVE_DIR="${THIS_DIR}/META-INF/native"
-BASE_DIR=${THIS_DIR}/..
-TMP_DIR="${BASE_DIR}/tmp"
-CONF_DIR="${BASE_DIR}/conf"
-LIB_DIR="${BASE_DIR}/lib"
-NUM_SERVER_THREADS=4
-
-if [[ -e ${TMP_DIR} ]]; then
-  rm -rf ${TMP_DIR}
-fi
-mkdir ${TMP_DIR}
-
-if [[ -e ${NATIVE_DIR} ]]; then
-  rm -rf ${NATIVE_DIR}
-fi
-mkdir -p ${NATIVE_DIR}
-
-pushd ${BASE_DIR}/bin
-$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-tcnative-boringssl-static*.jar META-INF/native/libnetty_tcnative_linux_x86_64.${TCNATIVE_SUFFIX}
-$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-all*.jar META-INF/native/libnetty_transport_native_epoll_x86_64.${TCNATIVE_SUFFIX}
-popd
-
-export CLASSPATH="${CONF_DIR}:${LIB_DIR}/*:${HADOOP_CONF_DIR}"
-JVM_ARGS="-Xmx1G -Xms1G -Dio.netty.eventLoopThreads=${NUM_SERVER_THREADS} Dlog4j.configurationFile=${CONF_DIR}/log4j2-spring.xml"
-JVM_ARGS="${JVM_ARGS} -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
-JVM_ARGS="${JVM_ARGS} -Djava.library.path=${NATIVE_DIR}"
-
-#JVM_ARGS="${JVM_ARGS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
-
-echo "$JAVA_HOME/bin/java ${JVM_ARGS} timely.grafana.auth.GrafanaAuth --spring.config.name=grafana-auth"
-$JAVA_HOME/bin/java ${JVM_ARGS} timely.grafana.auth.GrafanaAuth --spring.config.name=grafana-auth

grafana-auth/conf/grafana-auth.yml

@@ -1,55 +0,0 @@
-grafana-auth:
-  grafana:
-    host: localhost
-    port: 3001
-  security:
-    session-max-age: 86400
-    cache-expiration-minutes: 60
-    cache-refresh-minutes: 5
-    allow-anonymous-http-access: true
-    allow-anonymous-ws-access: true
-    serverSsl:
-      certificate-file:
-      key-file:
-      #key-password:
-      use-generated-keypair: true
-      trust-store-file:
-      use-openssl: true
-      #use-ciphers:
-    clientSsl:
-      keyFile:
-      keyType: pkcs12
-      #keyPassword:
-      trustStoreFile:
-      trustStoreType: jks
-      #trustStorePassword:
-  http:
-    host: localhost
-    ip: 127.0.0.1
-    port: 3000
-    redirect-path: /secure-me
-    strict-transport-max-age: 608400
-    cors:
-      allow-any-origin: false
-      allow-null-origin: false
-      allow-credentials: true
-      allowed-origins:
-      allowed-methods: DELETE,GET,HEAD,OPTIONS,PUT,POST
-      allowed-headers: content-type
-    httpClientPool:
-      minIdlePerKey: 0
-      maxIdlePerKey: 40
-      maxTotalPerKey: 40
-      maxTotal: -1
-      lifo: true
-      fairness: false
-      maxWaitMillis: -1
-      minEvictableIdleTimeMillis: 1800000
-      evictorShutdownTimeoutMillis: 10000
-      softMinEvictableIdleTimeMillis: -1
-      numTestsPerEvictionRun: 3
-      timeBetweenEvictionRunsMillis: -1
-      blockWhenExhausted: true
-      jmxEnabled: true
-      testOnBorrow: false
-      testOnReturn: false

grafana-auth/conf/log4j2-error-console.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="warn" monitorInterval="60">
-  <Appenders>
-    <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Root level="error" includeLocation="false">
-      <AppenderRef ref="Console" level="error" />
-    </Root>
-  </Loggers>
-</Configuration>

grafana-auth/conf/log4j2-spring.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="warn" monitorInterval="60">
-  <Properties>
-    <Property name="PID">????</Property>
-    <Property name="LOG_PATTERN">%clr{%d{yyyy-MM-dd HH:mm:ss.SSS}}{faint} %clr{%5p} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n%wEx</Property>
-  </Properties>
-  <Appenders>
-    <RollingRandomAccessFile name="Rolling" fileName="/srv/logs/timely/grafana-auth.log"
-    						 filePattern="/srv/logs/timely/$${date:yyyy-MM}/grafana-auth-%d{MM-dd-yyyy}-%i.log.gz">
-      <PatternLayout pattern="${LOG_PATTERN}"/>
-      <Policies>
-      	<SizeBasedTriggeringPolicy size="1024 MB" />
-      </Policies>
-      <DefaultRolloverStrategy max="10" />
-    </RollingRandomAccessFile>
-    <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="${LOG_PATTERN}"/>
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Root level="trace" includeLocation="false">
-      <AppenderRef ref="Console" level="warn" />
-      <AppenderRef ref="Rolling" level="trace" />
-    </Root>
-    <Logger name="timely" additivity="false">
-      <AppenderRef ref="Console" level="debug" />
-    </Logger>
-  </Loggers>
-</Configuration>

grafana-auth/conf/security.xml

@@ -1,71 +0,0 @@
-<beans:beans xmlns="http://www.springframework.org/schema/security"
-             xmlns:beans="http://www.springframework.org/schema/beans"
-             xmlns:util="http://www.springframework.org/schema/util"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://www.springframework.org/schema/beans
-								 http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-								 http://www.springframework.org/schema/security
-								 http://www.springframework.org/schema/security/spring-security.xsd
-								 http://www.springframework.org/schema/util
-								 http://www.springframework.org/schema/util/spring-util.xsd">
-		          
-	<beans:bean id="x509PrincipalExtractor" class="org.springframework.security.web.authentication.preauth.x509.SubjectDnX509PrincipalExtractor">
-		<beans:property name="subjectDnRegex" value="CN=(.*?)(?:,|$)"/>
-	</beans:bean>
-
-	<beans:bean id="timelyUserDetailsService" class="timely.auth.UserDetailsService">
-		<beans:property name="users">
-			<util:list>
-				<beans:bean class="timely.auth.TimelyUser">
-					<beans:constructor-arg name="subjectDn">
-						<beans:value>CN=example.com</beans:value>
-					</beans:constructor-arg>
-					<beans:constructor-arg name="auths">
-						<util:list>
-							<beans:value>D</beans:value>
-							<beans:value>E</beans:value>
-							<beans:value>F</beans:value>
-						</util:list>
-					</beans:constructor-arg>
-					<beans:constructor-arg name="roles">
-						<util:list>
-							<beans:value>G</beans:value>
-							<beans:value>H</beans:value>
-							<beans:value>I</beans:value>
-						</util:list>
-					</beans:constructor-arg>
-				</beans:bean>
-			</util:list>
-		</beans:property>
-	</beans:bean>
-    
-    <beans:bean id="x509AuthorizationProvider" class="org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider">
-    	<beans:property name="preAuthenticatedUserDetailsService" ref="timelyUserDetailsService" />
-    </beans:bean>
-    
-    <user-service id="usernamePasswordService">
-    	<user name="test" password="test1" authorities="A,B,C" />
-    </user-service>
-
-	<beans:bean id="noOpPasswordEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
-
-	<beans:bean id="UserNamePasswordAuthenticationProvider" class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
-		<beans:property name="userDetailsService" ref="usernamePasswordService"/>
-		<beans:property name="passwordEncoder" ref="noOpPasswordEncoder"/>
-	</beans:bean>
-	    
-	<authentication-manager alias="authenticationManager">
-		<!-- X509 PreAuthenticated authorization provider -->
-		<authentication-provider ref="x509AuthorizationProvider"/>
-		<!-- Basic authorization provider, validates provided username and password -->
-		<authentication-provider ref="UserNamePasswordAuthenticationProvider" />
-	</authentication-manager>
-
-	<util:list id="requiredRoles" value-type="java.lang.String">
-		<beans:value></beans:value>
-	</util:list>
-
-	<util:list id="requiredAuths" value-type="java.lang.String">
-		<beans:value></beans:value>
-	</util:list>
-</beans:beans>

grafana-auth/pom.xml

@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>timely</groupId>
-    <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
-  </parent>
-  <artifactId>grafana-auth</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jdk8</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.github.ben-manes.caffeine</groupId>
-      <artifactId>caffeine</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.flatbuffers</groupId>
-      <artifactId>flatbuffers-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.github.lukehutch</groupId>
-      <artifactId>fast-classpath-scanner</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-all</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.javacsv</groupId>
-      <artifactId>javacsv</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-minicluster</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-pool2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.curator</groupId>
-      <artifactId>curator-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.curator</groupId>
-      <artifactId>curator-framework</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.curator</groupId>
-      <artifactId>curator-recipes</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.curator</groupId>
-      <artifactId>curator-x-discovery</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>jdk.tools</groupId>
-          <artifactId>jdk.tools</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-minicluster</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-websocket</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-log4j2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-config</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>timely</groupId>
-      <artifactId>timely-balancer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>timely</groupId>
-      <artifactId>timely-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>timely</groupId>
-      <artifactId>timely-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>timely</groupId>
-      <artifactId>timely-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.lmax</groupId>
-      <artifactId>disruptor</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-test-autoconfigure</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>assemble</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/dist/assembly.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <excludeArtifactIds>junit</excludeArtifactIds>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>unpack-native</id>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <phase>process-test-classes</phase>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>io.netty</groupId>
-                  <artifactId>netty-tcnative-boringssl-static</artifactId>
-                  <version>${version.netty-tcnative}</version>
-                  <type>jar</type>
-                  <overWrite>false</overWrite>
-                  <outputDirectory>${project.build.directory}/native</outputDirectory>
-                  <includes>**/*.so</includes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sources>
-                <source>src/main/generated-java</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <extensions>
-      <!-- Use os-maven-plugin to initialize the "os.detected" properties -->
-      <extension>
-        <groupId>kr.motd.maven</groupId>
-        <artifactId>os-maven-plugin</artifactId>
-      </extension>
-    </extensions>
-  </build>
-</project>

grafana-auth/src/main/dist/assembly.xml

@@ -1,55 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-  <id>dist</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>lib</outputDirectory>
-      <includes>
-        <include>timely*.jar</include>
-        <include>grafana*.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}/lib</directory>
-      <outputDirectory>lib</outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-     </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-     </fileSet>
-    <fileSet>
-      <directory>${project.basedir}/conf</directory>
-      <outputDirectory>conf</outputDirectory>
-      <includes>
-        <include>*</include>
-      </includes>
-     </fileSet>
-	<fileSet>
-	  <directory>${project.basedir}/src/main/resources/webapp</directory>
-	  <outputDirectory>bin/webapp</outputDirectory>
-	  <includes>
-		<include>*</include>
-	  </includes>
-	</fileSet>
-  </fileSets>
-</assembly>

grafana-auth/src/main/java/timely/grafana/auth/GrafanaAuth.java

@@ -1,321 +0,0 @@
-package timely.grafana.auth;
-
-import java.io.File;
-import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import javax.net.ssl.SSLContext;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.epoll.EpollServerSocketChannel;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.ServerSocketChannel;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.handler.codec.http.HttpContentCompressor;
-import io.netty.handler.codec.http.HttpContentDecompressor;
-import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.codec.http.HttpRequestDecoder;
-import io.netty.handler.codec.http.HttpResponseEncoder;
-import io.netty.handler.logging.LoggingHandler;
-import io.netty.handler.ssl.ClientAuth;
-import io.netty.handler.ssl.OpenSslServerContext;
-import io.netty.handler.ssl.OpenSslServerSessionContext;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
-import io.netty.handler.ssl.util.SelfSignedCertificate;
-import io.netty.handler.stream.ChunkedWriteHandler;
-import io.netty.util.internal.SystemPropertyUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.context.ConfigurableApplicationContext;
-import timely.auth.AuthCache;
-import timely.balancer.configuration.ClientSsl;
-import timely.balancer.connection.http.HttpClientPool;
-import timely.client.http.HttpClient;
-import timely.configuration.ServerSsl;
-import timely.grafana.auth.configuration.GrafanaAuthConfiguration;
-import timely.grafana.auth.configuration.SpringBootstrap;
-import timely.grafana.auth.netty.http.GrafanaRelayHandler;
-import timely.grafana.auth.netty.http.GrafanaRequestDecoder;
-import timely.netty.http.HttpStaticFileServerHandler;
-import timely.netty.http.NonSslRedirectHandler;
-import timely.netty.http.TimelyExceptionHandler;
-import timely.netty.http.auth.X509LoginRequestHandler;
-
-public class GrafanaAuth {
-
-    private static final Logger LOG = LoggerFactory.getLogger(GrafanaAuth.class);
-    private static final int EPOLL_MIN_MAJOR_VERSION = 2;
-    private static final int EPOLL_MIN_MINOR_VERSION = 6;
-    private static final int EPOLL_MIN_PATCH_VERSION = 32;
-    private static final String OS_NAME = "os.name";
-    private static final String OS_VERSION = "os.version";
-    protected static final CountDownLatch LATCH = new CountDownLatch(1);
-    static ConfigurableApplicationContext applicationContext;
-
-    private final GrafanaAuthConfiguration grafanaAuthConfig;
-    private EventLoopGroup httpWorkerGroup = null;
-    private EventLoopGroup httpBossGroup = null;
-    protected Channel httpChannelHandle = null;
-    protected volatile boolean shutdown = false;
-
-    public GrafanaAuth(GrafanaAuthConfiguration grafanaAuthConfig) throws Exception {
-        this.grafanaAuthConfig = grafanaAuthConfig;
-    }
-
-    protected static ConfigurableApplicationContext initializeConfiguration(String[] args) {
-        return new SpringApplicationBuilder(SpringBootstrap.class).web(WebApplicationType.NONE).run(args);
-    }
-
-    private void shutdownHook() {
-
-        final Runnable shutdownRunner = () -> {
-            if (!shutdown) {
-                shutdown();
-            }
-        };
-        final Thread hook = new Thread(shutdownRunner, "shutdown-hook-thread");
-        Runtime.getRuntime().addShutdownHook(hook);
-    }
-
-    public void shutdown() {
-        List<ChannelFuture> channelFutures = new ArrayList<>();
-
-        if (httpChannelHandle != null) {
-            LOG.info("Closing httpChannelHandle");
-            channelFutures.add(httpChannelHandle.close());
-        }
-
-        // wait for the channels to shutdown
-        channelFutures.forEach(f -> {
-            try {
-                f.get();
-            } catch (final Exception e) {
-                LOG.error("Error while shutting down channel: {}", f.channel().config());
-                LOG.error("{}", e.getMessage());
-                e.printStackTrace();
-            }
-        });
-
-        Integer quietPeriod = grafanaAuthConfig.getShutdownQuietPeriod();
-        List<Future<?>> groupFutures = new ArrayList<>();
-
-        if (httpBossGroup != null) {
-            LOG.info("Shutting down httpBossGroup");
-            groupFutures.add(httpBossGroup.shutdownGracefully(quietPeriod, 10, TimeUnit.SECONDS));
-        }
-
-        if (httpWorkerGroup != null) {
-            LOG.info("Shutting down httpWorkerGroup");
-            groupFutures.add(httpWorkerGroup.shutdownGracefully(quietPeriod, 10, TimeUnit.SECONDS));
-        }
-
-        groupFutures.parallelStream().forEach(f -> {
-            try {
-                f.get();
-            } catch (final Exception e) {
-                LOG.error("Error while shutting down group: {}", f.toString());
-                LOG.error("{}", e.getMessage());
-                e.printStackTrace();
-            }
-        });
-
-        if (applicationContext != null) {
-            LOG.info("Closing applicationContext");
-            applicationContext.close();
-        }
-
-        this.shutdown = true;
-        LOG.info("Server shut down.");
-    }
-
-    private static boolean useEpoll() {
-
-        // Should we just return true if this is Linux and if we get an error
-        // during Epoll
-        // setup handle it there?
-        final String os = SystemPropertyUtil.get(OS_NAME).toLowerCase().trim();
-        final String[] version = SystemPropertyUtil.get(OS_VERSION).toLowerCase().trim().split("\\.");
-        if (os.startsWith("linux") && version.length >= 3) {
-            final int major = Integer.parseInt(version[0]);
-            if (major > EPOLL_MIN_MAJOR_VERSION) {
-                return true;
-            } else if (major == EPOLL_MIN_MAJOR_VERSION) {
-                final int minor = Integer.parseInt(version[1]);
-                if (minor > EPOLL_MIN_MINOR_VERSION) {
-                    return true;
-                } else if (minor == EPOLL_MIN_MINOR_VERSION) {
-                    final int patch = Integer.parseInt(version[2].substring(0, 2));
-                    return patch >= EPOLL_MIN_PATCH_VERSION;
-                } else {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    protected SslContext createSSLContext(GrafanaAuthConfiguration config) throws Exception {
-
-        ServerSsl sslCfg = config.getSecurity().getServerSsl();
-        Boolean generate = sslCfg.isUseGeneratedKeypair();
-        SslContextBuilder ssl;
-        if (generate) {
-            LOG.warn("Using generated self signed server certificate");
-            Date begin = new Date();
-            Date end = new Date(begin.getTime() + 86400000);
-            SelfSignedCertificate ssc = new SelfSignedCertificate("localhost", begin, end);
-            ssl = SslContextBuilder.forServer(ssc.certificate(), ssc.privateKey());
-        } else {
-            String cert = sslCfg.getCertificateFile();
-            String key = sslCfg.getKeyFile();
-            String keyPass = sslCfg.getKeyPassword();
-            if (null == cert || null == key) {
-                throw new IllegalArgumentException("Check your SSL properties, something is wrong.");
-            }
-            ssl = SslContextBuilder.forServer(new File(cert), new File(key), keyPass);
-        }
-
-        ssl.ciphers(sslCfg.getUseCiphers());
-
-        // Can't set to REQUIRE because the CORS pre-flight requests will fail.
-        ssl.clientAuth(ClientAuth.OPTIONAL);
-
-        Boolean useOpenSSL = sslCfg.isUseOpenssl();
-        if (useOpenSSL) {
-            ssl.sslProvider(SslProvider.OPENSSL);
-        } else {
-            ssl.sslProvider(SslProvider.JDK);
-        }
-        String trustStore = sslCfg.getTrustStoreFile();
-        if (null != trustStore) {
-            if (!trustStore.isEmpty()) {
-                ssl.trustManager(new File(trustStore));
-            }
-        }
-        return ssl.build();
-    }
-
-    protected SSLContext createSSLClientContext(GrafanaAuthConfiguration config) throws Exception {
-
-        ClientSsl ssl = config.getSecurity().getClientSsl();
-        return HttpClient.getSSLContext(ssl.getTrustStoreFile(), ssl.getTrustStoreType(), ssl.getTrustStorePassword(),
-                ssl.getKeyFile(), ssl.getKeyType(), ssl.getKeyPassword());
-    }
-
-    public void run() throws Exception {
-
-        AuthCache.configure(grafanaAuthConfig.getSecurity());
-        final boolean useEpoll = useEpoll();
-        Class<? extends ServerSocketChannel> channelClass;
-        if (useEpoll) {
-            httpWorkerGroup = new EpollEventLoopGroup();
-            httpBossGroup = new EpollEventLoopGroup();
-            channelClass = EpollServerSocketChannel.class;
-        } else {
-            httpWorkerGroup = new NioEventLoopGroup();
-            httpBossGroup = new NioEventLoopGroup();
-            channelClass = NioServerSocketChannel.class;
-        }
-        LOG.info("Using channel class {}", channelClass.getSimpleName());
-
-        final int httpPort = grafanaAuthConfig.getHttp().getPort();
-        final String httpIp = grafanaAuthConfig.getHttp().getIp();
-        SslContext sslCtx = createSSLContext(grafanaAuthConfig);
-        if (sslCtx instanceof OpenSslServerContext) {
-            OpenSslServerContext openssl = (OpenSslServerContext) sslCtx;
-            String application = "GrafanaAuth_" + httpPort;
-            OpenSslServerSessionContext opensslCtx = openssl.sessionContext();
-            opensslCtx.setSessionCacheEnabled(true);
-            opensslCtx.setSessionCacheSize(128);
-            opensslCtx.setSessionIdContext(application.getBytes(StandardCharsets.UTF_8));
-            opensslCtx.setSessionTimeout(grafanaAuthConfig.getSecurity().getSessionMaxAge());
-        }
-        SSLContext clientSSLContext = createSSLClientContext(grafanaAuthConfig);
-        final ServerBootstrap httpServer = new ServerBootstrap();
-        httpServer.group(httpBossGroup, httpWorkerGroup);
-        httpServer.channel(channelClass);
-        httpServer.handler(new LoggingHandler());
-        HttpClientPool httpClientPool = new HttpClientPool(grafanaAuthConfig.getSecurity(), grafanaAuthConfig.getHttp(),
-                clientSSLContext);
-        httpServer.childHandler(setupHttpChannel(grafanaAuthConfig, sslCtx, httpClientPool));
-        httpServer.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
-        httpServer.option(ChannelOption.SO_BACKLOG, 128);
-        httpServer.option(ChannelOption.SO_KEEPALIVE, true);
-        httpChannelHandle = httpServer.bind(httpIp, httpPort).sync().channel();
-        final String httpAddress = ((InetSocketAddress) httpChannelHandle.localAddress()).getAddress().getHostAddress();
-
-        shutdownHook();
-        LOG.info("Server started. Listening on {}:{} for HTTP traffic", httpAddress, httpPort);
-    }
-
-    public static void main(String[] args) throws Exception {
-
-        GrafanaAuth.applicationContext = GrafanaAuth.initializeConfiguration(args);
-        GrafanaAuthConfiguration balancerConf = applicationContext.getBean(GrafanaAuthConfiguration.class);
-
-        GrafanaAuth b = new GrafanaAuth(balancerConf);
-        try {
-            b.run();
-            LATCH.await();
-        } catch (final InterruptedException e) {
-            LOG.info("Server shutting down.");
-        } catch (Exception e) {
-            LOG.error("Error running server.", e);
-        } finally {
-            try {
-                b.shutdown();
-            } catch (Exception e) {
-                System.exit(1);
-            }
-        }
-    }
-
-    protected ChannelHandler setupHttpChannel(GrafanaAuthConfiguration config, SslContext sslCtx,
-            HttpClientPool httpClientPool) {
-
-        return new ChannelInitializer<SocketChannel>() {
-
-            @Override
-            protected void initChannel(SocketChannel ch) throws Exception {
-
-                ch.pipeline().addLast("ssl", new NonSslRedirectHandler(config.getHttp(), sslCtx));
-                ch.pipeline().addLast("encoder", new HttpResponseEncoder());
-                ch.pipeline().addLast("decoder", new HttpRequestDecoder());
-                ch.pipeline().addLast("compressor", new HttpContentCompressor());
-                ch.pipeline().addLast("decompressor", new HttpContentDecompressor());
-                // high maximum contentLength so that grafana snapshots can be delivered
-                // might not be necessary if inbound chunking (while proxying) is handled
-                ch.pipeline().addLast("aggregator", new HttpObjectAggregator(2097152));
-                ch.pipeline().addLast("chunker", new ChunkedWriteHandler());
-                ch.pipeline().addLast("grafanaDecoder",
-                        new GrafanaRequestDecoder(config.getSecurity(), config.getHttp()));
-                ch.pipeline().addLast("fileServer", new HttpStaticFileServerHandler());
-                ch.pipeline().addLast("login", new X509LoginRequestHandler(config.getSecurity(), config.getHttp()));
-                ch.pipeline().addLast("httpRelay", new GrafanaRelayHandler(config, httpClientPool));
-                ch.pipeline().addLast("error", new TimelyExceptionHandler());
-            }
-        };
-    }
-}

grafana-auth/src/main/java/timely/grafana/auth/configuration/Grafana.java

@@ -1,32 +0,0 @@
-package timely.grafana.auth.configuration;
-
-public class Grafana {
-
-    private String host = "localhost";
-    private Integer port = 3000;
-    private String protocol = "http";
-
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    public Integer getPort() {
-        return port;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public String getProtocol() {
-        return protocol;
-    }
-}

grafana-auth/src/main/java/timely/grafana/auth/configuration/GrafanaAuthConfiguration.java

@@ -1,54 +0,0 @@
-package timely.grafana.auth.configuration;
-
-import javax.validation.Valid;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-import timely.balancer.configuration.BalancerHttp;
-import timely.balancer.configuration.BalancerSecurity;
-
-@Validated
-@Component
-@ConfigurationProperties(prefix = "grafana-auth")
-public class GrafanaAuthConfiguration {
-
-    @Valid
-    @NestedConfigurationProperty
-    private BalancerHttp http = new BalancerHttp();
-
-    @Valid
-    @NestedConfigurationProperty
-    private BalancerSecurity security = new BalancerSecurity();
-
-    @Valid
-    @NestedConfigurationProperty
-    private Grafana grafana = new Grafana();
-
-    private Integer shutdownQuietPeriod = 5;
-
-    public BalancerSecurity getSecurity() {
-        return security;
-    }
-
-    public BalancerHttp getHttp() {
-        return http;
-    }
-
-    public Grafana getGrafana() {
-        return grafana;
-    }
-
-    /**
-     * Time to wait (in seconds) for connections to finish and to make sure no new
-     * connections happen before shutting down Netty event loop groups.
-     */
-    public int getShutdownQuietPeriod() {
-        return this.shutdownQuietPeriod;
-    }
-
-    public void setShutdownQuietPeriod(Integer quietPeriod) {
-        this.shutdownQuietPeriod = quietPeriod;
-    }
-}

grafana-auth/src/main/java/timely/grafana/auth/configuration/SpringBootstrap.java

@@ -1,7 +0,0 @@
-package timely.grafana.auth.configuration;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication(scanBasePackageClasses = { SpringBootstrap.class })
-public class SpringBootstrap {
-}

grafana-auth/src/main/java/timely/grafana/auth/netty/http/GrafanaRelayHandler.java

@@ -1,234 +0,0 @@
-package timely.grafana.auth.netty.http;
-
-import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
-
-import java.io.ByteArrayOutputStream;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Multimap;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.handler.codec.http.DefaultFullHttpResponse;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.handler.codec.http.HttpVersion;
-import io.netty.util.ReferenceCountUtil;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpOptions;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.message.BasicHeader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.StreamUtils;
-import timely.api.request.timeseries.HttpRequest;
-import timely.api.response.TimelyException;
-import timely.auth.TimelyPrincipal;
-import timely.auth.TimelyUser;
-import timely.auth.util.DnUtils;
-import timely.auth.util.HttpHeaderUtils;
-import timely.balancer.connection.TimelyBalancedHost;
-import timely.balancer.connection.http.HttpClientPool;
-import timely.grafana.auth.configuration.GrafanaAuthConfiguration;
-import timely.grafana.request.GrafanaRequest;
-import timely.netty.http.TimelyHttpHandler;
-import timely.netty.http.auth.TimelyAuthenticationToken;
-
-public class GrafanaRelayHandler extends SimpleChannelInboundHandler<HttpRequest> implements TimelyHttpHandler {
-
-    private static final Logger LOG = LoggerFactory.getLogger(GrafanaRelayHandler.class);
-    private final HttpClientPool httpClientPool;
-    private GrafanaAuthConfiguration config;
-
-    public GrafanaRelayHandler(GrafanaAuthConfiguration config, HttpClientPool httpClientPool) {
-        this.config = config;
-        this.httpClientPool = httpClientPool;
-    }
-
-    @Override
-    public void channelRead0(ChannelHandlerContext ctx, HttpRequest msg) throws Exception {
-
-        CloseableHttpClient client = null;
-        CloseableHttpResponse relayedResponse = null;
-        FullHttpRequest request = null;
-        GrafanaRequest grafanaRequest;
-        TimelyBalancedHost k = null;
-        String relayURI = null;
-        try {
-            try {
-                request = msg.getHttpRequest();
-                String originalURI = request.uri();
-                originalURI = encodeURI(originalURI);
-
-                if (msg instanceof GrafanaRequest) {
-                    grafanaRequest = (GrafanaRequest) msg;
-                } else {
-                    throw new UnsupportedOperationException("Request not supported");
-                }
-                TimelyAuthenticationToken token = grafanaRequest.getToken();
-                if (token == null) {
-                    throw new IllegalStateException("No token on grafana request");
-                }
-
-                String protocol = config.getGrafana().getProtocol();
-                String host = config.getGrafana().getHost();
-                Integer port = config.getGrafana().getPort();
-                k = TimelyBalancedHost.of(host, -1, port, -1, -1);
-                client = httpClientPool.borrowObject(k);
-                Multimap<String, String> headers = HttpHeaderUtils.toMultimap(request.headers());
-
-                // If incoming user sets these headers, do not relay them
-                headers.removeAll("x-webauth-user");
-                headers.removeAll("x-webauth-name");
-                TimelyPrincipal principal = token.getTimelyPrincipal();
-                TimelyUser user = principal.getPrimaryUser();
-                String subjectDn = user.getDn().subjectDN();
-                String userName = DnUtils.getCommonName(subjectDn);
-                String loginName = DnUtils.getShortName(subjectDn);
-                headers.put("x-webauth-user", loginName);
-                headers.put("x-webauth-name", userName);
-                List<Header> relayedHeaderList = new ArrayList<>();
-                for (Map.Entry<String, String> h : headers.entries()) {
-                    if (!h.getKey().equals(CONTENT_LENGTH.toString())) {
-                        relayedHeaderList.add(new BasicHeader(h.getKey(), h.getValue()));
-                    }
-                }
-                Header[] headerArray = new Header[relayedHeaderList.size()];
-                relayedHeaderList.toArray(headerArray);
-                relayURI = protocol + "://" + host + ":" + port + originalURI;
-                if (request.method().equals(HttpMethod.HEAD)) {
-                    HttpHead relayedRequest = new HttpHead(relayURI);
-                    if (headerArray.length > 0) {
-                        relayedRequest.setHeaders(headerArray);
-                    }
-                    relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.GET)) {
-                    HttpGet relayedRequest = new HttpGet(relayURI);
-                    if (headerArray.length > 0) {
-                        relayedRequest.setHeaders(headerArray);
-                    }
-                    relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.POST)) {
-                    HttpPost relayedRequest = new HttpPost(relayURI);
-                    String content = request.content().toString(StandardCharsets.UTF_8);
-                    StringEntity entity = new StringEntity(content);
-                    relayedRequest.setEntity(entity);
-                    if (headerArray.length > 0) {
-                        relayedRequest.setHeaders(headerArray);
-                    }
-                    relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.PUT)) {
-                    HttpPut relayedRequest = new HttpPut(relayURI);
-                    String content = request.content().toString(StandardCharsets.UTF_8);
-                    StringEntity entity = new StringEntity(content);
-                    relayedRequest.setEntity(entity);
-                    if (headerArray.length > 0) {
-                        relayedRequest.setHeaders(headerArray);
-                    }
-                    relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.DELETE)) {
-                    HttpDelete relayedRequest = new HttpDelete(relayURI);
-                    if (headerArray.length > 0) {
-                        relayedRequest.setHeaders(headerArray);
-                    }
-                    relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.OPTIONS)) {
-                    HttpOptions relayedRequest = new HttpOptions(relayURI);
-                    if (headerArray.length > 0) {
-                        relayedRequest.setHeaders(headerArray);
-                    }
-                    relayedResponse = client.execute(relayedRequest);
-                }
-            } catch (Exception e) {
-                String message = e.getMessage();
-                if (message == null) {
-                    LOG.error("", e);
-                } else {
-                    LOG.error(message, e);
-                }
-                this.sendHttpError(ctx, new TimelyException(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(),
-                        e.getMessage(), e.getLocalizedMessage(), e));
-                return;
-            } finally {
-                if (request != null && request instanceof AutoCloseable) {
-                    ReferenceCountUtil.release(request);
-                }
-            }
-
-            FullHttpResponse response = null;
-            if (relayedResponse == null) {
-                this.sendHttpError(ctx, new TimelyException(HttpResponseStatus.METHOD_NOT_ALLOWED.code(),
-                        "Method not allowed", "Method not allowed"));
-            } else {
-                LOG.debug("RequestURL:{} ResponseCode:{}", relayURI, relayedResponse.getStatusLine().getStatusCode());
-                HttpEntity httpEntity = relayedResponse.getEntity();
-                if (httpEntity == null) {
-                    response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
-                            HttpResponseStatus.valueOf(relayedResponse.getStatusLine().getStatusCode()));
-                } else {
-                    ByteArrayOutputStream baos = new MyByteArrayOutputStream();
-                    StreamUtils.copy(httpEntity.getContent(), baos);
-                    response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
-                            HttpResponseStatus.valueOf(relayedResponse.getStatusLine().getStatusCode()),
-                            Unpooled.copiedBuffer(baos.toByteArray()));
-                    response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
-                }
-                for (Header h : relayedResponse.getAllHeaders()) {
-                    response.headers().add(h.getName(), h.getValue());
-                }
-                sendResponse(ctx, response);
-            }
-        } finally {
-            if (relayedResponse != null) {
-                relayedResponse.close();
-            }
-            if (client != null && k != null) {
-                httpClientPool.returnObject(k, client);
-            } else {
-                LOG.error("NOT RETURNING CONNECTION! " + msg.getHttpRequest().uri());
-            }
-        }
-    }
-
-    static public class MyByteArrayOutputStream extends ByteArrayOutputStream {
-
-        public MyByteArrayOutputStream() {
-        }
-
-        public MyByteArrayOutputStream(int size) {
-            super(size);
-        }
-
-        public int getCount() {
-            return count;
-        }
-
-        public byte[] getBuf() {
-            return buf;
-        }
-    }
-
-    static public String encodeURI(String s) {
-        try {
-            s = s.replaceAll("\\{", URLEncoder.encode("{", "UTF-8"));
-            s = s.replaceAll("\\}", URLEncoder.encode("}", "UTF-8"));
-        } catch (Exception e) {
-
-        }
-        return s;
-    }
-}

grafana-auth/src/main/java/timely/grafana/auth/netty/http/GrafanaRequestDecoder.java

@@ -1,133 +0,0 @@
-package timely.grafana.auth.netty.http;
-
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-import java.util.List;
-
-import com.google.common.collect.Multimap;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.QueryStringDecoder;
-import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import timely.api.request.AuthenticatedRequest;
-import timely.api.request.timeseries.HttpRequest;
-import timely.api.response.StrictTransportResponse;
-import timely.api.response.TimelyException;
-import timely.auth.AuthCache;
-import timely.auth.AuthenticationService;
-import timely.auth.SubjectIssuerDNPair;
-import timely.auth.TimelyPrincipal;
-import timely.auth.util.HttpHeaderUtils;
-import timely.configuration.Http;
-import timely.configuration.Security;
-import timely.grafana.request.GrafanaRequest;
-import timely.netty.Constants;
-import timely.netty.http.TimelyHttpHandler;
-import timely.netty.http.auth.TimelyAuthenticationToken;
-
-public class GrafanaRequestDecoder extends MessageToMessageDecoder<FullHttpRequest> implements TimelyHttpHandler {
-
-    private static final Logger LOG = LoggerFactory.getLogger(GrafanaRequestDecoder.class);
-    private static final String LOG_RECEIVED_REQUEST = "Received HTTP request {}";
-    private static final String LOG_PARSED_REQUEST = "Parsed request {}";
-
-    private final Security security;
-    private final String nonSecureRedirectAddress;
-
-    public GrafanaRequestDecoder(Security security, Http http) {
-
-        this.security = security;
-        this.nonSecureRedirectAddress = http.getRedirectPath();
-    }
-
-    public static String getSessionId(FullHttpRequest msg) {
-        Multimap<String, String> headers = HttpHeaderUtils.toMultimap(msg.headers());
-        Collection<String> cookies = headers.get(HttpHeaderNames.COOKIE.toString());
-        final StringBuilder buf = new StringBuilder();
-        cookies.forEach(h -> {
-            ServerCookieDecoder.STRICT.decode(h).forEach(c -> {
-                if (c.name().equals(Constants.COOKIE_NAME)) {
-                    if (buf.length() == 0) {
-                        buf.append(c.value());
-                    }
-                }
-            });
-        });
-        if (buf.length() == 0) {
-            return null;
-        } else {
-            return buf.toString();
-        }
-    }
-
-    @Override
-    protected void decode(ChannelHandlerContext ctx, FullHttpRequest msg, List<Object> out) throws Exception {
-
-        LOG.trace(LOG_RECEIVED_REQUEST, msg);
-
-        final String uri = msg.uri();
-        final QueryStringDecoder decoder = new QueryStringDecoder(uri);
-        if (decoder.path().equals(nonSecureRedirectAddress)) {
-            out.add(new StrictTransportResponse());
-            return;
-        }
-
-        final String sessionId = getSessionId(msg);
-        LOG.trace("SessionID: " + sessionId);
-
-        HttpRequest request;
-        try {
-            request = new GrafanaRequest();
-            Multimap<String, String> headers = HttpHeaderUtils.toMultimap(msg.headers());
-            ((AuthenticatedRequest) request).addHeaders(headers);
-            X509Certificate clientCert = AuthenticationService.getClientCertificate(ctx);
-            TimelyAuthenticationToken token;
-            if (StringUtils.isNotBlank(sessionId)) {
-                TimelyPrincipal principal;
-                ((AuthenticatedRequest) request).setSessionId(sessionId);
-                if (AuthCache.containsKey(sessionId)) {
-                    principal = AuthCache.get(sessionId);
-                } else {
-                    principal = TimelyPrincipal.anonymousPrincipal();
-                }
-                SubjectIssuerDNPair dn = principal.getPrimaryUser().getDn();
-                token = AuthenticationService.getAuthenticationToken(null, dn.subjectDN(), dn.issuerDN());
-            } else if (clientCert != null) {
-                token = AuthenticationService.getAuthenticationToken(clientCert, headers);
-            } else {
-                SubjectIssuerDNPair dn = TimelyPrincipal.anonymousPrincipal().getPrimaryUser().getDn();
-                token = AuthenticationService.getAuthenticationToken(null, dn.subjectDN(), dn.issuerDN());
-            }
-            ((AuthenticatedRequest) request).setToken(token);
-            request.setHttpRequest(msg.copy());
-            LOG.trace(LOG_PARSED_REQUEST, request);
-            request.validate();
-            out.add(request);
-        } catch (UnsupportedOperationException | NullPointerException e) {
-            // Return the original http request to route to the static file
-            // server
-            msg.retain();
-            out.add(msg);
-            return;
-        }
-        try {
-            try {
-                AuthenticationService.enforceAccess((AuthenticatedRequest) request);
-            } catch (TimelyException e) {
-                if (!security.isAllowAnonymousHttpAccess()) {
-                    throw e;
-                }
-            }
-        } catch (Exception e) {
-            out.clear();
-            throw e;
-        }
-
-    }
-
-}

grafana-auth/src/main/java/timely/grafana/request/GrafanaRequest.java

@@ -1,32 +0,0 @@
-package timely.grafana.request;
-
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.QueryStringDecoder;
-import timely.api.annotation.Http;
-import timely.api.request.AuthenticatedRequest;
-import timely.api.request.HttpGetRequest;
-import timely.api.request.HttpPostRequest;
-
-@Http(path = "/")
-public class GrafanaRequest extends AuthenticatedRequest implements HttpGetRequest, HttpPostRequest {
-
-    private FullHttpRequest httpRequest = null;
-
-    @Override
-    public HttpGetRequest parseQueryParameters(QueryStringDecoder decoder) throws Exception {
-        return new GrafanaRequest();
-    }
-
-    @Override
-    public HttpPostRequest parseBody(String content) throws Exception {
-        return new GrafanaRequest();
-    }
-
-    public void setHttpRequest(FullHttpRequest httpRequest) {
-        this.httpRequest = httpRequest;
-    }
-
-    public FullHttpRequest getHttpRequest() {
-        return httpRequest;
-    }
-}

grafana-auth/src/main/spotbugs/excludes.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FindBugsFilter>
-  <Match>
-    <Class name="timely.grafana.auth.netty.http.GrafanaRelayHandler$MyByteArrayOutputStream" />
-    <Method name="getBuf" />
-    <Bug pattern="EI_EXPOSE_REP" />
-  </Match>
-</FindBugsFilter>

grafana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>timely-app</artifactId>
   <packaging>pom</packaging>

grafana/timely-app/dist/plugin.json

@@ -23,8 +23,8 @@
       {"name": "Project site", "url": "https://github.com/NationalSecurityAgency/timely"},
       {"name": "License & Terms", "url": "https://raw.githubusercontent.com/NationalSecurityAgency/timely/master/LICENSE"}
     ],
-    "version": "1.2.5-SNAPSHOT",
-    "updated": "2019-05-30"
+    "version": "1.1.0",
+    "updated": "2019-01-15"
   },
 
   "includes": [

grafana/timely-app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "timely-app",
   "private": true,
-  "version": "1.2.5-SNAPSHOT",
+  "version": "1.1.0",
   "description": "",
   "main": "index.js",
   "scripts": {

grafana/timely-app/plugin.json

@@ -23,8 +23,8 @@
       {"name": "Project site", "url": "https://github.com/NationalSecurityAgency/timely"},
       {"name": "License & Terms", "url": "https://raw.githubusercontent.com/NationalSecurityAgency/timely/master/LICENSE"}
     ],
-    "version": "1.2.5-SNAPSHOT",
-    "updated": "2019-05-30"
+    "version": "1.1.0",
+    "updated": "2019-01-15"
   },
 
   "includes": [

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>timely</groupId>
   <artifactId>timely</artifactId>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.1.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Timely</name>
   <description>A secure and scalable time series database based on Apache Accumulo</description>
@@ -20,7 +20,6 @@
     <module>grafana</module>
     <module>analytics</module>
     <module>balancer</module>
-    <module>grafana-auth</module>
   </modules>
   <scm>
     <connection>scm:git:https://github.com/NationalSecurityAgency/timely.git</connection>
@@ -41,31 +40,33 @@
     <os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <version.accumulo>1.9.3</version.accumulo>
+    <version.accumulo>1.9.2</version.accumulo>
     <version.buildnumber-maven>1.4</version.buildnumber-maven>
-    <version.caffeine>2.6.2</version.caffeine>
+    <version.caffeine>2.3.3</version.caffeine>
     <version.collectd>5.7.1</version.collectd>
-    <version.commons-collections4>4.3</version.commons-collections4>
-    <version.commons-lang3>3.8.1</version.commons-lang3>
-    <version.commons-pool2>2.6.1</version.commons-pool2>
-    <version.curator>4.1.0</version.curator>
-    <version.disruptor>3.4.2</version.disruptor>
+    <version.commons-collections4>4.1</version.commons-collections4>
+    <version.commons-configuration>1.10</version.commons-configuration>
+    <version.commons-io>2.6</version.commons-io>
+    <version.commons-lang3>3.5</version.commons-lang3>
+    <version.commons-pool2>2.6.0</version.commons-pool2>
+    <version.curator>2.11.1</version.curator>
+    <version.disruptor>3.3.6</version.disruptor>
     <version.eclipse-lifecycle>1.0.0</version.eclipse-lifecycle>
-    <version.fast-classpath-scanner>3.1.13</version.fast-classpath-scanner>
+    <version.fast-classpath-scanner>2.0.5</version.fast-classpath-scanner>
     <version.flink>1.1.4</version.flink>
     <version.google-flatbuffers>1.10.0</version.google-flatbuffers>
-    <version.guava>27.1-jre</version.guava>
+    <version.guava>19.0</version.guava>
     <version.hadoop>2.7.3</version.hadoop>
-    <version.httpcomponents>4.5.6</version.httpcomponents>
+    <version.httpcomponents>4.5.2</version.httpcomponents>
     <version.impsort>1.2.0</version.impsort>
-    <version.jackson>2.9.9</version.jackson>
+    <version.jackson>2.9.8</version.jackson>
     <version.jacoco>0.7.6.201602180812</version.jacoco>
     <version.javacsv>2.0</version.javacsv>
-    <version.javassist>3.24.1-GA</version.javassist>
+    <version.javassist>3.21.0-GA</version.javassist>
     <version.jcip-annotations>1.0</version.jcip-annotations>
-    <version.jsoup>1.11.3</version.jsoup>
+    <version.jsoup>1.9.2</version.jsoup>
     <version.junit>4.12</version.junit>
-    <version.log4j>2.11.2</version.log4j>
+    <version.log4j>2.6.2</version.log4j>
     <version.maven-assembly>2.6</version.maven-assembly>
     <version.maven-build-helper>1.12</version.maven-build-helper>
     <version.maven-compiler>3.3</version.maven-compiler>
@@ -75,14 +76,14 @@
     <version.maven-rpm>2.1.4</version.maven-rpm>
     <version.maven-shade>2.4.2</version.maven-shade>
     <version.maven-surefire>2.19.1</version.maven-surefire>
-    <version.netty>4.1.35.Final</version.netty>
-    <version.netty-tcnative>2.0.25.Final</version.netty-tcnative>
+    <version.netty>4.0.56.Final</version.netty>
+    <version.netty-tcnative>2.0.7.Final</version.netty-tcnative>
     <version.os-maven>1.5.0.Final</version.os-maven>
     <version.powermock>1.6.4</version.powermock>
-    <version.slf4j>1.7.26</version.slf4j>
+    <version.slf4j>1.7.21</version.slf4j>
     <version.spotbugs-maven>3.1.7</version.spotbugs-maven>
-    <version.spring-boot>2.1.3.RELEASE</version.spring-boot>
-    <version.tyrus>1.15</version.tyrus>
+    <version.spring-boot>1.4.1.RELEASE</version.spring-boot>
+    <version.tyrus>1.13</version.tyrus>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -139,18 +140,13 @@
       <dependency>
         <groupId>io.github.lukehutch</groupId>
         <artifactId>fast-classpath-scanner</artifactId>
-        <version>${version.fast-classpath-scanner}</version>
+        <version>2.0.5</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
         <version>${version.netty}</version>
       </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-tcnative-boringssl-static</artifactId>
-        <version>${version.netty-tcnative}</version>
-      </dependency>
       <dependency>
         <groupId>net.sourceforge.javacsv</groupId>
         <artifactId>javacsv</artifactId>
@@ -160,12 +156,6 @@
         <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-core</artifactId>
         <version>${version.accumulo}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
@@ -319,11 +309,6 @@
         <artifactId>collectd-plugin-parent</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>timely</groupId>
-        <artifactId>timely-balancer</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>timely</groupId>
         <artifactId>timely-client</artifactId>
@@ -461,7 +446,7 @@
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>${version.maven-surefire}</version>
           <configuration>
-            <argLine>${failsafeArgLine} -Djava.library.path=${project.build.directory}/native/META-INF/native/libnetty_tcnative_linux_x86_64.so -Dzookeeper.sasl.client=false</argLine>
+            <argLine>${failsafeArgLine} -Djava.library.path=${project.build.directory}/native/META-INF/native/libnetty-tcnative.so -Dzookeeper.sasl.client=false</argLine>
             <includes>
               <include>**/*.java</include>
             </includes>
@@ -504,7 +489,7 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${version.maven-surefire}</version>
           <configuration>
-            <argLine>${sureFireArgLine} -Djava.library.path=${project.build.directory}/native/META-INF/native/libnetty-tcnative_linux_x86_64.so -Dzookeeper.sasl.client=false</argLine>
+            <argLine>${sureFireArgLine} -Djava.library.path=${project.build.directory}/native/META-INF/native/libnetty-tcnative.so -Dzookeeper.sasl.client=false</argLine>
             <excludedGroups>timely.test.IntegrationTest</excludedGroups>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
           </configuration>

server/bin/timely-server.sh

@@ -27,14 +27,15 @@ fi
 mkdir -p ${NATIVE_DIR}
 
 pushd ${BASE_DIR}/bin
-$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-tcnative-boringssl-static*.jar META-INF/native/libnetty_tcnative_linux_x86_64.${TCNATIVE_SUFFIX}
-$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-all*.jar META-INF/native/libnetty_transport_native_epoll_x86_64.${TCNATIVE_SUFFIX}
+$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-tcnative*.jar META-INF/native/libnetty_tcnative.${TCNATIVE_SUFFIX}
+$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-transport-native-epoll*.jar META-INF/native/libnetty_transport_native_epoll_x86_64.${TCNATIVE_SUFFIX}
 popd
 
-export CLASSPATH="${CONF_DIR}:${LIB_DIR}/*:${HADOOP_CONF_DIR}"
-JVM_ARGS="-Xmx256m -Xms256m -Dio.netty.eventLoopThreads=${NUM_SERVER_THREADS} -Dlog4j.configurationFile=${CONF_DIR}/log4j2-spring.xml"
+export CLASSPATH="${CONF_DIR}:${LIB_DIR}/*"
+JVM_ARGS="-Xmx256m -Xms256m -Dio.netty.eventLoopThreads=${NUM_SERVER_THREADS}"
 JVM_ARGS="${JVM_ARGS} -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
 JVM_ARGS="${JVM_ARGS} -Djava.library.path=${NATIVE_DIR}"
+JVM_ARGS="${JVM_ARGS} -Djava.library.path=${NATIVE_DIR}/libnetty-${TCNATIVE_SUFFIX}"
 
 echo "$JAVA_HOME/bin/java ${JVM_ARGS} timely.Server --spring.config.name=timely"
 $JAVA_HOME/bin/java ${JVM_ARGS} timely.Server --spring.config.name=timely

server/bin/timely-standalone.sh

@@ -2,12 +2,17 @@
 
 if [[ `uname` == "Darwin" ]]; then
         THIS_SCRIPT=`python -c 'import os,sys; print os.path.realpath(sys.argv[1])' $0`
-        TCNATIVE_SUFFIX="jnilib"
+        TCNATIVE_SUFFIX="tcnative.jnilib"
 else
         THIS_SCRIPT=`readlink -f $0`
-        TCNATIVE_SUFFIX="so"
+        TCNATIVE_SUFFIX="tcnative.so"
 fi
 
+# netty tcnative file reference
+#netty-tcnative-1.1.33.Fork18-linux-x86_64-fedora.jar -> libnetty-tcnative.so
+#netty-tcnative-1.1.33.Fork18-linux-x86_64.jar -> libnetty-tcnative.so
+#netty-tcnative-1.1.33.Fork18-osx-x86_64.jar -> libnetty-tcnative.jnilib
+
 THIS_DIR="${THIS_SCRIPT%/*}"
 NATIVE_DIR="${THIS_DIR}/META-INF/native"
 BASE_DIR=${THIS_DIR}/..
@@ -27,12 +32,11 @@ fi
 mkdir -p ${NATIVE_DIR}
 
 pushd ${BASE_DIR}/bin
-$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-tcnative-boringssl-static*.jar META-INF/native/libnetty_tcnative_linux_x86_64.${TCNATIVE_SUFFIX}
-$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-all*.jar META-INF/native/libnetty_transport_native_epoll_x86_64.${TCNATIVE_SUFFIX}
+$JAVA_HOME/bin/jar xf ${LIB_DIR}/netty-tcnative*.jar META-INF/native/libnetty-${TCNATIVE_SUFFIX}
 popd
 
-export CLASSPATH="${CONF_DIR}:${LIB_DIR}/*:${HADOOP_CONF_DIR}"
-JVM_ARGS="-Xmx256m -Xms256m -Dio.netty.eventLoopThreads=${NUM_SERVER_THREADS} -Dlog4j.configurationFile=${CONF_DIR}/log4j2-spring.xml"
+export CLASSPATH="${CONF_DIR}:${LIB_DIR}/*"
+JVM_ARGS="-Xmx256m -Xms256m -Dio.netty.eventLoopThreads=${NUM_SERVER_THREADS}"
 JVM_ARGS="${JVM_ARGS} -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
 JVM_ARGS="${JVM_ARGS} -Djava.library.path=${NATIVE_DIR}"
 # for debugging

server/conf/security.xml

@@ -46,12 +46,9 @@
     <user-service id="usernamePasswordService">
     	<user name="test" password="test1" authorities="A,B,C" />
     </user-service>
-
-	<beans:bean id="noOpPasswordEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
-
-	<beans:bean id="UserNamePasswordAuthenticationProvider" class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
+    
+    <beans:bean id="UserNamePasswordAuthenticationProvider" class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
 		<beans:property name="userDetailsService" ref="usernamePasswordService"/>
-		<beans:property name="passwordEncoder" ref="noOpPasswordEncoder"/>
 	</beans:bean>
 	    
 	<authentication-manager alias="authenticationManager">
@@ -61,11 +58,8 @@
 		<authentication-provider ref="UserNamePasswordAuthenticationProvider" />
 	</authentication-manager>
 
-	<util:list id="requiredRoles" value-type="java.lang.String">
-		<beans:value></beans:value>
-	</util:list>
+	<beans:bean id="requiredRoles" class="Array">
+
+	</beans:bean>
 
-	<util:list id="requiredAuths" value-type="java.lang.String">
-		<beans:value></beans:value>
-	</util:list>
 </beans:beans>

server/conf/timely-docker.yml

@@ -18,11 +18,9 @@ timely:
       max-downsample-memory: 10000000
   security:
     session-max-age: 86400
-    cache-expiration-minutes: 60
-    cache-refresh-minutes: 5
     allow-anonymous-http-access: true
     allow-anonymous-ws-access: true
-    server-ssl:
+    ssl:
       certificate-file: /timely-server-src/server/pki/timely.csr
       key-file: /timely-server-src/server/pki/timely-pkcs8.key
       key-password: password
@@ -52,9 +50,9 @@ timely:
     timeout: 60
     subscription-lag: 120
   meta-cache:
-    expiration-minutes: 1440
-    cache-refresh-minutes: 60
-    max-tag-values: 100
+    expiration-minutes: 60
+    initial-capacity: 2000
+    max-capacity: 10000
   visibility-cache:
     expiration-minutes: 60
     initial-capacity: 2000

server/conf/timely-standalone.yml

@@ -3,8 +3,6 @@ timely:
   meta-table: timely.meta
   metric-age-off-days:
     default: 7
-  cache:
-    enabled: false
   metrics-report-ignored-tags:
   accumulo:
     instance-name: TimelyStandalone
@@ -20,11 +18,9 @@ timely:
       max-downsample-memory: 10000000
   security:
     session-max-age: 86400
-    cache-expiration-minutes: 60
-    cache-refresh-minutes: 5
     allow-anonymous-http-access: true
     allow-anonymous-ws-access: true
-    server-ssl:
+    ssl:
       certificate-file:
       key-file:
       key-password: timely
@@ -58,9 +54,9 @@ timely:
     scanner-read-ahead: 1
     subscription-batch-size: 5000
   meta-cache:
-    expiration-minutes: 1440
-    cache-refresh-minutes: 60
-    max-tag-values: 100
+    expiration-minutes: 60
+    initial-capacity: 2000
+    max-capacity: 10000
   visibility-cache:
     expiration-minutes: 60
     initial-capacity: 2000

server/conf/timely.yml

@@ -8,7 +8,6 @@ timely:
     age-off-hours:
       default: 26
   metrics-report-ignored-tags:
-  defaultVisibility:
   accumulo:
     instance-name: accumulo
     zookeepers: localhost:2181
@@ -23,11 +22,9 @@ timely:
       max-downsample-memory: 10000000
   security:
     session-max-age: 86400
-    cache-expiration-minutes: 60
-    cache-refresh-minutes: 5
     allow-anonymous-http-access: true
     allow-anonymous-ws-access: true
-    server-ssl:
+    serverSsl:
       certificate-file:
       key-file:
       key-password:
@@ -62,9 +59,10 @@ timely:
     scanner-read-ahead: 1
     subscription-batch-size: 5000
   meta-cache:
-    expiration-minutes: 1440
-    cache-refresh-minutes: 60
-    max-tag-values: 100
+    expiration-minutes: 60
+    initial-capacity: 2000
+    max-capacity: 10000
   visibility-cache:
     expiration-minutes: 60
-
+    initial-capacity: 2000
+    max-capacity: 10000

server/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>timely-server</artifactId>
   <dependencies>
@@ -149,7 +149,9 @@
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
+      <artifactId>netty-tcnative</artifactId>
+      <version>${version.netty-tcnative}</version>
+      <classifier>${os.detected.classifier}</classifier>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -238,8 +240,9 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>io.netty</groupId>
-                  <artifactId>netty-tcnative-boringssl-static</artifactId>
+                  <artifactId>netty-tcnative</artifactId>
                   <version>${version.netty-tcnative}</version>
+                  <classifier>${os.detected.classifier}</classifier>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/native</outputDirectory>
@@ -281,4 +284,37 @@
       </extension>
     </extensions>
   </build>
+  <profiles>
+    <profile>
+      <id>native-epoll-linux</id>
+      <activation>
+        <os>
+          <family>!mac</family>
+        </os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-epoll</artifactId>
+          <version>${version.netty}</version>
+          <classifier>linux-x86_64</classifier>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>native-epoll</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-epoll</artifactId>
+          <version>${version.netty}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

server/src/main/java/timely/Server.java

@@ -24,7 +24,6 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.WriteBufferWaterMark;
 import io.netty.channel.epoll.EpollChannelOption;
 import io.netty.channel.epoll.EpollDatagramChannel;
 import io.netty.channel.epoll.EpollEventLoopGroup;
@@ -45,7 +44,6 @@ import io.netty.handler.codec.http.HttpRequestDecoder;
 import io.netty.handler.codec.http.HttpResponseEncoder;
 import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.handler.codec.http.cors.CorsConfig;
-import io.netty.handler.codec.http.cors.CorsConfigBuilder;
 import io.netty.handler.codec.http.cors.CorsHandler;
 import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
 import io.netty.handler.logging.LoggingHandler;
@@ -72,7 +70,6 @@ import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import timely.api.response.TimelyException;
@@ -211,13 +208,13 @@ public class Server {
             payload.setWsPort(config.getWebsocket().getPort());
             payload.setUdpPort(config.getServer().getUdpPort());
 
-            ServiceInstanceBuilder<ServerDetails> builder = ServiceInstance.builder();
+            ServiceInstanceBuilder builder = ServiceInstance.builder();
             String serviceName = host + ":" + config.getServer().getTcpPort();
-            ServiceInstance<ServerDetails> serviceInstance = builder.id(serviceName).name("timely-server")
+            ServiceInstance serviceInstance = builder.id(serviceName).name("timely-server")
                     .address(config.getServer().getIp()).port(config.getServer().getTcpPort()).payload(payload).build();
 
-            ServiceDiscovery<ServerDetails> discovery = ServiceDiscoveryBuilder.builder(ServerDetails.class)
-                    .client(curatorFramework).basePath(SERVICE_DISCOVERY_PATH).build();
+            ServiceDiscovery discovery = ServiceDiscoveryBuilder.builder(ServerDetails.class).client(curatorFramework)
+                    .basePath(SERVICE_DISCOVERY_PATH).build();
             discovery.start();
             discovery.registerService(serviceInstance);
 
@@ -253,7 +250,7 @@ public class Server {
     }
 
     protected static Configuration initializeConfiguration(String[] args) {
-        applicationContext = new SpringApplicationBuilder(SpringBootstrap.class).web(WebApplicationType.NONE).run(args);
+        applicationContext = new SpringApplicationBuilder(SpringBootstrap.class).web(false).run(args);
         return applicationContext.getBean(Configuration.class);
     }
 
@@ -433,7 +430,7 @@ public class Server {
         // Initialize the MetaCache
         MetaCacheFactory.getCache(config);
         // initialize the auth cache
-        AuthCache.configure(config.getSecurity());
+        AuthCache.setSessionMaxAge(config.getSecurity());
         // Initialize the VisibilityCache
         VisibilityCache.init(config);
         final boolean useEpoll = useEpoll();
@@ -510,9 +507,10 @@ public class Server {
         wsServer.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
         wsServer.option(ChannelOption.SO_BACKLOG, 128);
         wsServer.option(ChannelOption.SO_KEEPALIVE, true);
-        /* Not sure if next two lines are necessary */
+        /* Not sure if next three lines are necessary */
         wsServer.option(ChannelOption.SO_SNDBUF, 1048576);
-        wsServer.option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(620145, 838860));
+        wsServer.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 838860);
+        wsServer.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 620145);
         wsChannelHandle = wsServer.bind(wsIp, wsPort).sync().channel();
         final String wsAddress = ((InetSocketAddress) wsChannelHandle.localAddress()).getAddress().getHostAddress();
 
@@ -589,14 +587,14 @@ public class Server {
                 ch.pipeline().addLast("decoder", new HttpRequestDecoder());
                 ch.pipeline().addLast("compressor", new HttpContentCompressor());
                 ch.pipeline().addLast("decompressor", new HttpContentDecompressor());
-                ch.pipeline().addLast("aggregator", new HttpObjectAggregator(65536));
+                ch.pipeline().addLast("aggregator", new HttpObjectAggregator(8192));
                 ch.pipeline().addLast("chunker", new ChunkedWriteHandler());
                 final Cors corsCfg = config.getHttp().getCors();
-                final CorsConfigBuilder ccb;
+                final CorsConfig.Builder ccb;
                 if (corsCfg.isAllowAnyOrigin()) {
-                    ccb = CorsConfigBuilder.forAnyOrigin();
+                    ccb = new CorsConfig.Builder();
                 } else {
-                    ccb = CorsConfigBuilder.forOrigins(corsCfg.getAllowedOrigins().stream().toArray(String[]::new));
+                    ccb = new CorsConfig.Builder(corsCfg.getAllowedOrigins().stream().toArray(String[]::new));
                 }
                 if (corsCfg.isAllowNullOrigin()) {
                     ccb.allowNullOrigin();
@@ -637,7 +635,7 @@ public class Server {
                 ch.pipeline().addLast("logger", new LoggingHandler());
                 ch.pipeline().addLast("packetDecoder", new UdpPacketToByteBuf());
                 ch.pipeline().addLast("buffer", new MetricsBufferDecoder());
-                ch.pipeline().addLast("frame", new DelimiterBasedFrameDecoder(65536, true, Delimiters.lineDelimiter()));
+                ch.pipeline().addLast("frame", new DelimiterBasedFrameDecoder(8192, true, Delimiters.lineDelimiter()));
                 ch.pipeline().addLast("putDecoder", new UdpDecoder());
                 ch.pipeline().addLast("putHandler", new TcpPutHandler(dataStore));
             }
@@ -650,7 +648,7 @@ public class Server {
             @Override
             protected void initChannel(SocketChannel ch) throws Exception {
                 ch.pipeline().addLast("buffer", new MetricsBufferDecoder());
-                ch.pipeline().addLast("frame", new DelimiterBasedFrameDecoder(65536, true, Delimiters.lineDelimiter()));
+                ch.pipeline().addLast("frame", new DelimiterBasedFrameDecoder(8192, true, Delimiters.lineDelimiter()));
                 ch.pipeline().addLast("putDecoder", new TcpDecoder());
                 ch.pipeline().addLast("putHandler", new TcpPutHandler(dataStore));
                 ch.pipeline().addLast("versionHandler", new TcpVersionHandler());
@@ -665,11 +663,11 @@ public class Server {
             protected void initChannel(SocketChannel ch) throws Exception {
                 ch.pipeline().addLast("ssl", sslCtx.newHandler(ch.alloc()));
                 ch.pipeline().addLast("httpServer", new HttpServerCodec());
-                ch.pipeline().addLast("aggregator", new HttpObjectAggregator(65536));
+                ch.pipeline().addLast("aggregator", new HttpObjectAggregator(8192));
                 ch.pipeline().addLast("sessionExtractor", new WebSocketFullRequestHandler());
                 ch.pipeline().addLast("idle-handler", new IdleStateHandler(conf.getWebsocket().getTimeout(), 0, 0));
                 ch.pipeline().addLast("ws-protocol",
-                        new WebSocketServerProtocolHandler(WS_PATH, null, true, 65536, false, true));
+                        new WebSocketServerProtocolHandler(WS_PATH, null, true, 65536, true));
                 ch.pipeline().addLast("wsDecoder", new WebSocketRequestDecoder(config.getSecurity()));
                 ch.pipeline().addLast("aggregators", new WSAggregatorsRequestHandler());
                 ch.pipeline().addLast("metrics", new WSMetricsRequestHandler(config));

server/src/main/java/timely/adapter/accumulo/MetaAdapter.java

@@ -1,39 +0,0 @@
-package timely.adapter.accumulo;
-
-import org.apache.accumulo.core.data.Key;
-import timely.api.model.Meta;
-import timely.model.Metric;
-
-/**
- * Creates Accumulo data structures from {@link Metric}
- */
-public class MetaAdapter {
-
-    public static Key createMetricKey(String metricName, Long timestamp) {
-        return new Key(Meta.METRIC_PREFIX + metricName, "", "", timestamp);
-    }
-
-    public static Key createTagKey(String metricName, String tagName, Long timestamp) {
-        return new Key(Meta.TAG_PREFIX + metricName, tagName, "", timestamp);
-    }
-
-    public static Key createValueKey(String metricName, String tagName, String tagValue, Long timestamp) {
-        return new Key(Meta.VALUE_PREFIX + metricName, tagName, tagValue, timestamp);
-    }
-
-    public static Meta parse(Key key) {
-        String row = key.getRow().toString();
-        if (row.startsWith(Meta.METRIC_PREFIX)) {
-            return Meta.parse(key, null, Meta.METRIC_PREFIX);
-        } else if (row.startsWith(Meta.TAG_PREFIX)) {
-            return Meta.parse(key, null, Meta.TAG_PREFIX);
-        } else if (row.startsWith(Meta.VALUE_PREFIX)) {
-            return Meta.parse(key, null, Meta.VALUE_PREFIX);
-        }
-        throw new IllegalStateException("Invalid key in meta " + key.toString());
-    }
-
-    public static String decodeRowKey(Key key) {
-        return parse(key).getMetric();
-    }
-}

server/src/main/java/timely/api/model/Meta.java

@@ -55,43 +55,16 @@ public class Meta implements Comparable<Meta> {
         return keys;
     }
 
-    public static String prefix(Key key) {
-        String row = key.getRow().toString();
-        if (row.startsWith(Meta.METRIC_PREFIX)) {
-            return Meta.METRIC_PREFIX;
-        } else if (row.startsWith(Meta.TAG_PREFIX)) {
-            return Meta.TAG_PREFIX;
-        } else if (row.startsWith(Meta.VALUE_PREFIX)) {
-            return Meta.VALUE_PREFIX;
-        }
-        throw new IllegalStateException("Invalid key in meta " + key.toString());
-    }
-
-    public static Meta parse(Key key) {
-        return parse(key, null);
-    }
-
-    public static Meta parse(Key key, Value value) {
-        String row = key.getRow().toString();
-        if (row.startsWith(Meta.METRIC_PREFIX)) {
-            return Meta.parse(key, value, Meta.METRIC_PREFIX);
-        } else if (row.startsWith(Meta.TAG_PREFIX)) {
-            return Meta.parse(key, value, Meta.TAG_PREFIX);
-        } else if (row.startsWith(Meta.VALUE_PREFIX)) {
-            return Meta.parse(key, value, Meta.VALUE_PREFIX);
-        }
-        throw new IllegalStateException("Invalid key in meta " + key.toString());
-    }
-
-    public static Meta parse(Key k, Value v, String prefix) {
+    public static Meta parse(Key k, Value v) {
         if (k.getColumnQualifier().getLength() > 0) {
-            return new Meta(k.getRow().toString().substring(prefix.length()), k.getColumnFamily().toString(),
+            return new Meta(k.getRow().toString().substring(METRIC_PREFIX.length()), k.getColumnFamily().toString(),
                     k.getColumnQualifier().toString());
         } else if (k.getColumnFamily().getLength() > 0) {
-            return new Meta(k.getRow().toString().substring(prefix.length()), k.getColumnFamily().toString(), null);
+            return new Meta(k.getRow().toString().substring(METRIC_PREFIX.length()), k.getColumnFamily().toString(),
+                    null);
 
         } else {
-            return new Meta(k.getRow().toString().substring(prefix.length()), null, null);
+            return new Meta(k.getRow().toString().substring(METRIC_PREFIX.length()), null, null);
         }
     }
 

server/src/main/java/timely/api/request/AuthenticatedRequest.java

@@ -9,7 +9,7 @@ import timely.auth.util.HttpHeaderUtils;
 import timely.netty.http.auth.TimelyAuthenticationToken;
 
 /**
- * Base class for requests that require auth
+ * Base class for requests that require authentication
  */
 @JsonIgnoreProperties({ "userName", "requestHeader" })
 public class AuthenticatedRequest implements Request {

server/src/main/java/timely/api/request/TcpRequest.java

@@ -4,6 +4,8 @@ public interface TcpRequest extends Request {
 
     /**
      * Parse a line of text received and populate this object
+     * 
+     * @param line
      */
     public void parse(String line);
 

server/src/main/java/timely/api/request/UdpRequest.java

@@ -4,6 +4,8 @@ public interface UdpRequest {
 
     /**
      * Parse a line of text received and populate this object
+     * 
+     * @param line
      */
     public void parse(String line);
 

server/src/main/java/timely/api/response/timeseries/MetricsResponse.java

@@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
@@ -129,8 +129,8 @@ public class MetricsResponse {
         }
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
                 Unpooled.copiedBuffer(buf));
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, responseType);
-        response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+        response.headers().set(Names.CONTENT_TYPE, responseType);
+        response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
         return response;
     }
 

server/src/main/java/timely/auth/AuthCache.java

@@ -23,67 +23,32 @@ public class AuthCache {
     private static final Logger LOG = LoggerFactory.getLogger(AuthCache.class);
     private static Cache<String, TimelyPrincipal> CACHE = null;
 
-    private static int cacheExpirationMinutes = -1;
-    private static int cacheRefreshMinutes = -1;
+    private static int sessionMaxAge = -1;
 
     /**
      * For tests only
      */
-    public static void resetConfiguration() {
-        cacheExpirationMinutes = -1;
-        cacheRefreshMinutes = -1;
+    public static void resetSessionMaxAge() {
+        sessionMaxAge = -1;
     }
 
-    public static void configure(Security security) {
-        if (-1 != cacheExpirationMinutes || -1 != cacheRefreshMinutes) {
-            throw new IllegalStateException("Cache already configured.");
+    public static void setSessionMaxAge(Security security) {
+        if (-1 != sessionMaxAge) {
+            throw new IllegalStateException("Cache session max age already configured.");
         }
-        cacheExpirationMinutes = security.getCacheExpirationMinutes();
-        cacheRefreshMinutes = security.getCacheRefreshMinutes();
+        sessionMaxAge = security.getSessionMaxAge();
     }
 
     private static Cache<String, TimelyPrincipal> getCache() {
-        if (-1 == cacheExpirationMinutes) {
+        if (-1 == sessionMaxAge) {
             throw new IllegalStateException("Cache session max age not configured.");
         }
         if (null == CACHE) {
-            Caffeine<Object, Object> caffeine = Caffeine.newBuilder();
-            caffeine.expireAfterWrite(cacheExpirationMinutes, TimeUnit.MINUTES);
-            if (cacheRefreshMinutes > 0) {
-                caffeine.refreshAfterWrite(cacheRefreshMinutes, TimeUnit.MINUTES);
-                CACHE = caffeine.build(key -> getTimelyPrincipal(key));
-            } else {
-                CACHE = caffeine.build();
-            }
+            CACHE = Caffeine.newBuilder().expireAfterAccess(sessionMaxAge, TimeUnit.SECONDS).build();
         }
         return CACHE;
     }
 
-    private static TimelyPrincipal getTimelyPrincipal(String key) {
-        LOG.debug("Refreshing TimelyPrincipal {}", key);
-        TimelyPrincipal timelyPrincipal = null;
-        String[] dnArray = key.split(" -> ");
-        if (dnArray.length == 1) {
-            SubjectIssuerDNPair pair = SubjectIssuerDNPair.parse(dnArray[0]);
-            TimelyAuthenticationToken token = AuthenticationService.getAuthenticationToken(new Object(),
-                    pair.subjectDN(), pair.issuerDN());
-            timelyPrincipal = AuthenticationService.authenticate(token, pair, token.getTimelyPrincipal().getName(),
-                    false);
-        } else if (dnArray.length > 1) {
-            Collection<TimelyUser> timelyUsers = new ArrayList<>();
-            for (String s : dnArray) {
-                SubjectIssuerDNPair pair = SubjectIssuerDNPair.parse(s);
-                TimelyAuthenticationToken token = AuthenticationService.getAuthenticationToken(new Object(),
-                        pair.subjectDN(), pair.issuerDN());
-                TimelyPrincipal p = AuthenticationService.authenticate(token, pair,
-                        token.getTimelyPrincipal().getName(), false);
-                timelyUsers.addAll(p.getProxiedUsers());
-            }
-            timelyPrincipal = new TimelyPrincipal(timelyUsers);
-        }
-        return timelyPrincipal;
-    }
-
     public static boolean containsKey(String key) {
         return getCache().getIfPresent(key) != null;
     }

server/src/main/java/timely/auth/AuthenticationService.java

@@ -23,6 +23,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.preauth.x509.SubjectDnX509PrincipalExtractor;
 import timely.api.request.AuthenticatedRequest;
 import timely.api.response.TimelyException;
 import timely.auth.util.DnUtils;
@@ -34,6 +35,7 @@ public class AuthenticationService {
     private static final Logger LOG = LoggerFactory.getLogger(AuthenticationService.class);
     private static ApplicationContext springContext = null;
     private static AuthenticationManager authManager = null;
+    private static SubjectDnX509PrincipalExtractor x509 = null;
     private static ConcurrentHashMap<String, Object> fetchingEntity = new ConcurrentHashMap<>();
     private static ConcurrentHashMap<String, Object> fetchingPrincipal = new ConcurrentHashMap<>();
     private static Collection<String> requiredRoles;
@@ -43,14 +45,9 @@ public class AuthenticationService {
         try {
             springContext = new ClassPathXmlApplicationContext("security.xml");
             authManager = springContext.getBean("authenticationManager", AuthenticationManager.class);
-            @SuppressWarnings("unchecked")
-            List<String> uncheckedRoles = springContext.getBean("requiredRoles", List.class);
-            requiredRoles = uncheckedRoles;
-            requiredRoles.removeIf(String::isEmpty);
-            @SuppressWarnings("unchecked")
-            List<String> uncheckedAuths = springContext.getBean("requiredAuths", List.class);
-            requiredAuths = uncheckedAuths;
-            requiredAuths.removeIf(String::isEmpty);
+            x509 = springContext.getBean("x509PrincipalExtractor", SubjectDnX509PrincipalExtractor.class);
+            requiredRoles = springContext.getBean("requiredRoles", List.class);
+            requiredAuths = springContext.getBean("requiredAuths", List.class);
         } catch (BeansException e) {
             throw new ServiceConfigurationError("Error setting up Authentication objects: " + e.getMessage(),
                     e.getRootCause());
@@ -66,17 +63,9 @@ public class AuthenticationService {
     }
 
     public static TimelyPrincipal authenticate(Authentication authentication, SubjectIssuerDNPair pair, String entity) {
-        return authenticate(authentication, pair, entity, true);
-    }
-
-    public static TimelyPrincipal authenticate(Authentication authentication, SubjectIssuerDNPair pair, String entity,
-            boolean useCache) {
 
         // only one thread should call the authenticationManager for a given entity
-        TimelyPrincipal principal = null;
-        if (useCache) {
-            principal = AuthCache.get(entity);
-        }
+        TimelyPrincipal principal = AuthCache.get(entity);
         // once an entity is in the AuthCache, we can bypass all of this
         if (principal == null) {
             Object newObj = new Object();
@@ -88,16 +77,12 @@ public class AuthenticationService {
                 synchronized (o) {
                     // if multiple threads are waiting on this synchronized, then the 2nd and all
                     // others will get the principal here
-                    if (useCache) {
-                        principal = AuthCache.get(entity);
-                    }
+                    principal = AuthCache.get(entity);
                     if (principal == null) {
                         Authentication token = getAuthenticationManager().authenticate(authentication);
                         principal = getTimelyPrincipal(token, pair);
                         LOG.trace("Got entity principal for {} from AuthenticationManager", entity);
-                        if (useCache) {
-                            AuthCache.put(entity, principal);
-                        }
+                        AuthCache.put(entity, principal);
                     } else {
                         LOG.trace("Got entity principal for {} from AuthCache on 2nd attempt", entity);
                     }
@@ -129,8 +114,7 @@ public class AuthenticationService {
                 TimelyAuthenticationToken token = request.getToken();
                 TimelyPrincipal requestPrincipal = token.getTimelyPrincipal();
                 String entity = requestPrincipal.getName();
-                verifiedPrincipal = AuthCache.get(entity);
-                if (verifiedPrincipal == null) {
+                if (!AuthCache.containsKey(requestPrincipal.getName())) {
                     Object newObj = new Object();
                     Object o = fetchingPrincipal.getOrDefault(entity, newObj);
                     if (o == null) {
@@ -139,8 +123,7 @@ public class AuthenticationService {
                     try {
                         synchronized (o) {
                             // check again if in the AuthCache
-                            verifiedPrincipal = AuthCache.get(entity);
-                            if (verifiedPrincipal == null) {
+                            if (!AuthCache.containsKey(entity)) {
                                 // first thread here, so authenticate all entities in requestPrincipal
                                 List<TimelyUser> authenticatedTimelyUsers = new ArrayList<>();
                                 for (TimelyUser user : requestPrincipal.getProxiedUsers()) {
@@ -151,11 +134,10 @@ public class AuthenticationService {
                                             entityToken.getTimelyPrincipal().getName());
                                     authenticatedTimelyUsers.addAll(entityPrincipal.getProxiedUsers());
                                 }
-                                verifiedPrincipal = new TimelyPrincipal(authenticatedTimelyUsers);
-                                AuthCache.put(verifiedPrincipal.getName(), verifiedPrincipal);
+                                TimelyPrincipal principal = new TimelyPrincipal(authenticatedTimelyUsers);
+                                AuthCache.put(principal.getName(), principal);
                                 LOG.debug("Authenticated user {} for request {} with authorizations {}",
-                                        verifiedPrincipal.getName(), request.toString(),
-                                        verifiedPrincipal.getAuthorizationsString());
+                                        principal.getName(), request.toString(), principal.getAuthorizationsString());
                             } else {
                                 LOG.trace("Verified principal {} in AuthCache on 2nd attempt", entity);
                             }
@@ -166,54 +148,32 @@ public class AuthenticationService {
                 } else {
                     LOG.trace("Verified principal {} in AuthCache on 1st attempt", entity);
                 }
-            } catch (RuntimeException e) {
+
+                TimelyUser primaryUser = verifiedPrincipal.getPrimaryUser();
+                if (requiredRoles != null) {
+                    if (!primaryUser.getRoles().containsAll(requiredRoles)) {
+                        Set<String> missingRoles = new TreeSet<>();
+                        missingRoles.addAll(requiredRoles);
+                        missingRoles.removeAll(primaryUser.getRoles());
+                        throw new TimelyException(HttpResponseStatus.UNAUTHORIZED.code(), "Access denied",
+                                "User:" + primaryUser.getCommonName() + " is missing auth(s):" + missingRoles);
+                    }
+                }
+                if (requiredAuths != null) {
+                    if (!primaryUser.getAuths().containsAll(requiredAuths)) {
+                        Set<String> missingAuths = new TreeSet<>();
+                        missingAuths.addAll(requiredRoles);
+                        missingAuths.removeAll(primaryUser.getAuths());
+                        throw new TimelyException(HttpResponseStatus.UNAUTHORIZED.code(), "Access denied",
+                                "User:" + primaryUser.getCommonName() + " is missing role(s):" + missingAuths);
+                    }
+                }
+
+            } catch (Exception e) {
                 LOG.error(e.getMessage(), e);
                 throw new TimelyException(HttpResponseStatus.UNAUTHORIZED.code(), "Access denied", e.getMessage());
             }
         }
-        try {
-            checkAllowedAccess(verifiedPrincipal.getPrimaryUser());
-        } catch (TimelyException e) {
-            // validation based on roles and/or auths failed
-            // remove combined principal and primary user from cache
-            // i.e. don't cache a failure
-            AuthCache.remove(verifiedPrincipal.getName());
-            AuthCache.remove(verifiedPrincipal.getPrimaryUser().getName());
-            throw e;
-        }
-
-    }
-
-    private static void checkAllowedAccess(TimelyUser primaryUser) throws TimelyException {
-        Set<String> missingRoles = new TreeSet<>();
-        Set<String> missingAuths = new TreeSet<>();
-        if (requiredRoles != null) {
-            if (!primaryUser.getRoles().containsAll(requiredRoles)) {
-                missingRoles.addAll(requiredRoles);
-                missingRoles.removeAll(primaryUser.getRoles());
-            }
-        }
-        if (requiredAuths != null) {
-            if (!primaryUser.getAuths().containsAll(requiredAuths)) {
-                missingAuths.addAll(requiredRoles);
-                missingAuths.removeAll(primaryUser.getAuths());
-            }
-        }
-
-        if (!missingRoles.isEmpty() || !missingAuths.isEmpty()) {
-            String message = "";
-            if (!missingRoles.isEmpty() && !missingAuths.isEmpty()) {
-                message = "User:" + primaryUser.getName() + " is missing role(s):" + missingRoles + " and auth(s):"
-                        + missingAuths;
-
-            } else if (!missingRoles.isEmpty()) {
-                message = "User:" + primaryUser.getName() + " is missing role(s):" + missingRoles;
-            } else if (missingAuths.isEmpty()) {
-                message = "User:" + primaryUser.getName() + " is missing auths(s):" + missingAuths;
-            }
-            LOG.debug(message);
-            throw new TimelyException(HttpResponseStatus.UNAUTHORIZED.code(), "Access denied", message);
-        }
     }
 
     public static X509Certificate getClientCertificate(ChannelHandlerContext ctx) {
@@ -245,7 +205,7 @@ public class AuthenticationService {
         return authenticationToken;
     }
 
-    public static TimelyAuthenticationToken getAuthenticationToken(Object clientCert, String subjectDn,
+    public static TimelyAuthenticationToken getAuthenticationToken(X509Certificate clientCert, String subjectDn,
             String issuerDn) {
         TimelyAuthenticationToken authenticationToken = null;
         try {

server/src/main/java/timely/auth/ScannerBaseDelegate.java

@@ -16,6 +16,8 @@ import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.data.thrift.IterInfo;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.io.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple wrapper around a {@link ScannerBase} that overrides the methods that
@@ -25,6 +27,7 @@ import org.apache.hadoop.io.Text;
  */
 public class ScannerBaseDelegate implements ScannerBase {
 
+    private static final Logger log = LoggerFactory.getLogger(ScannerBaseDelegate.class);
     private static final String SYSTEM_ITERATOR_NAME_PREFIX = "sys_";
 
     protected final ScannerBase delegate;
@@ -136,11 +139,10 @@ public class ScannerBaseDelegate implements ScannerBase {
     @Override
     public void clearScanIterators() {
         if (delegate instanceof ScannerOptions) {
-            try (ScannerOptionsHelper opts = new ScannerOptionsHelper((ScannerOptions) delegate)) {
-                for (IteratorSetting iteratorSetting : opts.getIterators()) {
-                    if (!iteratorSetting.getName().startsWith(SYSTEM_ITERATOR_NAME_PREFIX)) {
-                        delegate.removeScanIterator(iteratorSetting.getName());
-                    }
+            ScannerOptionsHelper opts = new ScannerOptionsHelper((ScannerOptions) delegate);
+            for (IteratorSetting iteratorSetting : opts.getIterators()) {
+                if (!iteratorSetting.getName().startsWith(SYSTEM_ITERATOR_NAME_PREFIX)) {
+                    delegate.removeScanIterator(iteratorSetting.getName());
                 }
             }
         } else {

server/src/main/java/timely/auth/SubjectIssuerDNPair.java

@@ -13,7 +13,6 @@ import timely.auth.util.ProxiedEntityUtils;
  */
 public class SubjectIssuerDNPair implements Serializable {
 
-    private static final long serialVersionUID = 1L;
     private final String subjectDN;
     private final String issuerDN;
 

server/src/main/java/timely/auth/TimelyPrincipal.java

@@ -29,7 +29,6 @@ import timely.auth.util.DnUtils;
 @XmlAccessorType(XmlAccessType.NONE)
 public class TimelyPrincipal implements Principal, Serializable {
 
-    private static final long serialVersionUID = 1L;
     private final String username;
     private final TimelyUser primaryUser;
     @XmlElement
@@ -104,7 +103,7 @@ public class TimelyPrincipal implements Principal, Serializable {
 
     public Set<String> getProxyServers() {
 
-    // @formatter:off
+        // @formatter:off
         Set<String> proxyServers = getProxiedUsers().stream()
                 .filter(u -> u.getUserType() == TimelyUser.UserType.SERVER)
                 .map(TimelyUser::getDn)

server/src/main/java/timely/auth/TimelyUser.java

@@ -20,8 +20,6 @@ import timely.auth.util.DnUtils;
  */
 public class TimelyUser implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     public enum UserType {
         USER, SERVER
     }

server/src/main/java/timely/auth/util/DnUtils.java

@@ -11,7 +11,6 @@ import java.util.List;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
-import io.netty.handler.codec.http.QueryStringDecoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -201,12 +200,4 @@ public class DnUtils {
             return false;
         }
     }
-
-    public static void main(String[] args) {
-
-        QueryStringDecoder decoder = new QueryStringDecoder("https://my.server:3000");
-
-        System.out.println(decoder.path());
-
-    }
 }

server/src/main/java/timely/auth/util/HttpHeaderUtils.java

@@ -13,9 +13,7 @@ public class HttpHeaderUtils {
         Multimap<String, String> headerMultimap = HashMultimap.create();
         if (headers != null) {
             for (Map.Entry<String, String> e : headers.entries()) {
-                // lower case for HTTP/2 compatibility; even for HTTP/1, these were always
-                // case-insensitive
-                headerMultimap.put(e.getKey().toLowerCase(), e.getValue());
+                headerMultimap.put(e.getKey(), e.getValue());
             }
         }
         return headerMultimap;
@@ -24,9 +22,6 @@ public class HttpHeaderUtils {
     public static String getSingleHeader(Multimap<String, String> headers, String headerName, boolean enforceOneValue)
             throws IllegalArgumentException {
         String value = null;
-        // lower case for HTTP/2 compatibility; even for HTTP/1, these were always
-        // case-insensitive
-        headerName = headerName.toLowerCase();
         Collection<String> values = (headers == null) ? null : headers.get(headerName);
         if (values != null && !values.isEmpty()) {
             if (values.size() > 1 && enforceOneValue) {

server/src/main/java/timely/configuration/Accumulo.java

@@ -1,8 +1,8 @@
 package timely.configuration;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 
+import org.hibernate.validator.constraints.NotBlank;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 public class Accumulo {

server/src/main/java/timely/configuration/Configuration.java

@@ -9,9 +9,7 @@ import javax.validation.Valid;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
 
-@Validated
 @Component
 @ConfigurationProperties(prefix = "timely")
 public class Configuration {
@@ -21,7 +19,6 @@ public class Configuration {
     private HashMap<String, Integer> metricAgeOffDays = new HashMap<>();
     private List<String> metricsReportIgnoredTags = new ArrayList<>();
     private String instance = null;
-    private String defaultVisibility = null;
 
     @Valid
     @NestedConfigurationProperty
@@ -74,14 +71,6 @@ public class Configuration {
         return instance;
     }
 
-    public String getDefaultVisibility() {
-        return defaultVisibility;
-    }
-
-    public void setDefaultVisibility(String defaultVisibility) {
-        this.defaultVisibility = defaultVisibility;
-    }
-
     public HashMap<String, Integer> getMetricAgeOffDays() {
         return metricAgeOffDays;
     }

server/src/main/java/timely/configuration/Http.java

@@ -1,9 +1,9 @@
 package timely.configuration;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import org.hibernate.validator.constraints.NotBlank;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 public class Http {

server/src/main/java/timely/configuration/MetaCache.java

@@ -2,9 +2,9 @@ package timely.configuration;
 
 public class MetaCache {
 
-    private long expirationMinutes = 1440;
-    private int cacheRefreshMinutes = -1;
-    private long maxTagValues = 100;
+    private long expirationMinutes = 60;
+    private int initialCapacity = 2000;
+    private long maxCapacity = 10000;
 
     public long getExpirationMinutes() {
         return expirationMinutes;
@@ -14,19 +14,19 @@ public class MetaCache {
         this.expirationMinutes = expirationMinutes;
     }
 
-    public void setCacheRefreshMinutes(int cacheRefreshMinutes) {
-        this.cacheRefreshMinutes = cacheRefreshMinutes;
+    public int getInitialCapacity() {
+        return initialCapacity;
     }
 
-    public int getCacheRefreshMinutes() {
-        return cacheRefreshMinutes;
+    public void setInitialCapacity(int initialCapacity) {
+        this.initialCapacity = initialCapacity;
     }
 
-    public long getMaxTagValues() {
-        return maxTagValues;
+    public long getMaxCapacity() {
+        return maxCapacity;
     }
 
-    public void setMaxTagValues(long maxTagValues) {
-        this.maxTagValues = maxTagValues;
+    public void setMaxCapacity(long maxCapacity) {
+        this.maxCapacity = maxCapacity;
     }
 }

server/src/main/java/timely/configuration/Security.java

@@ -9,8 +9,6 @@ public class Security {
     private boolean allowAnonymousHttpAccess = false;
     private boolean allowAnonymousWsAccess = false;
     private int sessionMaxAge = 86400;
-    private int cacheExpirationMinutes = 60;
-    private int cacheRefreshMinutes = 5;
     @Valid
     @NestedConfigurationProperty
     private ServerSsl serverSsl = new ServerSsl();
@@ -39,22 +37,6 @@ public class Security {
         this.sessionMaxAge = sessionMaxAge;
     }
 
-    public void setCacheExpirationMinutes(int cacheExpirationMinutes) {
-        this.cacheExpirationMinutes = cacheExpirationMinutes;
-    }
-
-    public int getCacheExpirationMinutes() {
-        return cacheExpirationMinutes;
-    }
-
-    public void setCacheRefreshMinutes(int cacheRefreshMinutes) {
-        this.cacheRefreshMinutes = cacheRefreshMinutes;
-    }
-
-    public int getCacheRefreshMinutes() {
-        return cacheRefreshMinutes;
-    }
-
     public ServerSsl getServerSsl() {
         return serverSsl;
     }

server/src/main/java/timely/configuration/Server.java

@@ -1,8 +1,9 @@
 package timely.configuration;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import org.hibernate.validator.constraints.NotBlank;
+
 public class Server {
 
     @NotBlank
@@ -41,6 +42,8 @@ public class Server {
     /**
      * Time to wait (in seconds) for connections to finish and to make sure no new
      * connections happen before shutting down Netty event loop groups.
+     *
+     * @return
      */
     public int getShutdownQuietPeriod() {
         return this.shutdownQuietPeriod;

server/src/main/java/timely/configuration/Websocket.java

@@ -1,8 +1,9 @@
 package timely.configuration;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import org.hibernate.validator.constraints.NotBlank;
+
 public class Websocket {
 
     @NotBlank

server/src/main/java/timely/netty/http/HttpCacheRequestHandler.java

@@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import timely.api.request.CacheRequest;
@@ -35,8 +35,8 @@ public class HttpCacheRequestHandler extends SimpleChannelInboundHandler<CacheRe
         }
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
                 Unpooled.copiedBuffer(buf));
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.JSON_TYPE);
-        response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+        response.headers().set(Names.CONTENT_TYPE, Constants.JSON_TYPE);
+        response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
         sendResponse(ctx, response);
     }
 

server/src/main/java/timely/netty/http/HttpMetricPutHandler.java

@@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import org.slf4j.Logger;
@@ -35,8 +35,8 @@ public class HttpMetricPutHandler extends SimpleChannelInboundHandler<MetricRequ
         }
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
                 Unpooled.EMPTY_BUFFER);
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.JSON_TYPE);
-        response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+        response.headers().set(Names.CONTENT_TYPE, Constants.JSON_TYPE);
+        response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
         sendResponse(ctx, response);
     }
 

server/src/main/java/timely/netty/http/HttpRequestDecoder.java

@@ -10,7 +10,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.QueryStringDecoder;
@@ -52,7 +52,7 @@ public class HttpRequestDecoder extends MessageToMessageDecoder<FullHttpRequest>
 
     public static String getSessionId(FullHttpRequest msg) {
         Multimap<String, String> headers = HttpHeaderUtils.toMultimap(msg.headers());
-        Collection<String> cookies = headers.get(HttpHeaderNames.COOKIE.toString());
+        Collection<String> cookies = headers.get(Names.COOKIE);
         final StringBuilder buf = new StringBuilder();
         cookies.forEach(h -> {
             ServerCookieDecoder.STRICT.decode(h).forEach(c -> {
@@ -75,7 +75,7 @@ public class HttpRequestDecoder extends MessageToMessageDecoder<FullHttpRequest>
 
         LOG.trace(LOG_RECEIVED_REQUEST, msg);
 
-        final String uri = msg.uri();
+        final String uri = msg.getUri();
         final QueryStringDecoder decoder = new QueryStringDecoder(uri);
         if (decoder.path().equals(nonSecureRedirectAddress)) {
             out.add(new StrictTransportResponse());
@@ -87,10 +87,10 @@ public class HttpRequestDecoder extends MessageToMessageDecoder<FullHttpRequest>
 
         HttpRequest request;
         try {
-            if (msg.method().equals(HttpMethod.GET)) {
+            if (msg.getMethod().equals(HttpMethod.GET)) {
                 HttpGetRequest get = AnnotationResolver.getClassForHttpGet(decoder.path());
                 request = get.parseQueryParameters(decoder);
-            } else if (msg.method().equals(HttpMethod.POST)) {
+            } else if (msg.getMethod().equals(HttpMethod.POST)) {
                 HttpPostRequest post = AnnotationResolver.getClassForHttpPost(decoder.path());
                 String content = "";
                 ByteBuf body = msg.content();
@@ -101,9 +101,8 @@ public class HttpRequestDecoder extends MessageToMessageDecoder<FullHttpRequest>
             } else {
                 TimelyException e = new TimelyException(HttpResponseStatus.METHOD_NOT_ALLOWED.code(),
                         "unhandled method type", "");
-                e.addResponseHeader(HttpHeaderNames.ALLOW.toString(),
-                        HttpMethod.GET.name() + "," + HttpMethod.POST.name());
-                LOG.warn("Unhandled HTTP request type {}", msg.method());
+                e.addResponseHeader(Names.ALLOW, HttpMethod.GET.name() + "," + HttpMethod.POST.name());
+                LOG.warn("Unhandled HTTP request type {}", msg.getMethod());
                 throw e;
             }
             if (request instanceof AuthenticatedRequest) {

server/src/main/java/timely/netty/http/HttpStaticFileServerHandler.java

@@ -15,14 +15,14 @@
  */
 package timely.netty.http;
 
-import static io.netty.handler.codec.http.HttpHeaderNames.CACHE_CONTROL;
-import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION;
-import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
-import static io.netty.handler.codec.http.HttpHeaderNames.DATE;
-import static io.netty.handler.codec.http.HttpHeaderNames.EXPIRES;
-import static io.netty.handler.codec.http.HttpHeaderNames.IF_MODIFIED_SINCE;
-import static io.netty.handler.codec.http.HttpHeaderNames.LAST_MODIFIED;
-import static io.netty.handler.codec.http.HttpHeaderNames.LOCATION;
+import static io.netty.handler.codec.http.HttpHeaders.Names.CACHE_CONTROL;
+import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
+import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE;
+import static io.netty.handler.codec.http.HttpHeaders.Names.DATE;
+import static io.netty.handler.codec.http.HttpHeaders.Names.EXPIRES;
+import static io.netty.handler.codec.http.HttpHeaders.Names.IF_MODIFIED_SINCE;
+import static io.netty.handler.codec.http.HttpHeaders.Names.LAST_MODIFIED;
+import static io.netty.handler.codec.http.HttpHeaders.Names.LOCATION;
 import static io.netty.handler.codec.http.HttpMethod.GET;
 import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
 import static io.netty.handler.codec.http.HttpResponseStatus.FORBIDDEN;
@@ -59,10 +59,9 @@ import io.netty.handler.codec.http.DefaultHttpResponse;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpChunkedInput;
-import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.handler.codec.http.HttpUtil;
 import io.netty.handler.stream.ChunkedFile;
 import io.netty.util.CharsetUtil;
 import io.netty.util.internal.SystemPropertyUtil;
@@ -95,7 +94,7 @@ import timely.netty.Constants;
  * Request #1 Headers
  * ===================
  * GET /file1.txt HTTP/1.1
- *
+ * 
  * Response #1 Headers
  * ===================
  * HTTP/1.1 200 OK
@@ -103,12 +102,12 @@ import timely.netty.Constants;
  * Last-Modified:      Wed, 30 Jun 2010 21:36:48 GMT
  * Expires:            Tue, 01 Mar 2012 22:44:26 GMT
  * Cache-Control:      private, max-age=31536000
- *
+ * 
  * Request #2 Headers
  * ===================
  * GET /file1.txt HTTP/1.1
  * If-Modified-Since:  Wed, 30 Jun 2010 21:36:48 GMT
- *
+ * 
  * Response #2 Headers
  * ===================
  * HTTP/1.1 304 Not Modified
@@ -126,17 +125,17 @@ public class HttpStaticFileServerHandler extends SimpleChannelInboundHandler<Ful
 
     @Override
     public void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception {
-        if (!request.decoderResult().isSuccess()) {
+        if (!request.getDecoderResult().isSuccess()) {
             sendError(ctx, BAD_REQUEST);
             return;
         }
 
-        if (request.method() != GET) {
+        if (request.getMethod() != GET) {
             sendError(ctx, METHOD_NOT_ALLOWED);
             return;
         }
 
-        String uri = request.uri();
+        String uri = request.getUri();
         if (uri.startsWith("/favicon.ico")) {
             uri = uri.replaceFirst("\\/", "/webapp/");
         }
@@ -202,12 +201,12 @@ public class HttpStaticFileServerHandler extends SimpleChannelInboundHandler<Ful
         long fileLength = raf.length();
 
         HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
-        HttpUtil.setContentLength(response, fileLength);
+        HttpHeaders.setContentLength(response, fileLength);
         setContentTypeHeader(response, file);
         setDateAndCacheHeaders(response, file);
-        HttpUtil.setTransferEncodingChunked(response, true);
-        if (HttpUtil.isKeepAlive(request)) {
-            response.headers().set(CONNECTION, HttpHeaderValues.KEEP_ALIVE);
+        HttpHeaders.setTransferEncodingChunked(response);
+        if (HttpHeaders.isKeepAlive(request)) {
+            response.headers().set(CONNECTION, HttpHeaders.Values.KEEP_ALIVE);
         }
 
         // Write the initial line and the header.

server/src/main/java/timely/netty/http/HttpVersionRequestHandler.java

@@ -7,7 +7,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import timely.api.request.VersionRequest;
@@ -20,8 +20,8 @@ public class HttpVersionRequestHandler extends SimpleChannelInboundHandler<Versi
     protected void channelRead0(ChannelHandlerContext ctx, VersionRequest v) throws Exception {
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
                 Unpooled.copiedBuffer(VersionRequest.VERSION.getBytes(StandardCharsets.UTF_8)));
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.TEXT_TYPE);
-        response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+        response.headers().set(Names.CONTENT_TYPE, Constants.TEXT_TYPE);
+        response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
         sendResponse(ctx, response);
     }
 

server/src/main/java/timely/netty/http/NonSslRedirectHandler.java

@@ -6,7 +6,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseEncoder;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
@@ -51,7 +51,7 @@ public class NonSslRedirectHandler extends OptionalSslHandler implements TimelyH
                 LOG.trace("Received non-SSL request, returning redirect");
                 FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
                         HttpResponseStatus.MOVED_PERMANENTLY, Unpooled.EMPTY_BUFFER);
-                response.headers().set(HttpHeaderNames.LOCATION, redirectAddress);
+                response.headers().set(Names.LOCATION, redirectAddress);
                 LOG.trace(Constants.LOG_RETURNING_RESPONSE, response);
                 encoder.write(ctx, response, ctx.voidPromise());
                 ctx.flush();

server/src/main/java/timely/netty/http/TimelyHttpHandler.java

@@ -6,7 +6,7 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import org.slf4j.Logger;
@@ -25,8 +25,8 @@ public interface TimelyHttpHandler {
                 .writeValueAsBytes("ResponseCode: " + e.getCode() + " Message: " + e.getMessage());
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
                 HttpResponseStatus.valueOf(e.getCode()), Unpooled.copiedBuffer(buf));
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.JSON_TYPE);
-        response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+        response.headers().set(Names.CONTENT_TYPE, Constants.JSON_TYPE);
+        response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
         e.getResponseHeaders().entrySet().forEach(entry -> response.headers().set(entry.getKey(), entry.getValue()));
         // Send the error response
         sendResponse(ctx, response);

server/src/main/java/timely/netty/http/auth/TimelyAuthenticationToken.java

@@ -17,26 +17,24 @@ import timely.auth.util.HttpHeaderUtils;
 
 public class TimelyAuthenticationToken extends PreAuthenticatedAuthenticationToken {
 
-    private static final long serialVersionUID = 1L;
     private static final Logger LOG = LoggerFactory.getLogger(TimelyAuthenticationToken.class);
-    public static final String PROXIED_ENTITIES_HEADER = "x-proxiedentitieschain";
-    public static final String PROXIED_ISSUERS_HEADER = "x-proxiedissuerschain";
+    public static final String PROXIED_ENTITIES_HEADER = "X-ProxiedEntitiesChain";
+    public static final String PROXIED_ISSUERS_HEADER = "X-ProxiedIssuersChain";
 
     private Multimap<String, String> httpHeaders = null;
-    private X509Certificate clientCert = null;
+    private X509Certificate clientCert;
     private TimelyPrincipal timelyPrincipal;
 
-    public TimelyAuthenticationToken(String subjectDn, Object clientCert, Multimap<String, String> httpHeaders) {
+    public TimelyAuthenticationToken(String subjectDn, X509Certificate clientCert,
+            Multimap<String, String> httpHeaders) {
         super(subjectDn, clientCert);
         if (httpHeaders == null) {
             this.httpHeaders = HashMultimap.create();
         } else {
             this.httpHeaders = httpHeaders;
         }
-        if (clientCert instanceof X509Certificate) {
-            this.clientCert = (X509Certificate) clientCert;
-        }
-        String issuerDn = clientCert == null ? null : this.clientCert.getIssuerDN().getName();
+        this.clientCert = clientCert;
+        String issuerDn = clientCert == null ? null : clientCert.getIssuerDN().getName();
         String proxiedEntities;
         String proxiedIssuers;
         try {
@@ -63,11 +61,9 @@ public class TimelyAuthenticationToken extends PreAuthenticatedAuthenticationTok
         LOG.trace("Created TimelyAuthenticationToken: {}", timelyPrincipal.getName());
     }
 
-    public TimelyAuthenticationToken(String subjectDn, String issuerDn, Object clientCert) {
+    public TimelyAuthenticationToken(String subjectDn, String issuerDn, X509Certificate clientCert) {
         super(subjectDn, clientCert);
-        if (clientCert instanceof X509Certificate) {
-            this.clientCert = (X509Certificate) clientCert;
-        }
+        this.clientCert = clientCert;
         TimelyUser.UserType userType = DnUtils.isServerDN(subjectDn) ? TimelyUser.UserType.SERVER
                 : TimelyUser.UserType.USER;
         TimelyUser timelyUser = new TimelyUser(SubjectIssuerDNPair.of(subjectDn, issuerDn), userType, null, null, null,

server/src/main/java/timely/netty/http/auth/TimelyLoginRequestHandler.java

@@ -8,7 +8,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.codec.http.cookie.DefaultCookie;
@@ -43,22 +43,22 @@ public abstract class TimelyLoginRequestHandler<T> extends SimpleChannelInboundH
                     principal.getPrimaryUser().getDn().subjectDN());
             String sessionIdEncoded = URLEncoder.encode(sessionId, StandardCharsets.UTF_8.name());
             FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK);
-            response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.JSON_TYPE);
-            response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+            response.headers().set(Names.CONTENT_TYPE, Constants.JSON_TYPE);
+            response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
             DefaultCookie cookie = new DefaultCookie(Constants.COOKIE_NAME, sessionIdEncoded);
             cookie.setDomain(domain);
             cookie.setMaxAge(maxAge);
             cookie.setPath("/");
             cookie.setHttpOnly(true);
             cookie.setSecure(true);
-            response.headers().set(HttpHeaderNames.SET_COOKIE, ServerCookieEncoder.STRICT.encode(cookie));
+            response.headers().set(Names.SET_COOKIE, ServerCookieEncoder.STRICT.encode(cookie));
             sendResponse(ctx, response);
         } catch (Exception e) {
             LOG.error("Login failure", e);
             FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
                     HttpResponseStatus.UNAUTHORIZED);
-            response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.JSON_TYPE);
-            response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+            response.headers().set(Names.CONTENT_TYPE, Constants.JSON_TYPE);
+            response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
             sendResponse(ctx, response);
         }
 

server/src/main/java/timely/netty/http/timeseries/HttpAggregatorsRequestHandler.java

@@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import timely.api.request.timeseries.AggregatorsRequest;
@@ -22,8 +22,8 @@ public class HttpAggregatorsRequestHandler extends SimpleChannelInboundHandler<A
         byte[] buf = JsonUtil.getObjectMapper().writeValueAsBytes(AggregatorsResponse.RESPONSE);
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
                 Unpooled.copiedBuffer(buf));
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.JSON_TYPE);
-        response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+        response.headers().set(Names.CONTENT_TYPE, Constants.JSON_TYPE);
+        response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
         sendResponse(ctx, response);
     }
 

server/src/main/java/timely/netty/http/timeseries/HttpMetricsRequestHandler.java

@@ -2,7 +2,7 @@ package timely.netty.http.timeseries;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import timely.api.request.timeseries.MetricsRequest;
 import timely.api.response.timeseries.MetricsResponse;
 import timely.configuration.Configuration;
@@ -20,7 +20,7 @@ public class HttpMetricsRequestHandler extends SimpleChannelInboundHandler<Metri
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, MetricsRequest msg) throws Exception {
         MetricsResponse r = new MetricsResponse(conf);
-        String acceptHeader = msg.getRequestHeader(HttpHeaderNames.ACCEPT.toString());
+        String acceptHeader = msg.getRequestHeader(Names.ACCEPT);
         sendResponse(ctx, r.toHttpResponse(acceptHeader));
     }
 

server/src/main/java/timely/netty/http/timeseries/HttpQueryRequestHandler.java

@@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import org.slf4j.Logger;
@@ -42,8 +42,8 @@ public class HttpQueryRequestHandler extends SimpleChannelInboundHandler<QueryRe
         }
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
                 Unpooled.copiedBuffer(buf));
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.JSON_TYPE);
-        response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+        response.headers().set(Names.CONTENT_TYPE, Constants.JSON_TYPE);
+        response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
         sendResponse(ctx, response);
     }
 

server/src/main/java/timely/netty/http/timeseries/HttpSearchLookupRequestHandler.java

@@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import org.slf4j.Logger;
@@ -39,8 +39,8 @@ public class HttpSearchLookupRequestHandler extends SimpleChannelInboundHandler<
         }
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
                 Unpooled.copiedBuffer(buf));
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.JSON_TYPE);
-        response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+        response.headers().set(Names.CONTENT_TYPE, Constants.JSON_TYPE);
+        response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
         sendResponse(ctx, response);
     }
 

server/src/main/java/timely/netty/http/timeseries/HttpSuggestRequestHandler.java

@@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
 import org.slf4j.Logger;
@@ -39,8 +39,8 @@ public class HttpSuggestRequestHandler extends SimpleChannelInboundHandler<Sugge
         }
         FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK,
                 Unpooled.copiedBuffer(buf));
-        response.headers().set(HttpHeaderNames.CONTENT_TYPE, Constants.JSON_TYPE);
-        response.headers().set(HttpHeaderNames.CONTENT_LENGTH, response.content().readableBytes());
+        response.headers().set(Names.CONTENT_TYPE, Constants.JSON_TYPE);
+        response.headers().set(Names.CONTENT_LENGTH, response.content().readableBytes());
         sendResponse(ctx, response);
     }
 

server/src/main/java/timely/sample/iterators/AggregationIterator.java

@@ -37,6 +37,7 @@ public class AggregationIterator extends WrappingIterator {
     private Set<Tag> tags;
     private Key last;
 
+    @SuppressWarnings("unchecked")
     @Override
     public void init(SortedKeyValueIterator<Key, Value> source, Map<String, String> options, IteratorEnvironment env)
             throws IOException {
@@ -44,10 +45,7 @@ public class AggregationIterator extends WrappingIterator {
         String aggClassname = options.get(AGGCLASS);
         Class<? extends Aggregator> aggClass = null;
         try {
-            @SuppressWarnings("unchecked")
-            Class<? extends Aggregator> uncheckedAggClass = (Class<? extends Aggregator>) this.getClass()
-                    .getClassLoader().loadClass(aggClassname);
-            aggClass = uncheckedAggClass;
+            aggClass = (Class<? extends Aggregator>) this.getClass().getClassLoader().loadClass(aggClassname);
             tags = new HashSet<>(new TagListParser().parse(options.get(TAGS)));
             aggregation = new Aggregation(aggClass.newInstance());
         } catch (ClassNotFoundException e) {
@@ -121,11 +119,10 @@ public class AggregationIterator extends WrappingIterator {
         is.addOption(AGGCLASS, classname);
     }
 
+    @SuppressWarnings("unchecked")
     public static Map<Set<Tag>, Aggregation> decodeValue(Value value) throws IOException, ClassNotFoundException {
         ByteArrayInputStream bis = new ByteArrayInputStream(value.get());
         ObjectInputStream ois = new ObjectInputStream(bis);
-        @SuppressWarnings("unchecked")
-        Map<Set<Tag>, Aggregation> unchecked = (Map<Set<Tag>, Aggregation>) ois.readObject();
-        return unchecked;
+        return (Map<Set<Tag>, Aggregation>) ois.readObject();
     }
 }

server/src/main/java/timely/sample/iterators/DownsampleIterator.java

@@ -51,6 +51,7 @@ public class DownsampleIterator extends WrappingIterator {
 
     private DownsampleMemoryEstimator memoryEstimator = null;
 
+    @SuppressWarnings("unchecked")
     @Override
     public void init(SortedKeyValueIterator<Key, Value> source, Map<String, String> options, IteratorEnvironment env)
             throws IOException {
@@ -72,9 +73,7 @@ public class DownsampleIterator extends WrappingIterator {
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
-        @SuppressWarnings("unchecked")
-        Class<? extends Aggregator> uncheckedAggClass = (Class<? extends Aggregator>) aggClass;
-        factory = new DownsampleFactory(start, end, period, uncheckedAggClass);
+        factory = new DownsampleFactory(start, end, period, (Class<? extends Aggregator>) aggClass);
     }
 
     @Override
@@ -155,12 +154,11 @@ public class DownsampleIterator extends WrappingIterator {
         is.addOption(AGGCLASS, classname);
     }
 
+    @SuppressWarnings("unchecked")
     public static Map<Set<Tag>, Downsample> decodeValue(Value value) throws IOException, ClassNotFoundException {
         ByteArrayInputStream bis = new ByteArrayInputStream(value.get());
         ObjectInputStream ois = new ObjectInputStream(bis);
-        @SuppressWarnings("unchecked")
-        Map<Set<Tag>, Downsample> unchecked = (Map<Set<Tag>, Downsample>) ois.readObject();
-        return unchecked;
+        return (Map<Set<Tag>, Downsample>) ois.readObject();
     }
 
     public static long getDownsamplePeriod(QueryRequest.SubQuery query) {

server/src/main/java/timely/store/DataStoreImpl.java

@@ -2,7 +2,6 @@ package timely.store;
 
 import static org.apache.accumulo.core.conf.AccumuloConfiguration.getMemoryInBytes;
 import static org.apache.accumulo.core.conf.AccumuloConfiguration.getTimeInMillis;
-import static timely.adapter.accumulo.MetricAdapter.VISIBILITY_TAG;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -19,7 +18,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.Timer;
@@ -48,18 +46,12 @@ import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.PartialKey;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.data.*;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.user.RegExFilter;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.core.security.VisibilityEvaluator;
 import org.apache.accumulo.core.util.Pair;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.configuration.BaseConfiguration;
 import org.apache.hadoop.io.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -138,16 +130,15 @@ public class DataStoreImpl implements DataStore {
     private final Map<String, String> ageOff;
     private final long defaultAgeOffMilliSec;
     private DataStoreCache cache = null;
-    private final String defaultVisibility;
 
     public DataStoreImpl(Configuration conf, int numWriteThreads) throws TimelyException {
 
         try {
-            final Map<String, String> properties = new HashMap<>();
+            final BaseConfiguration apacheConf = new BaseConfiguration();
             Accumulo accumuloConf = conf.getAccumulo();
-            properties.put("instance.name", accumuloConf.getInstanceName());
-            properties.put("instance.zookeeper.host", accumuloConf.getZookeepers());
-            final ClientConfiguration aconf = ClientConfiguration.fromMap(properties);
+            apacheConf.setProperty("instance.name", accumuloConf.getInstanceName());
+            apacheConf.setProperty("instance.zookeeper.host", accumuloConf.getZookeepers());
+            final ClientConfiguration aconf = new ClientConfiguration(Collections.singletonList(apacheConf));
             final Instance instance = new ZooKeeperInstance(aconf);
             connector = instance.getConnector(accumuloConf.getUsername(),
                     new PasswordToken(accumuloConf.getPassword()));
@@ -158,31 +149,6 @@ public class DataStoreImpl implements DataStore {
             scannerThreads = accumuloConf.getScan().getThreads();
             maxDownsampleMemory = accumuloConf.getScan().getMaxDownsampleMemory();
             security = conf.getSecurity();
-            defaultVisibility = conf.getDefaultVisibility();
-            if (StringUtils.isNotBlank(defaultVisibility)) {
-                ColumnVisibility vis;
-                try {
-                    // validate visibility
-                    vis = new ColumnVisibility(defaultVisibility);
-                    LOG.info("Using defaultVisibility: {}", vis.toString());
-                } catch (RuntimeException e) {
-                    LOG.error("Error validating defaultVisibility " + defaultVisibility + " " + e.getMessage(), e);
-                    throw e;
-                }
-
-                try {
-                    String whoami = connector.whoami();
-                    Authorizations auths = connector.securityOperations().getUserAuthorizations(whoami);
-                    VisibilityEvaluator eval = new VisibilityEvaluator(auths);
-                    if (!eval.evaluate(vis)) {
-                        throw new IllegalArgumentException("Accumulo user " + whoami + " with authorization "
-                                + auths.toString() + " can not see data with defaultVisibility " + vis.toString());
-                    }
-                } catch (RuntimeException e) {
-                    LOG.error(e.getMessage(), e);
-                    throw e;
-                }
-            }
 
             metricsTable = conf.getMetricsTable();
             if (metricsTable.contains(".")) {
@@ -211,7 +177,7 @@ public class DataStoreImpl implements DataStore {
             }
             try {
                 this.removeAgeOffIterators(connector, metricsTable);
-                this.applyMetricAgeOffIterator(connector, metricsTable);
+                this.applyAgeOffIterator(connector, metricsTable, true);
             } catch (Exception e1) {
                 Throwable cause = e1.getCause();
                 if (cause.getMessage().contains("conflict")) {
@@ -232,7 +198,7 @@ public class DataStoreImpl implements DataStore {
             }
             try {
                 this.removeAgeOffIterators(connector, metaTable);
-                this.applyMetaAgeOffIterator(connector, metaTable);
+                this.applyAgeOffIterator(connector, metaTable, false);
             } catch (Exception e1) {
                 Throwable cause = e1.getCause();
                 if (cause.getMessage().contains("conflict")) {
@@ -285,15 +251,13 @@ public class DataStoreImpl implements DataStore {
         }
     }
 
-    private void applyMetricAgeOffIterator(Connector con, String tableName) throws Exception {
-        IteratorSetting ageOffIteratorSettings = new IteratorSetting(100, "ageoffmetrics", MetricAgeOffIterator.class,
-                this.ageOff);
-        connector.tableOperations().attachIterator(tableName, ageOffIteratorSettings, AGEOFF_SCOPES);
-    }
-
-    private void applyMetaAgeOffIterator(Connector con, String tableName) throws Exception {
-        IteratorSetting ageOffIteratorSettings = new IteratorSetting(100, "ageoffmeta", MetaAgeOffIterator.class,
-                this.ageOff);
+    private void applyAgeOffIterator(Connector con, String tableName, boolean useIterator) throws Exception {
+        IteratorSetting ageOffIteratorSettings = null;
+        if (useIterator) {
+            ageOffIteratorSettings = new IteratorSetting(100, "ageoff", MetricAgeOffIterator.class, this.ageOff);
+        } else {
+            ageOffIteratorSettings = new IteratorSetting(100, "ageoff", MetricAgeOffFilter.class, this.ageOff);
+        }
         connector.tableOperations().attachIterator(tableName, ageOffIteratorSettings, AGEOFF_SCOPES);
     }
 
@@ -315,17 +279,6 @@ public class DataStoreImpl implements DataStore {
     public void store(Metric metric, boolean cacheEnabled) {
         LOG.trace("Received Store Request for: {}", metric);
 
-        // if default visibility is configured and current metric does not contain a
-        // visibility
-        // add it here, so that the cache and accumulo stores both have the correct
-        // visibility
-        if (StringUtils.isNotBlank(defaultVisibility)) {
-            Optional<Tag> visTag = metric.getTags().stream().filter(t -> t.getKey().equals(VISIBILITY_TAG)).findFirst();
-            if (!visTag.isPresent()) {
-                metric.addTag(new Tag(VISIBILITY_TAG, defaultVisibility));
-            }
-        }
-
         if (cache != null && cacheEnabled) {
             cache.store(metric);
         }
@@ -443,7 +396,6 @@ public class DataStoreImpl implements DataStore {
     @Override
     public SuggestResponse suggest(SuggestRequest request) throws TimelyException {
         SuggestResponse result = new SuggestResponse();
-        Scanner scanner = null;
         try {
             if (request.getType().equals("metrics")) {
                 Range range;
@@ -463,7 +415,7 @@ public class DataStoreImpl implements DataStore {
                     end.append(lastBytes, 0, lastBytes.length);
                     range = new Range(start, end);
                 }
-                scanner = connector.createScanner(metaTable, Authorizations.EMPTY);
+                Scanner scanner = connector.createScanner(metaTable, Authorizations.EMPTY);
                 scanner.setRange(range);
                 List<String> metrics = new ArrayList<>();
                 for (Entry<Key, Value> metric : scanner) {
@@ -478,10 +430,6 @@ public class DataStoreImpl implements DataStore {
             LOG.error("Error during suggest: " + ex.getMessage(), ex);
             throw new TimelyException(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(),
                     "Error during suggest: " + ex.getMessage(), ex.getMessage(), ex);
-        } finally {
-            if (scanner != null) {
-                scanner.close();
-            }
         }
         return result;
     }
@@ -516,34 +464,28 @@ public class DataStoreImpl implements DataStore {
             tagPatterns.put(k, Pattern.compile(v));
         });
         try {
-            final Scanner scanner = connector.createScanner(metaTable, Authorizations.EMPTY);
-            try {
-                List<Result> resultField = new ArrayList<>();
-                Key start = new Key(Meta.VALUE_PREFIX + msg.getQuery());
-                Key end = start.followingKey(PartialKey.ROW);
-                Range range = new Range(start, end);
-                scanner.setRange(range);
-                tags.keySet().forEach(k -> scanner.fetchColumnFamily(new Text(k)));
-                int total = 0;
-                for (Entry<Key, Value> entry : scanner) {
-                    Meta metaEntry = Meta.parse(entry.getKey(), entry.getValue());
-                    if (matches(metaEntry.getTagKey(), metaEntry.getTagValue(), tagPatterns)) {
-                        if (resultField.size() < msg.getLimit()) {
-                            Result r = new Result();
-                            r.putTag(metaEntry.getTagKey(), metaEntry.getTagValue());
-                            resultField.add(r);
-                        }
-                        total++;
+            List<Result> resultField = new ArrayList<>();
+            Scanner scanner = connector.createScanner(metaTable, Authorizations.EMPTY);
+            Key start = new Key(Meta.VALUE_PREFIX + msg.getQuery());
+            Key end = start.followingKey(PartialKey.ROW);
+            Range range = new Range(start, end);
+            scanner.setRange(range);
+            tags.keySet().forEach(k -> scanner.fetchColumnFamily(new Text(k)));
+            int total = 0;
+            for (Entry<Key, Value> entry : scanner) {
+                Meta metaEntry = Meta.parse(entry.getKey(), entry.getValue());
+                if (matches(metaEntry.getTagKey(), metaEntry.getTagValue(), tagPatterns)) {
+                    if (resultField.size() < msg.getLimit()) {
+                        Result r = new Result();
+                        r.putTag(metaEntry.getTagKey(), metaEntry.getTagValue());
+                        resultField.add(r);
                     }
-                }
-                result.setResults(resultField);
-                result.setTotalResults(total);
-                result.setTime((int) (System.currentTimeMillis() - startMillis));
-            } finally {
-                if (scanner != null) {
-                    scanner.close();
+                    total++;
                 }
             }
+            result.setResults(resultField);
+            result.setTotalResults(total);
+            result.setTime((int) (System.currentTimeMillis() - startMillis));
         } catch (Exception ex) {
             LOG.error("Error during lookup: " + ex.getMessage(), ex);
             throw new TimelyException(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(),
@@ -812,80 +754,72 @@ public class DataStoreImpl implements DataStore {
         return !REGEX_TEST.matcher(value).matches();
     }
 
-    @Override
     public Set<Tag> getColumnFamilies(String metric, Map<String, String> requestedTags) throws TableNotFoundException {
 
-        Scanner meta = null;
-        try {
-            Map<String, String> tags = (requestedTags == null) ? new LinkedHashMap<>() : requestedTags;
-            LOG.trace("Looking for requested tags: {}", tags);
-            meta = connector.createScanner(metaTable, Authorizations.EMPTY);
-            Text start = new Text(Meta.VALUE_PREFIX + metric);
-            Text end = new Text(Meta.VALUE_PREFIX + metric + "\\x0000");
-            end.append(new byte[] { (byte) 0xff }, 0, 1);
-            meta.setRange(new Range(start, end));
-            // Only look for the meta entries that match our tags, if any
-            boolean onlyFirstRow = false;
-            Entry<String, String> first = null;
-            // Set the columns on the meta scanner based on the first tag
-            // in the set of tags passed in the query. If no tags are present
-            // then we are only going to return the first tag name present in the
-            // meta table.
-            Iterator<Entry<String, String>> tagIter = tags.entrySet().iterator();
-            if (tagIter.hasNext()) {
-                first = tagIter.next();
-                if (isTagValueRegex(first.getValue())) {
-                    meta.fetchColumnFamily(new Text(first.getKey()));
-                } else {
-                    meta.fetchColumn(new Text(first.getKey()), new Text(first.getValue()));
-                }
+        Map<String, String> tags = (requestedTags == null) ? new LinkedHashMap<>() : requestedTags;
+        LOG.trace("Looking for requested tags: {}", tags);
+        Scanner meta = connector.createScanner(metaTable, Authorizations.EMPTY);
+        Text start = new Text(Meta.VALUE_PREFIX + metric);
+        Text end = new Text(Meta.VALUE_PREFIX + metric + "\\x0000");
+        end.append(new byte[] { (byte) 0xff }, 0, 1);
+        meta.setRange(new Range(start, end));
+        // Only look for the meta entries that match our tags, if any
+        boolean onlyFirstRow = false;
+        Entry<String, String> first = null;
+        // Set the columns on the meta scanner based on the first tag
+        // in the set of tags passed in the query. If no tags are present
+        // then we are only going to return the first tag name present in the
+        // meta table.
+        Iterator<Entry<String, String>> tagIter = tags.entrySet().iterator();
+        if (tagIter.hasNext()) {
+            first = tagIter.next();
+            if (isTagValueRegex(first.getValue())) {
+                meta.fetchColumnFamily(new Text(first.getKey()));
             } else {
-                // grab all of the values found for the first tag for the metric
-                onlyFirstRow = true;
-            }
-            final boolean ONLY_RETURN_FIRST_TAG = onlyFirstRow;
-            Iterator<Entry<Key, Value>> iter = meta.iterator();
-            Iterator<Pair<String, String>> knownKeyValues = new Iterator<Pair<String, String>>() {
-
-                Text firstTag = null;
-                Text tagName = null;
-                Text tagValue = null;
-
-                @Override
-                public boolean hasNext() {
-                    if (iter.hasNext()) {
-                        Entry<Key, Value> metaEntry = iter.next();
-                        if (null == firstTag) {
-                            firstTag = metaEntry.getKey().getColumnFamily();
-                        }
-                        tagName = metaEntry.getKey().getColumnFamily();
-                        tagValue = metaEntry.getKey().getColumnQualifier();
-                        LOG.trace("Found tag entry {}={}", tagName, tagValue);
-
-                        if (ONLY_RETURN_FIRST_TAG && !tagName.equals(firstTag)) {
-                            return false;
-                        }
-                        return true;
-                    }
-                    return false;
-                }
-
-                @Override
-                public Pair<String, String> next() {
-                    LOG.trace("Returning tag {}={}", tagName, tagValue);
-                    return new Pair<>(tagName.toString(), tagValue.toString());
-                }
-            };
-            // Expand the list of tags in the meta table for this metric that
-            // matches
-            // the pattern of the first tag in the query. The resulting set of tags
-            // will be used to fetch specific columns from the metric table.
-            return expandTagValues(first, knownKeyValues);
-        } finally {
-            if (meta != null) {
-                meta.close();
+                meta.fetchColumn(new Text(first.getKey()), new Text(first.getValue()));
             }
+        } else {
+            // grab all of the values found for the first tag for the metric
+            onlyFirstRow = true;
         }
+        final boolean ONLY_RETURN_FIRST_TAG = onlyFirstRow;
+        Iterator<Entry<Key, Value>> iter = meta.iterator();
+        Iterator<Pair<String, String>> knownKeyValues = new Iterator<Pair<String, String>>() {
+
+            Text firstTag = null;
+            Text tagName = null;
+            Text tagValue = null;
+
+            @Override
+            public boolean hasNext() {
+                if (iter.hasNext()) {
+                    Entry<Key, Value> metaEntry = iter.next();
+                    if (null == firstTag) {
+                        firstTag = metaEntry.getKey().getColumnFamily();
+                    }
+                    tagName = metaEntry.getKey().getColumnFamily();
+                    tagValue = metaEntry.getKey().getColumnQualifier();
+                    LOG.trace("Found tag entry {}={}", tagName, tagValue);
+
+                    if (ONLY_RETURN_FIRST_TAG && !tagName.equals(firstTag)) {
+                        return false;
+                    }
+                    return true;
+                }
+                return false;
+            }
+
+            @Override
+            public Pair<String, String> next() {
+                LOG.trace("Returning tag {}={}", tagName, tagValue);
+                return new Pair<>(tagName.toString(), tagValue.toString());
+            }
+        };
+        // Expand the list of tags in the meta table for this metric that
+        // matches
+        // the pattern of the first tag in the query. The resulting set of tags
+        // will be used to fetch specific columns from the metric table.
+        return expandTagValues(first, knownKeyValues);
     }
 
     private void setQueryColumns(ScannerBase scanner, String metric, Map<String, String> tags, Set<Tag> colFamValues)
@@ -956,7 +890,6 @@ public class DataStoreImpl implements DataStore {
         return result;
     }
 
-    @Override
     public List<Range> getQueryRanges(String metric, long start, long end, Set<Tag> colFamValues) {
         List<Range> ranges = new ArrayList<>();
         long beginRangeRounded = MetricAdapter.roundTimestampToLastHour(start);
@@ -1019,7 +952,6 @@ public class DataStoreImpl implements DataStore {
         return AuthCache.getAuthorizations(request, security);
     }
 
-    @Override
     public long getAgeOffForMetric(String metricName) {
         String age = this.ageOff.get(MetricAgeOffIterator.AGE_OFF_PREFIX + metricName);
         if (null == age) {
@@ -1029,7 +961,6 @@ public class DataStoreImpl implements DataStore {
         }
     }
 
-    @Override
     public Scanner createScannerForMetric(AuthenticatedRequest request, String metric, Map<String, String> tags,
             int scannerBatchSize, int scannerReadAhead) throws TimelyException {
         try {

server/src/main/java/timely/store/MetaAgeOffIterator.java

@@ -1,116 +0,0 @@
-package timely.store;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.accumulo.core.data.ByteSequence;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.iterators.WrappingIterator;
-import org.apache.commons.collections4.trie.PatriciaTrie;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import timely.api.model.Meta;
-
-public class MetaAgeOffIterator extends WrappingIterator implements OptionDescriber {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MetaAgeOffIterator.class);
-    public static final String AGE_OFF_PREFIX = "ageoff.";
-    public static final String DEFAULT_AGEOFF_KEY = "default";
-
-    /* set in init */
-    private PatriciaTrie<Long> ageoffs = null;
-    private Long currentTime = 0L;
-    private Long defaultAgeOff = 0L;
-    private Long minAgeOff = Long.MAX_VALUE;
-    private Long maxAgeOff = Long.MIN_VALUE;
-
-    @Override
-    public SortedKeyValueIterator<Key, Value> deepCopy(IteratorEnvironment env) {
-        MetaAgeOffIterator iter = new MetaAgeOffIterator();
-        iter.ageoffs = this.ageoffs;
-        iter.defaultAgeOff = this.defaultAgeOff;
-        iter.currentTime = this.currentTime;
-        iter.minAgeOff = this.minAgeOff;
-        iter.maxAgeOff = this.maxAgeOff;
-        return iter;
-    }
-
-    @Override
-    public void init(SortedKeyValueIterator<Key, Value> source, Map<String, String> options, IteratorEnvironment env)
-            throws IOException {
-        super.init(source, options, env);
-        validateOptions(options);
-        ageoffs = new PatriciaTrie<>();
-        options.forEach((k, v) -> {
-            if (k.startsWith(AGE_OFF_PREFIX)) {
-                String name = k.substring(AGE_OFF_PREFIX.length());
-                LOG.trace("Adding {} to Trie with value {}", name, Long.parseLong(v));
-                long ageoff = Long.parseLong(v);
-                this.minAgeOff = Math.min(this.minAgeOff, ageoff);
-                this.maxAgeOff = Math.max(this.maxAgeOff, ageoff);
-                ageoffs.put(name, ageoff);
-            }
-        });
-        defaultAgeOff = ageoffs.get(DEFAULT_AGEOFF_KEY);
-        currentTime = System.currentTimeMillis();
-    }
-
-    @Override
-    public void next() throws IOException {
-        super.next();
-        skipExpiredData();
-    }
-
-    @Override
-    public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
-        super.seek(range, columnFamilies, inclusive);
-        skipExpiredData();
-    }
-
-    private void skipExpiredData() throws IOException {
-
-        boolean done = false;
-        while (!done && super.hasTop()) {
-            Key top = super.getTopKey();
-            long dataAge = this.currentTime - top.getTimestamp();
-            // If less than any configured ageoff, then we want to return this K,V
-            if (dataAge < this.minAgeOff) {
-                done = true;
-            } else {
-                String metricName = Meta.parse(top).getMetric();
-                long metaAgeOff = ageoffs.getOrDefault(metricName, defaultAgeOff);
-                if (dataAge > metaAgeOff) {
-                    // data beyond ageOff, so skip
-                    super.next();
-                } else {
-                    done = true;
-                }
-            }
-        }
-    }
-
-    @Override
-    public IteratorOptions describeOptions() {
-        return new IteratorOptions("meta-age-off", "Iterator that ages off meta entries for Timely metrics",
-                Collections.singletonMap(AGE_OFF_PREFIX + DEFAULT_AGEOFF_KEY, "default age off days"),
-                Collections.singletonList("Additional meta age off properties where the value is specified as "
-                        + AGE_OFF_PREFIX
-                        + " the metric name and the value is an integer representing the number of days to keep"));
-    }
-
-    @Override
-    public boolean validateOptions(Map<String, String> options) {
-        if (null == options.get(AGE_OFF_PREFIX + DEFAULT_AGEOFF_KEY)) {
-            throw new IllegalArgumentException(DEFAULT_AGEOFF_KEY + " must be configured for MetaAgeOffFilter");
-        }
-        return true;
-    }
-
-}

server/src/main/java/timely/store/MetaCacheImpl.java

@@ -1,121 +1,27 @@
 package timely.store;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
-import org.apache.accumulo.core.client.ClientConfiguration;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.security.Authorizations;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import timely.api.model.Meta;
-import timely.configuration.Accumulo;
 import timely.configuration.Configuration;
 
 public class MetaCacheImpl implements MetaCache {
 
-    private static Logger LOG = LoggerFactory.getLogger(MetaCacheImpl.class);
     private static final Object DUMMY = new Object();
     private volatile boolean closed = false;
     private Cache<Meta, Object> cache = null;
-    private Configuration configuration;
-    private Timer timer = new Timer("MetaCacheImpl", true);
 
     @Override
     public void init(Configuration config) {
-        configuration = config;
-        cache = Caffeine.newBuilder().initialCapacity(1000).build();
-        long cacheRefreshMinutes = configuration.getMetaCache().getCacheRefreshMinutes();
-        if (cacheRefreshMinutes > 0) {
-            timer.schedule(new TimerTask() {
-
-                @Override
-                public void run() {
-                    refreshCache(config.getMetaCache().getExpirationMinutes());
-                }
-            }, 60000, cacheRefreshMinutes * 60 * 1000);
-        }
-    }
-
-    private void refreshCache(long expirationMinutes) {
-        long oldestTimestamp = System.currentTimeMillis() - (expirationMinutes * 60 * 1000);
-        Map<String, String> properties = new HashMap<>();
-        Accumulo accumuloConf = configuration.getAccumulo();
-        properties.put("instance.name", accumuloConf.getInstanceName());
-        properties.put("instance.zookeeper.host", accumuloConf.getZookeepers());
-        final ClientConfiguration aConf = ClientConfiguration.fromMap(properties);
-        String metaTable = configuration.getMetaTable();
-        Map<String, Map<String, Long>> metricMap = new HashMap<>();
-        Scanner scanner = null;
-        try {
-            final Instance instance = new ZooKeeperInstance(aConf);
-            Connector connector = instance.getConnector(accumuloConf.getUsername(),
-                    new PasswordToken(accumuloConf.getPassword()));
-            scanner = connector.createScanner(metaTable, Authorizations.EMPTY);
-            LOG.debug("Begin scanning " + metaTable);
-            Range metricRange = new Range(new Key(Meta.METRIC_PREFIX), true, new Key(Meta.METRIC_PREFIX + '\0'), false);
-            scanner.setRange(metricRange);
-            Set<String> allMetrics = new TreeSet<>();
-            for (Map.Entry<Key, Value> entry : scanner) {
-                Meta meta = Meta.parse(entry.getKey(), entry.getValue(), Meta.METRIC_PREFIX);
-                allMetrics.add(meta.getMetric());
-            }
-            for (String currMetric : allMetrics) {
-                Key begin = new Key(Meta.VALUE_PREFIX + currMetric);
-                Key end = new Key(Meta.VALUE_PREFIX + currMetric + '\0');
-                Range range = new Range(begin, true, end, false);
-                scanner.setRange(range);
-                Iterator<Map.Entry<Key, Value>> itr = scanner.iterator();
-                boolean maxedOutValues = false;
-                while (itr.hasNext() && !maxedOutValues) {
-                    Map.Entry<Key, Value> entry = itr.next();
-                    Meta meta = Meta.parse(entry.getKey(), entry.getValue(), Meta.VALUE_PREFIX);
-                    String metric = meta.getMetric();
-                    String tagKey = meta.getTagKey();
-                    Map<String, Long> tagMap = metricMap.get(metric);
-                    if (tagMap == null) {
-                        tagMap = new HashMap<>();
-                        metricMap.put(metric, tagMap);
-                    }
-                    long numTagValues = tagMap.getOrDefault(tagKey, 0l);
-                    if (entry.getKey().getTimestamp() > oldestTimestamp) {
-                        tagMap.put(tagKey, ++numTagValues);
-                        if (numTagValues <= configuration.getMetaCache().getMaxTagValues()) {
-                            cache.put(meta, DUMMY);
-                        } else {
-                            // found maxTagValues on this refresh, so remove this key
-                            cache.invalidate(meta);
-                            maxedOutValues = true;
-                        }
-                    } else {
-                        // this entry is more than expirationMinutes old, so remove it
-                        cache.invalidate(meta);
-                    }
-                }
-            }
-            LOG.debug("Finished scanning " + metaTable);
-        } catch (Exception e) {
-            LOG.error(e.getMessage(), e);
-        } finally {
-            if (scanner != null) {
-                scanner.close();
-            }
-        }
+        long expirationMinutes = config.getMetaCache().getExpirationMinutes();
+        int initialCapacity = config.getMetaCache().getInitialCapacity();
+        long maxCapacity = config.getMetaCache().getMaxCapacity();
+        cache = Caffeine.newBuilder().expireAfterAccess(expirationMinutes, TimeUnit.MINUTES)
+                .initialCapacity(initialCapacity).maximumSize(maxCapacity).build();
     }
 
     @Override
@@ -147,4 +53,5 @@ public class MetaCacheImpl implements MetaCache {
     public boolean isClosed() {
         return closed;
     }
+
 }

server/src/main/java/timely/store/MetricAgeOffIterator.java

@@ -143,8 +143,8 @@ public class MetricAgeOffIterator extends WrappingIterator implements OptionDesc
             byte[] newStartRow = MetricAdapter.encodeRowKey(start.getFirst(), timeTarget);
             // @formatter:off
             Key newStartKey = new Key(newStartRow, 
-                    null != startKey.getColumnFamily() ? startKey.getColumnFamilyData().getBackingArray() : null, 
-                    null != startKey.getColumnQualifier() ? startKey.getColumnQualifierData().getBackingArray() : null,
+            		null != startKey.getColumnFamily() ? startKey.getColumnFamilyData().getBackingArray() : null, 
+            		null != startKey.getColumnQualifier() ? startKey.getColumnQualifierData().getBackingArray() : null,
                     null != startKey.getColumnVisibility() ? startKey.getColumnVisibility().getBytes() : null,
                     timeTarget, startKey.isDeleted());
             // @formatter:on