-
Notifications
You must be signed in to change notification settings - Fork 205
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
With experimental support for non-aggregated metering reporting changelog_begin with experimental support for non-aggregated metering reporting changelog_end
- Loading branch information
1 parent
716cc22
commit 6cdda6f
Showing
23 changed files
with
543 additions
and
97 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
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
47 changes: 0 additions & 47 deletions
47
...integration-api/src/main/scala/platform/apiserver/services/ApiMeteringReportService.scala
This file was deleted.
Oops, something went wrong.
124 changes: 124 additions & 0 deletions
124
...ation-api/src/main/scala/platform/apiserver/services/admin/ApiMeteringReportService.scala
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,124 @@ | ||
| // Copyright (c) 2022 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package com.daml.platform.apiserver.services.admin | ||
|
|
||
| import com.daml.error.{ | ||
| ContextualizedErrorLogger, | ||
| DamlContextualizedErrorLogger, | ||
| ErrorCodesVersionSwitcher, | ||
| } | ||
| import com.daml.ledger.api.v1.admin.metering_report_service.MeteringReportServiceGrpc.MeteringReportService | ||
| import com.daml.ledger.api.v1.admin.metering_report_service._ | ||
| import com.daml.ledger.participant.state.index.v2.MeteringStore | ||
| import com.daml.ledger.participant.state.index.v2.MeteringStore.TransactionMetering | ||
| import com.daml.lf.data.Ref | ||
| import com.daml.lf.data.Time.Timestamp | ||
| import com.daml.logging.{ContextualizedLogger, LoggingContext} | ||
| import com.daml.platform.api.grpc.GrpcApiService | ||
| import com.daml.platform.apiserver.services.admin.ApiMeteringReportService._ | ||
| import com.daml.platform.server.api.ValidationLogger | ||
| import com.daml.platform.server.api.validation.ErrorFactories | ||
| import com.google.protobuf.timestamp.{Timestamp => ProtoTimestamp} | ||
| import io.grpc.ServerServiceDefinition | ||
|
|
||
| import java.time.Instant | ||
| import scala.concurrent.{ExecutionContext, Future} | ||
| import scala.util.chaining.scalaUtilChainingOps | ||
|
|
||
| private[apiserver] final class ApiMeteringReportService( | ||
| participantId: Ref.ParticipantId, | ||
| store: MeteringStore, | ||
| errorCodesVersionSwitcher: ErrorCodesVersionSwitcher, | ||
| clock: () => ProtoTimestamp = () => toProtoTimestamp(Timestamp.now()), | ||
| )(implicit | ||
| executionContext: ExecutionContext, | ||
| loggingContext: LoggingContext, | ||
| ) extends MeteringReportService | ||
| with GrpcApiService { | ||
|
|
||
| private implicit val logger: ContextualizedLogger = ContextualizedLogger.get(this.getClass) | ||
| private implicit val contextualizedErrorLogger: ContextualizedErrorLogger = | ||
| new DamlContextualizedErrorLogger(logger, loggingContext, None) | ||
|
|
||
| private val generator = new MeteringReportGenerator(participantId) | ||
| private val errorFactories = ErrorFactories(errorCodesVersionSwitcher) | ||
|
|
||
| override def bindService(): ServerServiceDefinition = | ||
| MeteringReportServiceGrpc.bindService(this, executionContext) | ||
|
|
||
| override def close(): Unit = () | ||
|
|
||
| override def getMeteringReport( | ||
| request: GetMeteringReportRequest | ||
| ): Future[GetMeteringReportResponse] = { | ||
| logger.info(s"Received metering report request: $request") | ||
|
|
||
| (for { | ||
| protoFrom <- request.from.toRight("from date must be specified") | ||
| from <- toTimestamp(protoFrom) | ||
| to <- request.to.fold[Either[String, Option[Timestamp]]](Right(None))(t => | ||
| toTimestamp(t).map(Some.apply) | ||
| ) | ||
| applicationId <- toOption(request.applicationId) | ||
| .fold[Either[String, Option[Ref.ApplicationId]]](Right(None))(t => | ||
| Ref.ApplicationId.fromString(t).map(Some.apply) | ||
| ) | ||
| } yield { | ||
| val reportTime = clock() | ||
| store.getTransactionMetering(from, to, applicationId).map { metering => | ||
| generator.generate(request, metering, reportTime) | ||
| } | ||
| }) match { | ||
| case Right(f) => f | ||
| case Left(error) => | ||
| Future.failed( | ||
| ValidationLogger.logFailure(request, errorFactories.invalidArgument(None)(error)) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private[apiserver] object ApiMeteringReportService { | ||
|
|
||
| def toOption(protoString: String): Option[String] = { | ||
| if (protoString.nonEmpty) Some(protoString) else None | ||
| } | ||
|
|
||
| def toProtoTimestamp(ts: Timestamp): ProtoTimestamp = { | ||
| ts.toInstant.pipe { i => ProtoTimestamp.of(i.getEpochSecond, i.getNano) } | ||
| } | ||
|
|
||
| def toTimestamp(ts: ProtoTimestamp): Either[String, Timestamp] = { | ||
| Timestamp.fromInstant(Instant.ofEpochSecond(ts.seconds, ts.nanos.toLong)) | ||
| } | ||
|
|
||
| class MeteringReportGenerator(participantId: Ref.ParticipantId) { | ||
| def generate( | ||
| request: GetMeteringReportRequest, | ||
| metering: Vector[TransactionMetering], | ||
| generationTime: ProtoTimestamp, | ||
| ): GetMeteringReportResponse = { | ||
|
|
||
| val applicationReports = metering | ||
| .groupMapReduce(_.applicationId)(_.actionCount.toLong)(_ + _) | ||
| .toList | ||
| .sortBy(_._1) | ||
| .map((ApplicationMeteringReport.apply _).tupled) | ||
|
|
||
| val report = ParticipantMeteringReport( | ||
| participantId, | ||
| toActual = Some(generationTime), | ||
| applicationReports, | ||
| ) | ||
|
|
||
| GetMeteringReportResponse( | ||
| request = Some(request), | ||
| participantReport = Some(report), | ||
| reportGenerationTime = Some(generationTime), | ||
| ) | ||
|
|
||
| } | ||
| } | ||
|
|
||
| } |
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
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
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
Oops, something went wrong.