Skip to content

Commit 832c583

Browse files
committed
refactor: reformat imports and code blocks for consistency
1 parent 0c31a13 commit 832c583

File tree

3 files changed

+18
-26
lines changed

3 files changed

+18
-26
lines changed

opentelemetry-prometheus/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use core::fmt;
22
use once_cell::sync::OnceCell;
3-
use opentelemetry_sdk::metrics::{MetricError, MetricResult,ManualReaderBuilder};
3+
use opentelemetry_sdk::metrics::{ManualReaderBuilder, MetricError, MetricResult};
44
use std::sync::{Arc, Mutex};
55

66
use crate::{Collector, PrometheusExporter, ResourceSelector};

opentelemetry-prometheus/src/lib.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,14 @@
101101
#![cfg_attr(test, deny(warnings))]
102102

103103
use once_cell::sync::{Lazy, OnceCell};
104-
use opentelemetry::{
105-
Key, Value,
106-
otel_error,
107-
InstrumentationScope,
108-
};
104+
use opentelemetry::{otel_error, InstrumentationScope, Key, Value};
109105
use opentelemetry_sdk::{
110106
metrics::{
111-
MetricResult,
112107
data::{self, ResourceMetrics},
113108
reader::MetricReader,
114-
Temporality, InstrumentKind,
115-
ManualReader, Pipeline,
109+
InstrumentKind, ManualReader, MetricResult, Pipeline, Temporality,
116110
},
117-
Resource
111+
Resource,
118112
};
119113
use prometheus::{
120114
core::Desc,
@@ -323,7 +317,8 @@ impl prometheus::core::Collector for Collector {
323317
res.push(scope_info.clone());
324318
}
325319

326-
let mut labels = Vec::with_capacity(1 + scope_metrics.scope.version().is_some() as usize);
320+
let mut labels =
321+
Vec::with_capacity(1 + scope_metrics.scope.version().is_some() as usize);
327322
let mut name = LabelPair::new();
328323
name.set_name(SCOPE_INFO_KEYS[0].into());
329324
name.set_value(scope_metrics.scope.name().to_string());

opentelemetry-prometheus/tests/integration_test.rs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@ use opentelemetry_sdk::Resource;
1515
use opentelemetry_semantic_conventions::resource::{SERVICE_NAME, TELEMETRY_SDK_VERSION};
1616
use prometheus::{Encoder, TextEncoder};
1717

18-
const BOUNDARIES: &[f64] = &[0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 250.0, 500.0, 1000.0];
18+
const BOUNDARIES: &[f64] = &[
19+
0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 250.0, 500.0, 1000.0,
20+
];
1921

20-
const BYTES_BOUNDARIES: &[f64] = &[0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 250.0, 500.0, 750.0, 1000.0, 2500.0, 5000.0, 7500.0, 10000.0];
22+
const BYTES_BOUNDARIES: &[f64] = &[
23+
0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 250.0, 500.0, 750.0, 1000.0, 2500.0, 5000.0, 7500.0,
24+
10000.0,
25+
];
2126

2227
#[ignore = "https://github.com/open-telemetry/opentelemetry-rust/pull/2224"]
2328
#[test]
@@ -352,11 +357,7 @@ fn prometheus_exporter_integration() {
352357

353358
for tc in test_cases {
354359
let registry = prometheus::Registry::new();
355-
let exporter = tc
356-
.builder
357-
.with_registry(registry.clone())
358-
.build()
359-
.unwrap();
360+
let exporter = tc.builder.with_registry(registry.clone()).build().unwrap();
360361

361362
let res = if tc.empty_resource {
362363
Resource::empty()
@@ -387,9 +388,9 @@ fn prometheus_exporter_integration() {
387388
.build();
388389
let meter = provider.meter_with_scope(
389390
opentelemetry::InstrumentationScope::builder("testmeter")
390-
.with_version("v0.1.0")
391-
.with_attributes(vec![KeyValue::new("k", "v")])
392-
.build(),
391+
.with_version("v0.1.0")
392+
.with_attributes(vec![KeyValue::new("k", "v")])
393+
.build(),
393394
);
394395
(tc.record_metrics)(meter);
395396

@@ -773,11 +774,7 @@ fn duplicate_metrics() {
773774

774775
for tc in test_cases {
775776
let registry = prometheus::Registry::new();
776-
let exporter = tc
777-
.builder
778-
.with_registry(registry.clone())
779-
.build()
780-
.unwrap();
777+
let exporter = tc.builder.with_registry(registry.clone()).build().unwrap();
781778

782779
let resource = Resource::from_detectors(
783780
Duration::from_secs(0),

0 commit comments

Comments
 (0)