Only set span as errored in variables when it might not be bad user input

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

Cargo.lock

@@ -7,6 +7,7 @@ edition = { workspace = true }
 [dependencies]
 spin-expressions = { path = "../expressions" }
 spin-factors = { path = "../factors" }
+spin-telemetry = { path = "../telemetry" }
 spin-world = { path = "../world" }
 tracing = { workspace = true }
 

crates/factor-variables/Cargo.toml

@@ -1,11 +1,12 @@
 use spin_factors::anyhow;
+use spin_telemetry::OpenTelemetrySpanExt as _;
 use spin_world::{v1, v2::variables, wasi::config as wasi_config};
-use tracing::{instrument, Level};
+use tracing::instrument;
 
 use crate::InstanceState;
 
 impl variables::Host for InstanceState {
-    #[instrument(name = "spin_variables.get", skip(self), err(level = Level::INFO), fields(otel.kind = "client"))]
+    #[instrument(name = "spin_variables.get", skip(self), fields(otel.kind = "client"))]
     async fn get(&mut self, key: String) -> Result<String, variables::Error> {
         let key = spin_expressions::Key::new(&key).map_err(expressions_to_variables_err)?;
         self.expression_resolver
@@ -20,6 +21,7 @@ impl variables::Host for InstanceState {
 }
 
 impl v1::config::Host for InstanceState {
+    #[instrument(name = "spin_config.get", skip(self), fields(otel.kind = "client"))]
     async fn get_config(&mut self, key: String) -> Result<String, v1::config::Error> {
         <Self as variables::Host>::get(self, key)
             .await
@@ -36,6 +38,7 @@ impl v1::config::Host for InstanceState {
 }
 
 impl wasi_config::store::Host for InstanceState {
+    #[instrument(name = "wasi_config.get", skip(self), fields(otel.kind = "client"))]
     async fn get(&mut self, key: String) -> Result<Option<String>, wasi_config::store::Error> {
         match <Self as variables::Host>::get(self, key).await {
             Ok(value) => Ok(Some(value)),
@@ -46,6 +49,7 @@ impl wasi_config::store::Host for InstanceState {
         }
     }
 
+    #[instrument(name = "wasi_config.get_all", skip(self), fields(otel.kind = "client"))]
     async fn get_all(&mut self) -> Result<Vec<(String, String)>, wasi_config::store::Error> {
         let all = self
             .expression_resolver
@@ -74,7 +78,14 @@ fn expressions_to_variables_err(err: spin_expressions::Error) -> variables::Erro
     match err {
         Error::InvalidName(msg) => variables::Error::InvalidName(msg),
         Error::Undefined(msg) => variables::Error::Undefined(msg),
-        Error::Provider(err) => variables::Error::Provider(err.to_string()),
-        other => variables::Error::Other(format!("{other}")),
+        other @ Error::InvalidTemplate(_) => variables::Error::Other(format!("{other}")),
+        Error::Provider(err) => {
+            // This error may not be caused by bad user input, so set the span status to error.
+            let current_span = tracing::Span::current();
+            current_span.set_status(spin_telemetry::opentelemetry::trace::Status::error(
+                err.to_string(),
+            ));
+            variables::Error::Provider(err.to_string())
+        }
     }
 }

crates/factor-variables/src/host.rs

@@ -77,6 +77,7 @@ pub(crate) fn otel_sdk_disabled() -> bool {
 }
 
 /// The protocol to use for OTLP exporter.
+#[derive(Debug)]
 pub(crate) enum OtlpProtocol {
     Grpc,
     HttpProtobuf,

crates/telemetry/src/env.rs

@@ -15,6 +15,9 @@ pub mod metrics;
 mod propagation;
 mod traces;
 
+pub use opentelemetry;
+pub use tracing_opentelemetry::OpenTelemetrySpanExt;
+
 #[cfg(feature = "testing")]
 pub mod testing;
 

crates/telemetry/src/lib.rs

@@ -1,4 +1,3 @@
-version: "3"
 services:
   otel-collector:
     image: otel/opentelemetry-collector-contrib:0.98.0