Merge branch 'master' into dev

minitrace-jaeger/Cargo.toml

@@ -15,7 +15,7 @@ keywords = ["tracing", "span", "datadog", "jaeger", "opentelemetry"]
 [dependencies]
 log = "0.4"
 minitrace = { version = "0.6.6", path = "../minitrace" }
-thrift_codec = "0.2"
+thrift_codec = "0.3"
 
 [dev-dependencies]
 futures = "0.3"

minitrace/Cargo.toml

@@ -28,9 +28,9 @@ rtrb = "0.2"
 [dev-dependencies]
 # The procedural macro `trace` only supports async-trait higher than 0.1.52
 async-trait = "0.1.52"
-criterion = { version = "0.4", features = ["html_reports"] }
+criterion = { version = "0.5", features = ["html_reports"] }
 crossbeam = "0.8"
-env_logger = "0.10"
+env_logger = "0.11"
 futures = "0.3"
 futures-timer = "3"
 log = "0.4"
@@ -39,16 +39,16 @@ minitrace = { path = ".", features = ["enable"] }
 minitrace-datadog = { version = "0.6.6", path = "../minitrace-datadog" }
 minitrace-jaeger = { version = "0.6.6", path = "../minitrace-jaeger" }
 minitrace-opentelemetry = { version = "0.6.6", path = "../minitrace-opentelemetry" }
-mockall = "0.11"
+mockall = "0.12"
 once_cell = "1"
 opentelemetry-otlp = { version = "0.16", features = ["trace"] }
 opentelemetry = { version = "0.23", features = ["trace"] }
 opentelemetry_sdk = { version = "0.23", features = ["trace"] }
 
 rand = "0.8"
 rustracing = "0.6"
-serial_test = "2"
-test-harness = "0.1.1"
+serial_test = "3"
+test-harness = "0.2"
 tokio = { version = "1", features = ["rt", "time", "macros", "rt-multi-thread"] }
 tracing = "0.1"
 tracing-core = "0.1"