Skip to content

Commit 9d73e16

Browse files
calebschoeppcalebschoepp
committed
s/observe/otel/g
Signed-off-by: Caleb Schoepp <caleb.schoepp@fermyon.com>
1 parent 30f18f3 commit 9d73e16

File tree

42 files changed

+166
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+166
-166
lines changed

‎Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/factor-key-value/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = { workspace = true }
88
anyhow = { workspace = true }
99
serde = { workspace = true }
1010
spin-core = { path = "../core" }
11-
spin-factor-observe = { path = "../factor-observe" }
11+
spin-factor-otel = { path = "../factor-otel" }
1212
spin-factors = { path = "../factors" }
1313
spin-locked-app = { path = "../locked-app" }
1414
spin-resource-table = { path = "../table" }

‎crates/factor-key-value/src/host.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::{Cas, SwapError};
22
use anyhow::{Context, Result};
33
use spin_core::{async_trait, wasmtime::component::Resource};
4-
use spin_factor_observe::ObserveContext;
4+
use spin_factor_otel::OtelContext;
55
use spin_resource_table::Table;
66
use spin_world::v2::key_value;
77
use spin_world::wasi::keyvalue as wasi_keyvalue;
@@ -49,7 +49,7 @@ pub struct KeyValueDispatch {
4949
manager: Arc<dyn StoreManager>,
5050
stores: Table<Arc<dyn Store>>,
5151
compare_and_swaps: Table<Arc<dyn Cas>>,
52-
observe_context: Option<ObserveContext>,
52+
otel_context: Option<OtelContext>,
5353
}
5454

5555
impl KeyValueDispatch {
@@ -61,14 +61,14 @@ impl KeyValueDispatch {
6161
allowed_stores: HashSet<String>,
6262
manager: Arc<dyn StoreManager>,
6363
capacity: u32,
64-
observe_context: Option<ObserveContext>,
64+
otel_context: Option<OtelContext>,
6565
) -> Self {
6666
Self {
6767
allowed_stores,
6868
manager,
6969
stores: Table::new(capacity),
7070
compare_and_swaps: Table::new(capacity),
71-
observe_context,
71+
otel_context,
7272
}
7373
}
7474

@@ -112,8 +112,8 @@ impl key_value::Host for KeyValueDispatch {}
112112
impl key_value::HostStore for KeyValueDispatch {
113113
#[instrument(name = "spin_key_value.open", skip(self), err(level = Level::INFO), fields(otel.kind = "client", kv.backend=self.manager.summary(&name).unwrap_or("unknown".to_string())))]
114114
async fn open(&mut self, name: String) -> Result<Result<Resource<key_value::Store>, Error>> {
115-
if let Some(observe_context) = self.observe_context.as_ref() {
116-
observe_context.reparent_tracing_span()
115+
if let Some(otel_context) = self.otel_context.as_ref() {
116+
otel_context.reparent_tracing_span()
117117
}
118118
Ok(async {
119119
if self.allowed_stores.contains(&name) {
@@ -137,8 +137,8 @@ impl key_value::HostStore for KeyValueDispatch {
137137
store: Resource<key_value::Store>,
138138
key: String,
139139
) -> Result<Result<Option<Vec<u8>>, Error>> {
140-
if let Some(observe_context) = self.observe_context.as_ref() {
141-
observe_context.reparent_tracing_span()
140+
if let Some(otel_context) = self.otel_context.as_ref() {
141+
otel_context.reparent_tracing_span()
142142
}
143143
let store = self.get_store(store)?;
144144
Ok(store.get(&key).await)
@@ -151,8 +151,8 @@ impl key_value::HostStore for KeyValueDispatch {
151151
key: String,
152152
value: Vec<u8>,
153153
) -> Result<Result<(), Error>> {
154-
if let Some(observe_context) = self.observe_context.as_ref() {
155-
observe_context.reparent_tracing_span()
154+
if let Some(otel_context) = self.otel_context.as_ref() {
155+
otel_context.reparent_tracing_span()
156156
}
157157
let store = self.get_store(store)?;
158158
Ok(store.set(&key, &value).await)
@@ -164,8 +164,8 @@ impl key_value::HostStore for KeyValueDispatch {
164164
store: Resource<key_value::Store>,
165165
key: String,
166166
) -> Result<Result<(), Error>> {
167-
if let Some(observe_context) = self.observe_context.as_ref() {
168-
observe_context.reparent_tracing_span()
167+
if let Some(otel_context) = self.otel_context.as_ref() {
168+
otel_context.reparent_tracing_span()
169169
}
170170
let store = self.get_store(store)?;
171171
Ok(store.delete(&key).await)
@@ -177,8 +177,8 @@ impl key_value::HostStore for KeyValueDispatch {
177177
store: Resource<key_value::Store>,
178178
key: String,
179179
) -> Result<Result<bool, Error>> {
180-
if let Some(observe_context) = self.observe_context.as_ref() {
181-
observe_context.reparent_tracing_span()
180+
if let Some(otel_context) = self.otel_context.as_ref() {
181+
otel_context.reparent_tracing_span()
182182
}
183183
let store = self.get_store(store)?;
184184
Ok(store.exists(&key).await)
@@ -189,8 +189,8 @@ impl key_value::HostStore for KeyValueDispatch {
189189
&mut self,
190190
store: Resource<key_value::Store>,
191191
) -> Result<Result<Vec<String>, Error>> {
192-
if let Some(observe_context) = self.observe_context.as_ref() {
193-
observe_context.reparent_tracing_span()
192+
if let Some(otel_context) = self.otel_context.as_ref() {
193+
otel_context.reparent_tracing_span()
194194
}
195195
let store = self.get_store(store)?;
196196
Ok(store.get_keys().await)

‎crates/factor-key-value/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::{
88
};
99

1010
use anyhow::ensure;
11-
use spin_factor_observe::ObserveContext;
11+
use spin_factor_otel::OtelContext;
1212
use spin_factors::{
1313
ConfigureAppContext, Factor, FactorInstanceBuilder, InitContext, PrepareContext, RuntimeFactors,
1414
};
@@ -93,11 +93,11 @@ impl Factor for KeyValueFactor {
9393
.get(ctx.app_component().id())
9494
.expect("component should be in component_stores")
9595
.clone();
96-
let observe_context = ObserveContext::from_prepare_context(&mut ctx)?;
96+
let otel_context = OtelContext::from_prepare_context(&mut ctx)?;
9797
Ok(InstanceBuilder {
9898
store_manager: app_state.store_manager.clone(),
9999
allowed_stores,
100-
observe_context,
100+
otel_context,
101101
})
102102
}
103103
}
@@ -177,7 +177,7 @@ pub struct InstanceBuilder {
177177
store_manager: Arc<AppStoreManager>,
178178
/// The allowed stores for this component instance.
179179
allowed_stores: HashSet<String>,
180-
observe_context: ObserveContext,
180+
otel_context: OtelContext,
181181
}
182182

183183
impl FactorInstanceBuilder for InstanceBuilder {
@@ -187,13 +187,13 @@ impl FactorInstanceBuilder for InstanceBuilder {
187187
let Self {
188188
store_manager,
189189
allowed_stores,
190-
observe_context,
190+
otel_context,
191191
} = self;
192192
Ok(KeyValueDispatch::new_with_capacity(
193193
allowed_stores,
194194
store_manager,
195195
u32::MAX,
196-
Some(observe_context),
196+
Some(otel_context),
197197
))
198198
}
199199
}

‎crates/factor-llm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ llm-cublas = ["llm", "spin-llm-local/cublas"]
1717
anyhow = { workspace = true }
1818
async-trait = { workspace = true }
1919
serde = { workspace = true }
20-
spin-factor-observe = { path = "../factor-observe" }
20+
spin-factor-otel = { path = "../factor-otel" }
2121
spin-factors = { path = "../factors" }
2222
spin-llm-local = { path = "../llm-local", optional = true }
2323
spin-llm-remote-http = { path = "../llm-remote-http" }

‎crates/factor-llm/src/host.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ impl v2::Host for InstanceState {
1313
prompt: String,
1414
params: Option<v2::InferencingParams>,
1515
) -> Result<v2::InferencingResult, v2::Error> {
16-
self.observe_context.reparent_tracing_span();
16+
self.otel_context.reparent_tracing_span();
1717

1818
if !self.allowed_models.contains(&model) {
1919
return Err(access_denied_error(&model));
@@ -42,7 +42,7 @@ impl v2::Host for InstanceState {
4242
model: v1::EmbeddingModel,
4343
data: Vec<String>,
4444
) -> Result<v2::EmbeddingsResult, v2::Error> {
45-
self.observe_context.reparent_tracing_span();
45+
self.otel_context.reparent_tracing_span();
4646

4747
if !self.allowed_models.contains(&model) {
4848
return Err(access_denied_error(&model));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::collections::{HashMap, HashSet};
55
use std::sync::Arc;
66

77
use async_trait::async_trait;
8-
use spin_factor_observe::ObserveContext;
8+
use spin_factor_otel::OtelContext;
99
use spin_factors::{
1010
ConfigureAppContext, Factor, PrepareContext, RuntimeFactors, SelfInstanceBuilder,
1111
};
@@ -86,12 +86,12 @@ impl Factor for LlmFactor {
8686
.cloned()
8787
.unwrap_or_default();
8888
let engine = ctx.app_state().engine.clone();
89-
let observe_context = ObserveContext::from_prepare_context(&mut ctx)?;
89+
let otel_context = OtelContext::from_prepare_context(&mut ctx)?;
9090

9191
Ok(InstanceState {
9292
engine,
9393
allowed_models,
94-
observe_context,
94+
otel_context,
9595
})
9696
}
9797
}
@@ -106,7 +106,7 @@ pub struct AppState {
106106
pub struct InstanceState {
107107
engine: Arc<Mutex<dyn LlmEngine>>,
108108
pub allowed_models: Arc<HashSet<String>>,
109-
observe_context: ObserveContext,
109+
otel_context: OtelContext,
110110
}
111111

112112
/// The runtime configuration for the LLM factor.

‎crates/factor-observe/Cargo.toml renamed to ‎crates/factor-otel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "spin-factor-observe"
2+
name = "spin-factor-otel"
33
version = { workspace = true }
44
authors = { workspace = true }
55
edition = { workspace = true }

‎crates/factor-observe/src/host.rs renamed to ‎crates/factor-otel/src/host.rs

File renamed without changes.

0 commit comments

Comments
 (0)