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

Update protobuf requirement from 2.14 to 3.3 #1548

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
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
2 changes: 1 addition & 1 deletion opentelemetry-prometheus/Cargo.toml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ once_cell = { workspace = true }
opentelemetry = { version = "0.21", path = "../opentelemetry", default-features = false, features = ["metrics"] }
opentelemetry_sdk = { version = "0.21", path = "../opentelemetry-sdk", default-features = false, features = ["metrics"] }
prometheus = "0.13"
protobuf = "2.14"
protobuf = "3.3"

[dev-dependencies]
opentelemetry-semantic-conventions = { path = "../opentelemetry-semantic-conventions" }

Unchanged files with check annotations Beta

let mut h = prometheus::proto::Histogram::default();
h.set_sample_sum(dp.sum.as_f64());
h.set_sample_count(dp.count);
h.set_bucket(protobuf::RepeatedField::from_vec(bucket));

Check failure on line 463 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
let mut pm = prometheus::proto::Metric::default();
pm.set_label(protobuf::RepeatedField::from_vec(kvs));

Check failure on line 465 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
pm.set_histogram(h);
let mut mf = prometheus::proto::MetricFamily::default();
mf.set_name(name.to_string());
mf.set_help(description.clone());
mf.set_field_type(prometheus::proto::MetricType::HISTOGRAM);
mf.set_metric(protobuf::RepeatedField::from_vec(vec![pm]));

Check failure on line 472 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
res.push(mf);
}
}
let kvs = get_attrs(&mut dp.attributes.iter(), extra);
let mut pm = prometheus::proto::Metric::default();
pm.set_label(protobuf::RepeatedField::from_vec(kvs));

Check failure on line 494 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
if sum.is_monotonic {
let mut c = prometheus::proto::Counter::default();
mf.set_name(name.to_string());
mf.set_help(description.clone());
mf.set_field_type(metric_type);
mf.set_metric(protobuf::RepeatedField::from_vec(vec![pm]));

Check failure on line 510 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
res.push(mf);
}
}
let mut g = prometheus::proto::Gauge::default();
g.set_value(dp.value.as_f64());
let mut pm = prometheus::proto::Metric::default();
pm.set_label(protobuf::RepeatedField::from_vec(kvs));

Check failure on line 528 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
pm.set_gauge(g);
let mut mf = prometheus::proto::MetricFamily::default();
mf.set_name(name.to_string());
mf.set_help(description.to_string());
mf.set_field_type(MetricType::GAUGE);
mf.set_metric(protobuf::RepeatedField::from_vec(vec![pm]));

Check failure on line 535 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
res.push(mf);
}
}
g.set_value(1.0);
let mut m = prometheus::proto::Metric::default();
m.set_label(protobuf::RepeatedField::from_vec(get_attrs(

Check failure on line 549 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
&mut resource.iter(),
&[],
)));
mf.set_name(target_info_name.into());
mf.set_help(target_info_description.into());
mf.set_field_type(MetricType::GAUGE);
mf.set_metric(protobuf::RepeatedField::from_vec(vec![m]));

Check failure on line 559 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
mf
}
}
let mut m = prometheus::proto::Metric::default();
m.set_label(protobuf::RepeatedField::from_vec(labels));

Check failure on line 580 in opentelemetry-prometheus/src/lib.rs

GitHub Actions / lint

failed to resolve: could not find `RepeatedField` in `protobuf`
m.set_gauge(g);
let mut mf = MetricFamily::default();