Skip to content

Commit 611a3f3

Browse files
committed
wrap default config provider test with temp_env
1 parent 74ae6c5 commit 611a3f3

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed

opentelemetry-sdk/src/logs/log_emitter.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -284,13 +284,15 @@ mod tests {
284284
};
285285

286286
// If users didn't provide a resource and there isn't a env var set. Use default one.
287-
let default_config_provider = super::LoggerProvider::builder().build();
288-
assert_resource(
289-
&default_config_provider,
290-
SERVICE_NAME,
291-
Some("unknown_service"),
292-
);
293-
assert_telemetry_resource(&default_config_provider);
287+
temp_env::with_var_unset("OTEL_RESOURCE_ATTRIBUTES", || {
288+
let default_config_provider = super::LoggerProvider::builder().build();
289+
assert_resource(
290+
&default_config_provider,
291+
SERVICE_NAME,
292+
Some("unknown_service"),
293+
);
294+
assert_telemetry_resource(&default_config_provider);
295+
});
294296

295297
// If user provided a resource, use that.
296298
let custom_config_provider = super::LoggerProvider::builder()

opentelemetry-sdk/src/metrics/meter_provider.rs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,17 +257,20 @@ mod tests {
257257
Some(Value::from(env!("CARGO_PKG_VERSION")))
258258
);
259259
};
260+
260261
// If users didn't provide a resource and there isn't a env var set. Use default one.
261-
let reader = TestMetricReader::new();
262-
let default_meter_provider = super::SdkMeterProvider::builder()
263-
.with_reader(reader)
264-
.build();
265-
assert_resource(
266-
&default_meter_provider,
267-
SERVICE_NAME,
268-
Some("unknown_service"),
269-
);
270-
assert_telemetry_resource(&default_meter_provider);
262+
temp_env::with_var_unset("OTEL_RESOURCE_ATTRIBUTES", || {
263+
let reader = TestMetricReader::new();
264+
let default_meter_provider = super::SdkMeterProvider::builder()
265+
.with_reader(reader)
266+
.build();
267+
assert_resource(
268+
&default_meter_provider,
269+
SERVICE_NAME,
270+
Some("unknown_service"),
271+
);
272+
assert_telemetry_resource(&default_meter_provider);
273+
});
271274

272275
// If user provided a resource, use that.
273276
let reader2 = TestMetricReader::new();

opentelemetry-sdk/src/trace/provider.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,15 @@ mod tests {
309309
};
310310

311311
// If users didn't provide a resource and there isn't a env var set. Use default one.
312-
let default_config_provider = super::TracerProvider::builder().build();
313-
assert_resource(
314-
&default_config_provider,
315-
SERVICE_NAME,
316-
Some("unknown_service"),
317-
);
318-
assert_telemetry_resource(&default_config_provider);
312+
temp_env::with_var_unset("OTEL_RESOURCE_ATTRIBUTES", || {
313+
let default_config_provider = super::TracerProvider::builder().build();
314+
assert_resource(
315+
&default_config_provider,
316+
SERVICE_NAME,
317+
Some("unknown_service"),
318+
);
319+
assert_telemetry_resource(&default_config_provider);
320+
});
319321

320322
// If user provided a resource, use that.
321323
let custom_config_provider = super::TracerProvider::builder()

0 commit comments

Comments
 (0)