diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f805fe2d..7a900643f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,6 +114,6 @@ jobs: - name: cargo llvm-cov run: cargo llvm-cov --locked --all-features --workspace --lcov --output-path lcov.info - name: Upload to codecov.io - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: fail_ci_if_error: true diff --git a/Cargo.toml b/Cargo.toml index 2e685293a..3aa0e68c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,10 +18,10 @@ resolver = "2" debug = 1 [workspace.dependencies] -opentelemetry = "0.22" -opentelemetry-appender-tracing = "0.3" -opentelemetry-http = "0.11" -opentelemetry-proto = { version = "0.5", default-features = false } -opentelemetry_sdk = { version = "0.22", default-features = false } -opentelemetry-stdout = "0.3" -opentelemetry-semantic-conventions = "0.14" +opentelemetry = "0.23" +opentelemetry-appender-tracing = "0.4" +opentelemetry-http = "0.12" +opentelemetry-proto = { version = "0.6", default-features = false } +opentelemetry_sdk = { version = "0.23", default-features = false } +opentelemetry-stdout = "0.4" +opentelemetry-semantic-conventions = "0.15" diff --git a/opentelemetry-aws/CHANGELOG.md b/opentelemetry-aws/CHANGELOG.md index b2fd91aa5..52000f7c4 100644 --- a/opentelemetry-aws/CHANGELOG.md +++ b/opentelemetry-aws/CHANGELOG.md @@ -2,6 +2,10 @@ ## vNext +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.23.0 + ## v0.10.0 ### Changed diff --git a/opentelemetry-contrib/CHANGELOG.md b/opentelemetry-contrib/CHANGELOG.md index b479e9ff5..2a061e06e 100644 --- a/opentelemetry-contrib/CHANGELOG.md +++ b/opentelemetry-contrib/CHANGELOG.md @@ -2,6 +2,11 @@ ## vNext +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.23 +- Bump opentelemetry-semantic-conventions version to 0.15 + ## v0.14.0 ### Changed diff --git a/opentelemetry-contrib/src/trace/exporter/jaeger_json.rs b/opentelemetry-contrib/src/trace/exporter/jaeger_json.rs index 22ad2a604..a81c26c7d 100644 --- a/opentelemetry-contrib/src/trace/exporter/jaeger_json.rs +++ b/opentelemetry-contrib/src/trace/exporter/jaeger_json.rs @@ -11,6 +11,7 @@ use opentelemetry::trace::SpanId; feature = "rt-tokio-current-thread" ))] use opentelemetry::trace::TraceError; +use opentelemetry::trace::TracerProvider as _; use opentelemetry_sdk::{ export::trace::{ExportResult, SpanData, SpanExporter}, runtime::RuntimeChannel, @@ -51,13 +52,11 @@ impl JaegerJsonExporter { let runtime = self.runtime.clone(); let provider_builder = TracerProvider::builder().with_batch_exporter(self, runtime); let provider = provider_builder.build(); - let tracer = opentelemetry::trace::TracerProvider::versioned_tracer( - &provider, - "opentelemetry", - Some(env!("CARGO_PKG_VERSION")), - Some(SCHEMA_URL), - None, - ); + let tracer = provider + .tracer_builder("opentelemetry") + .with_version(env!("CARGO_PKG_VERSION")) + .with_schema_url(SCHEMA_URL) + .build(); let _ = opentelemetry::global::set_tracer_provider(provider); tracer diff --git a/opentelemetry-etw-logs/CHANGELOG.md b/opentelemetry-etw-logs/CHANGELOG.md index 95c18e44a..ee84331f3 100644 --- a/opentelemetry-etw-logs/CHANGELOG.md +++ b/opentelemetry-etw-logs/CHANGELOG.md @@ -3,3 +3,4 @@ ## Unreleased - Initial Alpha implementation +- Bump opentelemetry and opentelemetry_sdk versions to 0.23.0 diff --git a/opentelemetry-etw-logs/src/logs/exporter.rs b/opentelemetry-etw-logs/src/logs/exporter.rs index e6a582592..3143e1216 100644 --- a/opentelemetry-etw-logs/src/logs/exporter.rs +++ b/opentelemetry-etw-logs/src/logs/exporter.rs @@ -223,7 +223,8 @@ impl ETWExporter { let event_time: SystemTime = log_data .record .timestamp - .unwrap_or(log_data.record.observed_timestamp); + .or(log_data.record.observed_timestamp) + .unwrap_or_else(SystemTime::now); const COUNT_TIME: u8 = 1u8; const PART_A_COUNT: u8 = COUNT_TIME; @@ -430,7 +431,6 @@ mod tests { let log_data = LogData { instrumentation: Default::default(), record: Default::default(), - resource: Default::default(), }; let result = exporter.export_log_data(&log_data); diff --git a/opentelemetry-etw-logs/src/logs/reentrant_logprocessor.rs b/opentelemetry-etw-logs/src/logs/reentrant_logprocessor.rs index 9f85e5e2d..87b923655 100644 --- a/opentelemetry-etw-logs/src/logs/reentrant_logprocessor.rs +++ b/opentelemetry-etw-logs/src/logs/reentrant_logprocessor.rs @@ -44,7 +44,7 @@ impl opentelemetry_sdk::logs::LogProcessor for ReentrantLogProcessor { // This is a no-op no special cleanup is required before // shutdown. - fn shutdown(&mut self) -> LogResult<()> { + fn shutdown(&self) -> LogResult<()> { Ok(()) } @@ -66,7 +66,7 @@ mod tests { #[test] fn test_shutdown() { - let mut processor = ReentrantLogProcessor::new( + let processor = ReentrantLogProcessor::new( "test-provider-name", "test-event-name".into(), None, @@ -100,7 +100,6 @@ mod tests { let log_data = LogData { instrumentation: Default::default(), record: Default::default(), - resource: Default::default(), }; processor.emit(log_data); diff --git a/opentelemetry-etw-metrics/CHANGELOG.md b/opentelemetry-etw-metrics/CHANGELOG.md index 3678f8329..701221e6b 100644 --- a/opentelemetry-etw-metrics/CHANGELOG.md +++ b/opentelemetry-etw-metrics/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Changed + - Bump opentelemetry and opentelemetry_sdk versions to 0.23 + - Bump opentelemetry-proto version to 0.6 + ## v0.1.0 ### Added diff --git a/opentelemetry-resource-detectors/CHANGELOG.md b/opentelemetry-resource-detectors/CHANGELOG.md index 607b70b9c..1d1701dc1 100644 --- a/opentelemetry-resource-detectors/CHANGELOG.md +++ b/opentelemetry-resource-detectors/CHANGELOG.md @@ -2,6 +2,11 @@ ## vNext +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.23 +- Bump opentelemetry-semantic-conventions version to 0.15 + ### Added - Add "host.arch" attribute into the `HostResourceDetector`. diff --git a/opentelemetry-user-events-logs/CHANGELOG.md b/opentelemetry-user-events-logs/CHANGELOG.md index 68043eaa2..24e2504d3 100644 --- a/opentelemetry-user-events-logs/CHANGELOG.md +++ b/opentelemetry-user-events-logs/CHANGELOG.md @@ -2,6 +2,11 @@ ## Unreleased +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.23 +- Bump eventheader and eventheader_dynamics versions to 0.4 + ## v0.3.0 ### Changed diff --git a/opentelemetry-user-events-logs/Cargo.toml b/opentelemetry-user-events-logs/Cargo.toml index 811d4441d..cd20b73e9 100644 --- a/opentelemetry-user-events-logs/Cargo.toml +++ b/opentelemetry-user-events-logs/Cargo.toml @@ -11,8 +11,8 @@ keywords = ["opentelemetry", "log", "trace", "user_events"] license = "Apache-2.0" [dependencies] -eventheader = "0.3.2" -eventheader_dynamic = "0.3.3" +eventheader = "0.4.0" +eventheader_dynamic = "0.4.0" opentelemetry = { workspace = true, features = ["logs"] } opentelemetry_sdk = { workspace = true, features = ["logs"] } async-std = { version="1.6" } diff --git a/opentelemetry-user-events-logs/src/logs/exporter.rs b/opentelemetry-user-events-logs/src/logs/exporter.rs index 3825af496..38c1968eb 100644 --- a/opentelemetry-user-events-logs/src/logs/exporter.rs +++ b/opentelemetry-user-events-logs/src/logs/exporter.rs @@ -201,7 +201,8 @@ impl UserEventsExporter { let event_time: SystemTime = log_data .record .timestamp - .unwrap_or(log_data.record.observed_timestamp); + .or(log_data.record.observed_timestamp) + .unwrap_or_else(SystemTime::now); cs_a_count += 1; // for event_time eb.add_struct("PartA", cs_a_count, 0); { diff --git a/opentelemetry-user-events-logs/src/logs/reentrant_logprocessor.rs b/opentelemetry-user-events-logs/src/logs/reentrant_logprocessor.rs index d66447b83..e8e118b12 100644 --- a/opentelemetry-user-events-logs/src/logs/reentrant_logprocessor.rs +++ b/opentelemetry-user-events-logs/src/logs/reentrant_logprocessor.rs @@ -45,7 +45,7 @@ impl opentelemetry_sdk::logs::LogProcessor for ReentrantLogProcessor { // This is a no-op no special cleanup is required before // shutdown. - fn shutdown(&mut self) -> LogResult<()> { + fn shutdown(&self) -> LogResult<()> { Ok(()) } diff --git a/opentelemetry-user-events-metrics/CHANGELOG.md b/opentelemetry-user-events-metrics/CHANGELOG.md index f0ff6eba1..c69054efe 100644 --- a/opentelemetry-user-events-metrics/CHANGELOG.md +++ b/opentelemetry-user-events-metrics/CHANGELOG.md @@ -2,6 +2,12 @@ ## Unreleased +### Changed + +- Bump opentelemetry and opentelemetry_sdk versions to 0.23, + opentelemetry-proto version to 0.6. +- Bump eventheader version to 0.4.0 + ## v0.3.0 ### Changed diff --git a/opentelemetry-user-events-metrics/Cargo.toml b/opentelemetry-user-events-metrics/Cargo.toml index f11a19f32..6d0b570f7 100644 --- a/opentelemetry-user-events-metrics/Cargo.toml +++ b/opentelemetry-user-events-metrics/Cargo.toml @@ -14,7 +14,7 @@ rust-version = "1.65" opentelemetry = { workspace = true, features = ["metrics"] } opentelemetry_sdk = { workspace = true, features = ["metrics", "rt-tokio"] } opentelemetry-proto = { workspace = true, features = ["gen-tonic", "metrics"] } -eventheader = { version = "= 0.3.4" } +eventheader = { version = "= 0.4.0" } async-trait = "0.1" prost = "0.12"