Skip to content

Commit

Permalink
First step of changing from chariott -> intent brokering in the code
Browse files Browse the repository at this point in the history
  • Loading branch information
ladatz committed Jan 23, 2024
1 parent 5886244 commit cdfd6be
Show file tree
Hide file tree
Showing 86 changed files with 404 additions and 404 deletions.
152 changes: 76 additions & 76 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ members = [
[workspace.dependencies]
anyhow = "1.0"
async-trait = "0.1"
chariott-common = { path = "./intent_brokering/common/" }
chariott-proto = { path = "./intent_brokering/proto.rs/" }
intent-brokering-common = { path = "./intent_brokering/common/" }
intent-brokering-proto = { path = "./intent_brokering/proto.rs/" }
futures = { version = "0.3" }
lazy_static = "1.4.0"
parking_lot = "0.12.1"
Expand Down
4 changes: 2 additions & 2 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.file_descriptor_set_path(out_dir.join("descriptor.bin"))
.compile(
&[
"./proto/chariott/runtime/v1/runtime.proto",
"./proto/chariott/provider/v1/provider.proto",
"./proto/runtime/v1/runtime.proto",
"./proto/provider/v1/provider.proto",
],
&["./proto/"],
)?;
Expand Down
4 changes: 2 additions & 2 deletions docs/adr/0020-integration-and-e2e-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ well as from the CI.

Integration tests will be invoking the Chariott runtime server code directly,
without using the [upstream gRPC
layer](../../intent_brokering/proto/chariott/runtime/v1/runtime.proto). We will not mock out any parts
layer](../../proto/chariott/runtime/v1/runtime.proto). We will not mock out any parts
from the Chariott runtime when integration testing, hence we will need to set up
a provider that is exposing a gRPC endpoint in order to handle intent
fulfillments.
Expand Down Expand Up @@ -88,4 +88,4 @@ This approach is equivalent to the setup in [ADR
`cargo test`, and come with the advantages a test framework has without
taking a dependency on test framework which we do not already use.

[charc]: ../../intent_brokering/tools/charc.md
[charc]: ../../tools/charc.md
2 changes: 1 addition & 1 deletion docs/design/intent_brokering_design.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## <a name="introduction">Introduction</a>

Project Eclipse Chariott delivers a metadata-driven application programming model. Today, Chariott serves two main purposes. First, it offers service discovery of "provider" applications advertising their functionality. These providers register their capabilities with Chariott. Second, Chariott provides the brokering of intent requests from any application towards the offering providers. Chariott was founded on [Capability Oriented Architecture](https://www.linkedin.com/pulse/brief-introduction-capability-oriented-architecture-coa-haishi-bai/) (COA). Since Chariott provides a common [gRPC](https://grpc.io/) interface for interacting with applications, it can be used with any language supporting gRPC. For more details on the gRPC interfaces, please see the [proto folder](../../intent_brokering/proto/chariott/).
Project Eclipse Chariott delivers a metadata-driven application programming model. Today, Chariott serves two main purposes. First, it offers service discovery of "provider" applications advertising their functionality. These providers register their capabilities with Chariott. Second, Chariott provides the brokering of intent requests from any application towards the offering providers. Chariott was founded on [Capability Oriented Architecture](https://www.linkedin.com/pulse/brief-introduction-capability-oriented-architecture-coa-haishi-bai/) (COA). Since Chariott provides a common [gRPC](https://grpc.io/) interface for interacting with applications, it can be used with any language supporting gRPC. For more details on the gRPC interfaces, please see the [proto folder](../../intent_brokering/proto/).

## <a name="architecture">Architecture</a>

Expand Down
6 changes: 3 additions & 3 deletions intent_brokering/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# SPDX-License-Identifier: MIT

[package]
name = "chariott"
name = "intent-brokering"
version = "0.1.0"
edition = "2021"
license = "MIT"

[dependencies]
async-recursion = "1.0"
async-trait = { workspace = true }
chariott-common = { workspace = true }
chariott-proto = { workspace = true }
intent-brokering-common = { workspace = true }
intent-brokering-proto = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread", "time"] }
Expand Down
4 changes: 2 additions & 2 deletions intent_brokering/common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "chariott-common"
name = "intent-brokering-common"
version = "0.1.0"
edition = "2021"
license = "MIT"

[dependencies]
async-trait = { workspace = true }
chariott-proto = { workspace = true }
intent-brokering-proto = { workspace = true }
ess = { path = "../ess" }
regex = { workspace = true }
serde = { workspace = true, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion intent_brokering/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//! In order to get started, reference this library in your Cargo.toml
//!
//! ```toml
//! chariott_common = { path = "../common/" }
//! intent_brokering_common = { path = "../common/" }
//! ```
//!
Expand Down
4 changes: 2 additions & 2 deletions intent_brokering/common/src/streaming_ess.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use std::{ops::Deref, sync::Arc, time::SystemTime};

use async_trait::async_trait;
use chariott_proto::{
use intent_brokering_proto::{
common::ValueMessage,
common::{SubscribeFulfillment, SubscribeIntent, ValueEnum},
streaming::{channel_service_server::ChannelService, Event, OpenRequest},
Expand Down Expand Up @@ -99,7 +99,7 @@ impl<T> Deref for StreamingEss<T> {
mod tests {
use std::time::Duration;

use chariott_proto::{
use intent_brokering_proto::{
common::{SubscribeIntent, ValueEnum, ValueMessage},
streaming::{channel_service_server::ChannelService, OpenRequest},
};
Expand Down
2 changes: 1 addition & 1 deletion intent_brokering/ess/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tokio-util = { workspace = true }
tracing = { workspace = true }

[dev-dependencies]
chariott-common = { path = "../common/" }
intent-brokering-common = { path = "../common/" }
criterion = { version = "0.5.1", features = ["async_tokio"] }
futures = { workspace = true }
tokio = { workspace = true, features = ["macros", "sync", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion intent_brokering/ess/benches/load_bench.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use chariott_common::tokio_runtime_fork::BuilderExt;
use intent_brokering_common::tokio_runtime_fork::BuilderExt;
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
use ess::EventSubSystem;
use futures::StreamExt;
Expand Down
Loading

1 comment on commit cdfd6be

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ESS Benchmark

Benchmark suite Current: cdfd6be Previous: 5886244 Ratio
ess/1-subscribers/1000-events 190047 ns/iter (± 9248) 188873 ns/iter (± 6213) 1.01
ess/10-subscribers/1000-events 1353096 ns/iter (± 29470) 1368890 ns/iter (± 32371) 0.99
ess/100-subscribers/1000-events 13104216 ns/iter (± 762444) 13413472 ns/iter (± 574355) 0.98
ess/1-subscribers/10000-events 1769022 ns/iter (± 27564) 1712373 ns/iter (± 59392) 1.03
ess/10-subscribers/10000-events 13298132 ns/iter (± 76851) 13528032 ns/iter (± 51857) 0.98
ess/100-subscribers/10000-events 131046773 ns/iter (± 1094343) 131653141 ns/iter (± 461857) 1.00

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.