Skip to content

Commit 4a34922

Browse files
committed
resolve conflict
2 parents bda9faa + e62de04 commit 4a34922

File tree

8 files changed

+174
-193
lines changed

8 files changed

+174
-193
lines changed

opentelemetry-proto/src/transform/common.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ pub mod tonic {
152152
Array::I64(vals) => array_into_proto(vals),
153153
Array::F64(vals) => array_into_proto(vals),
154154
Array::String(vals) => array_into_proto(vals),
155+
_ => unreachable!("Nonexistent array type"), // Needs to be updated when new array types are added
155156
})),
157+
_ => unreachable!("Nonexistent value type"), // Needs to be updated when new value types are added
156158
},
157159
}
158160
}

opentelemetry-sdk/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- Improved `LoggerProvider` shutdown handling to prevent redundant shutdown calls when `drop` is invoked. [#2195](https://github.com/open-telemetry/opentelemetry-rust/pull/2195)
88
- **BREAKING**: [#2217](https://github.com/open-telemetry/opentelemetry-rust/pull/2217)
99
- **Replaced**: Removed `{Delta,Cumulative}TemporalitySelector::new()` in favor of directly using `Temporality` enum to simplify the configuration of MetricExporterBuilder with different temporalities.
10+
- When creating new metric instruments, SDK would return a no-op instrument if the validation fails. [#2166](https://github.com/open-telemetry/opentelemetry-rust/pull/2166)
1011

1112
## v0.26.0
1213
Released 2024-Sep-30

0 commit comments

Comments
 (0)