lots of stuff

src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -7,11 +7,12 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-
+import org.slf4j.Logger;
 @Service
 public class EndpointConfiguration {
-
+    private static final Logger logger = LoggerFactory.getLogger(EndpointConfiguration.class);
     private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
     private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
 
@@ -25,6 +26,7 @@ public class EndpointConfiguration {
     }
 
     public void disableEndpoint(String endpoint) {
+        logger.info("Disabling {}", endpoint);
         endpointStatuses.put(endpoint, false);
     }
 
@@ -162,6 +164,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Javascript", "pdf-organizer");
         addEndpointToGroup("Javascript", "sign");
         addEndpointToGroup("Javascript", "compare");
+        
     }
                 
     private void processEnvironmentConfigs() {

src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java

@@ -17,12 +17,10 @@ public class EndpointInterceptor implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
         String requestURI = request.getRequestURI();
-        System.out.println("trying " + requestURI);
         if (!endpointConfiguration.isEndpointEnabled(requestURI)) {
             response.sendError(HttpServletResponse.SC_FORBIDDEN, "This endpoint is disabled");
             return false;
         }
         return true;
     }
-}
-
+}

src/main/java/stirling/software/SPDF/config/MetricsConfig.java

@@ -18,7 +18,7 @@ public class MetricsConfig {
         return new MeterFilter() {
             @Override
             public MeterFilterReply accept(Meter.Id id) {
-                if (id.getName().equals("http.requests") || id.getName().equals("health")) {
+                if (id.getName().equals("http.requests")) {
                     return MeterFilterReply.NEUTRAL;
                 }
                 return MeterFilterReply.DENY;

src/main/java/stirling/software/SPDF/config/MetricsFilter.java

@@ -33,7 +33,7 @@ public class MetricsFilter extends OncePerRequestFilter {
         String uri = request.getRequestURI();
 
         // Ignore static resources
-        if (!(uri.startsWith("/css") || uri.startsWith("/js") || uri.startsWith("/images") || uri.endsWith(".ico") || uri.endsWith(".svg")|| uri.endsWith(".js"))) {
+        if (!(uri.startsWith("/js") || uri.startsWith("/images") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".svg")|| uri.endsWith(".js") || uri.contains("swagger") || uri.startsWith("/api"))) {
             Counter counter = Counter.builder("http.requests")
                     .tag("uri", uri)
                     .tag("method", request.getMethod())

src/main/java/stirling/software/SPDF/controller/web/MetricsController.java

@@ -0,0 +1,80 @@
+package stirling.software.SPDF.controller.web;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.swagger.v3.oas.annotations.Operation;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/v1")
+public class MetricsController {
+
+    private final MeterRegistry meterRegistry;
+
+    public MetricsController(MeterRegistry meterRegistry) {
+        this.meterRegistry = meterRegistry;
+    }
+
+    @GetMapping("/status")
+    @Operation(summary = "Application status and version",
+            description = "This endpoint returns the status of the application and its version number.")
+    public Map<String, String> getStatus() {
+        Map<String, String> status = new HashMap<>();
+        status.put("status", "UP");
+        status.put("version", getClass().getPackage().getImplementationVersion());
+        return status;
+    }
+    
+    @GetMapping("/loads")
+    @Operation(summary = "GET request count",
+            description = "This endpoint returns the total count of GET requests or the count of GET requests for a specific endpoint.")
+    public Double getPageLoads(@RequestParam Optional<String> endpoint) {
+        try {
+            double count = 0.0;
+
+            for (Meter meter : meterRegistry.getMeters()) {
+                if (meter.getId().getName().equals("http.requests")) {
+                    String method = meter.getId().getTag("method");
+                    if (method != null && method.equals("GET")) {
+                        if (meter instanceof Counter) {
+                            count += ((Counter) meter).count();
+                        }
+                    }
+                }
+            }
+
+            return count;
+        } catch (Exception e) {
+            return -1.0;
+        }
+    }
+
+    @GetMapping("/requests")
+    @Operation(summary = "POST request count",
+            description = "This endpoint returns the total count of POST requests or the count of POST requests for a specific endpoint.")
+    public Double getTotalRequests(@RequestParam Optional<String> endpoint) {
+        try {
+            Counter counter;
+            if (endpoint.isPresent()) {
+                counter = meterRegistry.get("http.requests")
+                    .tags("method", "POST", "uri", endpoint.get()).counter();
+            } else {
+                counter = meterRegistry.get("http.requests")
+                    .tags("method", "POST").counter();
+            }
+            return counter.count();
+        } catch (Exception e) {
+            return -1.0;
+        }
+        
+    }
+
+}