Skip to content

Commit 8149ba2

Browse files
committed
fixes
1 parent 5e78680 commit 8149ba2

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

crates/builder/op-rbuilder/src/tests/framework/instance.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ impl LocalInstance {
9797
/// This method does not prefund any accounts, so before sending any transactions
9898
/// make sure that sender accounts are funded.
9999
pub async fn new<P: PayloadBuilder>(args: OpRbuilderArgs) -> eyre::Result<Self> {
100+
clear_otel_env_vars();
100101
Box::pin(Self::new_with_config::<P>(args, default_node_config())).await
101102
}
102103

crates/builder/op-rbuilder/src/tests/framework/macros/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ pub fn rb_test(args: TokenStream, input: TokenStream) -> TokenStream {
229229
generated_functions.push(quote! {
230230
#test_attribute
231231
async fn #test_name() -> eyre::Result<()> {
232+
crate::tests::clear_otel_env_vars();
232233
let subscriber = tracing_subscriber::fmt()
233234
.with_env_filter(std::env::var("RUST_LOG")
234235
.unwrap_or_else(|_| "info".to_string()))

deny.toml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ multiple-versions = "deny"
55
# Skip crates with multiple versions from upstream dependencies that we cannot control
66
# These are primarily from reth, alloy, and kona dependencies
77
skip = [
8-
# Alloy version mismatch between workspace (0.4.x) and kona-registry (0.2.x)
9-
"alloy-hardforks",
10-
"alloy-op-hardforks",
11-
128
# Windows platform crates - different versions used by various upstream deps
139
"windows-sys",
1410
"windows",
@@ -86,4 +82,25 @@ skip = [
8682
"unicode-width",
8783
"unsigned-varint",
8884
"webpki-roots",
85+
86+
# OpenTelemetry crates - version differences from kona dependencies
87+
"opentelemetry",
88+
"opentelemetry-http",
89+
"opentelemetry-otlp",
90+
"opentelemetry-proto",
91+
"opentelemetry_sdk",
92+
"tracing-opentelemetry",
93+
94+
# Protobuf/gRPC crates
95+
"prost",
96+
"prost-derive",
97+
"tonic",
98+
"tower",
99+
100+
# Misc
101+
"gloo-timers",
102+
"indexmap",
103+
"rustc-hash",
104+
"serde_spanned",
105+
"toml",
89106
]

0 commit comments

Comments
 (0)