Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI and bump the msrv of OTLP to 1.71.1 #2140

Merged
merged 9 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix CI
  • Loading branch information
utpilla committed Sep 23, 2024
commit 17c136472a333e788a1159059b130b82e0b5c9df
2 changes: 1 addition & 1 deletion opentelemetry-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = [
keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"]
license = "Apache-2.0"
edition = "2021"
rust-version = "1.70"
rust-version = "1.71.1"
autotests = false

[lib]
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-proto/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ This crate contains generated files from [opentelemetry-proto](https://github.co
repository and transformation between types from generated files and types defined in [opentelemetry](/~https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry).


*Compiler support: [requires `rustc` 1.70+]
*Compiler support: [requires `rustc` 1.71.1+]
Original file line number Diff line number Diff line change
Expand Up @@ -227,31 +227,31 @@ impl SeverityNumber {
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
pub fn as_str_name(&self) -> &'static str {
match self {
SeverityNumber::Unspecified => "SEVERITY_NUMBER_UNSPECIFIED",
SeverityNumber::Trace => "SEVERITY_NUMBER_TRACE",
SeverityNumber::Trace2 => "SEVERITY_NUMBER_TRACE2",
SeverityNumber::Trace3 => "SEVERITY_NUMBER_TRACE3",
SeverityNumber::Trace4 => "SEVERITY_NUMBER_TRACE4",
SeverityNumber::Debug => "SEVERITY_NUMBER_DEBUG",
SeverityNumber::Debug2 => "SEVERITY_NUMBER_DEBUG2",
SeverityNumber::Debug3 => "SEVERITY_NUMBER_DEBUG3",
SeverityNumber::Debug4 => "SEVERITY_NUMBER_DEBUG4",
SeverityNumber::Info => "SEVERITY_NUMBER_INFO",
SeverityNumber::Info2 => "SEVERITY_NUMBER_INFO2",
SeverityNumber::Info3 => "SEVERITY_NUMBER_INFO3",
SeverityNumber::Info4 => "SEVERITY_NUMBER_INFO4",
SeverityNumber::Warn => "SEVERITY_NUMBER_WARN",
SeverityNumber::Warn2 => "SEVERITY_NUMBER_WARN2",
SeverityNumber::Warn3 => "SEVERITY_NUMBER_WARN3",
SeverityNumber::Warn4 => "SEVERITY_NUMBER_WARN4",
SeverityNumber::Error => "SEVERITY_NUMBER_ERROR",
SeverityNumber::Error2 => "SEVERITY_NUMBER_ERROR2",
SeverityNumber::Error3 => "SEVERITY_NUMBER_ERROR3",
SeverityNumber::Error4 => "SEVERITY_NUMBER_ERROR4",
SeverityNumber::Fatal => "SEVERITY_NUMBER_FATAL",
SeverityNumber::Fatal2 => "SEVERITY_NUMBER_FATAL2",
SeverityNumber::Fatal3 => "SEVERITY_NUMBER_FATAL3",
SeverityNumber::Fatal4 => "SEVERITY_NUMBER_FATAL4",
Self::Unspecified => "SEVERITY_NUMBER_UNSPECIFIED",
Self::Trace => "SEVERITY_NUMBER_TRACE",
Self::Trace2 => "SEVERITY_NUMBER_TRACE2",
Self::Trace3 => "SEVERITY_NUMBER_TRACE3",
Self::Trace4 => "SEVERITY_NUMBER_TRACE4",
Self::Debug => "SEVERITY_NUMBER_DEBUG",
Self::Debug2 => "SEVERITY_NUMBER_DEBUG2",
Self::Debug3 => "SEVERITY_NUMBER_DEBUG3",
Self::Debug4 => "SEVERITY_NUMBER_DEBUG4",
Self::Info => "SEVERITY_NUMBER_INFO",
Self::Info2 => "SEVERITY_NUMBER_INFO2",
Self::Info3 => "SEVERITY_NUMBER_INFO3",
Self::Info4 => "SEVERITY_NUMBER_INFO4",
Self::Warn => "SEVERITY_NUMBER_WARN",
Self::Warn2 => "SEVERITY_NUMBER_WARN2",
Self::Warn3 => "SEVERITY_NUMBER_WARN3",
Self::Warn4 => "SEVERITY_NUMBER_WARN4",
Self::Error => "SEVERITY_NUMBER_ERROR",
Self::Error2 => "SEVERITY_NUMBER_ERROR2",
Self::Error3 => "SEVERITY_NUMBER_ERROR3",
Self::Error4 => "SEVERITY_NUMBER_ERROR4",
Self::Fatal => "SEVERITY_NUMBER_FATAL",
Self::Fatal2 => "SEVERITY_NUMBER_FATAL2",
Self::Fatal3 => "SEVERITY_NUMBER_FATAL3",
Self::Fatal4 => "SEVERITY_NUMBER_FATAL4",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
Expand Down Expand Up @@ -313,8 +313,8 @@ impl LogRecordFlags {
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
pub fn as_str_name(&self) -> &'static str {
match self {
LogRecordFlags::DoNotUse => "LOG_RECORD_FLAGS_DO_NOT_USE",
LogRecordFlags::TraceFlagsMask => "LOG_RECORD_FLAGS_TRACE_FLAGS_MASK",
Self::DoNotUse => "LOG_RECORD_FLAGS_DO_NOT_USE",
Self::TraceFlagsMask => "LOG_RECORD_FLAGS_TRACE_FLAGS_MASK",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -808,9 +808,9 @@ impl AggregationTemporality {
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
pub fn as_str_name(&self) -> &'static str {
match self {
AggregationTemporality::Unspecified => "AGGREGATION_TEMPORALITY_UNSPECIFIED",
AggregationTemporality::Delta => "AGGREGATION_TEMPORALITY_DELTA",
AggregationTemporality::Cumulative => "AGGREGATION_TEMPORALITY_CUMULATIVE",
Self::Unspecified => "AGGREGATION_TEMPORALITY_UNSPECIFIED",
Self::Delta => "AGGREGATION_TEMPORALITY_DELTA",
Self::Cumulative => "AGGREGATION_TEMPORALITY_CUMULATIVE",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
Expand Down Expand Up @@ -851,10 +851,8 @@ impl DataPointFlags {
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
pub fn as_str_name(&self) -> &'static str {
match self {
DataPointFlags::DoNotUse => "DATA_POINT_FLAGS_DO_NOT_USE",
DataPointFlags::NoRecordedValueMask => {
"DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK"
}
Self::DoNotUse => "DATA_POINT_FLAGS_DO_NOT_USE",
Self::NoRecordedValueMask => "DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,12 +378,12 @@ pub mod span {
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
pub fn as_str_name(&self) -> &'static str {
match self {
SpanKind::Unspecified => "SPAN_KIND_UNSPECIFIED",
SpanKind::Internal => "SPAN_KIND_INTERNAL",
SpanKind::Server => "SPAN_KIND_SERVER",
SpanKind::Client => "SPAN_KIND_CLIENT",
SpanKind::Producer => "SPAN_KIND_PRODUCER",
SpanKind::Consumer => "SPAN_KIND_CONSUMER",
Self::Unspecified => "SPAN_KIND_UNSPECIFIED",
Self::Internal => "SPAN_KIND_INTERNAL",
Self::Server => "SPAN_KIND_SERVER",
Self::Client => "SPAN_KIND_CLIENT",
Self::Producer => "SPAN_KIND_PRODUCER",
Self::Consumer => "SPAN_KIND_CONSUMER",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
Expand Down Expand Up @@ -450,9 +450,9 @@ pub mod status {
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
pub fn as_str_name(&self) -> &'static str {
match self {
StatusCode::Unset => "STATUS_CODE_UNSET",
StatusCode::Ok => "STATUS_CODE_OK",
StatusCode::Error => "STATUS_CODE_ERROR",
Self::Unset => "STATUS_CODE_UNSET",
Self::Ok => "STATUS_CODE_OK",
Self::Error => "STATUS_CODE_ERROR",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
Expand Down Expand Up @@ -504,10 +504,10 @@ impl SpanFlags {
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
pub fn as_str_name(&self) -> &'static str {
match self {
SpanFlags::DoNotUse => "SPAN_FLAGS_DO_NOT_USE",
SpanFlags::TraceFlagsMask => "SPAN_FLAGS_TRACE_FLAGS_MASK",
SpanFlags::ContextHasIsRemoteMask => "SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK",
SpanFlags::ContextIsRemoteMask => "SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK",
Self::DoNotUse => "SPAN_FLAGS_DO_NOT_USE",
Self::TraceFlagsMask => "SPAN_FLAGS_TRACE_FLAGS_MASK",
Self::ContextHasIsRemoteMask => "SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK",
Self::ContextIsRemoteMask => "SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
Expand Down
Loading