Merge branch 'master' into expose-cancel-cause

temporalio · Feb 11, 2025 · 907c9a1 · 907c9a1
2 parents 9f528b6 + d2c0351
commit 907c9a1
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 42 deletions.
diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml
@@ -38,7 +38,20 @@ jobs:
   test:
     name: Unit Tests
     timeout-minutes: 10
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, ubuntu-arm, macos-intel, macos-arm, windows-latest ]
+        include:
+          - os: windows-latest
+          - os: ubuntu-latest
+          - os: ubuntu-arm
+            runsOn: ubuntu-24.04-arm64-2-core
+          - os: macos-intel
+            runsOn: macos-13
+          - os: macos-arm
+            runsOn: macos-14
+    runs-on: ${{ matrix.runsOn || matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
@@ -69,7 +82,20 @@ jobs:
       TEMPORAL_CLIENT_CERT: ${{ secrets.TEMPORAL_CLIENT_CERT }}
       TEMPORAL_CLIENT_KEY: ${{ secrets.TEMPORAL_CLIENT_KEY }}
     timeout-minutes: 20
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, ubuntu-arm, macos-intel, macos-arm, windows-latest ]
+        include:
+          - os: windows-latest
+          - os: ubuntu-latest
+          - os: ubuntu-arm
+            runsOn: ubuntu-24.04-arm64-2-core
+          - os: macos-intel
+            runsOn: macos-13
+          - os: macos-arm
+            runsOn: macos-14
+    runs-on: ${{ matrix.runsOn || matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable

diff --git a/tests/integ_tests/ephemeral_server_tests.rs b/tests/integ_tests/ephemeral_server_tests.rs
@@ -1,5 +1,4 @@
-use futures_util::stream;
-use futures_util::TryStreamExt;
+use futures_util::{stream, TryStreamExt};
 use std::time::{SystemTime, UNIX_EPOCH};
 use temporal_client::{ClientOptionsBuilder, TestService, WorkflowService};
 use temporal_sdk_core::ephemeral_server::{
@@ -29,7 +28,7 @@ async fn temporal_cli_default() {
 #[tokio::test]
 async fn temporal_cli_fixed() {
     let config = TemporalDevServerConfigBuilder::default()
-        .exe(fixed_cached_download("v0.4.0"))
+        .exe(fixed_cached_download("v1.2.0"))
         .build()
         .unwrap();
     let mut server = config.start_server().await.unwrap();
@@ -81,43 +80,49 @@ async fn temporal_cli_concurrent_starts() -> Result<(), Box<dyn std::error::Erro
     Ok(())
 }
 
-#[tokio::test]
-async fn test_server_default() {
-    let config = TestServerConfigBuilder::default()
-        .exe(default_cached_download())
-        .build()
-        .unwrap();
-    let mut server = config.start_server().await.unwrap();
-    assert_ephemeral_server(&server).await;
-    server.shutdown().await.unwrap();
-}
+// Test server downloads aren't available for arm linux
+#[cfg(not(all(target_os = "linux", any(target_arch = "arm", target_arch = "aarch64"))))]
+mod test_server {
+    use super::*;
 
-#[tokio::test]
-async fn test_server_fixed() {
-    let config = TestServerConfigBuilder::default()
-        .exe(fixed_cached_download("v1.16.0"))
-        .build()
-        .unwrap();
-    let mut server = config.start_server().await.unwrap();
-    assert_ephemeral_server(&server).await;
-    server.shutdown().await.unwrap();
-}
+    #[tokio::test]
+    async fn test_server_default() {
+        let config = TestServerConfigBuilder::default()
+            .exe(default_cached_download())
+            .build()
+            .unwrap();
+        let mut server = config.start_server().await.unwrap();
+        assert_ephemeral_server(&server).await;
+        server.shutdown().await.unwrap();
+    }
 
-#[tokio::test]
-async fn test_server_shutdown_port_reuse() {
-    // Start, test shutdown, do again immediately on same port to ensure we can
-    // reuse after shutdown
-    let config = TestServerConfigBuilder::default()
-        .exe(default_cached_download())
-        .port(Some(10124))
-        .build()
-        .unwrap();
-    let mut server = config.start_server().await.unwrap();
-    assert_ephemeral_server(&server).await;
-    server.shutdown().await.unwrap();
-    let mut server = config.start_server().await.unwrap();
-    assert_ephemeral_server(&server).await;
-    server.shutdown().await.unwrap();
+    #[tokio::test]
+    async fn test_server_fixed() {
+        let config = TestServerConfigBuilder::default()
+            .exe(fixed_cached_download("v1.16.0"))
+            .build()
+            .unwrap();
+        let mut server = config.start_server().await.unwrap();
+        assert_ephemeral_server(&server).await;
+        server.shutdown().await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn test_server_shutdown_port_reuse() {
+        // Start, test shutdown, do again immediately on same port to ensure we can
+        // reuse after shutdown
+        let config = TestServerConfigBuilder::default()
+            .exe(default_cached_download())
+            .port(Some(10124))
+            .build()
+            .unwrap();
+        let mut server = config.start_server().await.unwrap();
+        assert_ephemeral_server(&server).await;
+        server.shutdown().await.unwrap();
+        let mut server = config.start_server().await.unwrap();
+        assert_ephemeral_server(&server).await;
+        server.shutdown().await.unwrap();
+    }
 }
 
 fn fixed_cached_download(version: &str) -> EphemeralExe {

diff --git a/tests/integ_tests/metrics_tests.rs b/tests/integ_tests/metrics_tests.rs
@@ -1159,7 +1159,7 @@ async fn otel_errors_logged_as_errors() {
     let _guard = tracing::subscriber::set_default(subscriber);
 
     let opts = OtelCollectorOptionsBuilder::default()
-        .url("https://localhostt:9995/v1/metrics".parse().unwrap()) // Invalid endpoint
+        .url("https://localhost:12345/v1/metrics".parse().unwrap()) // Nothing bound on that port
         .build()
         .unwrap();
     let exporter = build_otlp_metric_exporter(opts).unwrap();
@@ -1174,7 +1174,8 @@ async fn otel_errors_logged_as_errors() {
     let _worker = starter.get_worker().await;
 
     // Wait to allow exporter to attempt sending metrics and fail.
-    tokio::time::sleep(Duration::from_secs(2)).await;
+    // Windows takes a while to fail the network attempt for some reason so 5s.
+    tokio::time::sleep(Duration::from_secs(5)).await;
 
     let logs = logs.lock().unwrap();
     let log_str = String::from_utf8_lossy(&logs);