Fix CI

Author: jasgin

examples/pokemon-service/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2021"
 publish = false
 authors = ["Smithy-rs Server Team <smithy-rs-server@amazon.com>"]
 description = "A smithy Rust service to retrieve information about Pokémon."
+rust-version = "1.88"
 
 [dependencies]
 clap = { version = "4", features = ["derive"] }
@@ -14,7 +15,7 @@ tokio = "1.26.0"
 tower = "0.4"
 tracing = "0.1"
 tracing-appender = "0.2"
-metrique = { version = "=0.1.9", features = ["emf"] }
+metrique = { version = "=0.1", features = ["emf"] }
 
 # Local paths
 pokemon-service-server-sdk = { path = "../pokemon-service-server-sdk/", features = ["request-id"]}

rust-runtime/Cargo.lock

@@ -4,6 +4,14 @@ proc-macro = true
 [package]
 name = "aws-smithy-http-server-metrics-macro"
 version = "0.1.0"
+authors = [
+    "AWS Rust SDK Team <aws-sdk-rust@amazon.com>",
+    "Jason Gin <jasgin@amazon.com>",
+]
+description = "Server metrics via metrique integration."
 edition = "2021"
+license = "Apache-2.0"
+repository = "https://github.com/smithy-lang/smithy-rs"
+rust-version = "1.88"
 
 [dependencies]

rust-runtime/aws-smithy-http-server-metrics-macro/Cargo.toml

@@ -1,19 +1,20 @@
 [package]
 name = "aws-smithy-http-server-metrics"
 version = "0.1.0"
+authors = [
+    "AWS Rust SDK Team <aws-sdk-rust@amazon.com>",
+    "Jason Gin <jasgin@amazon.com>",
+]
+description = "Server metrics via metrique integration."
 edition = "2021"
+license = "Apache-2.0"
+repository = "https://github.com/smithy-lang/smithy-rs"
+rust-version = "1.88"
 
 [dependencies]
-# Pinning these to versions with MSRV 1.88.0
-metrique = "=0.1.9"
-metrique-macro = "=0.1.6"
-metrique-core = "=0.1.8"
-metrique-writer = "=0.1.10"
-metrique-writer-core = "=0.1.7"
-metrique-service-metrics = "=0.1.9"
-metrique-timesource = "=0.1.5"
-metrique-writer-macro = "=0.1.4"
-metrique-writer-format-emf = "=0.1.9"
+metrique = "0.1"
+metrique-writer = "0.1"
+metrique-core = "0.1"
 
 tower = "0.5"
 futures = "0.3"
@@ -23,3 +24,4 @@ hyper = "0.14"
 thiserror = "2"
 
 aws-smithy-http-server = { path = "../aws-smithy-http-server" }
+aws-smithy-http-server-metrics-macro = { path = "../aws-smithy-http-server-metrics-macro" }

rust-runtime/aws-smithy-http-server-metrics/Cargo.toml

@@ -1,8 +1,8 @@
 use std::fmt::Debug;
 
+use metrique::unit_of_work::metrics;
 use metrique::Slot;
 use metrique::SlotGuard;
-use metrique_macro::metrics;
 
 #[metrics]
 #[derive(Default)]

rust-runtime/aws-smithy-http-server-metrics/src/default.rs

@@ -2,14 +2,11 @@ use std::marker::PhantomData;
 
 use http::Request;
 use http::Response;
-use metrique::writer::EntrySink;
 use metrique::AppendAndCloseOnDrop;
 use metrique::DefaultSink;
 use metrique::OnParentDrop;
-use metrique::RootEntry;
 use metrique::Slot;
 
-use crate::default::DefaultMetricsEntry;
 use crate::default::DefaultRequestMetrics;
 use crate::default::DefaultRequestMetricsConfig;
 use crate::default::DefaultRequestMetricsExtension;
@@ -250,7 +247,7 @@ macro_rules! impl_build_for_state {
     ($state:ty) => {
         impl<S, I, Rq, Rs> DefaultMetricsBuildExt<S, I, Rq, Rs> for MetricsLayerBuilder<$state, DefaultMetrics, S, I, Rq, Rs>
         where
-            S: EntrySink<RootEntry<DefaultMetricsEntry>> + Send + Sync + 'static,
+            S: MetriqueEntrySink<DefaultMetrics>,
             I: InitMetrics<DefaultMetrics, S>,
             Rq: SetRequestMetrics<DefaultMetrics, S>,
             Rs: SetResponseMetrics<DefaultMetrics, S>,