@temporalio/core-bridge 1.9.0-rc.0 → 1.9.0

package/src/conversions.rs

@@ -37,17 +37,22 @@ impl ArrayHandleConversionsExt for Handle<'_, JsArray> {
         let len = js_vec.len();
         let mut ret_vec = Vec::<String>::with_capacity(len);
 
-        for i in 0..len - 1 {
-            ret_vec[i] = js_vec[i].downcast_or_throw::<JsString, _>(cx)?.value(cx);
+        for i in js_vec.iter().take(len) {
+            ret_vec.push(i.downcast_or_throw::<JsString, _>(cx)?.value(cx));
         }
         Ok(ret_vec)
     }
 }
 
+pub(crate) type TelemOptsRes = (
+    TelemetryOptions,
+    Option<Box<dyn FnOnce() -> Arc<dyn CoreMeter> + Send>>,
+);
+
 pub trait ObjectHandleConversionsExt {
     fn set_default(&self, cx: &mut FunctionContext, key: &str, value: &str) -> NeonResult<()>;
     fn as_client_options(&self, ctx: &mut FunctionContext) -> NeonResult<ClientOptions>;
-    fn as_telemetry_options(&self, cx: &mut FunctionContext) -> NeonResult<TelemetryOptions>;
+    fn as_telemetry_options(&self, cx: &mut FunctionContext) -> NeonResult<TelemOptsRes>;
     fn as_worker_config(&self, cx: &mut FunctionContext) -> NeonResult<WorkerConfig>;
     fn as_ephemeral_server_config(
         &self,
@@ -164,7 +169,7 @@ impl ObjectHandleConversionsExt for Handle<'_, JsObject> {
             .expect("Core server gateway options must be valid"))
     }
 
-    fn as_telemetry_options(&self, cx: &mut FunctionContext) -> NeonResult<TelemetryOptions> {
+    fn as_telemetry_options(&self, cx: &mut FunctionContext) -> NeonResult<TelemOptsRes> {
         let mut telemetry_opts = TelemetryOptionsBuilder::default();
         if js_optional_value_getter!(cx, self, "noTemporalPrefixForMetrics", JsBoolean)
             .unwrap_or_default()
@@ -185,6 +190,8 @@ impl ObjectHandleConversionsExt for Handle<'_, JsObject> {
             }
         }
 
+        let mut meter_maker = None;
+
         if let Some(ref metrics) = js_optional_getter!(cx, self, "metrics", JsObject) {
             if let Some(ref prom) = js_optional_getter!(cx, metrics, "prometheus", JsObject) {
                 if js_optional_getter!(cx, metrics, "otel", JsObject).is_some() {
@@ -201,16 +208,24 @@ impl ObjectHandleConversionsExt for Handle<'_, JsObject> {
                     Err(_) => {
                         return cx.throw_type_error(
                             "Invalid telemetryOptions.metrics.prometheus.bindAddress",
-                        )?
+                        )?;
                     }
                 };
 
-                let options = options
-                    .build()
-                    .expect("Failed to build prometheus exporter options");
-                let prom_info = start_prometheus_metric_exporter(options)
-                    .expect("Failed creating prometheus exporter");
-                telemetry_opts.metrics(prom_info.meter as Arc<dyn CoreMeter>);
+                let options = options.build().map_err(|e| {
+                    cx.throw_type_error::<_, TelemetryOptions>(format!(
+                        "Failed to build prometheus exporter options: {:?}",
+                        e
+                    ))
+                    .unwrap_err()
+                })?;
+
+                meter_maker = Some(Box::new(move || {
+                    let prom_info = start_prometheus_metric_exporter(options)
+                        .expect("Failed creating prometheus exporter");
+                    prom_info.meter as Arc<dyn CoreMeter>
+                })
+                    as Box<dyn FnOnce() -> Arc<dyn CoreMeter> + Send>);
             } else if let Some(ref otel) = js_optional_getter!(cx, metrics, "otel", JsObject) {
                 let mut options = OtelCollectorOptionsBuilder::default();
 
@@ -218,7 +233,7 @@ impl ObjectHandleConversionsExt for Handle<'_, JsObject> {
                 match Url::parse(&url) {
                     Ok(url) => options.url(url),
                     Err(_) => {
-                        return cx.throw_type_error("Invalid telemetryOptions.metrics.otel.url")
+                        return cx.throw_type_error("Invalid telemetryOptions.metrics.otel.url");
                     }
                 };
 
@@ -246,12 +261,19 @@ impl ObjectHandleConversionsExt for Handle<'_, JsObject> {
                     };
                 };
 
-                let options = options
-                    .build()
-                    .expect("Failed to build otlp exporter options");
-                let otlp_exporter =
-                    build_otlp_metric_exporter(options).expect("Failed to build otlp exporter");
-                telemetry_opts.metrics(Arc::new(otlp_exporter) as Arc<dyn CoreMeter>);
+                let options = options.build().map_err(|e| {
+                    cx.throw_type_error::<_, TelemetryOptions>(format!(
+                        "Failed to build otlp exporter options: {:?}",
+                        e
+                    ))
+                    .unwrap_err()
+                })?;
+
+                meter_maker = Some(Box::new(move || {
+                    let otlp_exporter =
+                        build_otlp_metric_exporter(options).expect("Failed to build otlp exporter");
+                    Arc::new(otlp_exporter) as Arc<dyn CoreMeter>
+                }));
             } else {
                 cx.throw_type_error(
                     "Invalid telemetryOptions.metrics, missing `prometheus` or `otel` option",
@@ -259,10 +281,13 @@ impl ObjectHandleConversionsExt for Handle<'_, JsObject> {
             }
         }
 
-        telemetry_opts.build().map_err(|reason| {
-            cx.throw_type_error::<_, TelemetryOptions>(format!("{}", reason))
-                .unwrap_err()
-        })
+        Ok((
+            telemetry_opts.build().map_err(|reason| {
+                cx.throw_type_error::<_, TelemetryOptions>(format!("{}", reason))
+                    .unwrap_err()
+            })?,
+            meter_maker,
+        ))
     }
 
     fn as_worker_config(&self, cx: &mut FunctionContext) -> NeonResult<WorkerConfig> {

package/src/runtime.rs

@@ -11,7 +11,7 @@ use std::{
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 use temporal_client::{ClientInitError, ConfiguredClient, TemporalServiceClientWithMetrics};
-use temporal_sdk_core::api::telemetry::{CoreTelemetry, TelemetryOptions};
+use temporal_sdk_core::api::telemetry::CoreTelemetry;
 use temporal_sdk_core::CoreRuntime;
 use temporal_sdk_core::{
     ephemeral_server::EphemeralServer as CoreEphemeralServer,
@@ -116,17 +116,23 @@ pub enum RuntimeRequest {
 /// Bridges requests from JS to core and sends responses back to JS using a neon::Channel.
 /// Blocks current thread until a [Shutdown] request is received in channel.
 pub fn start_bridge_loop(
-    telemetry_options: TelemetryOptions,
+    telemetry_options: TelemOptsRes,
     channel: Arc<Channel>,
     receiver: &mut UnboundedReceiver<RuntimeRequest>,
 ) {
     let mut tokio_builder = tokio::runtime::Builder::new_multi_thread();
     tokio_builder.enable_all().thread_name("core");
-    let core_runtime = Arc::new(
-        CoreRuntime::new(telemetry_options, tokio_builder).expect("Failed to create CoreRuntime"),
-    );
+    let telem_opts = telemetry_options.0;
+    let meter_maker = telemetry_options.1;
+    let mut core_runtime =
+        CoreRuntime::new(telem_opts, tokio_builder).expect("Failed to create CoreRuntime");
 
     core_runtime.tokio_handle().block_on(async {
+        if let Some(meter_maker) = meter_maker {
+            core_runtime
+                .telemetry_mut()
+                .attach_late_init_metrics(meter_maker());
+        }
         loop {
             let request_option = receiver.recv().await;
             let request = match request_option {
@@ -147,13 +153,10 @@ pub fn start_bridge_loop(
                     headers,
                     callback,
                 } => {
-                    let runtime_clone = core_runtime.clone();
+                    let mm = core_runtime.telemetry().get_metric_meter();
                     core_runtime.tokio_handle().spawn(async move {
                         match options
-                            .connect_no_namespace(
-                                runtime_clone.telemetry().get_metric_meter(),
-                                headers.map(|h| Arc::new(RwLock::new(h))),
-                            )
+                            .connect_no_namespace(mm, headers.map(|h| Arc::new(RwLock::new(h))))
                             .await
                         {
                             Err(err) => {

package/ts/index.ts

@@ -14,8 +14,8 @@ type Shadow<Base, New> = Base extends object
             ? Shadow<Base[K], New[K]>
             : Base[K]
           : K extends keyof New
-          ? New[K]
-          : never;
+            ? New[K]
+            : never;
       }
     : New
   : New;

package/sdk-core/client/LICENSE.txt

@@ -1,23 +0,0 @@
-Temporal Core SDK
-
-The MIT License
-
-Copyright (c) 2021 Temporal Technologies, Inc. All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/sdk-core/core/LICENSE.txt

@@ -1,23 +0,0 @@
-Temporal Core SDK
-
-The MIT License
-
-Copyright (c) 2021 Temporal Technologies, Inc. All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/sdk-core/core-api/LICENSE.txt

@@ -1,23 +0,0 @@
-Temporal Core SDK
-
-The MIT License
-
-Copyright (c) 2021 Temporal Technologies, Inc. All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/sdk-core/sdk/LICENSE.txt

@@ -1,23 +0,0 @@
-Temporal Core SDK
-
-The MIT License
-
-Copyright (c) 2021 Temporal Technologies, Inc. All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/sdk-core/sdk-core-protos/LICENSE.txt

@@ -1,23 +0,0 @@
-Temporal Core SDK
-
-The MIT License
-
-Copyright (c) 2021 Temporal Technologies, Inc. All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.