chore: update core (#1807)

Co-authored-by: Andrew Yuan <[email protected]>

Author: chris-olszewski

packages/core-bridge/Cargo.lock

@@ -35,10 +35,11 @@ prost = "0.14"
 prost-types = "0.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-temporal-sdk-core = { version = "*", path = "./sdk-core/core", features = [
+temporalio-sdk-core = { version = "*", path = "./sdk-core/crates/sdk-core", features = [
   "ephemeral-server",
 ] }
-temporal-client = { version = "*", path = "./sdk-core/client" }
+temporalio-client = { version = "*", path = "./sdk-core/crates/client" }
+temporalio-common = { version = "*", path = "./sdk-core/crates/common" }
 thiserror = "2"
 tokio = "1.13"
 tokio-stream = "0.1"

packages/core-bridge/Cargo.toml

@@ -5,10 +5,10 @@ use std::{collections::HashMap, sync::Arc};
 use neon::prelude::*;
 use tonic::metadata::{BinaryMetadataValue, MetadataKey};
 
-use temporal_sdk_core::{ClientOptions as CoreClientOptions, CoreRuntime, RetryClient};
+use temporalio_sdk_core::{ClientOptions as CoreClientOptions, CoreRuntime, RetryClient};
 
 use bridge_macros::{TryFromJs, js_function};
-use temporal_client::{ClientInitError, ConfiguredClient, TemporalServiceClient};
+use temporalio_client::{ClientInitError, ConfiguredClient, TemporalServiceClient};
 
 use crate::runtime::Runtime;
 use crate::{helpers::*, runtime::RuntimeExt as _};
@@ -257,7 +257,7 @@ async fn client_invoke_workflow_service(
     mut retry_client: CoreClient,
     call: RpcCall,
 ) -> BridgeResult<Vec<u8>> {
-    use temporal_client::WorkflowService;
+    use temporalio_client::WorkflowService;
 
     match call.rpc.as_str() {
         "CountWorkflowExecutions" => {
@@ -528,7 +528,7 @@ async fn client_invoke_operator_service(
     mut retry_client: CoreClient,
     call: RpcCall,
 ) -> BridgeResult<Vec<u8>> {
-    use temporal_client::OperatorService;
+    use temporalio_client::OperatorService;
 
     match call.rpc.as_str() {
         "AddOrUpdateRemoteCluster" => {
@@ -566,7 +566,7 @@ async fn client_invoke_test_service(
     mut retry_client: CoreClient,
     call: RpcCall,
 ) -> BridgeResult<Vec<u8>> {
-    use temporal_client::TestService;
+    use temporalio_client::TestService;
 
     match call.rpc.as_str() {
         "GetCurrentTime" => rpc_call!(retry_client, call, get_current_time),
@@ -588,7 +588,7 @@ async fn client_invoke_health_service(
     mut retry_client: CoreClient,
     call: RpcCall,
 ) -> BridgeResult<Vec<u8>> {
-    use temporal_client::HealthService;
+    use temporalio_client::HealthService;
 
     match call.rpc.as_str() {
         "Check" => rpc_call!(retry_client, call, check),
@@ -658,8 +658,8 @@ mod config {
 
     use anyhow::Context as _;
 
-    use temporal_client::HttpConnectProxyOptions;
-    use temporal_sdk_core::{
+    use temporalio_client::HttpConnectProxyOptions;
+    use temporalio_sdk_core::{
         ClientOptions as CoreClientOptions, ClientOptionsBuilder,
         ClientTlsConfig as CoreClientTlsConfig, TlsConfig as CoreTlsConfig, Url,
     };

packages/core-bridge/sdk-core

@@ -9,7 +9,7 @@ use neon::{
         Value, buffer::TypedArray,
     },
 };
-use temporal_sdk_core::Url;
+use temporalio_sdk_core::Url;
 
 use super::{AppendFieldContext, BridgeError, BridgeResult};
 

packages/core-bridge/src/client.rs

@@ -6,7 +6,7 @@ use std::{
 use neon::prelude::*;
 
 use serde::{Serialize, ser::SerializeMap as _};
-use temporal_sdk_core::api::telemetry::CoreLog;
+use temporalio_common::telemetry::CoreLog;
 
 use bridge_macros::js_function;
 

packages/core-bridge/src/helpers/try_from_js.rs

@@ -4,14 +4,14 @@ use anyhow::Context as _;
 use neon::prelude::*;
 use serde::Deserialize;
 
-use temporal_sdk_core::api::telemetry::metrics::{
+use temporalio_common::telemetry::metrics::{
     CoreMeter, Counter as CoreCounter, Gauge as CoreGauge, Histogram as CoreHistogram,
     MetricParametersBuilder, NewAttributes, TemporalMeter,
 };
-use temporal_sdk_core::api::telemetry::metrics::{
+use temporalio_common::telemetry::metrics::{
     GaugeF64 as CoreGaugeF64, HistogramF64 as CoreHistogramF64,
 };
-use temporal_sdk_core::api::telemetry::metrics::{
+use temporalio_common::telemetry::metrics::{
     MetricKeyValue as CoreMetricKeyValue, MetricValue as CoreMetricValue,
 };
 

packages/core-bridge/src/logs.rs

@@ -5,12 +5,12 @@ use futures::channel::mpsc::Receiver;
 use neon::prelude::*;
 use tracing::{Instrument, warn};
 
-use temporal_sdk_core::{
-    CoreRuntime, TokioRuntimeBuilder,
-    api::telemetry::{
-        CoreLog, OtelCollectorOptions as CoreOtelCollectorOptions,
-        PrometheusExporterOptions as CorePrometheusExporterOptions, metrics::CoreMeter,
-    },
+use temporalio_common::telemetry::{
+    CoreLog, OtelCollectorOptions as CoreOtelCollectorOptions,
+    PrometheusExporterOptions as CorePrometheusExporterOptions, metrics::CoreMeter,
+};
+use temporalio_sdk_core::{
+    CoreRuntime, RuntimeOptionsBuilder, TokioRuntimeBuilder,
     telemetry::{build_otlp_metric_exporter, start_prometheus_metric_exporter},
 };
 
@@ -62,11 +62,13 @@ pub fn runtime_new(
     let (telemetry_options, metrics_options, logging_options) = bridge_options.try_into()?;
 
     // Create core runtime which starts tokio multi-thread runtime
-    let mut core_runtime = CoreRuntime::new(
-        telemetry_options,
-        TokioRuntimeBuilder::default(),
-    )
-    .context("Failed to initialize Core Runtime")?;
+    let runtime_options = RuntimeOptionsBuilder::default()
+        .telemetry_options(telemetry_options)
+        .heartbeat_interval(None)
+        .build()
+        .context("Failed to build runtime options")?;
+    let mut core_runtime = CoreRuntime::new(runtime_options, TokioRuntimeBuilder::default())
+        .context("Failed to initialize Core Runtime")?;
 
     enter_sync!(core_runtime);
 
@@ -238,17 +240,14 @@ mod config {
     use anyhow::Context as _;
 
     use neon::prelude::*;
-    use temporal_sdk_core::{
-        Url,
-        api::telemetry::{
-            HistogramBucketOverrides, Logger as CoreTelemetryLogger, MetricTemporality,
-            OtelCollectorOptions as CoreOtelCollectorOptions, OtelCollectorOptionsBuilder,
-            OtlpProtocol, PrometheusExporterOptions as CorePrometheusExporterOptions,
-            PrometheusExporterOptionsBuilder, TelemetryOptions as CoreTelemetryOptions,
-            TelemetryOptionsBuilder,
-        },
-        telemetry::CoreLogStreamConsumer,
+    use temporalio_common::telemetry::{
+        HistogramBucketOverrides, Logger as CoreTelemetryLogger, MetricTemporality,
+        OtelCollectorOptions as CoreOtelCollectorOptions, OtelCollectorOptionsBuilder,
+        OtlpProtocol, PrometheusExporterOptions as CorePrometheusExporterOptions,
+        PrometheusExporterOptionsBuilder, TelemetryOptions as CoreTelemetryOptions,
+        TelemetryOptionsBuilder,
     };
+    use temporalio_sdk_core::{Url, telemetry::CoreLogStreamConsumer};
 
     use bridge_macros::TryFromJs;