add metrics collection for API
- extract webclient call from getConfiguration and add metrics in DeviceConfigurationService - extract webclient call from getMeasurement, addMeasurement and add metrics in DeviceDataService - extract webclient call from getIdentityFromDevice and add metrics in DeviceRegistryService - add MeterRegistry dependency - fix test application.yml - update kotlin logging dependency
This commit is contained in:
@@ -1,39 +1,65 @@
|
||||
package ltd.hlaeja.service
|
||||
|
||||
import io.github.oshai.kotlinlogging.KotlinLogging
|
||||
import io.micrometer.core.instrument.Counter
|
||||
import io.micrometer.core.instrument.MeterRegistry
|
||||
import java.util.UUID
|
||||
import ltd.hlaeja.library.deviceData.MeasurementData
|
||||
import ltd.hlaeja.property.DeviceDataProperty
|
||||
import ltd.hlaeja.util.logCall
|
||||
import org.springframework.http.HttpStatus.NOT_FOUND
|
||||
import org.springframework.http.HttpStatus.NO_CONTENT
|
||||
import org.springframework.http.HttpStatus.REQUEST_TIMEOUT
|
||||
import ltd.hlaeja.util.deviceDataAddMeasurement
|
||||
import ltd.hlaeja.util.deviceDataGetMeasurement
|
||||
import org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE
|
||||
import org.springframework.http.ResponseEntity
|
||||
import org.springframework.stereotype.Service
|
||||
import org.springframework.web.ErrorResponseException
|
||||
import org.springframework.web.reactive.function.client.WebClient
|
||||
import org.springframework.web.reactive.function.client.awaitBodilessEntity
|
||||
import org.springframework.web.reactive.function.client.awaitBodyOrNull
|
||||
import org.springframework.web.reactive.function.client.WebClientRequestException
|
||||
import org.springframework.web.server.ResponseStatusException
|
||||
|
||||
private val log = KotlinLogging.logger {}
|
||||
|
||||
@Service
|
||||
class DeviceDataService(
|
||||
meterRegistry: MeterRegistry,
|
||||
private val webClient: WebClient,
|
||||
private val deviceDataProperty: DeviceDataProperty,
|
||||
) {
|
||||
|
||||
private val deviceDataSuccess = Counter.builder("device.data.success")
|
||||
.description("Number of successful device data calls")
|
||||
.register(meterRegistry)
|
||||
|
||||
private val deviceDataFailure = Counter.builder("device.data.failure")
|
||||
.description("Number of failed device data calls")
|
||||
.register(meterRegistry)
|
||||
|
||||
suspend fun getMeasurement(
|
||||
client: UUID,
|
||||
node: UUID,
|
||||
): MeasurementData.Response = webClient.get()
|
||||
.uri("${deviceDataProperty.url}/client-$client/node-$node".also(::logCall))
|
||||
.retrieve()
|
||||
.onStatus(NOT_FOUND::equals) { throw ResponseStatusException(NO_CONTENT) }
|
||||
.awaitBodyOrNull<MeasurementData.Response>() ?: throw ResponseStatusException(REQUEST_TIMEOUT)
|
||||
): MeasurementData.Response = try {
|
||||
webClient.deviceDataGetMeasurement(client, node, deviceDataProperty)
|
||||
.also { deviceDataSuccess.increment() }
|
||||
} catch (e: ErrorResponseException) {
|
||||
deviceDataFailure.increment()
|
||||
throw e
|
||||
} catch (e: WebClientRequestException) {
|
||||
deviceDataFailure.increment()
|
||||
log.error(e) { "Error device registry" }
|
||||
throw ResponseStatusException(SERVICE_UNAVAILABLE)
|
||||
}
|
||||
|
||||
suspend fun addMeasurement(
|
||||
client: UUID,
|
||||
request: MeasurementData.Request,
|
||||
) = webClient.post()
|
||||
.uri("${deviceDataProperty.url}/client-$client".also(::logCall))
|
||||
.bodyValue(request)
|
||||
.retrieve()
|
||||
.awaitBodilessEntity()
|
||||
): ResponseEntity<Void> = try {
|
||||
webClient.deviceDataAddMeasurement(client, request, deviceDataProperty)
|
||||
.also { deviceDataSuccess.increment() }
|
||||
} catch (e: ErrorResponseException) {
|
||||
deviceDataFailure.increment()
|
||||
throw e
|
||||
} catch (e: WebClientRequestException) {
|
||||
deviceDataFailure.increment()
|
||||
log.error(e) { "Error device registry" }
|
||||
throw ResponseStatusException(SERVICE_UNAVAILABLE)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user