Skip to content

Commit 44903f4

Browse files
committed
fix merge issue
1 parent 70bf0df commit 44903f4

File tree

3 files changed

+6
-71
lines changed

3 files changed

+6
-71
lines changed

packages/core-bridge/Cargo.lock

Lines changed: 0 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core-bridge/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ prost = "0.14"
3535
prost-types = "0.14"
3636
serde = { version = "1.0", features = ["derive"] }
3737
serde_json = "1.0"
38-
temporal-sdk-core = { version = "*", path = "./sdk-core/core", features = [
38+
temporalio-sdk-core = { version = "*", path = "./sdk-core/crates/sdk-core", features = [
3939
"ephemeral-server",
4040
] }
4141
temporalio-client = { version = "*", path = "./sdk-core/crates/client" }

packages/core-bridge/src/runtime.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use futures::channel::mpsc::Receiver;
55
use neon::prelude::*;
66
use tracing::{Instrument, debug, warn};
77

8-
use temporal_sdk_core::{
8+
use temporalio_common::telemetry::{
9+
CoreLog, OtelCollectorOptions as CoreOtelCollectorOptions,
10+
PrometheusExporterOptions as CorePrometheusExporterOptions, metrics::CoreMeter,
11+
};
12+
use temporalio_sdk_core::{
913
CoreRuntime, RuntimeOptionsBuilder, TokioRuntimeBuilder,
10-
api::telemetry::{
11-
CoreLog, OtelCollectorOptions as CoreOtelCollectorOptions,
12-
PrometheusExporterOptions as CorePrometheusExporterOptions, metrics::CoreMeter,
13-
},
1414
telemetry::{build_otlp_metric_exporter, start_prometheus_metric_exporter},
1515
};
1616

0 commit comments

Comments
 (0)