Skip to content

Commit 42ba595

Browse files
calebschoeppcalebschoepp
committed
Fix traces and metrics not working. Fix slow tests. Rename variable
Signed-off-by: Caleb Schoepp <[email protected]>
1 parent 5f9beef commit 42ba595

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

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

+2-2
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

+2
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

+9-9
Original file line numberDiff line numberDiff line change
@@ -1426,7 +1426,7 @@ mod otel_integration_tests {
14261426
},
14271427
ServicesConfig::none(),
14281428
|env| {
1429-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1429+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
14301430
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
14311431
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
14321432
Ok(())
@@ -1469,7 +1469,7 @@ mod otel_integration_tests {
14691469
},
14701470
ServicesConfig::none(),
14711471
|env| {
1472-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1472+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
14731473
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
14741474
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
14751475
Ok(())
@@ -1539,7 +1539,7 @@ mod otel_integration_tests {
15391539
},
15401540
ServicesConfig::none(),
15411541
|env| {
1542-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1542+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
15431543
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
15441544
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
15451545
Ok(())
@@ -1604,7 +1604,7 @@ mod otel_integration_tests {
16041604
},
16051605
ServicesConfig::none(),
16061606
|env| {
1607-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1607+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
16081608
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
16091609
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
16101610
Ok(())
@@ -1665,7 +1665,7 @@ mod otel_integration_tests {
16651665
},
16661666
ServicesConfig::none(),
16671667
|env| {
1668-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1668+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
16691669
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
16701670
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
16711671
Ok(())
@@ -1727,7 +1727,7 @@ mod otel_integration_tests {
17271727
},
17281728
ServicesConfig::none(),
17291729
|env| {
1730-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1730+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
17311731
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
17321732
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
17331733
Ok(())
@@ -1793,7 +1793,7 @@ mod otel_integration_tests {
17931793
},
17941794
ServicesConfig::none(),
17951795
|env| {
1796-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1796+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
17971797
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
17981798
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
17991799
Ok(())
@@ -1851,7 +1851,7 @@ mod otel_integration_tests {
18511851
},
18521852
ServicesConfig::none(),
18531853
|env| {
1854-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1854+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
18551855
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
18561856
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
18571857
Ok(())
@@ -1908,7 +1908,7 @@ mod otel_integration_tests {
19081908
},
19091909
ServicesConfig::none(),
19101910
|env| {
1911-
env.set_env_var("OTEL_EXPORTER_OTLP_ENDPOINT", collector_endpoint);
1911+
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", collector_endpoint);
19121912
env.set_env_var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL", "grpc");
19131913
env.set_env_var("OTEL_BSP_SCHEDULE_DELAY", "5");
19141914
Ok(())

0 commit comments

Comments
 (0)