Merge pull request #2810 from calebschoepp/move-up-instruments

Move instruments up a level in factor-variables

Author: rylev

crates/factor-variables/src/host.rs

@@ -1,10 +1,12 @@
 use spin_factors::anyhow;
 use spin_world::{async_trait, v1, v2::variables};
+use tracing::{instrument, Level};
 
 use crate::InstanceState;
 
 #[async_trait]
 impl variables::Host for InstanceState {
+    #[instrument(name = "spin_variables.get", skip(self), err(level = Level::INFO), 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

crates/factor-variables/src/spin_cli/azure_key_vault.rs

@@ -134,7 +134,7 @@ impl AzureKeyVaultProvider {
 
 #[async_trait]
 impl Provider for AzureKeyVaultProvider {
-    #[instrument(name = "spin_variables.get_from_azure_key_vault", skip(self), err(level = Level::INFO), fields(otel.kind = "client"))]
+    #[instrument(name = "spin_variables.get_from_azure_key_vault", level = Level::DEBUG, skip(self), err(level = Level::INFO), fields(otel.kind = "client"))]
     async fn get(&self, key: &Key) -> anyhow::Result<Option<String>> {
         let secret = self
             .secret_client

crates/factor-variables/src/spin_cli/env.rs

@@ -128,7 +128,7 @@ fn load_dotenv(dotenv_path: &Path) -> anyhow::Result<HashMap<String, String>> {
 
 #[async_trait]
 impl Provider for EnvVariablesProvider {
-    #[instrument(name = "spin_variables.get_from_env", skip(self), err(level = Level::INFO))]
+    #[instrument(name = "spin_variables.get_from_env", level = Level::DEBUG, skip(self), err(level = Level::INFO))]
     async fn get(&self, key: &Key) -> anyhow::Result<Option<String>> {
         tokio::task::block_in_place(|| self.get_sync(key))
     }

crates/factor-variables/src/spin_cli/vault.rs

@@ -27,7 +27,7 @@ pub struct VaultVariablesProvider {
 
 #[async_trait]
 impl Provider for VaultVariablesProvider {
-    #[instrument(name = "spin_variables.get_from_vault", skip(self), err(level = Level::INFO), fields(otel.kind = "client"))]
+    #[instrument(name = "spin_variables.get_from_vault", level = Level::DEBUG, skip(self), err(level = Level::INFO), fields(otel.kind = "client"))]
     async fn get(&self, key: &Key) -> anyhow::Result<Option<String>> {
         let client = VaultClient::new(
             VaultClientSettingsBuilder::default()