Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: telemetry data export via a secure channel #8792

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

feat: telemetry data export via a secure channel #8792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d6ef60
refactor(rust): generalize the configuration of a secure client
etorreborre Jan 31, 2025
6fb11e6
feat(rust): add a span exporter using a secure channel
etorreborre Jan 31, 2025
63eb25b
feat(rust): integrate the new span exporter with the rest of the appl…
etorreborre Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 37 additions & 31 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion NOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ This file contains attributions for any 3rd-party open source code used in this
| ff | MIT, Apache-2.0 | https://crates.io/crates/ff |
| fiat-crypto | MIT, Apache-2.0, BSD-1-Clause | https://crates.io/crates/fiat-crypto |
| flate2 | MIT, Apache-2.0 | https://crates.io/crates/flate2 |
| flexi_logger | MIT, Apache-2.0 | https://crates.io/crates/flexi_logger |
| flume | Apache-2.0, MIT | https://crates.io/crates/flume |
| fnv | Apache-2.0, MIT | https://crates.io/crates/fnv |
| foldhash | Zlib | https://crates.io/crates/foldhash |
Expand Down Expand Up @@ -364,6 +363,7 @@ This file contains attributions for any 3rd-party open source code used in this
| openssl-probe | MIT, Apache-2.0 | https://crates.io/crates/openssl-probe |
| opentelemetry | Apache-2.0 | https://crates.io/crates/opentelemetry |
| opentelemetry-appender-tracing | Apache-2.0 | https://crates.io/crates/opentelemetry-appender-tracing |
| opentelemetry-http | Apache-2.0 | https://crates.io/crates/opentelemetry-http |
| opentelemetry-otlp | Apache-2.0 | https://crates.io/crates/opentelemetry-otlp |
| opentelemetry-proto | Apache-2.0 | https://crates.io/crates/opentelemetry-proto |
| opentelemetry-semantic-conventions | Apache-2.0 | https://crates.io/crates/opentelemetry-semantic-conventions |
Expand Down
2 changes: 1 addition & 1 deletion examples/rust/get_started/examples/06-credentials-exchange-client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ async fn main(ctx: Context) -> Result<()> {
// as a member of the production cluster so it returns a signed credential
// attesting to that knowledge.
let authority_node = NodeManager::authority_node_client(
&tcp,
tcp.clone(),
node.secure_channels().clone(),
&issuer,
&MultiAddr::try_from("/dnsaddr/localhost/tcp/5000/secure/api")?,
Expand Down
2 changes: 1 addition & 1 deletion examples/rust/get_started/examples/06-credentials-exchange-server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ async fn main(ctx: Context) -> Result<()> {
// as a member of the production cluster so it returns a signed credential
// attesting to that knowledge.
let authority_node = NodeManager::authority_node_client(
&tcp,
tcp.clone(),
node.secure_channels().clone(),
&issuer,
&MultiAddr::try_from("/dnsaddr/localhost/tcp/5000/secure/api").unwrap(),
Expand Down
4 changes: 2 additions & 2 deletions examples/rust/get_started/examples/11-attribute-based-authentication-control-plane.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async fn start_node(ctx: Context, project_information_path: &str, token: OneTime
// create a secure channel to the authority
// when creating the channel we check that the opposite side is indeed presenting the authority identity
let authority_node = NodeManager::authority_node_client(
&tcp,
tcp.clone(),
node.secure_channels().clone(),
&control_plane,
&MultiAddr::try_from("/dnsaddr/localhost/tcp/5000")?,
Expand All @@ -82,7 +82,7 @@ async fn start_node(ctx: Context, project_information_path: &str, token: OneTime
// Create a credential retriever that will be used to obtain credentials
let credential_retriever = Arc::new(RemoteCredentialRetrieverCreator::new(
node.context().try_clone()?,
Arc::new(tcp.clone()),
tcp.clone(),
node.secure_channels(),
RemoteCredentialRetrieverInfo::create_for_project_member(
project.authority_identifier(),
Expand Down
4 changes: 2 additions & 2 deletions examples/rust/get_started/examples/11-attribute-based-authentication-edge-plane.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async fn start_node(ctx: Context, project_information_path: &str, token: OneTime
// create a secure channel to the authority
// when creating the channel we check that the opposite side is indeed presenting the authority identity
let authority_node = NodeManager::authority_node_client(
&tcp,
tcp.clone(),
node.secure_channels().clone(),
&edge_plane,
&MultiAddr::try_from("/dnsaddr/localhost/tcp/5000")?,
Expand All @@ -80,7 +80,7 @@ async fn start_node(ctx: Context, project_information_path: &str, token: OneTime
// Create a credential retriever that will be used to obtain credentials
let credential_retriever = Arc::new(RemoteCredentialRetrieverCreator::new(
node.context().try_clone()?,
Arc::new(tcp.clone()),
tcp.clone(),
node.secure_channels(),
RemoteCredentialRetrieverInfo::create_for_project_member(
project.authority_identifier(),
Expand Down
21 changes: 11 additions & 10 deletions implementations/rust/ockam/ockam_api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ colorful = "0.3"
colors-transform = "0.2"
dialoguer = "0.11"
either = { version = "1.13.0", default-features = false }
flexi_logger = "0.28"
futures = { version = "0.3.30", features = [] }
futures-core = "0.3.31"
gethostname = "0.5.0"
hex = { version = "0.4.3", default-features = false, features = ["alloc", "serde"] }
home = "0.5"
http-body-util = "0"
httparse = "1.9.5"
hyper = { version = "1", default-features = false, features = ["server", "http1"] }
hyper = { version = "1", default-features = false, features = ["server", "http1", "client"] }
hyper-util = { version = "0", default-features = false, features = ["server", "http1", "tokio"] }
indicatif = "0.17"
itertools = "0.13.0"
Expand All @@ -80,11 +80,12 @@ nix = { version = "0.29", features = ["signal"] }
nu-ansi-term = "0.50"
once_cell = { version = "1", default-features = false }
open = "5.3.0"
opentelemetry = { version = "0.26.0", features = ["logs", "metrics", "trace"] }
opentelemetry-appender-tracing = { version = "0.26.0" }
opentelemetry-otlp = { version = "0.26.0", features = ["logs", "metrics", "trace", "grpc-tonic", "tls", "tls-roots"], default-features = false }
opentelemetry-semantic-conventions = { version = "0.26.0", features = ["semconv_experimental"] }
opentelemetry_sdk = { version = "0.26.0", features = ["logs", "metrics", "trace", "rt-tokio", "rt-tokio-current-thread", "testing", "logs_level_enabled"], default-features = false }
opentelemetry = { version = "0.27", features = ["logs", "metrics", "trace"] }
opentelemetry-appender-tracing = { version = "0.27" }
opentelemetry-otlp = { version = "0.27", features = ["logs", "metrics", "trace", "grpc-tonic", "gzip-tonic", "tls", "tls-roots", "hyper-client"], default-features = false }
opentelemetry-proto = { version = "0.27", features = ["full"] }
opentelemetry-semantic-conventions = { version = "0.27", features = ["semconv_experimental"] }
opentelemetry_sdk = { version = "0.27", features = ["logs", "metrics", "trace", "rt-tokio", "rt-tokio-current-thread", "testing"], default-features = false }
petname = { version = "2.0.2", default-features = false, features = ["default-rng", "default-words"] }
r3bl_rs_utils_core = "0.9"
r3bl_tui = "0.5"
Expand All @@ -111,14 +112,14 @@ tracing = { version = "0.1", default-features = false }
tracing-appender = "0.2.2"
tracing-core = { version = "0.1.32", default-features = false }
tracing-error = "0.2.0"
tracing-opentelemetry = "0.27.0"
tracing-opentelemetry = "0.28"
tracing-subscriber = { version = "0.3", features = ["json"] }
url = "2.5.2"

ockam_multiaddr = { path = "../ockam_multiaddr", version = "0.69.0", features = ["cbor", "serde"] }
ockam_transport_core = { path = "../ockam_transport_core", version = "^0.101.0" }
ockam_transport_tcp = { path = "../ockam_transport_tcp", version = "^0.135.0", default-features = false, features = ["std"] }
tonic = "0.12"
tonic = { version = "0.12", features = ["default", "gzip"] }

[dependencies.ockam_core]
version = "0.124.0"
Expand Down Expand Up @@ -164,7 +165,7 @@ multimap = "0.10.0"
ockam_macros = { path = "../ockam_macros", features = ["std"], version = "^0.37.0" }
ockam_transport_core = { path = "../ockam_transport_core", version = "^0.101.0" }
ockam_transport_tcp = { path = "../ockam_transport_tcp", default-features = false, version = "^0.135.0" }
opentelemetry_sdk = { version = "0.26.0", features = ["logs", "metrics", "trace", "rt-tokio", "testing"], default-features = false }
opentelemetry_sdk = { version = "0.27", features = ["logs", "metrics", "trace", "rt-tokio", "testing"], default-features = false }
quickcheck = "1.0.1"
quickcheck_macros = "1.0.0"
serial_test = "3.0.0"
Expand Down
Loading
Loading