Skip to content

Commit

Permalink
build: bump opentelemetry-appender-tracing from 0.4.0 to 0.5.0
Browse files Browse the repository at this point in the history
Bumps [opentelemetry-appender-tracing](https://github.com/open-telemetry/opentelemetry-rust) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases)
- [Commits](open-telemetry/opentelemetry-rust@opentelemetry-appender-tracing-0.4.0...opentelemetry-appender-tracing-0.5.0)

---
updated-dependencies:
- dependency-name: opentelemetry-appender-tracing
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and etorreborre committed Sep 9, 2024
1 parent 1cba50b commit 63f2251
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 108 deletions.
136 changes: 47 additions & 89 deletions Cargo.lock

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

2 changes: 0 additions & 2 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@ This file contains attributions for any 3rd-party open source code used in this
| opentelemetry-proto | Apache-2.0 | https://crates.io/crates/opentelemetry-proto |
| opentelemetry-semantic-conventions | Apache-2.0 | https://crates.io/crates/opentelemetry-semantic-conventions |
| opentelemetry_sdk | Apache-2.0 | https://crates.io/crates/opentelemetry_sdk |
| ordered-float | MIT | https://crates.io/crates/ordered-float |
| os_pipe | MIT | https://crates.io/crates/os_pipe |
| outref | MIT | https://crates.io/crates/outref |
| overload | MIT | https://crates.io/crates/overload |
Expand Down Expand Up @@ -538,7 +537,6 @@ This file contains attributions for any 3rd-party open source code used in this
| tinyvec_macros | MIT, Apache-2.0, Zlib | https://crates.io/crates/tinyvec_macros |
| tokio | MIT | https://crates.io/crates/tokio |
| tokio-io | MIT | https://crates.io/crates/tokio-io |
| tokio-io-timeout | MIT, Apache-2.0 | https://crates.io/crates/tokio-io-timeout |
| tokio-macros | MIT | https://crates.io/crates/tokio-macros |
| tokio-retry | MIT | https://crates.io/crates/tokio-retry |
| tokio-rustls | MIT, Apache-2.0 | https://crates.io/crates/tokio-rustls |
Expand Down
14 changes: 7 additions & 7 deletions implementations/rust/ockam/ockam_api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ miette = "7"
minicbor = { version = "0.24.1", features = ["alloc", "derive"] }
nix = { version = "0.29", features = ["signal"] }
open = "5.3.0"
opentelemetry = { version = "0.23.0", features = ["logs", "metrics", "trace"] }
opentelemetry-appender-tracing = { version = "0.4.0" }
opentelemetry-otlp = { version = "0.16.0", features = ["logs", "metrics", "trace", "grpc-tonic", "tls", "tls-roots"], default-features = false }
opentelemetry = { version = "0.24.0", features = ["logs", "metrics", "trace"] }
opentelemetry-appender-tracing = { version = "0.5.0" }
opentelemetry-otlp = { version = "0.17.0", features = ["logs", "metrics", "trace", "grpc-tonic", "tls", "tls-roots"], default-features = false }
opentelemetry-semantic-conventions = { version = "0.16.0" }
opentelemetry_sdk = { version = "0.23.0", features = ["logs", "metrics", "trace", "rt-tokio", "rt-tokio-current-thread", "testing", "logs_level_enabled"], default-features = false }
opentelemetry_sdk = { version = "0.24.1", features = ["logs", "metrics", "trace", "rt-tokio", "rt-tokio-current-thread", "testing", "logs_level_enabled"], 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 @@ -100,14 +100,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.24.0"
tracing-opentelemetry = "0.25.0"
tracing-subscriber = { version = "0.3.18", features = ["json"] }
url = "2.5.2"

ockam_multiaddr = { path = "../ockam_multiaddr", version = "0.60.0", features = ["cbor", "serde"] }
ockam_transport_core = { path = "../ockam_transport_core", version = "^0.90.0" }
ockam_transport_tcp = { path = "../ockam_transport_tcp", version = "^0.123.0", default-features = false, features = ["std"] }
tonic = "0.11"
tonic = "0.12"

[dependencies.ockam_core]
version = "0.116.0"
Expand Down Expand Up @@ -157,7 +157,7 @@ ockam_macros = { path = "../ockam_macros", features = ["std"], version = "^0.34.
ockam_transport_core = { path = "../ockam_transport_core", version = "^0.90.0" }
ockam_transport_tcp = { path = "../ockam_transport_tcp", default-features = false, version = "^0.123.0" }
once_cell = { version = "1", default-features = false }
opentelemetry_sdk = { version = "0.23.0", features = ["logs", "metrics", "trace", "rt-tokio", "testing"], default-features = false }
opentelemetry_sdk = { version = "0.24.1", features = ["logs", "metrics", "trace", "rt-tokio", "testing"], default-features = false }
pretty_assertions = "1.4.0"
proptest = "1.5.0"
quickcheck = "1.0.1"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use ockam_core::async_trait;
use opentelemetry::logs::{LogResult, Severity};
use opentelemetry_sdk::export::logs::{LogData, LogExporter};
use std::borrow::Cow;
use std::time::Duration;

/// This exporter can be used to intercept the log records sent to an OpenTelemetry collector
Expand All @@ -11,7 +12,7 @@ pub struct DecoratedLogExporter<L: LogExporter> {

#[async_trait]
impl<L: LogExporter> LogExporter for DecoratedLogExporter<L> {
async fn export(&mut self, batch: Vec<LogData>) -> LogResult<()> {
async fn export<'a>(&mut self, batch: Vec<Cow<'a, LogData>>) -> LogResult<()> {
self.exporter.export(batch).await
}

Expand Down Expand Up @@ -40,7 +41,7 @@ pub struct OckamLogExporter<L: LogExporter> {

#[async_trait]
impl<L: LogExporter> LogExporter for OckamLogExporter<L> {
async fn export(&mut self, batch: Vec<LogData>) -> LogResult<()> {
async fn export<'a>(&mut self, batch: Vec<Cow<'a, LogData>>) -> LogResult<()> {
match self.log_export_cutoff {
Some(cutoff) => {
let f = self.exporter.export(batch);
Expand Down
Loading

0 comments on commit 63f2251

Please sign in to comment.