Merge branch 'main' into diable-default-feature-at-workplace-level

Author: cijothomas

README.md

@@ -66,9 +66,9 @@ Project versioning information and stability guarantees can be found
 ```rust
 use opentelemetry::{
     global,
-    sdk::trace::TracerProvider,
     trace::{Tracer, TracerProvider as _},
 };
+use opentelemetry_sdk::trace::TracerProvider;
 
 fn main() {
     // Create a new trace pipeline that prints to stdout
@@ -86,6 +86,16 @@ fn main() {
 }
 ```
 
+The example above requires the following packages:
+
+```toml
+# Cargo.toml
+[dependencies]
+opentelemetry = "0.21"
+opentelemetry_sdk = "0.21"
+opentelemetry-stdout = { version = "0.2", features = ["trace"] }
+```
+
 See the [examples](./examples) directory for different integration patterns.
 
 ## Ecosystem

opentelemetry-sdk/CHANGELOG.md

@@ -1,7 +1,13 @@
 # Changelog
 
+
 ## vNext
 
+
+### Deprecated
+
+- XrayIdGenerator in the opentelemetry-sdk has been deprecated and moved to version 0.10.0 of the opentelemetry-aws crate.
+
 ### Added
 
 - [#1410](https://github.com/open-telemetry/opentelemetry-rust/pull/1410) Add experimental synchronous gauge
@@ -12,7 +18,6 @@
 Performance Improvement : Creating Spans and LogRecords are now faster, by avoiding expensive cloning of `Resource` for every Span/LogRecord.
 
 ### Changed
-
 - **Breaking**
 [#1313](https://github.com/open-telemetry/opentelemetry-rust/pull/1313)
 [#1350](https://github.com/open-telemetry/opentelemetry-rust/pull/1350)

opentelemetry-sdk/src/lib.rs

@@ -137,6 +137,8 @@ pub mod runtime;
 #[cfg(any(feature = "testing", test))]
 #[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
 pub mod testing;
+
+#[allow(deprecated)]
 #[cfg(feature = "trace")]
 #[cfg_attr(docsrs, doc(cfg(feature = "trace")))]
 pub mod trace;

opentelemetry-sdk/src/trace/id_generator/aws.rs

@@ -34,6 +34,10 @@ use std::time::{Duration, UNIX_EPOCH};
 /// [xray-exporter]: https://godoc.org/github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter
 /// [xray-trace-id]: https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids
 #[derive(Debug, Default)]
+#[deprecated(
+    since = "0.21.3",
+    note = "XrayId Generator has been migrated to the opentelemetry-aws crate"
+)]
 pub struct XrayIdGenerator {
     sdk_default_generator: RandomIdGenerator,
 }

opentelemetry-sdk/src/trace/mod.rs

@@ -19,7 +19,13 @@ mod tracer;
 
 pub use config::{config, Config};
 pub use events::SpanEvents;
-pub use id_generator::{aws::XrayIdGenerator, IdGenerator, RandomIdGenerator};
+
+#[deprecated(
+    since = "0.21.3",
+    note = "XrayId Generator has been migrated to the opentelemetry-aws crate"
+)]
+pub use id_generator::aws::XrayIdGenerator;
+pub use id_generator::{IdGenerator, RandomIdGenerator};
 pub use links::SpanLinks;
 pub use provider::{Builder, TracerProvider};
 pub use sampler::{Sampler, ShouldSample};

opentelemetry-stdout/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## vNext
 
+### Changed
+
+- Adjusted `chrono` features to reduce number of transitive dependencies. [#1569](https://github.com/open-telemetry/opentelemetry-rust/pull/1569)
+
 ## v0.2.0
 
 ### Changed

opentelemetry-stdout/Cargo.toml

@@ -22,7 +22,7 @@ logs = ["opentelemetry/logs", "opentelemetry_sdk/logs", "async-trait", "thiserro
 
 [dependencies]
 async-trait = { workspace = true, optional = true }
-chrono = { version = "0.4.22", default-features = false, features = ["clock"] }
+chrono = { version = "0.4.34", default-features = false, features = ["now"] }
 thiserror = { workspace = true, optional = true }
 futures-util = { workspace = true, optional = true }
 opentelemetry = { version = "0.21", path = "../opentelemetry", default_features = false }