Merge pull request #46 from Roblox/hyper-1

Upgrade rs-consul to latest http, hyper, opentelemetry

.github/workflows/format-code.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   format-code:
     runs-on: "ubuntu-latest"
-    container: rust:1.77
+    container: rust:1.79
 
     steps:
       - name: Checkout the code on merge

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   lint:
     runs-on: "ubuntu-latest"
-    container: rust:1.77
+    container: rust:1.79
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/main.yml

@@ -11,9 +11,9 @@ jobs:
   build:
     strategy:
       matrix:
-        features: ["", "--no-default-features --features rustls-native"]
+        features: [""]
     runs-on: "ubuntu-latest"
-    container: rust:1.74
+    container: rust:1.79
 
     steps:
       - uses: actions/checkout@v2
@@ -24,9 +24,9 @@ jobs:
   test:
     strategy:
       matrix:
-        features: ["", "--no-default-features --features rustls-native"]
+        features: [""]
     runs-on: "ubuntu-latest"
-    container: rust:1.77
+    container: rust:1.79
     services:
       consul:
         image: consul:1.11.11

.github/workflows/publish.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: rust:1.77
+    container: rust:1.79
     services:
       consul:
         image: consul:1.11.11
@@ -25,7 +25,7 @@ jobs:
 
   dry-run:
     runs-on: ubuntu-latest
-    container: rust:1.77
+    container: rust:1.79
 
     steps:
       - uses: actions/checkout@v2
@@ -36,7 +36,7 @@ jobs:
   publish:
     needs: [test, dry-run]
     runs-on: ubuntu-latest
-    container: rust:1.74
+    container: rust:1.79
     environment: crates-publish
 
     steps:

CHANGELOG.md

@@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+## 0.7.0 - 2024-06-25
+
+### Changed
+
+- `opentelemetry` updated to version `0.24` from `0.22`.
+- `http` updated to version `1.0` from `0.2`.
+- `hyper` updated to version `1.0` from `0.14`.
+- `hyper-rustls` updated to version `0.27` from `0.24`.
+- `get_service_nodes` now supports tags thanks to @gautamg795
+- `read_key` now also returns the index thanks to @badalex
+- Allow configuring `Consul` with a custom http client thanks to @LeonHartley
+- Removed `rustls-native-roots` feature and now defaults to `rustls-webpki-roots` (which has been removed). This addresses the bug that features were not additive.
+
 ## 0.6.0 - 2024-04-01
 
 ### Changed

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rs-consul"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Roblox"]
 edition = "2021"
 description = "This crate provides access to a set of strongly typed apis to interact with consul (https://www.consul.io/)"
@@ -10,21 +10,20 @@ license-file = "LICENSE"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-default = ["rustls-native"]
+default = []
 metrics = ["prometheus", "lazy_static"]
-rustls-native = ["hyper-rustls/rustls-native-certs"]
-rustls-webpki = ["hyper-rustls/webpki-roots"]
 trace = ["dep:opentelemetry"]
 
 # keep this list sorted!
 [dependencies]
 base64 = "0.22"
-futures = "0.3"
-http = "0.2"
-hyper = { version = "0.14", features = ["full"] }
-hyper-rustls = { version = "0.24" }
+http = "1"
+http-body-util = "0.1"
+hyper = { version = "1", features = ["full"] }
+hyper-rustls = { version = "0.27", default-features = false, features = ["webpki-roots", "ring", "http1"] }
+hyper-util = { version = "0.1", features = ["client", "client-legacy", "tokio", "http2"] }
 lazy_static = { version = "1", optional = true }
-opentelemetry = { version = "0.22", optional = true }
+opentelemetry = { version = "0.24", optional = true }
 prometheus = { version = "0.13", optional = true }
 quick-error = "2"
 serde = { version = "1.0", features = ["derive"] }

rust-toolchain

@@ -1 +1 @@
-1.77
+1.79

src/hyper_wrapper.rs

@@ -21,7 +21,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-#![cfg(feature = "trace")]
 use hyper::Version;
 use opentelemetry::{
     global::{BoxedSpan, BoxedTracer},