Revamp Filters, Support for HTTP Filters, AccessLog Filters

core/src/main/java/com/flipkart/gjex/core/GJEXConfiguration.java

@@ -20,11 +20,13 @@
 import com.flipkart.gjex.core.config.DashboardService;
 import com.flipkart.gjex.core.config.GrpcConfig;
 import com.flipkart.gjex.core.config.Tracing;
+import lombok.Data;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
+@Data
 public class GJEXConfiguration {
 
     @Valid
@@ -51,46 +53,6 @@ public class GJEXConfiguration {
     @JsonProperty("ScheduledJobs.executorThreads")
     private int scheduledJobExecutorThreads;
 
-    public GrpcConfig getGrpc() {
-        return grpc;
-    }
-
-    public void setGrpc(GrpcConfig grpc) {
-        this.grpc = grpc;
-    }
-
-    public ApiService getApiService() {
-        return apiService;
-    }
-
-    public void setApiService(ApiService apiService) {
-        this.apiService = apiService;
-    }
-
-    public DashboardService getDashboardService() {
-        return dashboardService;
-    }
-
-    public void setDashboardService(DashboardService dashboardService) {
-        this.dashboardService = dashboardService;
-    }
-
-    public Tracing getTracing() {
-        return tracing;
-    }
-
-    public void setTracing(Tracing tracing) {
-        this.tracing = tracing;
-    }
-
-    public int getScheduledJobExecutorThreads() {
-        return scheduledJobExecutorThreads;
-    }
-
-    public void setScheduledJobExecutorThreads(int scheduledJobExecutorThreads) {
-        this.scheduledJobExecutorThreads = scheduledJobExecutorThreads;
-    }
-
     @Override
     public String toString() {
         return "GJEXConfiguration{" +

core/src/main/java/com/flipkart/gjex/core/config/ApiService.java

@@ -16,9 +16,11 @@
 package com.flipkart.gjex.core.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
 
 import javax.validation.constraints.Min;
 
+@Data
 public class ApiService {
 
     @Min(1)
@@ -38,43 +40,6 @@ public class ApiService {
     @JsonProperty("scheduledexecutor.threadpool.size")
     private int scheduledExecutorThreadPoolSize;
 
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public int getAcceptors() {
-        return acceptors;
-    }
-
-    public void setAcceptors(int acceptors) {
-        this.acceptors = acceptors;
-    }
-
-    public int getSelectors() {
-        return selectors;
-    }
-
-    public void setSelectors(int selectors) {
-        this.selectors = selectors;
-    }
-
-    public int getWorkers() {
-        return workers;
-    }
-
-    public void setWorkers(int workers) {
-        this.workers = workers;
-    }
-
-    public int getScheduledExecutorThreadPoolSize() {
-        return scheduledExecutorThreadPoolSize;
-    }
-
-    public void setScheduledExecutorThreadPoolSize(int scheduledExecutorThreadPoolSize) {
-        this.scheduledExecutorThreadPoolSize = scheduledExecutorThreadPoolSize;
-    }
+    @JsonProperty("enableAccessLogs")
+    private boolean enableAccessLogs = true;
 }

core/src/main/java/com/flipkart/gjex/core/config/DashboardService.java

@@ -16,7 +16,9 @@
 package com.flipkart.gjex.core.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
 
+@Data
 public class DashboardService {
 
     @JsonProperty("service.port")
@@ -30,36 +32,4 @@ public class DashboardService {
 
     @JsonProperty("service.workers")
     private int workers;
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public int getAcceptors() {
-        return acceptors;
-    }
-
-    public void setAcceptors(int acceptors) {
-        this.acceptors = acceptors;
-    }
-
-    public int getSelectors() {
-        return selectors;
-    }
-
-    public void setSelectors(int selectors) {
-        this.selectors = selectors;
-    }
-
-    public int getWorkers() {
-        return workers;
-    }
-
-    public void setWorkers(int workers) {
-        this.workers = workers;
-    }
 }

core/src/main/java/com/flipkart/gjex/core/config/GrpcConfig.java

@@ -16,7 +16,9 @@
 package com.flipkart.gjex.core.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
 
+@Data
 public class GrpcConfig {
 
     @JsonProperty("server.port")
@@ -28,27 +30,6 @@ public class GrpcConfig {
     @JsonProperty("server.executorThreads")
     private int executorThreads = 0;
 
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public int getMaxMessageSize() {
-        return maxMessageSize;
-    }
-
-    public void setMaxMessageSize(int maxMessageSize) {
-        this.maxMessageSize = maxMessageSize;
-    }
-
-    public int getExecutorThreads() {
-        return executorThreads;
-    }
-
-    public void setExecutorThreads(int executorThreads) {
-        this.executorThreads = executorThreads;
-    }
+    @JsonProperty("enableAccessLogs")
+    private boolean enableAccessLogs = true;
 }

core/src/main/java/com/flipkart/gjex/core/config/Tracing.java

@@ -2,20 +2,14 @@
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 
+@Data
 public class Tracing {
 
     @NotNull
     @JsonProperty("collector.endpoint")
     private String collectorEndpoint;
-
-    public String getCollectorEndpoint() {
-        return collectorEndpoint;
-    }
-
-    public void setCollectorEndpoint(String collectorEndpoint) {
-        this.collectorEndpoint = collectorEndpoint;
-    }
 }

core/src/main/java/com/flipkart/gjex/core/filter/GrpcAccessLogFilter.java

@@ -0,0 +1,47 @@
+package com.flipkart.gjex.core.filter;
+
+import com.flipkart.gjex.core.logging.Logging;
+import com.google.protobuf.GeneratedMessageV3;
+import io.grpc.Metadata;
+
+/**
+ * Filter for logging grpc access log requests
+ * @author ajay.jalgaonkar
+ *
+ */
+public class GrpcAccessLogFilter <R extends GeneratedMessageV3,
+    S extends GeneratedMessageV3> implements Filter<R, S>, Logging {
+  private long startTime = 0;
+  private ServerRequestParams serverRequestParams;
+  @Override
+  public Filter<R,S> getInstance(){
+    return new GrpcAccessLogFilter<>();
+  }
+
+  @Override
+  public void doProcessRequest(R request) {
+    this.startTime = System.currentTimeMillis();
+  }
+
+  @Override
+  public void doFilterRequest(ServerRequestParams serverRequestParams, Metadata headers) {
+    this.serverRequestParams = serverRequestParams;
+  }
+
+  @Override
+  public void doProcessResponseHeaders(Metadata responseHeaders) {}
+
+  @Override
+  public void doProcessResponse(S response) {
+    String size = null;
+    if (response != null){
+      size = String.valueOf(response.getSerializedSize());
+    }
+    StringBuilder sb = new StringBuilder()
+        .append(serverRequestParams.getClientIp()).append(" ")
+        .append(serverRequestParams.getMethodName()).append(" ")
+        .append(size).append(" ")
+        .append(System.currentTimeMillis()-startTime);
+    error(sb.toString());
+  }
+}

core/src/main/java/com/flipkart/gjex/core/setup/Bootstrap.java

@@ -15,23 +15,6 @@
  */
 package com.flipkart.gjex.core.setup;
 
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
-import com.flipkart.gjex.core.healthcheck.HealthCheckRegistry;
-import io.dropwizard.metrics5.MetricRegistry;
-import io.dropwizard.metrics5.jmx.JmxReporter;
-import io.dropwizard.metrics5.jvm.BufferPoolMetricSet;
-import io.dropwizard.metrics5.jvm.GarbageCollectorMetricSet;
-import io.dropwizard.metrics5.jvm.MemoryUsageGaugeSet;
-import io.dropwizard.metrics5.jvm.ThreadStatesGaugeSet;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flipkart.gjex.core.Application;
 import com.flipkart.gjex.core.Bundle;
@@ -45,15 +28,25 @@
 import com.flipkart.gjex.core.config.DefaultConfigurationFactoryFactory;
 import com.flipkart.gjex.core.config.FileConfigurationSourceProvider;
 import com.flipkart.gjex.core.filter.Filter;
+import com.flipkart.gjex.core.healthcheck.HealthCheckRegistry;
 import com.flipkart.gjex.core.job.ScheduledJob;
 import com.flipkart.gjex.core.logging.Logging;
 import com.flipkart.gjex.core.service.Service;
 import com.flipkart.gjex.core.tracing.TracingSampler;
 import com.flipkart.gjex.core.util.Pair;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
+import io.dropwizard.metrics5.MetricRegistry;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * The pre-start application container, containing services required to bootstrap a GJEX application
  *
@@ -225,10 +218,10 @@ public void setConfigMap(U configMap) {
      */
 	public void run(Environment environment) throws Exception {
 		// Identify all Service implementations, start them and register for Runtime shutdown hook
-        services = new LinkedList<Service>();
-        filters = new LinkedList<Filter>();
-        tracingSamplers = new LinkedList<TracingSampler>();
-        scheduledJobs = new LinkedList<ScheduledJob>();
+        services = new ArrayList<>();
+        filters = new ArrayList<Filter>();
+        tracingSamplers = new ArrayList<TracingSampler>();
+        scheduledJobs = new ArrayList<ScheduledJob>();
         // Set the HealthCheckRegsitry to the one initialized by the Environment
         healthCheckRegistry = environment.getHealthCheckRegistry();
 

core/src/main/java/com/flipkart/gjex/core/web/filter/HttpAccessLogFilter.java

@@ -0,0 +1,54 @@
+package com.flipkart.gjex.core.web.filter;
+
+import com.flipkart.gjex.core.logging.Logging;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * Filter for logging http access log requests
+ * @author ajay.jalgaonkar
+ *
+ */
+
+@Singleton
+@Named("HttpAccessLogFilter")
+public class HttpAccessLogFilter implements Filter, Logging {
+  private long startTime;
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {}
+
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    startTime = System.currentTimeMillis();
+    chain.doFilter(request, response);
+    StringBuilder sb = new StringBuilder();
+    if (request instanceof HttpServletRequest && response instanceof HttpServletResponse){
+      HttpServletRequest httpServletRequest= (HttpServletRequest) request;
+      HttpServletResponse httpServletResponse = (HttpServletResponse) response;
+      sb.append(httpServletRequest.getHeader("x-forwarded-for")).append(" ")
+        .append(httpServletRequest.getRequestURI()).append(" ")
+        .append(httpServletResponse.getStatus()).append(" ")
+        .append(httpServletResponse.getHeader("Content-Length")).append(" ");
+    } else {
+      sb.append("Did not get HTTP request").append(" ");
+    }
+    sb.append(request.getRemoteAddr()).append(" ");
+    sb.append(System.currentTimeMillis()-startTime);
+    error(sb.toString());
+  }
+
+  @Override
+  public void destroy() {
+
+  }
+}