[ci] Add Http client metrics.

Signed-off-by: Raymond Roestenburg <[email protected]>

Author: ray-roestenburg-da

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/ConsoleHttpCommandRunner.scala

@@ -3,6 +3,7 @@
 
 package org.lfdecentralizedtrust.splice.console
 
+import com.daml.metrics.api.MetricsContext
 import com.digitalasset.canton.config.{ConsoleCommandTimeout, NonNegativeDuration}
 import com.digitalasset.canton.console.{
   CommandErrors,
@@ -56,9 +57,10 @@ class ConsoleHttpCommandRunner(
         traceContext
       )
       val commandTimeout = commandTimeouts.bounded
-
+      // TODO check this.
+      val metricsFactory = environment.metricsRegistry.generateMetricsFactory(MetricsContext.Empty)
       implicit val httpClient: HttpClient =
-        HttpClient(HttpClient.HttpRequestParameters(requestTimeout), logger)
+        HttpClient(HttpClient.HttpRequestParameters(requestTimeout), metricsFactory, logger)
 
       val url = clientConfig.url
       try {

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/ScanAppReference.scala

@@ -3,6 +3,7 @@
 
 package org.lfdecentralizedtrust.splice.console
 
+import com.daml.metrics.api.MetricsContext
 import org.apache.pekko.actor.ActorSystem
 import org.lfdecentralizedtrust.splice.codegen.java.splice
 import org.lfdecentralizedtrust.splice.codegen.java.splice.types.Round
@@ -752,7 +753,12 @@ final class ScanAppBackendReference(
     new ParticipantClientReference(
       spliceConsoleEnvironment,
       s"remote participant for `$name``",
-      config.participantClient.getParticipantClientConfig(),
+      // TODO this metricsRegistry stuff looks a but crazy - revisit
+      config.participantClient.getParticipantClientConfig(
+        spliceConsoleEnvironment.environment.metricsRegistry.generateMetricsFactory(
+          MetricsContext.Empty
+        )
+      ),
     )
 
   /** Remote participant this scan app is configured to interact with. Uses admin tokens to bypass auth. */

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/SplitwellReference.scala

@@ -6,6 +6,7 @@ package org.lfdecentralizedtrust.splice.console
 import org.apache.pekko.actor.ActorSystem
 import com.daml.ledger.api.v2.CommandsOuterClass
 import com.daml.ledger.javaapi.data.codegen.Update
+import com.daml.metrics.api.MetricsContext
 import org.lfdecentralizedtrust.splice.codegen.java.splice.splitwell as splitwellCodegen
 import org.lfdecentralizedtrust.splice.codegen.java.splice.wallet.payment as walletCodegen
 import org.lfdecentralizedtrust.splice.codegen.java.da.time.types.RelTime
@@ -29,7 +30,7 @@ import com.digitalasset.canton.console.{
   LedgerApiCommandRunner,
 }
 import com.digitalasset.canton.console.commands.BaseLedgerApiAdministration
-import com.digitalasset.canton.topology.{SynchronizerId, PartyId}
+import com.digitalasset.canton.topology.{PartyId, SynchronizerId}
 
 import scala.jdk.CollectionConverters.*
 
@@ -93,7 +94,13 @@ final class SplitwellAppClientReference(
       config.participantClient.ledgerApi.clientConfig.address,
       config.participantClient.ledgerApi.clientConfig.port,
       config.participantClient.ledgerApi.clientConfig.tls,
-      config.participantClient.ledgerApi.getToken().map(_.accessToken),
+      // TODO This is not right, revisit
+      config.participantClient.ledgerApi
+        .getToken(
+          spliceConsoleEnvironment.environment.metricsRegistry
+            .generateMetricsFactory(MetricsContext.Empty)
+        )
+        .map(_.accessToken),
     )(consoleEnvironment)
 
   val userId: String = config.ledgerApiUser
@@ -513,7 +520,12 @@ final class SplitwellAppBackendReference(
     new ParticipantClientReference(
       consoleEnvironment,
       s"remote participant for `$name``",
-      config.participantClient.getParticipantClientConfig(),
+      // TODO revisit
+      config.participantClient.getParticipantClientConfig(
+        spliceConsoleEnvironment.environment.metricsRegistry.generateMetricsFactory(
+          MetricsContext.Empty
+        )
+      ),
     )
 
   /** Remote participant this splitwell app is configured to interact with. Uses admin tokens to bypass auth. */

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/SvAppReference.scala

@@ -3,6 +3,7 @@
 
 package org.lfdecentralizedtrust.splice.console
 
+import com.daml.metrics.api.MetricsContext
 import org.lfdecentralizedtrust.splice.auth.AuthUtil
 import org.lfdecentralizedtrust.splice.codegen.java.splice.round.OpenMiningRound
 import org.lfdecentralizedtrust.splice.codegen.java.splice.dso.amuletprice as cp
@@ -408,7 +409,12 @@ class SvAppBackendReference(
     new ParticipantClientReference(
       consoleEnvironment,
       s"remote participant for `$name``",
-      config.participantClient.getParticipantClientConfig(),
+      // TODO this is not right - revisit
+      config.participantClient.getParticipantClientConfig(
+        spliceConsoleEnvironment.environment.metricsRegistry.generateMetricsFactory(
+          MetricsContext.Empty
+        )
+      ),
     )
 
   /** Remote participant this sv app is configured to interact with. Uses admin tokens to bypass auth. */

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/ValidatorAppReference.scala

@@ -3,6 +3,7 @@
 
 package org.lfdecentralizedtrust.splice.console
 
+import com.daml.metrics.api.MetricsContext
 import org.lfdecentralizedtrust.splice.auth.AuthUtil
 import org.lfdecentralizedtrust.splice.codegen.java.splice.ans.AnsRules
 import org.lfdecentralizedtrust.splice.codegen.java.splice.amuletrules as amuletrulesCodegen
@@ -37,8 +38,8 @@ import com.digitalasset.canton.topology.PartyId
 import org.apache.pekko.actor.ActorSystem
 import org.lfdecentralizedtrust.splice.codegen.java.splice.amuletrules.TransferPreapproval
 import org.lfdecentralizedtrust.splice.codegen.java.splice.api.token.{
-  allocationv1,
   allocationinstructionv1,
+  allocationv1,
   transferinstructionv1,
 }
 import org.lfdecentralizedtrust.splice.codegen.java.splice.externalpartyamuletrules.TransferCommandCounter
@@ -566,7 +567,12 @@ final class ValidatorAppBackendReference(
     new ParticipantClientReference(
       consoleEnvironment,
       s"remote participant for `$name`",
-      config.participantClient.getParticipantClientConfig(),
+      // TODO this is not right, revisit
+      config.participantClient.getParticipantClientConfig(
+        spliceConsoleEnvironment.environment.metricsRegistry.generateMetricsFactory(
+          MetricsContext.Empty
+        )
+      ),
     )
 
   /** Remote participant this validator app is configured to interact with. Uses admin tokens to bypass auth. */

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/unit/http/HttpClientProxyTest.scala

@@ -1,8 +1,10 @@
 package org.lfdecentralizedtrust.splice.unit.http
 
 import com.auth0.jwk.{JwkProvider, JwkProviderBuilder}
+import com.daml.metrics.api.MetricsContext
 import com.digitalasset.canton.config.{ApiLoggingConfig, NonNegativeDuration}
 import com.digitalasset.canton.logging.NamedLogging
+import com.digitalasset.canton.metrics.ScopedInMemoryMetricsFactory
 import com.digitalasset.canton.{BaseTest, FutureHelpers, HasActorSystem, HasExecutionContext}
 import com.typesafe.config.ConfigFactory
 import org.apache.pekko.Done
@@ -30,7 +32,8 @@ class HttpClientProxyTest
     with TinyProxySupport
     with HttpServerSupport
     with SystemPropertiesSupport {
-
+  private val metricsFactoryProvider = new ScopedInMemoryMetricsFactory()
+  private val metricsFactory = metricsFactoryProvider.generateMetricsFactory(MetricsContext.Empty)
   "HttpClient proxy settings" should {
     "support proxy configuration via http.proxyPort, http.proxyHost" in {
       withProxy() { proxy =>
@@ -168,6 +171,8 @@ class HttpClientProxyTest
             val api =
               new OAuthApi(
                 NonNegativeDuration.ofSeconds(20),
+                // TODO revisit metrics usage here
+                metricsFactory,
                 loggerFactory,
               )
             api.getWellKnown(wellKnownUrlString).futureValue shouldBe an[WellKnownResponse]
@@ -259,6 +264,7 @@ class HttpClientProxyTest
     val httpClient = HttpClient(
       ApiLoggingConfig(),
       HttpClient.HttpRequestParameters(NonNegativeDuration(30.seconds)),
+      metricsFactory,
       logger,
     )(ac, ec)
     val uriString = s"http://localhost:$serverPort"

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/auth/AuthTokenSource.scala

@@ -4,6 +4,7 @@
 package org.lfdecentralizedtrust.splice.auth
 
 import com.daml.jwt.{AuthServiceJWTCodec, Jwt, JwtDecoder, StandardJWTPayload}
+import com.daml.metrics.api.MetricHandle.LabeledMetricsFactory
 import com.digitalasset.canton.config.NonNegativeDuration
 import org.apache.pekko.actor.ActorSystem
 import org.lfdecentralizedtrust.splice.auth.OAuthApi.TokenResponse
@@ -88,11 +89,12 @@ case class AuthTokenSourceOAuthClientCredentials(
     audience: String,
     scope: Option[String],
     requestTimeout: NonNegativeDuration,
+    metricsFactory: LabeledMetricsFactory,
     override protected val loggerFactory: NamedLoggerFactory,
 )(implicit ec: ExecutionContext, ac: ActorSystem)
     extends AuthTokenSource
     with NamedLogging {
-  private val oauth = new OAuthApi(requestTimeout, loggerFactory)
+  private val oauth = new OAuthApi(requestTimeout, metricsFactory, loggerFactory)
 
   override def getToken(implicit tc: TraceContext): Future[Option[AuthToken]] = {
     for {
@@ -113,6 +115,7 @@ case class AuthTokenSourceOAuthClientCredentials(
 object AuthTokenSource {
   def fromConfig(
       config: AuthTokenSourceConfig,
+      metricsFactory: LabeledMetricsFactory,
       loggerFactory: NamedLoggerFactory,
   )(implicit ec: ExecutionContext, ac: ActorSystem): AuthTokenSource = config match {
     case AuthTokenSourceConfig.None() =>
@@ -134,6 +137,7 @@ object AuthTokenSource {
         wellKnownConfigUrl = wellKnownConfigUrl,
         clientId = clientId,
         clientSecret = clientSecret,
+        metricsFactory = metricsFactory,
         loggerFactory = loggerFactory,
         audience = audience,
         scope = scope,

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/auth/OAuthApi.scala

@@ -3,6 +3,7 @@
 
 package org.lfdecentralizedtrust.splice.auth
 
+import com.daml.metrics.api.MetricHandle.LabeledMetricsFactory
 import com.digitalasset.canton.config.{ApiLoggingConfig, NonNegativeDuration}
 import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
@@ -65,6 +66,7 @@ trait OAuthApiJson extends SprayJsonSupport with DefaultJsonProtocol {
 
 class OAuthApi(
     requestTimeout: NonNegativeDuration,
+    metricsFactory: LabeledMetricsFactory,
     override protected val loggerFactory: NamedLoggerFactory,
 )(implicit actorSystem: ActorSystem)
     extends OAuthApiJson
@@ -75,6 +77,7 @@ class OAuthApi(
   private val httpClient = HttpClient(
     ApiLoggingConfig(),
     HttpClient.HttpRequestParameters(requestTimeout),
+    metricsFactory,
     logger,
   )
 

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/config/CNRemoteParticipantConfig.scala

@@ -3,6 +3,7 @@
 
 package org.lfdecentralizedtrust.splice.config
 
+import com.daml.metrics.api.MetricHandle.LabeledMetricsFactory
 import org.apache.pekko.actor.ActorSystem
 import com.digitalasset.canton.config.FullClientConfig
 import com.digitalasset.canton.participant.config.{BaseParticipantConfig, RemoteParticipantConfig}
@@ -14,8 +15,10 @@ abstract class BaseParticipantClientConfig(
   override def clientAdminApi: FullClientConfig = adminApi
   override def clientLedgerApi: FullClientConfig = ledgerApi.clientConfig
 
-  def getParticipantClientConfig()(implicit actorSystem: ActorSystem): RemoteParticipantConfig = {
-    val tokenStrO = ledgerApi.getToken().map(_.accessToken)
+  def getParticipantClientConfig(
+      metricsFactory: LabeledMetricsFactory
+  )(implicit actorSystem: ActorSystem): RemoteParticipantConfig = {
+    val tokenStrO = ledgerApi.getToken(metricsFactory).map(_.accessToken)
     RemoteParticipantConfig(adminApi, ledgerApi.clientConfig, tokenStrO)
   }
 

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/config/LedgerApiClientConfig.scala

@@ -3,6 +3,7 @@
 
 package org.lfdecentralizedtrust.splice.config
 
+import com.daml.metrics.api.MetricHandle.LabeledMetricsFactory
 import com.digitalasset.canton.config.FullClientConfig
 import com.digitalasset.canton.logging.NamedLoggerFactory
 import com.digitalasset.canton.tracing.TraceContext
@@ -22,12 +23,15 @@ case class LedgerApiClientConfig(
   // Note: Some places, e.g., Cantons RemoteParticipantConfig expects a static token,
   // LedgerApiClientConfig contains information for how to acquire tokens.
   // We need to perform some blocking IO to generate the token here.
-  def getToken()(implicit actorSystem: ActorSystem): Option[AuthToken] = {
+  def getToken(
+      metricsFactory: LabeledMetricsFactory
+  )(implicit actorSystem: ActorSystem): Option[AuthToken] = {
     implicit val executionContext = actorSystem.dispatcher
     implicit val traceContext = TraceContext.empty
     val loggerFactory = NamedLoggerFactory.root
     val authTokenSource = AuthTokenSource.fromConfig(
       authConfig,
+      metricsFactory,
       loggerFactory,
     )
     Await.result(authTokenSource.getToken, 30.seconds)