From 92d5e5ee9eee5fde2de327e4930bf0f39fecee61 Mon Sep 17 00:00:00 2001
From: Christopher Durham <cad97@cad97.com>
Date: Tue, 26 Jul 2022 18:27:58 -0400
Subject: [PATCH] chore: fix minimal-versions correctness (#2246)

## Motivation

Fix minimal-versions failure.

## Solution

Upgrade all the dependencies to their most recent semver-compatible
version, adjusting back down as necessary for MSRV.

Essentially a cherry-pick of #2231, but redone by hand.

## Tests

- `cargo minimal-versions msrv verify -- cargo check --all-features`
- `cargo minimal-versions msrv verify -- cargo check --no-default-features`

## Methodology

- `cargo update && cargo upgrade --to-lockfile`
  - Identify [a bug](https://github.com/killercup/cargo-edit/issues/750) and manually resolve it
- loop; upgrade transitive deps
  - `cargo minimal-versions check --all-features`
  - Identify failing dep
  - `cargo minimal-versions tree -i dep --all-features`
  - Find the closest dependency leading to pulling in `dep`
  - `cargo add fixdep --optional` to force a more recent more-minimal-versions-correct version
- loop; downgrade to msrv
  - `cargo minimal-versions msrv verify -- cargo check --all-features`
  - Identify failing dep
  - `cargo minimal-versions tree -i dep --all-features`
  - Find the version that supports MSRV from lib.rs
  - `cargo upgrade dep@msrv`
---
 tracing-opentelemetry/Cargo.toml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tracing-opentelemetry/Cargo.toml b/tracing-opentelemetry/Cargo.toml
index 1781eb9..ee53821 100644
--- a/tracing-opentelemetry/Cargo.toml
+++ b/tracing-opentelemetry/Cargo.toml
@@ -23,17 +23,21 @@ rust-version = "1.46.0"
 default = ["tracing-log"]
 
 [dependencies]
-opentelemetry = { version = "0.17", default-features = false, features = ["trace"] }
-tracing = { path = "../tracing", version = "0.1", default-features = false, features = ["std"] }
-tracing-core = { path = "../tracing-core", version = "0.1" }
-tracing-subscriber = { path = "../tracing-subscriber", version = "0.3", default-features = false, features = ["registry", "std"] }
-tracing-log = { path = "../tracing-log", version = "0.1", default-features = false, optional = true }
+opentelemetry = { version = "0.17.0", default-features = false, features = ["trace"] }
+tracing = { path = "../tracing", version = "0.1.35", default-features = false, features = ["std"] }
+tracing-core = { path = "../tracing-core", version = "0.1.28" }
+tracing-subscriber = { path = "../tracing-subscriber", version = "0.3.0", default-features = false, features = ["registry", "std"] }
+tracing-log = { path = "../tracing-log", version = "0.1.3", default-features = false, optional = true }
 once_cell = "1"
 
+# Fix minimal-versions
+async-trait = { version = "0.1.56", optional = true }
+thiserror = { version = "1.0.31", optional = true }
+
 [dev-dependencies]
-async-trait = "0.1"
-criterion = { version = "0.3", default_features = false }
-opentelemetry-jaeger = "0.16"
+async-trait = "0.1.56"
+criterion = { version = "0.3.6", default-features = false }
+opentelemetry-jaeger = "0.16.0"
 
 [lib]
 bench = false