Removed dropwizard dependencies

digital-asset · Mar 14, 2024 · 700db86 · 700db86
1 parent 16e70f6
commit 700db86
Show file tree

Hide file tree

Showing 28 changed files with 34 additions and 1,200 deletions.
diff --git a/bazel-java-deps.bzl b/bazel-java-deps.bzl
@@ -140,9 +140,6 @@ def install_java_deps():
             "io.circe:circe-generic_{}:{}".format(scala_major_version, circe_version),
             "io.circe:circe-parser_{}:{}".format(scala_major_version, circe_version),
             "io.circe:circe-yaml_{}:{}".format(scala_major_version, "0.15.0-RC1"),
-            "io.dropwizard.metrics:metrics-core:{}".format(dropwizard_version),
-            "io.dropwizard.metrics:metrics-jmx:{}".format(dropwizard_version),
-            "io.dropwizard.metrics:metrics-jvm:{}".format(dropwizard_version),
             #            "io.gatling.highcharts:gatling-charts-highcharts:{}".format(gatling_version),
             #            "io.gatling:gatling-app:{}".format(gatling_version),
             #            "io.gatling:gatling-charts:{}".format(gatling_version),
@@ -199,7 +196,6 @@ def install_java_deps():
             "io.opentelemetry:opentelemetry-sdk:{}".format(opentelemetry_version),
             "io.opentelemetry:opentelemetry-semconv:{}-alpha".format(opentelemetry_version),
             "io.prometheus:simpleclient:{}".format(prometheus_version),
-            "io.prometheus:simpleclient_dropwizard:{}".format(prometheus_version),
             "io.prometheus:simpleclient_httpserver:{}".format(prometheus_version),
             "io.prometheus:simpleclient_servlet:{}".format(prometheus_version),
             "io.reactivex.rxjava2:rxjava:2.2.21",
@@ -266,7 +262,6 @@ def install_java_deps():
             "org.wartremover:wartremover_{}:2.4.21".format(scala_version),
             "org.xerial:sqlite-jdbc:3.36.0.1",
             maven.artifact("com.github.pureconfig", "pureconfig-macros_2.12", "0.14.0", neverlink = True),
-            maven.artifact("io.dropwizard.metrics", "metrics-graphite", dropwizard_version, exclusions = ["com.rabbitmq:amqp-client"]),
         ],
         fetch_sources = True,
         maven_install_json = "@com_github_digital_asset_daml//:maven_install_{}.json".format(scala_major_version),

diff --git a/canton/BUILD.bazel b/canton/BUILD.bazel
@@ -279,7 +279,6 @@ da_scala_library(
         "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
         "@maven//:commons_codec_commons_codec",
         "@maven//:commons_io_commons_io",
-        "@maven//:io_dropwizard_metrics_metrics_core",
         "@maven//:io_grpc_grpc_api",
         "@maven//:io_grpc_grpc_netty",
         "@maven//:io_grpc_grpc_protobuf",

diff --git a/...ledger/ledger-common/src/main/scala/com/digitalasset/canton/metrics/ServicesMetrics.scala b/...ledger/ledger-common/src/main/scala/com/digitalasset/canton/metrics/ServicesMetrics.scala
@@ -5,7 +5,6 @@ package com.digitalasset.canton.metrics
 
 import com.daml.metrics.api.MetricDoc.MetricQualification.{Debug, Saturation, Traffic}
 import com.daml.metrics.api.MetricHandle.*
-import com.daml.metrics.api.dropwizard.DropwizardTimer
 import com.daml.metrics.api.{MetricDoc, MetricName}
 
 class ServicesMetrics(
@@ -224,18 +223,6 @@ class ServicesMetrics(
   object write {
     val prefix: MetricName = ServicesMetrics.this.prefix :+ "write"
 
-    @MetricDoc.Tag(
-      summary = "The number of submitted transactions by the write service.",
-      description = """The write service is an internal interface for changing the state through
-                      |the synchronization services. The methods in this interface are all methods
-                      |that are supported uniformly across all ledger implementations. This metric
-                      |exposes the total number of the sumbitted transactions.""",
-      qualification = Traffic,
-    )
-    @SuppressWarnings(Array("org.wartremover.warts.Null"))
-    val submitOperationForDocs: Timer =
-      DropwizardTimer(prefix :+ "submit_transaction" :+ "count", null)
-
     @MetricDoc.FanInstanceTag
     val submitTransaction: Timer = openTelemetryMetricsFactory.timer(prefix :+ "submit_transaction")
     @MetricDoc.FanInstanceTag

diff --git a/daml-script/test/BUILD.bazel b/daml-script/test/BUILD.bazel
@@ -507,6 +507,5 @@ da_scala_test_suite(
         "//observability/metrics",
         "//test-common/canton/it-lib",
         "@maven//:com_auth0_java_jwt",
-        "@maven//:io_dropwizard_metrics_metrics_core",
     ],
 )
diff --git a/ledger-service/cli-opts/BUILD.bazel b/ledger-service/cli-opts/BUILD.bazel
diff --git a/ledger-service/cli-opts/src/main/scala/cliopts/GlobalLogLevel.scala b/ledger-service/cli-opts/src/main/scala/cliopts/GlobalLogLevel.scala
diff --git a/ledger-service/cli-opts/src/main/scala/cliopts/Http.scala b/ledger-service/cli-opts/src/main/scala/cliopts/Http.scala
diff --git a/ledger-service/cli-opts/src/main/scala/cliopts/Logging.scala b/ledger-service/cli-opts/src/main/scala/cliopts/Logging.scala
diff --git a/ledger-service/cli-opts/src/main/scala/cliopts/Metrics.scala b/ledger-service/cli-opts/src/main/scala/cliopts/Metrics.scala
diff --git a/ledger-service/cli-opts/src/main/scala/cliopts/package.scala b/ledger-service/cli-opts/src/main/scala/cliopts/package.scala
diff --git a/ledger-service/metrics/BUILD.bazel b/ledger-service/metrics/BUILD.bazel