Skip to content

Commit c93cf26

Browse files
utpillautpilla
authored
Fix CI and bump the msrv of OTLP to 1.71.1 (#2140)
1 parent d652dc8 commit c93cf26

File tree

11 files changed

+68
-69
lines changed

11 files changed

+68
-69
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
strategy:
105105
matrix:
106106
os: [windows-latest, ubuntu-latest]
107-
rust: [1.65.0, 1.70.0]
107+
rust: [1.65.0, 1.71.1]
108108
runs-on: ${{ matrix.os }}
109109
steps:
110110
- uses: actions/checkout@v4

‎opentelemetry-otlp/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelog
22

33
## vNext
4+
- Bump MSRV to 1.71.1 [2140](https://github.com/open-telemetry/opentelemetry-rust/pull/2140)
45

56
## v0.25.0
67

‎opentelemetry-otlp/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories = [
1313
keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"]
1414
license = "Apache-2.0"
1515
edition = "2021"
16-
rust-version = "1.70"
16+
rust-version = "1.71.1"
1717
autotests = false
1818

1919
[[test]]

‎opentelemetry-otlp/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ can easily instrument your applications or systems, no matter their language,
3030
infrastructure, or runtime environment. Crucially, the storage and visualization
3131
of telemetry is intentionally left to other tools.
3232

33-
*Compiler support: [requires `rustc` 1.70+][msrv]*
33+
*Compiler support: [requires `rustc` 1.71.1+][msrv]*
3434

3535
[Prometheus]: https://prometheus.io
3636
[Jaeger]: https://www.jaegertracing.io
@@ -43,7 +43,7 @@ See [docs](https://docs.rs/opentelemetry-otlp).
4343
## Supported Rust Versions
4444

4545
OpenTelemetry is built against the latest stable release. The minimum supported
46-
version is 1.70. The current OpenTelemetry version is not guaranteed to build
46+
version is 1.71.1. The current OpenTelemetry version is not guaranteed to build
4747
on Rust versions earlier than the minimum supported version.
4848

4949
The current stable Rust compiler and the three most recent minor versions

‎opentelemetry-proto/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## vNext
44

55
- Fix JSON serialization of `metrics::Exemplar` and `trace::span::Link` [#2069](https://github.com/open-telemetry/opentelemetry-rust/pull/2069)
6+
- Bump MSRV to 1.71.1 [2140](https://github.com/open-telemetry/opentelemetry-rust/pull/2140)
67

78
## v0.25.0
89
- Update `opentelemetry` dependency version to 0.25

‎opentelemetry-proto/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories = [
1313
keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"]
1414
license = "Apache-2.0"
1515
edition = "2021"
16-
rust-version = "1.70"
16+
rust-version = "1.71.1"
1717
autotests = false
1818

1919
[lib]

‎opentelemetry-proto/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ This crate contains generated files from [opentelemetry-proto](https://github.co
77
repository and transformation between types from generated files and types defined in [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry).
88

99

10-
*Compiler support: [requires `rustc` 1.70+]
10+
*Compiler support: [requires `rustc` 1.71.1+]

‎opentelemetry-proto/src/proto/tonic/opentelemetry.proto.logs.v1.rs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -227,31 +227,31 @@ impl SeverityNumber {
227227
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
228228
pub fn as_str_name(&self) -> &'static str {
229229
match self {
230-
SeverityNumber::Unspecified => "SEVERITY_NUMBER_UNSPECIFIED",
231-
SeverityNumber::Trace => "SEVERITY_NUMBER_TRACE",
232-
SeverityNumber::Trace2 => "SEVERITY_NUMBER_TRACE2",
233-
SeverityNumber::Trace3 => "SEVERITY_NUMBER_TRACE3",
234-
SeverityNumber::Trace4 => "SEVERITY_NUMBER_TRACE4",
235-
SeverityNumber::Debug => "SEVERITY_NUMBER_DEBUG",
236-
SeverityNumber::Debug2 => "SEVERITY_NUMBER_DEBUG2",
237-
SeverityNumber::Debug3 => "SEVERITY_NUMBER_DEBUG3",
238-
SeverityNumber::Debug4 => "SEVERITY_NUMBER_DEBUG4",
239-
SeverityNumber::Info => "SEVERITY_NUMBER_INFO",
240-
SeverityNumber::Info2 => "SEVERITY_NUMBER_INFO2",
241-
SeverityNumber::Info3 => "SEVERITY_NUMBER_INFO3",
242-
SeverityNumber::Info4 => "SEVERITY_NUMBER_INFO4",
243-
SeverityNumber::Warn => "SEVERITY_NUMBER_WARN",
244-
SeverityNumber::Warn2 => "SEVERITY_NUMBER_WARN2",
245-
SeverityNumber::Warn3 => "SEVERITY_NUMBER_WARN3",
246-
SeverityNumber::Warn4 => "SEVERITY_NUMBER_WARN4",
247-
SeverityNumber::Error => "SEVERITY_NUMBER_ERROR",
248-
SeverityNumber::Error2 => "SEVERITY_NUMBER_ERROR2",
249-
SeverityNumber::Error3 => "SEVERITY_NUMBER_ERROR3",
250-
SeverityNumber::Error4 => "SEVERITY_NUMBER_ERROR4",
251-
SeverityNumber::Fatal => "SEVERITY_NUMBER_FATAL",
252-
SeverityNumber::Fatal2 => "SEVERITY_NUMBER_FATAL2",
253-
SeverityNumber::Fatal3 => "SEVERITY_NUMBER_FATAL3",
254-
SeverityNumber::Fatal4 => "SEVERITY_NUMBER_FATAL4",
230+
Self::Unspecified => "SEVERITY_NUMBER_UNSPECIFIED",
231+
Self::Trace => "SEVERITY_NUMBER_TRACE",
232+
Self::Trace2 => "SEVERITY_NUMBER_TRACE2",
233+
Self::Trace3 => "SEVERITY_NUMBER_TRACE3",
234+
Self::Trace4 => "SEVERITY_NUMBER_TRACE4",
235+
Self::Debug => "SEVERITY_NUMBER_DEBUG",
236+
Self::Debug2 => "SEVERITY_NUMBER_DEBUG2",
237+
Self::Debug3 => "SEVERITY_NUMBER_DEBUG3",
238+
Self::Debug4 => "SEVERITY_NUMBER_DEBUG4",
239+
Self::Info => "SEVERITY_NUMBER_INFO",
240+
Self::Info2 => "SEVERITY_NUMBER_INFO2",
241+
Self::Info3 => "SEVERITY_NUMBER_INFO3",
242+
Self::Info4 => "SEVERITY_NUMBER_INFO4",
243+
Self::Warn => "SEVERITY_NUMBER_WARN",
244+
Self::Warn2 => "SEVERITY_NUMBER_WARN2",
245+
Self::Warn3 => "SEVERITY_NUMBER_WARN3",
246+
Self::Warn4 => "SEVERITY_NUMBER_WARN4",
247+
Self::Error => "SEVERITY_NUMBER_ERROR",
248+
Self::Error2 => "SEVERITY_NUMBER_ERROR2",
249+
Self::Error3 => "SEVERITY_NUMBER_ERROR3",
250+
Self::Error4 => "SEVERITY_NUMBER_ERROR4",
251+
Self::Fatal => "SEVERITY_NUMBER_FATAL",
252+
Self::Fatal2 => "SEVERITY_NUMBER_FATAL2",
253+
Self::Fatal3 => "SEVERITY_NUMBER_FATAL3",
254+
Self::Fatal4 => "SEVERITY_NUMBER_FATAL4",
255255
}
256256
}
257257
/// Creates an enum from field names used in the ProtoBuf definition.
@@ -313,8 +313,8 @@ impl LogRecordFlags {
313313
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
314314
pub fn as_str_name(&self) -> &'static str {
315315
match self {
316-
LogRecordFlags::DoNotUse => "LOG_RECORD_FLAGS_DO_NOT_USE",
317-
LogRecordFlags::TraceFlagsMask => "LOG_RECORD_FLAGS_TRACE_FLAGS_MASK",
316+
Self::DoNotUse => "LOG_RECORD_FLAGS_DO_NOT_USE",
317+
Self::TraceFlagsMask => "LOG_RECORD_FLAGS_TRACE_FLAGS_MASK",
318318
}
319319
}
320320
/// Creates an enum from field names used in the ProtoBuf definition.

‎opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -808,9 +808,9 @@ impl AggregationTemporality {
808808
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
809809
pub fn as_str_name(&self) -> &'static str {
810810
match self {
811-
AggregationTemporality::Unspecified => "AGGREGATION_TEMPORALITY_UNSPECIFIED",
812-
AggregationTemporality::Delta => "AGGREGATION_TEMPORALITY_DELTA",
813-
AggregationTemporality::Cumulative => "AGGREGATION_TEMPORALITY_CUMULATIVE",
811+
Self::Unspecified => "AGGREGATION_TEMPORALITY_UNSPECIFIED",
812+
Self::Delta => "AGGREGATION_TEMPORALITY_DELTA",
813+
Self::Cumulative => "AGGREGATION_TEMPORALITY_CUMULATIVE",
814814
}
815815
}
816816
/// Creates an enum from field names used in the ProtoBuf definition.
@@ -851,10 +851,8 @@ impl DataPointFlags {
851851
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
852852
pub fn as_str_name(&self) -> &'static str {
853853
match self {
854-
DataPointFlags::DoNotUse => "DATA_POINT_FLAGS_DO_NOT_USE",
855-
DataPointFlags::NoRecordedValueMask => {
856-
"DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK"
857-
}
854+
Self::DoNotUse => "DATA_POINT_FLAGS_DO_NOT_USE",
855+
Self::NoRecordedValueMask => "DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK",
858856
}
859857
}
860858
/// Creates an enum from field names used in the ProtoBuf definition.

‎opentelemetry-proto/src/proto/tonic/opentelemetry.proto.trace.v1.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -378,12 +378,12 @@ pub mod span {
378378
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
379379
pub fn as_str_name(&self) -> &'static str {
380380
match self {
381-
SpanKind::Unspecified => "SPAN_KIND_UNSPECIFIED",
382-
SpanKind::Internal => "SPAN_KIND_INTERNAL",
383-
SpanKind::Server => "SPAN_KIND_SERVER",
384-
SpanKind::Client => "SPAN_KIND_CLIENT",
385-
SpanKind::Producer => "SPAN_KIND_PRODUCER",
386-
SpanKind::Consumer => "SPAN_KIND_CONSUMER",
381+
Self::Unspecified => "SPAN_KIND_UNSPECIFIED",
382+
Self::Internal => "SPAN_KIND_INTERNAL",
383+
Self::Server => "SPAN_KIND_SERVER",
384+
Self::Client => "SPAN_KIND_CLIENT",
385+
Self::Producer => "SPAN_KIND_PRODUCER",
386+
Self::Consumer => "SPAN_KIND_CONSUMER",
387387
}
388388
}
389389
/// Creates an enum from field names used in the ProtoBuf definition.
@@ -450,9 +450,9 @@ pub mod status {
450450
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
451451
pub fn as_str_name(&self) -> &'static str {
452452
match self {
453-
StatusCode::Unset => "STATUS_CODE_UNSET",
454-
StatusCode::Ok => "STATUS_CODE_OK",
455-
StatusCode::Error => "STATUS_CODE_ERROR",
453+
Self::Unset => "STATUS_CODE_UNSET",
454+
Self::Ok => "STATUS_CODE_OK",
455+
Self::Error => "STATUS_CODE_ERROR",
456456
}
457457
}
458458
/// Creates an enum from field names used in the ProtoBuf definition.
@@ -504,10 +504,10 @@ impl SpanFlags {
504504
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
505505
pub fn as_str_name(&self) -> &'static str {
506506
match self {
507-
SpanFlags::DoNotUse => "SPAN_FLAGS_DO_NOT_USE",
508-
SpanFlags::TraceFlagsMask => "SPAN_FLAGS_TRACE_FLAGS_MASK",
509-
SpanFlags::ContextHasIsRemoteMask => "SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK",
510-
SpanFlags::ContextIsRemoteMask => "SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK",
507+
Self::DoNotUse => "SPAN_FLAGS_DO_NOT_USE",
508+
Self::TraceFlagsMask => "SPAN_FLAGS_TRACE_FLAGS_MASK",
509+
Self::ContextHasIsRemoteMask => "SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK",
510+
Self::ContextIsRemoteMask => "SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK",
511511
}
512512
}
513513
/// Creates an enum from field names used in the ProtoBuf definition.

0 commit comments

Comments
 (0)