Skip to content

Commit 3f98464

Browse files
calebschoeppcalebschoepp
committed
Fix traces and metrics not working. Fix slow tests. Rename variable
Signed-off-by: Caleb Schoepp <[email protected]>
1 parent 930156b commit 3f98464

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

‎crates/factor-observe/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl ObserveContext {
146146
};
147147

148148
// If there are no active guest spans then there is nothing to do
149-
let Some(current_span_id) = state.active_spans.last() else {
149+
let Some(active_span) = state.active_spans.last() else {
150150
return;
151151
};
152152

@@ -166,7 +166,7 @@ impl ObserveContext {
166166
// Now reparent the current span to the last active guest span
167167
let span_context = state
168168
.guest_spans
169-
.get(*current_span_id)
169+
.get(*active_span)
170170
.unwrap()
171171
.inner
172172
.span_context()

‎crates/telemetry/src/traces.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ pub(crate) fn otel_tracing_layer<S: Subscriber + for<'span> LookupSpan<'span>>(
5757

5858
global::set_tracer_provider(tracer_provider.clone());
5959

60+
global::set_tracer_provider(tracer_provider.clone());
61+
6062
let env_filter = match EnvFilter::try_from_env("SPIN_OTEL_TRACING_LEVEL") {
6163
Ok(filter) => filter,
6264
// If it isn't set or it fails to parse default to info

‎tests/integration.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,7 @@ mod otel_integration_tests {
14311431
},
14321432
ServicesConfig::none(),
14331433
|env| {
1434-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1434+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
14351435
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
14361436
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
14371437
Ok(())
@@ -1474,7 +1474,7 @@ mod otel_integration_tests {
14741474
},
14751475
ServicesConfig::none(),
14761476
|env| {
1477-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1477+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
14781478
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
14791479
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
14801480
Ok(())
@@ -1544,7 +1544,7 @@ mod otel_integration_tests {
15441544
},
15451545
ServicesConfig::none(),
15461546
|env| {
1547-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1547+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
15481548
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
15491549
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
15501550
Ok(())
@@ -1609,7 +1609,7 @@ mod otel_integration_tests {
16091609
},
16101610
ServicesConfig::none(),
16111611
|env| {
1612-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1612+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
16131613
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
16141614
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
16151615
Ok(())
@@ -1670,7 +1670,7 @@ mod otel_integration_tests {
16701670
},
16711671
ServicesConfig::none(),
16721672
|env| {
1673-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1673+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
16741674
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
16751675
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
16761676
Ok(())
@@ -1732,7 +1732,7 @@ mod otel_integration_tests {
17321732
},
17331733
ServicesConfig::none(),
17341734
|env| {
1735-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1735+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
17361736
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
17371737
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
17381738
Ok(())
@@ -1798,7 +1798,7 @@ mod otel_integration_tests {
17981798
},
17991799
ServicesConfig::none(),
18001800
|env| {
1801-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1801+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
18021802
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
18031803
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
18041804
Ok(())
@@ -1856,7 +1856,7 @@ mod otel_integration_tests {
18561856
},
18571857
ServicesConfig::none(),
18581858
|env| {
1859-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1859+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
18601860
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
18611861
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
18621862
Ok(())
@@ -1913,7 +1913,7 @@ mod otel_integration_tests {
19131913
},
19141914
ServicesConfig::none(),
19151915
|env| {
1916-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1916+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
19171917
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
19181918
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
19191919
Ok(())

0 commit comments

Comments
 (0)