fix: align file fetcher's user agent (#632)

* fix: align file fetcher's user agent

* stamp: oops

* stamp: fix unit test

Author: nyannyacha

cli/src/env.rs

@@ -33,8 +33,6 @@ pub(super) fn resolve_deno_runtime_env() {
     })
   };
 
-  runtime::MAYBE_DENO_VERSION.get_or_init(|| deno::version().to_string());
-
   resolve_boolish_env(
     "DENO_NO_DEPRECATION_WARNINGS",
     &runtime::SHOULD_DISABLE_DEPRECATED_API_WARNING,

crates/base/src/runtime/mod.rs

@@ -133,17 +133,6 @@ pub mod permissions;
 
 const DEFAULT_ALLOC_CHECK_INT_MSEC: u64 = 1000;
 
-static SUPABASE_UA: Lazy<String> = Lazy::new(|| {
-  let deno_version =
-    MAYBE_DENO_VERSION.get().map(|it| &**it).unwrap_or("1.0.0");
-  let supabase_version = option_env!("GIT_V_TAG").unwrap_or("0.1.0");
-  format!(
-    // TODO: It should be changed to a well-known name for the ecosystem.
-    "Deno/{} (variant; SupabaseEdgeRuntime/{})",
-    deno_version, supabase_version
-  )
-});
-
 static ALLOC_CHECK_DUR: Lazy<Duration> = Lazy::new(|| {
   std::env::var("EDGE_RUNTIME_ALLOC_CHECK_INT")
     .ok()
@@ -159,7 +148,6 @@ pub static SHOULD_USE_VERBOSE_DEPRECATED_API_WARNING: OnceCell<bool> =
   OnceCell::new();
 pub static SHOULD_INCLUDE_MALLOCED_MEMORY_ON_MEMCHECK: OnceCell<bool> =
   OnceCell::new();
-pub static MAYBE_DENO_VERSION: OnceCell<String> = OnceCell::new();
 
 pub static MAIN_WORKER_INITIAL_HEAP_SIZE_MIB: OnceCell<u64> = OnceCell::new();
 pub static MAIN_WORKER_MAX_HEAP_SIZE_MIB: OnceCell<u64> = OnceCell::new();
@@ -242,7 +230,6 @@ pub trait GetRuntimeContext {
     conf: &WorkerRuntimeOpts,
     use_inspector: bool,
     migrated: bool,
-    version: Option<&str>,
     otel_config: Option<OtelConfig>,
   ) -> impl Serialize {
     serde_json::json!({
@@ -252,11 +239,8 @@ pub trait GetRuntimeContext {
       "inspector": use_inspector,
       "migrated": migrated,
       "version": {
-        "runtime": version.unwrap_or("0.1.0"),
-        "deno": MAYBE_DENO_VERSION
-          .get()
-          .map(|it| &**it)
-          .unwrap_or("UNKNOWN"),
+        "runtime": deno::edge_runtime_version(),
+        "deno": deno::version(),
       },
       "flags": {
         "SHOULD_DISABLE_DEPRECATED_API_WARNING":
@@ -770,13 +754,13 @@ where
           deno_canvas::deno_canvas::init_ops(),
           deno_fetch::deno_fetch::init_ops::<PermissionsContainer>(
             deno_fetch::Options {
-              user_agent: SUPABASE_UA.clone(),
+              user_agent: deno::versions::user_agent().to_string(),
               root_cert_store_provider: Some(root_cert_store_provider.clone()),
               ..Default::default()
             },
           ),
           deno_websocket::deno_websocket::init_ops::<PermissionsContainer>(
-            SUPABASE_UA.clone(),
+            deno::versions::user_agent().to_string(),
             Some(root_cert_store_provider.clone()),
             None,
           ),
@@ -1036,7 +1020,6 @@ where
                 &conf,
                 has_inspector,
                 migrated,
-                option_env!("GIT_V_TAG"),
                 maybe_otel_config,
               ));
 
@@ -3065,7 +3048,10 @@ mod test {
       .to_vec();
     assert_eq!(
       deno_version_array.first().unwrap().as_str().unwrap(),
-      "supabase-edge-runtime-0.1.0 (compatible with Deno vUNKNOWN)"
+      format!(
+        "supabase-edge-runtime-0.1.0 (compatible with Deno v{})",
+        deno::version()
+      )
     );
     assert_eq!(
       deno_version_array.get(1).unwrap().as_str().unwrap(),

deno/http_util.rs

@@ -1,7 +1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 use crate::auth_tokens::AuthToken;
-use crate::versions::get_user_agent;
+use crate::versions::user_agent;
 
 use cache_control::Cachability;
 use cache_control::CacheControl;
@@ -245,7 +245,7 @@ impl HttpClientProvider {
       Entry::Occupied(entry) => Ok(HttpClient::new(entry.get().clone())),
       Entry::Vacant(entry) => {
         let client = create_http_client(
-          get_user_agent(),
+          user_agent(),
           CreateHttpClientOptions {
             root_cert_store: match &self.root_cert_store_provider {
               Some(provider) => Some(provider.get_or_try_init()?.clone()),

deno/lib.rs

@@ -78,6 +78,7 @@ pub use deno_resolver;
 pub use node_resolver;
 
 pub use deno_permissions::PermissionsContainer;
+pub use versions::edge_runtime_version;
 
 pub fn version() -> &'static str {
   env!("CARGO_PKG_VERSION")

deno/versions.rs

@@ -1,15 +1,26 @@
 use std::borrow::Cow;
 
 use deno_telemetry::OtelRuntimeConfig;
+use once_cell::sync::Lazy;
 
 use crate::version;
 
-pub fn deno() -> &'static str {
-  concat!("Supa:", "0")
+pub fn edge_runtime_version() -> &'static str {
+  option_env!("GIT_V_TAG").unwrap_or("0.1.0")
 }
 
-pub fn get_user_agent() -> &'static str {
-  concat!("Supa:", "0")
+pub fn user_agent() -> &'static str {
+  static VALUE: Lazy<String> = Lazy::new(|| {
+    let deno_version = version();
+    let edge_runtime_version = edge_runtime_version();
+    format!(
+      // TODO: It should be changed to a well-known name for the ecosystem.
+      "Deno/{} (variant; SupabaseEdgeRuntime/{})",
+      deno_version, edge_runtime_version
+    )
+  });
+
+  VALUE.as_str()
 }
 
 pub fn is_canary() -> bool {