Fix tests and update some dependencies (#53)

* fix: update docs and tests for controller/sink changes
* chore: remove hashbrown dep and update parking_lot version
* style: rustfmt

metrics-runtime/Cargo.toml

@@ -30,8 +30,7 @@ metrics-util = { path = "../metrics-util", version = "^0.3" }
 metrics = { path = "../metrics", version = "^0.11", features = ["std"] }
 im = "^12"
 arc-swap = "^0.3"
-parking_lot = "^0.8"
-hashbrown = "^0.5"
+parking_lot = "^0.9"
 quanta = "^0.3"
 futures = "^0.1"
 crossbeam-utils = "^0.6"

metrics-runtime/examples/benchmark.rs

@@ -214,7 +214,7 @@ fn main() {
         .build()
         .expect("failed to build receiver");
 
-    let sink = receiver.get_sink();
+    let sink = receiver.sink();
     let sink = sink.scoped(&["alpha", "pools", "primary"]);
 
     info!("sink configured");
@@ -243,7 +243,7 @@ fn main() {
     }
 
     // Spin up the sink and let 'er rip.
-    let controller = receiver.get_controller();
+    let controller = receiver.controller();
 
     // Poll the controller to figure out the sample rate.
     let mut total = 0;

metrics-runtime/examples/facade.rs

@@ -161,7 +161,7 @@ fn main() {
         .build()
         .expect("failed to build receiver");
 
-    let controller = receiver.get_controller();
+    let controller = receiver.controller();
 
     let addr = "0.0.0.0:23432"
         .parse()

metrics-runtime/src/lib.rs

@@ -45,7 +45,7 @@
 //! use metrics_runtime::Receiver;
 //! use std::{thread, time::Duration};
 //! let receiver = Receiver::builder().build().expect("failed to create receiver");
-//! let mut sink = receiver.get_sink();
+//! let mut sink = receiver.sink();
 //!
 //! // We can update a counter.  Counters are monotonic, unsigned integers that start at 0 and
 //! // increase over time.
@@ -89,7 +89,7 @@
 //! # use metrics_runtime::Receiver;
 //! # let receiver = Receiver::builder().build().expect("failed to create receiver");
 //! // This sink has no scope aka the root scope.  The metric will just end up as "widgets".
-//! let mut root_sink = receiver.get_sink();
+//! let mut root_sink = receiver.sink();
 //! root_sink.increment_counter("widgets", 42);
 //!
 //! // This sink is under the "secret" scope.  Since we derived ourselves from the root scope,
@@ -128,7 +128,7 @@
 //! # fn run_query(_: &str) -> u64 { 42 }
 //! # use metrics_runtime::Receiver;
 //! # let receiver = Receiver::builder().build().expect("failed to create receiver");
-//! # let mut sink = receiver.get_sink();
+//! # let mut sink = receiver.sink();
 //! // We might have a function that interacts with a database and returns the number of rows it
 //! // touched in doing so.
 //! fn process_query(query: &str) -> u64 {
@@ -172,7 +172,7 @@
 //! # use metrics_runtime::Receiver;
 //! # use std::time::Instant;
 //! # let receiver = Receiver::builder().build().expect("failed to create receiver");
-//! # let mut sink = receiver.get_sink();
+//! # let mut sink = receiver.sink();
 //! // Let's create a counter.
 //! let egg_count = sink.counter("eggs");
 //!
@@ -225,7 +225,7 @@
 //! # use metrics_runtime::{Receiver, Measurement};
 //! # use std::time::Instant;
 //! # let receiver = Receiver::builder().build().expect("failed to create receiver");
-//! # let mut sink = receiver.get_sink();
+//! # let mut sink = receiver.sink();
 //! // A proxy is now registered under the name "load_stats", which is prepended to all the metrics
 //! // generated by the closure i.e. "load_stats.avg_1min".  These metrics are also still scoped
 //! // normally based on the [`Sink`].
@@ -259,7 +259,7 @@
 //! use log::Level;
 //! use std::{thread, time::Duration};
 //! let receiver = Receiver::builder().build().expect("failed to create receiver");
-//! let mut sink = receiver.get_sink();
+//! let mut sink = receiver.sink();
 //!
 //! // We can update a counter.  Counters are monotonic, unsigned integers that start at 0 and
 //! // increase over time.
@@ -278,7 +278,7 @@
 //!
 //! // Now create our exporter/observer configuration, and wire it up.
 //! let exporter = LogExporter::new(
-//!     receiver.get_controller(),
+//!     receiver.controller(),
 //!     YamlBuilder::new(),
 //!     Level::Info,
 //!     Duration::from_secs(5),

metrics-runtime/src/registry/scope.rs

@@ -1,6 +1,6 @@
 use crate::common::{Scope, ScopeHandle};
-use hashbrown::HashMap;
 use parking_lot::RwLock;
+use std::collections::HashMap;
 
 #[derive(Debug)]
 struct Inner {

metrics-runtime/src/scopes.rs

@@ -1,5 +1,5 @@
 use parking_lot::RwLock;
-use hashbrown::HashMap;
+use std::collections::HashMap;
 
 pub struct Inner {
     id: u64,

metrics-runtime/src/sink.rs

@@ -3,10 +3,9 @@ use crate::{
     data::{Counter, Gauge, Histogram},
     registry::{MetricRegistry, ScopeRegistry},
 };
-use hashbrown::HashMap;
 use metrics_core::{IntoLabels, Key, Label, ScopedString};
 use quanta::Clock;
-use std::{error::Error, fmt, sync::Arc};
+use std::{collections::HashMap, error::Error, fmt, sync::Arc};
 
 /// Errors during sink creation.
 #[derive(Debug, Clone)]
@@ -131,7 +130,7 @@ impl Sink {
     /// # use metrics_runtime::Receiver;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// sink.increment_counter("messages_processed", 1);
     /// # }
     /// ```
@@ -154,7 +153,7 @@ impl Sink {
     /// # use metrics_runtime::Receiver;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// sink.increment_counter_with_labels("messages_processed", 1, &[("message_type", "mgmt")]);
     /// # }
     /// ```
@@ -178,7 +177,7 @@ impl Sink {
     /// # use metrics_runtime::Receiver;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// sink.update_gauge("current_offset", -131);
     /// # }
     /// ```
@@ -201,7 +200,7 @@ impl Sink {
     /// # use metrics_runtime::Receiver;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// sink.update_gauge_with_labels("current_offset", -131, &[("source", "stratum-1")]);
     /// # }
     /// ```
@@ -231,7 +230,7 @@ impl Sink {
     /// # use std::time::Duration;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// let start = sink.now();
     /// thread::sleep(Duration::from_millis(10));
     /// let end = sink.now();
@@ -262,7 +261,7 @@ impl Sink {
     /// # use std::time::Duration;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// let start = sink.now();
     /// thread::sleep(Duration::from_millis(10));
     /// let end = sink.now();
@@ -290,7 +289,7 @@ impl Sink {
     /// # use std::time::Duration;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// sink.record_value("rows_returned", 42);
     /// # }
     /// ```
@@ -315,7 +314,7 @@ impl Sink {
     /// # use std::time::Duration;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// sink.record_value_with_labels("rows_returned", 42, &[("table", "posts")]);
     /// # }
     /// ```
@@ -345,7 +344,7 @@ impl Sink {
     /// # use metrics_runtime::Receiver;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// let counter = sink.counter("messages_processed");
     /// counter.record(1);
     ///
@@ -376,7 +375,7 @@ impl Sink {
     /// # use metrics_runtime::Receiver;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// let counter = sink.counter_with_labels("messages_processed", &[("service", "secure")]);
     /// counter.record(1);
     ///
@@ -407,7 +406,7 @@ impl Sink {
     /// # use metrics_runtime::Receiver;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// let gauge = sink.gauge("current_offset");
     /// gauge.record(-131);
     /// # }
@@ -435,7 +434,7 @@ impl Sink {
     /// # use metrics_runtime::Receiver;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// let gauge = sink.gauge_with_labels("current_offset", &[("source", "stratum-1")]);
     /// gauge.record(-131);
     /// # }
@@ -465,7 +464,7 @@ impl Sink {
     /// # use std::time::Duration;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// let histogram = sink.histogram("request_duration");
     ///
     /// let start = sink.now();
@@ -503,7 +502,7 @@ impl Sink {
     /// # use std::time::Duration;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     /// let histogram = sink.histogram_with_labels("request_duration", &[("service", "secure")]);
     ///
     /// let start = sink.now();
@@ -549,7 +548,7 @@ impl Sink {
     /// # use std::time::Duration;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     ///
     /// // A proxy is now registered under the name "load_stats", which is prepended to all the
     /// // metrics generated by the closure i.e. "load_stats.avg_1min".  These metrics are also
@@ -598,7 +597,7 @@ impl Sink {
     /// # use std::time::Duration;
     /// # fn main() {
     /// let receiver = Receiver::builder().build().expect("failed to create receiver");
-    /// let mut sink = receiver.get_sink();
+    /// let mut sink = receiver.sink();
     ///
     /// let system_name = "web03".to_string();
     ///