feat(otel): propagate session.id to spans and log records (#7490)

Signed-off-by: Adrian Cole <adrian@tetrate.io>

crates/goose-test-support/src/lib.rs

@@ -1,4 +1,5 @@
 pub mod mcp;
+pub mod otel;
 pub mod session;
 
 pub use mcp::{McpFixture, FAKE_CODE, TEST_IMAGE_B64};

crates/goose-test-support/src/otel.rs

@@ -0,0 +1,62 @@
+use opentelemetry::global;
+use opentelemetry::metrics::{Meter, MeterProvider};
+use opentelemetry::InstrumentationScope;
+use std::env;
+use std::sync::Arc;
+
+struct SavedMeterProvider(Arc<dyn MeterProvider + Send + Sync>);
+
+impl MeterProvider for SavedMeterProvider {
+    fn meter_with_scope(&self, scope: InstrumentationScope) -> Meter {
+        self.0.meter_with_scope(scope)
+    }
+}
+
+pub struct OtelTestGuard {
+    pub _env: env_lock::EnvGuard<'static>,
+    prev_tracer: global::GlobalTracerProvider,
+    prev_meter: Arc<dyn MeterProvider + Send + Sync>,
+}
+
+impl Drop for OtelTestGuard {
+    fn drop(&mut self) {
+        global::set_tracer_provider(self.prev_tracer.clone());
+        global::set_meter_provider(SavedMeterProvider(self.prev_meter.clone()));
+    }
+}
+
+pub fn clear_otel_env(overrides: &[(&'static str, &'static str)]) -> OtelTestGuard {
+    let prev_tracer = global::tracer_provider();
+    let prev_meter = global::meter_provider();
+
+    let mut keys: Vec<&'static str> = vec![
+        "OTEL_EXPORTER_OTLP_ENDPOINT",
+        "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT",
+        "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT",
+        "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE",
+        "OTEL_EXPORTER_OTLP_TIMEOUT",
+        "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT",
+        "OTEL_LOG_LEVEL",
+        "OTEL_LOGS_EXPORTER",
+        "OTEL_METRICS_EXPORTER",
+        "OTEL_RESOURCE_ATTRIBUTES",
+        "OTEL_SDK_DISABLED",
+        "OTEL_SERVICE_NAME",
+        "OTEL_TRACES_EXPORTER",
+    ];
+    for &(k, _) in overrides {
+        if !keys.contains(&k) {
+            keys.push(k);
+        }
+    }
+
+    let guard = env_lock::lock_env(keys.into_iter().map(|k| (k, None::<&str>)));
+    for &(k, v) in overrides {
+        env::set_var(k, v);
+    }
+    OtelTestGuard {
+        _env: guard,
+        prev_tracer,
+        prev_meter,
+    }
+}