-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:mycloudnexus/kraken into fix/fix-in…
…stant-sync-quote-tips
- Loading branch information
Showing
12 changed files
with
1,115 additions
and
0 deletions.
There are no files selected for viewing
95 changes: 95 additions & 0 deletions
95
...com/consoleconnect/kraken/operator/controller/api/EnvAPIActivityStatisticsController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
package com.consoleconnect.kraken.operator.controller.api; | ||
|
||
import static com.consoleconnect.kraken.operator.core.model.HttpResponse.ok; | ||
|
||
import com.consoleconnect.kraken.operator.controller.dto.statistics.ApiRequestActivityStatistics; | ||
import com.consoleconnect.kraken.operator.controller.dto.statistics.ErrorApiRequestStatistics; | ||
import com.consoleconnect.kraken.operator.controller.dto.statistics.MostPopularEndpointStatistics; | ||
import com.consoleconnect.kraken.operator.controller.service.statistics.ApiActivityStatisticsService; | ||
import com.consoleconnect.kraken.operator.core.model.HttpResponse; | ||
import com.consoleconnect.kraken.operator.core.request.ApiStatisticsSearchRequest; | ||
import io.swagger.v3.oas.annotations.Operation; | ||
import io.swagger.v3.oas.annotations.tags.Tag; | ||
import java.time.ZonedDateTime; | ||
import lombok.AllArgsConstructor; | ||
import org.springframework.format.annotation.DateTimeFormat; | ||
import org.springframework.http.MediaType; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.PathVariable; | ||
import org.springframework.web.bind.annotation.RequestMapping; | ||
import org.springframework.web.bind.annotation.RequestParam; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
@AllArgsConstructor | ||
@RestController() | ||
@RequestMapping( | ||
value = "/products/{productId}/envs/{envId}/statistics", | ||
produces = MediaType.APPLICATION_JSON_VALUE) | ||
@Tag(name = "API Activities Statistics", description = "API Activities Statistics") | ||
public class EnvAPIActivityStatisticsController { | ||
|
||
private final ApiActivityStatisticsService apiActivityStatisticsService; | ||
|
||
@Operation(summary = "Load api activity request statistics") | ||
@GetMapping("/api-activity-requests") | ||
public HttpResponse<ApiRequestActivityStatistics> getRequestStatistics( | ||
@PathVariable("productId") String productId, | ||
@PathVariable("envId") String envId, | ||
@RequestParam(value = "requestStartTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) | ||
ZonedDateTime requestStartTime, | ||
@RequestParam(value = "requestEndTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) | ||
ZonedDateTime requestEndTime, | ||
@RequestParam(value = "buyerId", required = false) String buyerId) { | ||
|
||
return ok( | ||
apiActivityStatisticsService.loadRequestStatistics( | ||
ApiStatisticsSearchRequest.builder() | ||
.env(envId) | ||
.buyerId(buyerId) | ||
.queryStart(requestStartTime) | ||
.queryEnd(requestEndTime) | ||
.build())); | ||
} | ||
|
||
@Operation(summary = "Load error request statistics") | ||
@GetMapping("/error-requests") | ||
public HttpResponse<ErrorApiRequestStatistics> getErrorStatistics( | ||
@PathVariable("productId") String productId, | ||
@PathVariable("envId") String envId, | ||
@RequestParam(value = "requestStartTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) | ||
ZonedDateTime requestStartTime, | ||
@RequestParam(value = "requestEndTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) | ||
ZonedDateTime requestEndTime, | ||
@RequestParam(value = "buyerId", required = false) String buyerId) { | ||
|
||
return ok( | ||
apiActivityStatisticsService.loadErrorsStatistics( | ||
ApiStatisticsSearchRequest.builder() | ||
.env(envId) | ||
.buyerId(buyerId) | ||
.queryStart(requestStartTime) | ||
.queryEnd(requestEndTime) | ||
.build())); | ||
} | ||
|
||
@Operation(summary = "Load most popular endpoint statistics") | ||
@GetMapping("/most-popular-endpoint") | ||
public HttpResponse<MostPopularEndpointStatistics> getMostPopularEndpointStatistics( | ||
@PathVariable("productId") String productId, | ||
@PathVariable("envId") String envId, | ||
@RequestParam(value = "requestStartTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) | ||
ZonedDateTime requestStartTime, | ||
@RequestParam(value = "requestEndTime") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) | ||
ZonedDateTime requestEndTime, | ||
@RequestParam(value = "buyerId", required = false) String buyerId) { | ||
|
||
return ok( | ||
apiActivityStatisticsService.loadMostPopularEndpointStatistics( | ||
ApiStatisticsSearchRequest.builder() | ||
.env(envId) | ||
.buyerId(buyerId) | ||
.queryStart(requestStartTime) | ||
.queryEnd(requestEndTime) | ||
.build())); | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
...onsoleconnect/kraken/operator/controller/dto/statistics/ApiRequestActivityStatistics.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.consoleconnect.kraken.operator.controller.dto.statistics; | ||
|
||
import java.util.List; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Data; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Data | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class ApiRequestActivityStatistics { | ||
private List<RequestStatistics> requestStatistics; | ||
} |
13 changes: 13 additions & 0 deletions
13
...main/java/com/consoleconnect/kraken/operator/controller/dto/statistics/EndpointUsage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.consoleconnect.kraken.operator.controller.dto.statistics; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Data; | ||
|
||
@Data | ||
@AllArgsConstructor | ||
public class EndpointUsage { | ||
private String method; | ||
private String endpoint; | ||
private Long usage; | ||
private double popularity; | ||
} |
13 changes: 13 additions & 0 deletions
13
...m/consoleconnect/kraken/operator/controller/dto/statistics/ErrorApiRequestStatistics.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.consoleconnect.kraken.operator.controller.dto.statistics; | ||
|
||
import java.util.List; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Data; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Data | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class ErrorApiRequestStatistics { | ||
private List<ErrorBreakdown> errorBreakdowns; | ||
} |
15 changes: 15 additions & 0 deletions
15
...ain/java/com/consoleconnect/kraken/operator/controller/dto/statistics/ErrorBreakdown.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package com.consoleconnect.kraken.operator.controller.dto.statistics; | ||
|
||
import java.time.LocalDate; | ||
import java.util.Map; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Data; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Data | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class ErrorBreakdown { | ||
private LocalDate date; | ||
private Map<Integer, Long> errors; | ||
} |
13 changes: 13 additions & 0 deletions
13
...nsoleconnect/kraken/operator/controller/dto/statistics/MostPopularEndpointStatistics.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.consoleconnect.kraken.operator.controller.dto.statistics; | ||
|
||
import java.util.List; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Data; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Data | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class MostPopularEndpointStatistics { | ||
private List<EndpointUsage> endpointUsages; | ||
} |
13 changes: 13 additions & 0 deletions
13
.../java/com/consoleconnect/kraken/operator/controller/dto/statistics/RequestStatistics.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.consoleconnect.kraken.operator.controller.dto.statistics; | ||
|
||
import java.time.LocalDate; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Data; | ||
|
||
@Data | ||
@AllArgsConstructor | ||
public class RequestStatistics { | ||
private LocalDate date; | ||
private Long success; | ||
private Long error; | ||
} |
197 changes: 197 additions & 0 deletions
197
...leconnect/kraken/operator/controller/service/statistics/ApiActivityStatisticsService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,197 @@ | ||
package com.consoleconnect.kraken.operator.controller.service.statistics; | ||
|
||
import com.consoleconnect.kraken.operator.controller.dto.statistics.ApiRequestActivityStatistics; | ||
import com.consoleconnect.kraken.operator.controller.dto.statistics.EndpointUsage; | ||
import com.consoleconnect.kraken.operator.controller.dto.statistics.ErrorApiRequestStatistics; | ||
import com.consoleconnect.kraken.operator.controller.dto.statistics.ErrorBreakdown; | ||
import com.consoleconnect.kraken.operator.controller.dto.statistics.MostPopularEndpointStatistics; | ||
import com.consoleconnect.kraken.operator.controller.dto.statistics.RequestStatistics; | ||
import com.consoleconnect.kraken.operator.core.entity.AbstractHttpEntity; | ||
import com.consoleconnect.kraken.operator.core.entity.ApiActivityLogEntity; | ||
import com.consoleconnect.kraken.operator.core.repo.ApiActivityLogRepository; | ||
import com.consoleconnect.kraken.operator.core.request.ApiStatisticsSearchRequest; | ||
import jakarta.persistence.criteria.CriteriaBuilder; | ||
import jakarta.persistence.criteria.Predicate; | ||
import jakarta.persistence.criteria.Root; | ||
import java.math.BigDecimal; | ||
import java.math.RoundingMode; | ||
import java.time.ZoneId; | ||
import java.time.ZonedDateTime; | ||
import java.time.temporal.ChronoUnit; | ||
import java.util.ArrayList; | ||
import java.util.Comparator; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.stream.Collectors; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.data.jpa.domain.Specification; | ||
import org.springframework.http.HttpStatus; | ||
import org.springframework.stereotype.Service; | ||
|
||
@RequiredArgsConstructor | ||
@Service | ||
public class ApiActivityStatisticsService { | ||
|
||
public static final String CREATED_AT = "createdAt"; | ||
public static final String ENV = "env"; | ||
public static final String CALL_SEQ = "callSeq"; | ||
public static final String HTTP_STATUS_CODE = "httpStatusCode"; | ||
public static final String CALL_SEQ_ZERO = "0"; | ||
public static final String BUYER = "buyer"; | ||
public static final int NUMBER_OF_MOST_POPULAR_ENDPOINT_LIMIT = 7; | ||
|
||
private final ApiActivityLogRepository repository; | ||
|
||
public ApiRequestActivityStatistics loadRequestStatistics( | ||
ApiStatisticsSearchRequest searchRequest) { | ||
var zoneId = searchRequest.getQueryStart().getZone(); | ||
var logs = getApiActivityLogEntities(searchRequest); | ||
var logsGroupedByDay = groupByDayAndSuccessError(zoneId, logs); | ||
return createApiRequestActivityStatistics(logsGroupedByDay); | ||
} | ||
|
||
private List<ApiActivityLogEntity> getApiActivityLogEntities( | ||
ApiStatisticsSearchRequest searchRequest) { | ||
Specification<ApiActivityLogEntity> spec = | ||
(root, query, criteriaBuilder) -> { | ||
var predicateList = predicates(searchRequest, root, criteriaBuilder); | ||
if (searchRequest.getBuyerId() != null) { | ||
predicateList.add(criteriaBuilder.equal(root.get(BUYER), searchRequest.getBuyerId())); | ||
} | ||
return query.where(predicateList.toArray(new Predicate[0])).getRestriction(); | ||
}; | ||
return repository.findAll(spec); | ||
} | ||
|
||
private Map<ZonedDateTime, Map<RequestStatus, Long>> groupByDayAndSuccessError( | ||
ZoneId zoneId, List<ApiActivityLogEntity> logs) { | ||
return logs.stream() | ||
.collect( | ||
Collectors.groupingBy( | ||
entity -> | ||
entity.getCreatedAt().withZoneSameInstant(zoneId).truncatedTo(ChronoUnit.DAYS), | ||
Collectors.groupingBy( | ||
entity -> status(entity.getHttpStatusCode()), Collectors.counting()))); | ||
} | ||
|
||
private ApiRequestActivityStatistics createApiRequestActivityStatistics( | ||
Map<ZonedDateTime, Map<RequestStatus, Long>> logsGroupedByDayAndHttpStatus) { | ||
var stats = | ||
logsGroupedByDayAndHttpStatus.entrySet().stream() | ||
.map( | ||
dateEntry -> | ||
new RequestStatistics( | ||
dateEntry.getKey().toLocalDate(), | ||
dateEntry.getValue().get(RequestStatus.SUCCESS), | ||
dateEntry.getValue().get(RequestStatus.ERROR))) | ||
.sorted(Comparator.comparing(RequestStatistics::getDate)) | ||
.toList(); | ||
return new ApiRequestActivityStatistics(stats); | ||
} | ||
|
||
private RequestStatus status(Integer statusCode) { | ||
return (HttpStatus.valueOf(statusCode).is2xxSuccessful()) | ||
? RequestStatus.SUCCESS | ||
: RequestStatus.ERROR; | ||
} | ||
|
||
public ErrorApiRequestStatistics loadErrorsStatistics(ApiStatisticsSearchRequest searchRequest) { | ||
var zoneId = searchRequest.getQueryStart().getZone(); | ||
var errorLogs = getApiActivityLogErrorEntities(searchRequest); | ||
var logsGroupedByDayAndErrors = groupByDayAndStatus(zoneId, errorLogs); | ||
return createErrorApiRequestStatistics(logsGroupedByDayAndErrors); | ||
} | ||
|
||
private List<ApiActivityLogEntity> getApiActivityLogErrorEntities( | ||
ApiStatisticsSearchRequest searchRequest) { | ||
Specification<ApiActivityLogEntity> spec = | ||
(root, query, criteriaBuilder) -> { | ||
var predicateList = predicates(searchRequest, root, criteriaBuilder); | ||
if (searchRequest.getBuyerId() != null) { | ||
predicateList.add(criteriaBuilder.equal(root.get(BUYER), searchRequest.getBuyerId())); | ||
} | ||
predicateList.add(criteriaBuilder.greaterThanOrEqualTo(root.get(HTTP_STATUS_CODE), 400)); | ||
predicateList.add(criteriaBuilder.lessThan(root.get(HTTP_STATUS_CODE), 600)); | ||
return query.where(predicateList.toArray(new Predicate[0])).getRestriction(); | ||
}; | ||
return repository.findAll(spec); | ||
} | ||
|
||
private Map<ZonedDateTime, Map<Integer, Long>> groupByDayAndStatus( | ||
ZoneId zoneId, List<ApiActivityLogEntity> logs) { | ||
return logs.stream() | ||
.collect( | ||
Collectors.groupingBy( | ||
entity -> | ||
entity.getCreatedAt().withZoneSameInstant(zoneId).truncatedTo(ChronoUnit.DAYS), | ||
Collectors.groupingBy( | ||
AbstractHttpEntity::getHttpStatusCode, Collectors.counting()))); | ||
} | ||
|
||
private ErrorApiRequestStatistics createErrorApiRequestStatistics( | ||
Map<ZonedDateTime, Map<Integer, Long>> stats) { | ||
var data = | ||
stats.entrySet().stream() | ||
.map( | ||
dateEntry -> | ||
new ErrorBreakdown(dateEntry.getKey().toLocalDate(), dateEntry.getValue())) | ||
.sorted(Comparator.comparing(ErrorBreakdown::getDate)) | ||
.toList(); | ||
return new ErrorApiRequestStatistics(data); | ||
} | ||
|
||
public MostPopularEndpointStatistics loadMostPopularEndpointStatistics( | ||
ApiStatisticsSearchRequest searchRequest) { | ||
List<Object[]> endpointPerUsage = | ||
repository.findTopEndpoints( | ||
searchRequest.getEnv(), | ||
searchRequest.getQueryStart(), | ||
searchRequest.getQueryEnd(), | ||
CALL_SEQ_ZERO, | ||
searchRequest.getBuyerId(), | ||
NUMBER_OF_MOST_POPULAR_ENDPOINT_LIMIT); | ||
long numberOfAllRequests = | ||
repository.count( | ||
(root, query, criteriaBuilder) -> { | ||
var predicateList = predicates(searchRequest, root, criteriaBuilder); | ||
return query.where(predicateList.toArray(new Predicate[0])).getRestriction(); | ||
}); | ||
|
||
var data = | ||
endpointPerUsage.stream() | ||
.map(endpoint -> createEndpointUsage(endpoint, numberOfAllRequests)) | ||
.toList(); | ||
return new MostPopularEndpointStatistics(data); | ||
} | ||
|
||
private EndpointUsage createEndpointUsage(Object[] endpoint, long numberOfAllRequests) { | ||
var path = (String) endpoint[0]; | ||
var method = (String) endpoint[1]; | ||
var number = (Long) endpoint[2]; | ||
var percentage = | ||
new BigDecimal(number) | ||
.divide(new BigDecimal(numberOfAllRequests), 5, RoundingMode.DOWN) | ||
.multiply(new BigDecimal(100)) | ||
.setScale(2, RoundingMode.DOWN); | ||
return new EndpointUsage(method, path, number, percentage.doubleValue()); | ||
} | ||
|
||
private List<Predicate> predicates( | ||
ApiStatisticsSearchRequest searchRequest, | ||
Root<ApiActivityLogEntity> root, | ||
CriteriaBuilder criteriaBuilder) { | ||
var predicateList = new ArrayList<Predicate>(); | ||
predicateList.add(criteriaBuilder.equal(root.get(ENV), searchRequest.getEnv())); | ||
predicateList.add(criteriaBuilder.equal(root.get(CALL_SEQ), CALL_SEQ_ZERO)); | ||
predicateList.add( | ||
criteriaBuilder.greaterThanOrEqualTo(root.get(CREATED_AT), searchRequest.getQueryStart())); | ||
predicateList.add( | ||
criteriaBuilder.lessThanOrEqualTo(root.get(CREATED_AT), searchRequest.getQueryEnd())); | ||
return predicateList; | ||
} | ||
|
||
enum RequestStatus { | ||
SUCCESS, | ||
ERROR | ||
} | ||
} |
Oops, something went wrong.