Skip to content

Commit bf22aeb

Browse files
authored
fix: Remove pub fields and replace with getter method consistently across … (#2997)
1 parent 4be1a32 commit bf22aeb

File tree

3 files changed

+259
-86
lines changed

3 files changed

+259
-86
lines changed

opentelemetry-proto/src/transform/metrics.rs

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -215,19 +215,19 @@ pub mod tonic {
215215
.data_points()
216216
.map(|dp| TonicHistogramDataPoint {
217217
attributes: dp.attributes().map(Into::into).collect(),
218-
start_time_unix_nano: to_nanos(hist.start_time),
219-
time_unix_nano: to_nanos(hist.time),
220-
count: dp.count,
221-
sum: Some(dp.sum.into_f64()),
218+
start_time_unix_nano: to_nanos(hist.start_time()),
219+
time_unix_nano: to_nanos(hist.time()),
220+
count: dp.count(),
221+
sum: Some(dp.sum().into_f64()),
222222
bucket_counts: dp.bucket_counts().collect(),
223223
explicit_bounds: dp.bounds().collect(),
224224
exemplars: dp.exemplars().map(Into::into).collect(),
225225
flags: TonicDataPointFlags::default() as u32,
226-
min: dp.min.map(Numeric::into_f64),
227-
max: dp.max.map(Numeric::into_f64),
226+
min: dp.min().map(Numeric::into_f64),
227+
max: dp.max().map(Numeric::into_f64),
228228
})
229229
.collect(),
230-
aggregation_temporality: TonicTemporality::from(hist.temporality).into(),
230+
aggregation_temporality: TonicTemporality::from(hist.temporality()).into(),
231231
}
232232
}
233233
}
@@ -242,28 +242,28 @@ pub mod tonic {
242242
.data_points()
243243
.map(|dp| TonicExponentialHistogramDataPoint {
244244
attributes: dp.attributes().map(Into::into).collect(),
245-
start_time_unix_nano: to_nanos(hist.start_time),
246-
time_unix_nano: to_nanos(hist.time),
247-
count: dp.count as u64,
248-
sum: Some(dp.sum.into_f64()),
249-
scale: dp.scale.into(),
250-
zero_count: dp.zero_count,
245+
start_time_unix_nano: to_nanos(hist.start_time()),
246+
time_unix_nano: to_nanos(hist.time()),
247+
count: dp.count() as u64,
248+
sum: Some(dp.sum().into_f64()),
249+
scale: dp.scale().into(),
250+
zero_count: dp.zero_count(),
251251
positive: Some(TonicBuckets {
252-
offset: dp.positive_bucket.offset,
253-
bucket_counts: dp.positive_bucket.counts.clone(),
252+
offset: dp.positive_bucket().offset(),
253+
bucket_counts: dp.positive_bucket().counts().collect(),
254254
}),
255255
negative: Some(TonicBuckets {
256-
offset: dp.negative_bucket.offset,
257-
bucket_counts: dp.negative_bucket.counts.clone(),
256+
offset: dp.negative_bucket().offset(),
257+
bucket_counts: dp.negative_bucket().counts().collect(),
258258
}),
259259
flags: TonicDataPointFlags::default() as u32,
260260
exemplars: dp.exemplars().map(Into::into).collect(),
261-
min: dp.min.map(Numeric::into_f64),
262-
max: dp.max.map(Numeric::into_f64),
263-
zero_threshold: dp.zero_threshold,
261+
min: dp.min().map(Numeric::into_f64),
262+
max: dp.max().map(Numeric::into_f64),
263+
zero_threshold: dp.zero_threshold(),
264264
})
265265
.collect(),
266-
aggregation_temporality: TonicTemporality::from(hist.temporality).into(),
266+
aggregation_temporality: TonicTemporality::from(hist.temporality()).into(),
267267
}
268268
}
269269
}
@@ -278,15 +278,15 @@ pub mod tonic {
278278
.data_points()
279279
.map(|dp| TonicNumberDataPoint {
280280
attributes: dp.attributes().map(Into::into).collect(),
281-
start_time_unix_nano: to_nanos(sum.start_time),
282-
time_unix_nano: to_nanos(sum.time),
281+
start_time_unix_nano: to_nanos(sum.start_time()),
282+
time_unix_nano: to_nanos(sum.time()),
283283
exemplars: dp.exemplars().map(Into::into).collect(),
284284
flags: TonicDataPointFlags::default() as u32,
285-
value: Some(dp.value.into()),
285+
value: Some(dp.value().into()),
286286
})
287287
.collect(),
288-
aggregation_temporality: TonicTemporality::from(sum.temporality).into(),
289-
is_monotonic: sum.is_monotonic,
288+
aggregation_temporality: TonicTemporality::from(sum.temporality()).into(),
289+
is_monotonic: sum.is_monotonic(),
290290
}
291291
}
292292
}
@@ -301,11 +301,11 @@ pub mod tonic {
301301
.data_points()
302302
.map(|dp| TonicNumberDataPoint {
303303
attributes: dp.attributes().map(Into::into).collect(),
304-
start_time_unix_nano: gauge.start_time.map(to_nanos).unwrap_or_default(),
305-
time_unix_nano: to_nanos(gauge.time),
304+
start_time_unix_nano: gauge.start_time().map(to_nanos).unwrap_or_default(),
305+
time_unix_nano: to_nanos(gauge.time()),
306306
exemplars: dp.exemplars().map(Into::into).collect(),
307307
flags: TonicDataPointFlags::default() as u32,
308-
value: Some(dp.value.into()),
308+
value: Some(dp.value().into()),
309309
})
310310
.collect(),
311311
}
@@ -322,9 +322,9 @@ pub mod tonic {
322322
.filtered_attributes()
323323
.map(|kv| (&kv.key, &kv.value).into())
324324
.collect(),
325-
time_unix_nano: to_nanos(ex.time),
326-
span_id: ex.span_id.into(),
327-
trace_id: ex.trace_id.into(),
325+
time_unix_nano: to_nanos(ex.time()),
326+
span_id: ex.span_id().into(),
327+
trace_id: ex.trace_id().into(),
328328
value: Some(ex.value.into()),
329329
}
330330
}

0 commit comments

Comments
 (0)