GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

think its fixed

Browse Source
This commit is contained in:
mfahampshire
2025-08-01 14:53:18 +02:00
parent fc76c2d7a0
commit 99684e79e4
3 changed files with 70 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+3
View File
@@ -6016,6 +6016,7 @@ dependencies = [
"nym-wireguard",
"nym-wireguard-types 0.1.0",
"opentelemetry 0.30.0",
"opentelemetry_sdk 0.30.0",
"rand 0.8.5",
"sha2 0.10.9",
"sqlx",
@@ -8416,6 +8417,8 @@ dependencies = [
"rand 0.9.2",
"serde_json",
"thiserror 2.0.12",
"tokio",
"tokio-stream",
]
[[package]]
gateway/Cargo.toml
+10 -1
View File
@@ -74,8 +74,17 @@ nym-wireguard-types = { path = "../common/wireguard-types", default-features = f
defguard_wireguard_rs = { workspace = true }
opentelemetry = { workspace = true, features = ["trace"] }
tracing = { workspace = true, features = ["std", "attributes", "tracing-attributes"] }
tracing = { workspace = true, features = [
"std",
"attributes",
"tracing-attributes",
] }
tracing-opentelemetry = { workspace = true }
opentelemetry_sdk = { version = "0.30.0", default-features = false, features = [
"trace",
"rt-tokio",
"experimental_metrics_custom_reader",
] }
[build-dependencies]
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
+57 -20
View File
@@ -34,6 +34,7 @@ use nym_node_metrics::events::MetricsEvent;
use nym_sphinx::DestinationAddressBytes;
use nym_task::TaskClient;
use opentelemetry::trace::TraceContextExt;
use opentelemetry_sdk::trace::{IdGenerator, RandomIdGenerator};
use rand::CryptoRng;
use std::net::SocketAddr;
use std::time::Duration;
@@ -865,32 +866,68 @@ impl<R, S> FreshHandler<R, S> {
iv,
debug_trace_id,
} => {
/*
┌───────────────────────────────────────────────────────┐
│ Incoming Request │
│ trace_id: "abc123..." (from client) │
└────────────────────────┬──────────────────────────────┘
↓
┌───────────────────────────────────────────────────────┐
│ 1. Create SpanContext │
│ ┌─────────────────────────────────────────────┐ │
│ │ SpanContext::new( │ │
│ │ trace_id: "abc123..." (preserved) │ │
│ │ span_id: "new_random_id" │ │
│ │ is_remote: true │ │
│ │ ) │ │
│ └─────────────────────────────────────────────┘ │
└────────────────────────┬──────────────────────────────┘
↓
┌───────────────────────────────────────────────────────┐
│ 2. Convert to Context │
│ Context::current().with_remote_span_context(...) │
└────────────────────────┬──────────────────────────────┘
↓
┌───────────────────────────────────────────────────────┐
│ 3. Create & Configure Span │
│ span = info_span!("authenticate_v1") │
│ span.set_parent(context) // Before entering │
└────────────────────────┬─────────────────────────────-┘
↓
┌───────────────────────────────────────────────────────┐
│ 4. Enter Span │
│ let _enter = span.enter() │
│ // All child spans inherit trace_id "abc123..." │
└───────────────────────────────────────────────────────┘
*/
if let Some(trace_id) = debug_trace_id {
let span = info_span!("authenticate_v1");
let _enter = span.enter();
// let otel_context = span.context();
// let otel_span = otel_context.span();
// let otel_span_context = otel_span.span_context();
//
// let trace_id = opentelemetry::trace::TraceId::from_hex(&trace_id).unwrap();
// let span_id = otel_span_context.span_id().clone();
//
// let span_context = opentelemetry::trace::SpanContext::new(
// trace_id,
// span_id,
// opentelemetry::trace::TraceFlags::SAMPLED,
// true, // is_remote
// Default::default(),
// );
//
// let new_context = opentelemetry::Context::try_into(span_context).unwrap();
//
// span.set_parent(new_context);
let trace_id = opentelemetry::trace::TraceId::from_hex(&trace_id)
.expect("Invalid trace ID format");
let mut cx = tracing::Span::current().context();
let id_generator = RandomIdGenerator::default();
let span_id = id_generator.new_span_id();
tracing::span::Span::current().set_parent(cx);
let span_context = opentelemetry::trace::SpanContext::new(
trace_id,
span_id,
opentelemetry::trace::TraceFlags::SAMPLED,
true, // is_remote = true since this comes from another service
Default::default(),
);
use opentelemetry::trace::TraceContextExt;
let remote_context =
opentelemetry::Context::current().with_remote_span_context(span_context);
// Create span with remote context as parent
use tracing_opentelemetry::OpenTelemetrySpanExt;
let span = info_span!("authenticate_v1");
span.set_parent(remote_context);
let _enter = span.enter();
}
self.handle_legacy_authenticate(protocol_version, address, enc_address, iv)