From 49fe2457258fa53fbac9cd4d25047c02c432191b Mon Sep 17 00:00:00 2001 From: Caleb Schoepp Date: Wed, 18 Sep 2024 11:01:47 -0600 Subject: [PATCH] Fix traces and metrics not working. Fix slow tests. Rename variable Signed-off-by: Caleb Schoepp --- crates/factor-observe/src/lib.rs | 4 ++-- crates/telemetry/src/traces.rs | 2 ++ tests/integration.rs | 18 +++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/crates/factor-observe/src/lib.rs b/crates/factor-observe/src/lib.rs index 9a8a5a4dc8..640c5f6f07 100644 --- a/crates/factor-observe/src/lib.rs +++ b/crates/factor-observe/src/lib.rs @@ -146,7 +146,7 @@ impl ObserveContext { }; // If there are no active guest spans then there is nothing to do - let Some(current_span_id) = state.active_spans.last() else { + let Some(active_span) = state.active_spans.last() else { return; }; @@ -166,7 +166,7 @@ impl ObserveContext { // Now reparent the current span to the last active guest span let span_context = state .guest_spans - .get(*current_span_id) + .get(*active_span) .unwrap() .inner .span_context() diff --git a/crates/telemetry/src/traces.rs b/crates/telemetry/src/traces.rs index 25fa2e07f2..e0b6a916b6 100644 --- a/crates/telemetry/src/traces.rs +++ b/crates/telemetry/src/traces.rs @@ -57,6 +57,8 @@ pub(crate) fn otel_tracing_layer LookupSpan<'span>>( global::set_tracer_provider(tracer_provider.clone()); + global::set_tracer_provider(tracer_provider.clone()); + let env_filter = match EnvFilter::try_from_env("SPIN_OTEL_TRACING_LEVEL") { Ok(filter) => filter, // If it isn't set or it fails to parse default to info diff --git a/tests/integration.rs b/tests/integration.rs index fb6c9257ff..4d2ade52ab 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -1426,7 +1426,7 @@ mod otel_integration_tests { }, ServicesConfig::none(), |env| { - env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint); + env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint); env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc"); env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5"); Ok(()) @@ -1469,7 +1469,7 @@ mod otel_integration_tests { }, ServicesConfig::none(), |env| { - env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint); + env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint); env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc"); env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5"); Ok(()) @@ -1539,7 +1539,7 @@ mod otel_integration_tests { }, ServicesConfig::none(), |env| { - env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint); + env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint); env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc"); env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5"); Ok(()) @@ -1604,7 +1604,7 @@ mod otel_integration_tests { }, ServicesConfig::none(), |env| { - env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint); + env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint); env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc"); env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5"); Ok(()) @@ -1665,7 +1665,7 @@ mod otel_integration_tests { }, ServicesConfig::none(), |env| { - env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint); + env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint); env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc"); env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5"); Ok(()) @@ -1727,7 +1727,7 @@ mod otel_integration_tests { }, ServicesConfig::none(), |env| { - env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint); + env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint); env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc"); env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5"); Ok(()) @@ -1793,7 +1793,7 @@ mod otel_integration_tests { }, ServicesConfig::none(), |env| { - env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint); + env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint); env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc"); env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5"); Ok(()) @@ -1851,7 +1851,7 @@ mod otel_integration_tests { }, ServicesConfig::none(), |env| { - env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint); + env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint); env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc"); env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5"); Ok(()) @@ -1908,7 +1908,7 @@ mod otel_integration_tests { }, ServicesConfig::none(), |env| { - env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint); + env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint); env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc"); env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5"); Ok(())