Skip to content

Commit 10cf02c

Browse files
authored
chore: Fix changelogs and few nits (open-telemetry#2929)
1 parent 4ce7655 commit 10cf02c

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

.cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"anyvalue",
3030
"appender",
3131
"appenders",
32+
"autobenches",
3233
"Bhasin",
3334
"BLRP",
3435
"Cijo",

examples/metrics-advanced/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ bench = false
1313

1414
[dependencies]
1515
opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
16-
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["spec_unstable_metrics_views", "rt-tokio"] }
16+
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["spec_unstable_metrics_views"] }
1717
opentelemetry-stdout = { workspace = true, features = ["metrics"] }
1818
tokio = { workspace = true, features = ["full"] }

examples/metrics-basic/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bench = false
1313

1414
[dependencies]
1515
opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
16-
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["metrics", "rt-tokio"] }
16+
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["metrics"] }
1717
opentelemetry-stdout = { workspace = true, features = ["metrics"] }
1818
tokio = { workspace = true, features = ["full"] }
1919

opentelemetry-sdk/CHANGELOG.md

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
## vNext
44

5-
[#2868](https://github.com/open-telemetry/opentelemetry-rust/pull/2868)
6-
`SdkLogger`, `SdkTracer` modified to respect telemetry suppression based on
5+
- **Feature**: Added context based telemetry suppression. [#2868](https://github.com/open-telemetry/opentelemetry-rust/pull/2868)
6+
- `SdkLogger`, `SdkTracer` modified to respect telemetry suppression based on
77
`Context`. In other words, if the current context has telemetry suppression
8-
enabled, then logs/spans will be ignored. The flag is typically set by OTel
8+
enabled, then logs/spans will be ignored.
9+
- The flag is typically set by OTel
910
components to prevent telemetry from itself being fed back into OTel.
10-
`BatchLogProcessor`, `BatchSpanProcessor`, and `PeriodicReader` modified to set
11+
- `BatchLogProcessor`, `BatchSpanProcessor`, and `PeriodicReader` modified to set
1112
the suppression flag in their dedicated thread, so that telemetry generated from
12-
those threads will not be fed back into OTel. Similarly, `SimpleLogProcessor`
13+
those threads will not be fed back into OTel.
14+
- Similarly, `SimpleLogProcessor`
1315
also modified to suppress telemetry before invoking exporters.
1416

1517
- **Feature**: Implemented and enabled cardinality capping for Metrics by
@@ -25,20 +27,21 @@ also modified to suppress telemetry before invoking exporters.
2527
[#2878](https://github.com/open-telemetry/opentelemetry-rust/issues/2878)
2628
- *Breaking* `MetricError`, `MetricResult` no longer public (except when
2729
`spec_unstable_metrics_views` feature flag is enabled). `OTelSdkResult` should
28-
be used instead, wherever applicable.
29-
- *Breaking* change, affecting custom MetricReader authors: The
30-
`shutdown_with_timeout` method is added to `MetricReader` trait. `collect`
30+
be used instead, wherever applicable. [#2906](https://github.com/open-telemetry/opentelemetry-rust/pull/2906)
31+
- *Breaking* change, affecting custom `MetricReader` authors:
32+
- The
33+
`shutdown_with_timeout` method is added to `MetricReader` trait.
34+
- `collect`
3135
method on `MetricReader` modified to return `OTelSdkResult`.
3236
[#2905](https://github.com/open-telemetry/opentelemetry-rust/pull/2905)
33-
[#2905](https://github.com/open-telemetry/opentelemetry-rust/pull/2905)
34-
- *Breaking* change, affecting custom MetricReader authors: `MetricReader`
37+
- `MetricReader`
3538
trait, `ManualReader` struct, `Pipeline` struct, `InstrumentKind` enum moved
36-
behind feature flag "experimental_metrics_custom_reader". These were only
37-
required for writing custom readers.
38-
[2928](https://github.com/open-telemetry/opentelemetry-rust/pull/2928)
39+
behind feature flag "experimental_metrics_custom_reader".
40+
[#2928](https://github.com/open-telemetry/opentelemetry-rust/pull/2928)
41+
3942
- *Breaking* `Aggregation` enum moved behind feature flag
4043
"spec_unstable_metrics_views". This was only required when using Views.
41-
[2928](https://github.com/open-telemetry/opentelemetry-rust/pull/2928)
44+
[#2928](https://github.com/open-telemetry/opentelemetry-rust/pull/2928)
4245

4346
## 0.29.0
4447

opentelemetry-sdk/src/metrics/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,9 @@ pub use instrument::InstrumentKind;
8787

8888
#[cfg(feature = "spec_unstable_metrics_views")]
8989
pub use instrument::*;
90-
// #[cfg(not(feature = "spec_unstable_metrics_views"))]
91-
// pub(crate) use instrument::*;
9290

9391
#[cfg(feature = "spec_unstable_metrics_views")]
9492
pub use view::*;
95-
// #[cfg(not(feature = "spec_unstable_metrics_views"))]
96-
// pub(crate) use view::*;
9793

9894
use std::hash::Hash;
9995

0 commit comments

Comments
 (0)