Fix bad rebase

Signed-off-by: Caleb Schoepp <[email protected]>

crates/factor-observe/src/lib.rs

@@ -36,8 +36,7 @@ impl Factor for ObserveFactor {
 
     fn prepare<T: spin_factors::RuntimeFactors>(
         &self,
-        ctx: spin_factors::PrepareContext<Self>,
-        _builders: &mut spin_factors::InstanceBuilders<T>,
+        ctx: spin_factors::PrepareContext<T, Self>,
     ) -> anyhow::Result<Self::InstanceBuilder> {
         // TODO(Lann): Is it fine that we're using BoxedTracer and BoxedSpan? Are there perf tradeoffs?
         // TODO(Lann): Would it make sense to put the tracer on the app state and just hold a reference to it in the instance state?

crates/factor-outbound-http/src/lib.rs

@@ -64,7 +64,9 @@ impl Factor for OutboundHttpFactor {
         let outbound_networking = ctx.instance_builder::<OutboundNetworkingFactor>()?;
         let allowed_hosts = outbound_networking.allowed_hosts();
         let component_tls_configs = outbound_networking.component_tls_configs().clone();
-        let observe_context = builders.get_mut::<ObserveFactor>()?.get_observe_context();
+        let observe_context = ctx
+            .instance_builder::<ObserveFactor>()?
+            .get_observe_context();
         Ok(InstanceState {
             wasi_http_ctx: WasiHttpCtx::new(),
             allowed_hosts,

crates/runtime-factors/Cargo.toml

@@ -19,6 +19,7 @@ clap = { version = "3.1.18", features = ["derive", "env"] }
 spin-common = { path = "../common" }
 spin-factor-key-value = { path = "../factor-key-value" }
 spin-factor-llm = { path = "../factor-llm" }
+spin-factor-observe = { path = "../factor-observe" }
 spin-factor-outbound-http = { path = "../factor-outbound-http" }
 spin-factor-outbound-mqtt = { path = "../factor-outbound-mqtt" }
 spin-factor-outbound-mysql = { path = "../factor-outbound-mysql" }