fix(opentelemetry-aws): Add feature gating to features needing trace. (…

…#42)

Update changelogs to match existing parlance.
This should allow us to release the next version of opentelemetry-aws.

opentelemetry-aws/CHANGELOG.md

@@ -13,14 +13,15 @@
 
 ### Changed
 
+- Update to opentelemetry v0.21.0
 - Bump MSRV to 1.65 [#1318](https://github.com/open-telemetry/opentelemetry-rust/pull/1318)
 - Bump MSRV to 1.64 [#1203](https://github.com/open-telemetry/opentelemetry-rust/pull/1203)
 
 ## v0.8.0
 
 ### Changed
 
-- Update to opentelemetry-api v0.20.0
+- Update to opentelemetry v0.20.0
 
 ## v0.7.0
 

opentelemetry-aws/Cargo.toml

@@ -20,15 +20,15 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = ["trace"]
-trace = ["opentelemetry/trace", "opentelemetry_sdk"]
+trace = ["opentelemetry/trace", "opentelemetry_sdk/trace"]
 
 [dependencies]
 once_cell = "1.12"
 opentelemetry = { workspace = true }
 opentelemetry_sdk = { workspace = true, optional = true }
 
 [dev-dependencies]
-opentelemetry_sdk = { workspace = true, features = ["trace", "testing"] }
+opentelemetry_sdk = { workspace = true, features = ["testing"] }
 opentelemetry-http = { workspace = true }
 opentelemetry-stdout = { workspace = true, features = ["trace"] }
 hyper = { version = "0.14" }

opentelemetry-aws/src/trace/mod.rs

@@ -1,4 +1,6 @@
+#[cfg(feature = "trace")]
 pub mod id_generator;
+#[cfg(feature = "trace")]
 pub mod xray_propagator;
 
 #[cfg(feature = "trace")]

scripts/test.sh

@@ -4,10 +4,11 @@ set -eu
 
 cargo test --all --all-features "$@" -- --test-threads=1
 
+
+cargo test --manifest-path=opentelemetry-aws/Cargo.toml --all-features
 cargo test --manifest-path=opentelemetry-contrib/Cargo.toml --all-features
-# TODO: Test like others when they're back in the workspace
-#cargo test --manifest-path=opentelemetry-datadog/Cargo.toml --all-features
-#cargo test --manifest-path=opentelemetry-stackdriver/Cargo.toml --all-features
+cargo test --manifest-path=opentelemetry-datadog/Cargo.toml --all-features
+cargo test --manifest-path=opentelemetry-stackdriver/Cargo.toml --all-features
 
 cargo test --manifest-path=opentelemetry-user-events-logs/Cargo.toml --all-features
 cargo test --manifest-path=opentelemetry-user-events-metrics/Cargo.toml --all-features