From 45375c13d4812f282c7cdd7adafbda7a97878fb2 Mon Sep 17 00:00:00 2001
From: sree <rajan.sreeraj@yahoo.com>
Date: Thu, 22 Feb 2024 15:33:52 +0530
Subject: [PATCH 1/5] mark XrayIdGenerator as deprecated
---
opentelemetry-sdk/src/trace/id_generator/aws.rs | 4 ++++
opentelemetry-sdk/src/trace/mod.rs | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/opentelemetry-sdk/src/trace/id_generator/aws.rs b/opentelemetry-sdk/src/trace/id_generator/aws.rs
index c108e96671..b0bbdf7748 100644
--- a/opentelemetry-sdk/src/trace/id_generator/aws.rs
+++ b/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.0",
+ note = "XrayId Generator has been migrated to the opentelemetry-aws crate"
+ )]
pub struct XrayIdGenerator {
sdk_default_generator: RandomIdGenerator,
}
diff --git a/opentelemetry-sdk/src/trace/mod.rs b/opentelemetry-sdk/src/trace/mod.rs
index df9478a6af..d7a909efdf 100644
--- a/opentelemetry-sdk/src/trace/mod.rs
+++ b/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.0",
+ 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};
From 5a90808db66c5ef8f3c22e2fc687710618a92659 Mon Sep 17 00:00:00 2001
From: sree <rajan.sreeraj@yahoo.com>
Date: Thu, 22 Feb 2024 20:22:13 +0530
Subject: [PATCH 2/5] update changelog
---
opentelemetry-sdk/CHANGELOG.md | 8 +++++++-
opentelemetry-sdk/src/trace/id_generator/aws.rs | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
index 91814f20ef..3276235608 100644
--- a/opentelemetry-sdk/CHANGELOG.md
+++ b/opentelemetry-sdk/CHANGELOG.md
@@ -1,7 +1,13 @@
# Changelog
+## Deprecation Notice
+
+XrayIdGenerator has been migrated to the opentelemetry-aws crate starting from 0.10.0. [#33](https://github.com/open-telemetry/opentelemetry-rust-contrib/pull/33)
+
+
## vNext
+
### Added
- [#1410](https://github.com/open-telemetry/opentelemetry-rust/pull/1410) Add experimental synchronous gauge
@@ -12,7 +18,7 @@
Performance Improvement : Creating Spans and LogRecords are now faster, by avoiding expensive cloning of `Resource` for every Span/LogRecord.
### Changed
-
+- XrayIdGenerator in the opentelemetry-sdk has been deprecated. XrayIdGenerator has been added to the opentelemetry-aws crate starting from version 0.10.0.
- **Breaking**
[#1313](https://github.com/open-telemetry/opentelemetry-rust/pull/1313)
[#1350](https://github.com/open-telemetry/opentelemetry-rust/pull/1350)
diff --git a/opentelemetry-sdk/src/trace/id_generator/aws.rs b/opentelemetry-sdk/src/trace/id_generator/aws.rs
index b0bbdf7748..0d584f39b7 100644
--- a/opentelemetry-sdk/src/trace/id_generator/aws.rs
+++ b/opentelemetry-sdk/src/trace/id_generator/aws.rs
@@ -37,7 +37,7 @@ use std::time::{Duration, UNIX_EPOCH};
#[deprecated(
since = "0.21.0",
note = "XrayId Generator has been migrated to the opentelemetry-aws crate"
- )]
+)]
pub struct XrayIdGenerator {
sdk_default_generator: RandomIdGenerator,
}
From 6309c7dcc02dc8a9158235f1dcafdb3fb70fba38 Mon Sep 17 00:00:00 2001
From: sree <rajan.sreeraj@yahoo.com>
Date: Sat, 24 Feb 2024 02:07:19 +0530
Subject: [PATCH 3/5] allow usage of deprecated xrayidgenerator
---
opentelemetry-sdk/src/lib.rs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/opentelemetry-sdk/src/lib.rs b/opentelemetry-sdk/src/lib.rs
index 947a217197..668f84a05a 100644
--- a/opentelemetry-sdk/src/lib.rs
+++ b/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;
From 64c7d9d26fb29f39336bafcdae5d411fd5606af1 Mon Sep 17 00:00:00 2001
From: sree <rajan.sreeraj@yahoo.com>
Date: Sat, 24 Feb 2024 02:24:47 +0530
Subject: [PATCH 4/5] update deprecated since versions
---
opentelemetry-sdk/src/trace/id_generator/aws.rs | 2 +-
opentelemetry-sdk/src/trace/mod.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opentelemetry-sdk/src/trace/id_generator/aws.rs b/opentelemetry-sdk/src/trace/id_generator/aws.rs
index 0d584f39b7..39a46d6a9c 100644
--- a/opentelemetry-sdk/src/trace/id_generator/aws.rs
+++ b/opentelemetry-sdk/src/trace/id_generator/aws.rs
@@ -35,7 +35,7 @@ use std::time::{Duration, UNIX_EPOCH};
/// [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.0",
+ since = "0.21.3",
note = "XrayId Generator has been migrated to the opentelemetry-aws crate"
)]
pub struct XrayIdGenerator {
diff --git a/opentelemetry-sdk/src/trace/mod.rs b/opentelemetry-sdk/src/trace/mod.rs
index d7a909efdf..a49259c0a5 100644
--- a/opentelemetry-sdk/src/trace/mod.rs
+++ b/opentelemetry-sdk/src/trace/mod.rs
@@ -21,7 +21,7 @@ pub use config::{config, Config};
pub use events::SpanEvents;
#[deprecated(
- since = "0.21.0",
+ since = "0.21.3",
note = "XrayId Generator has been migrated to the opentelemetry-aws crate"
)]
pub use id_generator::aws::XrayIdGenerator;
From 2a91ea9cd094115c814e55ec785d12d8e4c8a274 Mon Sep 17 00:00:00 2001
From: sree <rajan.sreeraj@yahoo.com>
Date: Sat, 24 Feb 2024 15:05:05 +0530
Subject: [PATCH 5/5] update changelog
---
opentelemetry-sdk/CHANGELOG.md | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
index 3276235608..c1594983d6 100644
--- a/opentelemetry-sdk/CHANGELOG.md
+++ b/opentelemetry-sdk/CHANGELOG.md
@@ -1,12 +1,12 @@
# Changelog
-## Deprecation Notice
-XrayIdGenerator has been migrated to the opentelemetry-aws crate starting from 0.10.0. [#33](https://github.com/open-telemetry/opentelemetry-rust-contrib/pull/33)
+## vNext
-## vNext
+### Deprecated
+- XrayIdGenerator in the opentelemetry-sdk has been deprecated and moved to version 0.10.0 of the opentelemetry-aws crate.
### Added
@@ -18,7 +18,6 @@ XrayIdGenerator has been migrated to the opentelemetry-aws crate starting from 0
Performance Improvement : Creating Spans and LogRecords are now faster, by avoiding expensive cloning of `Resource` for every Span/LogRecord.
### Changed
-- XrayIdGenerator in the opentelemetry-sdk has been deprecated. XrayIdGenerator has been added to the opentelemetry-aws crate starting from version 0.10.0.
- **Breaking**
[#1313](https://github.com/open-telemetry/opentelemetry-rust/pull/1313)
[#1350](https://github.com/open-telemetry/opentelemetry-rust/pull/1350)