Merge pull request #334 from obeli-sk/local-should-work

Switch to test.sh, test-js-local.sh

Author: tomasol

.github/workflows/check-test.yml

@@ -31,9 +31,9 @@ jobs:
       matrix:
         include:
           - report: junit-default.xml
-            additional: ""
+            script: "scripts/test.sh"
           - report: junit-js-local.xml
-            additional: "-F activity-js-local -F workflow-js-local"
+            script: "scripts/test-js-local.sh"
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
@@ -56,22 +56,14 @@ jobs:
       - name: Build tests
         run: nix develop --command cargo nextest run --workspace --no-run
 
-      - name: Populate the codegen cache
-        run: nix develop --command scripts/test-phase1.sh
+      - name: Run tests
+        run: nix develop --command ${{ matrix.script }}
         env:
-          CI: true
-          ADDITIONAL_FEATURES: "${{ matrix.additional }}"
-
-      - name: test
-        run: nix develop --command scripts/test-phase2.sh
-        env:
-          RUST_LOG: "info,executor=trace,wasm_workers=trace,db=info"
           CI: true
           TEST_POSTGRES_HOST: "localhost"
           TEST_POSTGRES_USER: "postgres"
           TEST_POSTGRES_PASSWORD: "postgres"
           TEST_POSTGRES_DATABASE_PREFIX: "obelisk_test"
-          ADDITIONAL_FEATURES: "${{ matrix.additional }}"
 
       - name: Rename test report
         run: mv target/nextest/ci-test/junit.xml target/nextest/ci-test/${{ matrix.report }}

src/command/server.rs

@@ -2088,6 +2088,7 @@ async fn fetch_webhook_js_runtime(
 
 /// Fetch the webhook-js runtime WASM from OCI.
 #[cfg(not(feature = "webhook-js-local"))]
+#[instrument(skip_all)]
 async fn fetch_webhook_js_runtime(
     wasm_cache_dir: Arc<Path>,
     metadata_dir: Arc<Path>,

src/config/toml.rs

@@ -29,7 +29,7 @@ use std::{
     sync::Arc,
     time::Duration,
 };
-use tracing::{info, instrument, trace, warn};
+use tracing::{debug, info, instrument, trace, warn};
 use utils::wasm_tools::WasmComponent;
 use wasm_workers::http_request_policy::HostPatternError;
 use wasm_workers::{
@@ -513,12 +513,14 @@ impl ComponentLocationToml {
     ) -> Result<(ContentDigest, PathBuf), anyhow::Error> {
         use utils::sha256sum::calculate_sha256_file;
 
+        debug!("Fetching {self:?}");
+        let stopwatch = std::time::Instant::now();
         // Happy path: if content_digest is known and file exists in cache, return immediately
         if let Some(expected_digest) = expected_digest
             && let wasm_path = content_digest_to_wasm_file(wasm_cache_dir, expected_digest)
             && wasm_path.exists()
         {
-            trace!("Using cached file for known content digest");
+            debug!("Using cached file for known content digest");
             return Ok((expected_digest.clone(), wasm_path));
         }
 
@@ -557,6 +559,8 @@ impl ComponentLocationToml {
                 "content digest mismatch: expected {expected_digest}, got {actual_digest}"
             );
         }
+        let stopwatch = stopwatch.elapsed();
+        debug!("Fetching done in {stopwatch:?}");
         Ok((actual_digest, path))
     }
 }

src/oci.rs

@@ -88,6 +88,7 @@ pub(crate) async fn pull_to_cache_dir(
         // Create new file in the metadata directory.
         let metadata_file =
             digest_to_metadata_file(metadata_dir, &Digest::from_str(&metadata_digest)?);
+        debug!("Writing WASM digest {layer_content_digest} to metadata file {metadata_file:?}");
         tokio::fs::write(&metadata_file, layer_content_digest.to_string()).await?;
         (layer, layer_content_digest)
     };