-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add endpoint to retrieve build stats (#339)
Update UI to use new endpoint for build stats
- Loading branch information
Showing
6 changed files
with
160 additions
and
3 deletions.
There are no files selected for viewing
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
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
50 changes: 50 additions & 0 deletions
50
service/src/main/java/org/kiwiproject/champagne/resource/MetricsResource.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,50 @@ | ||
package org.kiwiproject.champagne.resource; | ||
|
||
import static org.kiwiproject.champagne.util.DeployableSystems.getSystemIdOrThrowBadRequest; | ||
|
||
import java.time.LocalDate; | ||
import java.time.LocalTime; | ||
import java.time.ZoneOffset; | ||
import java.time.temporal.ChronoUnit; | ||
import java.util.Map; | ||
|
||
import com.codahale.metrics.annotation.ExceptionMetered; | ||
import com.codahale.metrics.annotation.Timed; | ||
import jakarta.annotation.security.PermitAll; | ||
import jakarta.ws.rs.GET; | ||
import jakarta.ws.rs.Path; | ||
import jakarta.ws.rs.Produces; | ||
import jakarta.ws.rs.core.MediaType; | ||
import jakarta.ws.rs.core.Response; | ||
import org.kiwiproject.champagne.dao.BuildDao; | ||
|
||
@Path("/metrics") | ||
@Produces(MediaType.APPLICATION_JSON) | ||
public class MetricsResource { | ||
|
||
private final BuildDao buildDao; | ||
|
||
public MetricsResource(BuildDao buildDao) { | ||
this.buildDao = buildDao; | ||
} | ||
|
||
@GET | ||
@Timed | ||
@ExceptionMetered | ||
@PermitAll | ||
public Response getMetrics() { | ||
var systemId = getSystemIdOrThrowBadRequest(); | ||
|
||
var endOfToday = LocalDate.now().atTime(LocalTime.MAX); | ||
var oneMonthAgo = endOfToday.minusDays(30).truncatedTo(ChronoUnit.DAYS); | ||
|
||
long thisMonthCount = buildDao.countBuildsInSystemInRange(systemId, oneMonthAgo.toInstant(ZoneOffset.UTC), endOfToday.toInstant(ZoneOffset.UTC)); | ||
|
||
var endOfLastMonth = oneMonthAgo.minusSeconds(1); | ||
var startOfPreviousMonth = endOfLastMonth.minusDays(30).truncatedTo(ChronoUnit.DAYS); | ||
|
||
long lastMonthCount = buildDao.countBuildsInSystemInRange(systemId, startOfPreviousMonth.toInstant(ZoneOffset.UTC), endOfLastMonth.toInstant(ZoneOffset.UTC)); | ||
|
||
return Response.ok(Map.of("builds", Map.of("current", thisMonthCount, "previous", lastMonthCount))).build(); | ||
} | ||
} |
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
79 changes: 79 additions & 0 deletions
79
service/src/test/java/org/kiwiproject/champagne/resource/MetricsResourceTest.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,79 @@ | ||
package org.kiwiproject.champagne.resource; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
import static org.kiwiproject.test.jaxrs.JaxrsTestHelper.assertOkResponse; | ||
import static org.mockito.ArgumentMatchers.any; | ||
import static org.mockito.ArgumentMatchers.eq; | ||
import static org.mockito.Mockito.mock; | ||
import static org.mockito.Mockito.reset; | ||
import static org.mockito.Mockito.times; | ||
import static org.mockito.Mockito.verify; | ||
import static org.mockito.Mockito.verifyNoMoreInteractions; | ||
import static org.mockito.Mockito.when; | ||
|
||
import java.time.Instant; | ||
import java.util.Map; | ||
|
||
import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; | ||
import io.dropwizard.testing.junit5.ResourceExtension; | ||
import jakarta.ws.rs.core.GenericType; | ||
import org.junit.jupiter.api.AfterEach; | ||
import org.junit.jupiter.api.DisplayName; | ||
import org.junit.jupiter.api.Nested; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.ExtendWith; | ||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
import org.kiwiproject.champagne.dao.BuildDao; | ||
import org.kiwiproject.champagne.junit.jupiter.DeployableSystemExtension; | ||
import org.kiwiproject.champagne.junit.jupiter.JwtExtension; | ||
import org.kiwiproject.jaxrs.exception.JaxrsExceptionMapper; | ||
|
||
@DisplayName("MetricsResource") | ||
@ExtendWith({DropwizardExtensionsSupport.class}) | ||
class MetricsResourceTest { | ||
|
||
private static final BuildDao BUILD_DAO = mock(BuildDao.class); | ||
|
||
private static final MetricsResource RESOURCE = new MetricsResource(BUILD_DAO); | ||
private static final ResourceExtension RESOURCES = ResourceExtension.builder() | ||
.bootstrapLogging(false) | ||
.addResource(RESOURCE) | ||
.addProvider(JaxrsExceptionMapper.class) | ||
.build(); | ||
|
||
@RegisterExtension | ||
public final JwtExtension jwtExtension = new JwtExtension("bob"); | ||
|
||
@RegisterExtension | ||
public final DeployableSystemExtension deployableSystemExtension = new DeployableSystemExtension(1L, true); | ||
|
||
@AfterEach | ||
void cleanup() { | ||
reset(BUILD_DAO); | ||
} | ||
|
||
@Nested | ||
class GetMetrics { | ||
|
||
@Test | ||
void shouldReturnMetrics() { | ||
when(BUILD_DAO.countBuildsInSystemInRange(eq(1L), any(Instant.class), any(Instant.class))) | ||
.thenReturn(2L) | ||
.thenReturn(1L); | ||
|
||
var response = RESOURCES | ||
.target("/metrics") | ||
.request() | ||
.get(); | ||
|
||
assertOkResponse(response); | ||
|
||
var result = response.readEntity(new GenericType<Map<String, Map<String, Long>>>() {}); | ||
|
||
assertThat(result).isEqualTo(Map.of("builds", Map.of("current", 2L, "previous", 1L))); | ||
|
||
verify(BUILD_DAO, times(2)).countBuildsInSystemInRange(eq(1L), any(Instant.class), any(Instant.class)); | ||
verifyNoMoreInteractions(BUILD_DAO); | ||
} | ||
} | ||
} |
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