Merge and fix more deprecations

Author: rossabaker

prometheus-metrics/src/test/scala/org/http4s/metrics/prometheus/PrometheusClientMetricsCustomLabelsSuite.scala

@@ -235,5 +235,5 @@ class PrometheusClientMetricsCustomLabelsSuite extends CatsEffectSuite {
   def meteredClient(
       classifier: Request[IO] => Option[String] = (_: Request[IO]) => None
   ): SyncIO[FunFixture[(CollectorRegistry, Client[IO])]] =
-    ResourceFixture(buildMeteredClient(classifier))
+    ResourceFunFixture(buildMeteredClient(classifier))
 }

prometheus-metrics/src/test/scala/org/http4s/metrics/prometheus/PrometheusExemplarsCustomLabelsSuite.scala

@@ -68,5 +68,5 @@ class PrometheusExemplarsCustomLabelsSuite extends CatsEffectSuite {
   def meteredClient(
       exemplar: Map[String, String]
   ): SyncIO[FunFixture[(CollectorRegistry, Client[IO])]] =
-    ResourceFixture(buildMeteredClient(exemplar))
+    ResourceFunFixture(buildMeteredClient(exemplar))
 }

prometheus-metrics/src/test/scala/org/http4s/metrics/prometheus/PrometheusServerMetricsCustomLabelsSuite.scala

@@ -301,5 +301,5 @@ class PrometheusServerMetricsCustomLabelsSuite extends CatsEffectSuite {
   def meteredRoutes(
       classifier: Request[IO] => Option[String] = (_: Request[IO]) => None
   ): SyncIO[FunFixture[(CollectorRegistry, HttpApp[IO])]] =
-    ResourceFixture(buildMeteredRoutes(classifier))
+    ResourceFunFixture(buildMeteredRoutes(classifier))
 }