Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade rs-consul to latest http, hyper, opentelemetry #46

Merged
merged 20 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/format-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
lint:
runs-on: "ubuntu-latest"
container: rust:1.77
container: rust:1.79

steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,7 +25,7 @@ jobs:

dry-run:
runs-on: ubuntu-latest
container: rust:1.77
container: rust:1.79

steps:
- uses: actions/checkout@v2
Expand All @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 8 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -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/)"
Expand All @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.77
1.79
1 change: 0 additions & 1 deletion src/hyper_wrapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
Loading
Loading