Skip to content

Few fixes to PeriodicReader tests #2589

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 3, 2025
Merged

Few fixes to PeriodicReader tests #2589

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65f1a55
Few fixes to PeriodicReader tests
cijothomas Feb 3, 2025
f8c995a
Merge branch 'main' into cijothomas/periodicreader-test-fixe
cijothomas Feb 3, 2025
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
42 changes: 16 additions & 26 deletions opentelemetry-sdk/src/metrics/periodic_reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,13 @@ impl PeriodicReaderInner {
.produce(rm)?;
Ok(())
} else {
Err(MetricError::Other("pipeline is not registered".into()))
otel_warn!(
name: "PeriodReader.MeterProviderNotRegistered",
message = "PeriodicReader is not registered with MeterProvider. Metrics will not be collected. \
This occurs when a periodic reader is created but not associated with a MeterProvider \
by calling `.with_reader(reader)` on MeterProviderBuilder."
);
Err(MetricError::Other("MeterProvider is not registered".into()))
}
}

Expand Down Expand Up @@ -472,7 +478,7 @@ impl MetricReader for PeriodicReader {
mod tests {
use super::PeriodicReader;
use crate::{
error::ShutdownResult,
error::{ShutdownError, ShutdownResult},
metrics::{
data::ResourceMetrics, exporter::PushMetricExporter, reader::MetricReader,
InMemoryMetricExporter, MetricError, MetricResult, SdkMeterProvider, Temporality,
Expand Down Expand Up @@ -594,11 +600,8 @@ mod tests {
#[test]
fn shutdown_repeat() {
// Arrange
let interval = std::time::Duration::from_millis(1);
let exporter = InMemoryMetricExporter::default();
let reader = PeriodicReader::builder(exporter.clone())
.with_interval(interval)
.build();
let reader = PeriodicReader::builder(exporter.clone()).build();

let meter_provider = SdkMeterProvider::builder().with_reader(reader).build();
let result = meter_provider.shutdown();
Expand All @@ -607,20 +610,19 @@ mod tests {
// calling shutdown again should return Err
let result = meter_provider.shutdown();
assert!(result.is_err());
assert!(matches!(result, Err(ShutdownError::AlreadyShutdown)));

// calling shutdown again should return Err
let result = meter_provider.shutdown();
assert!(result.is_err());
assert!(matches!(result, Err(ShutdownError::AlreadyShutdown)));
}

#[test]
fn flush_after_shutdown() {
// Arrange
let interval = std::time::Duration::from_millis(1);
let exporter = InMemoryMetricExporter::default();
let reader = PeriodicReader::builder(exporter.clone())
.with_interval(interval)
.build();
let reader = PeriodicReader::builder(exporter.clone()).build();

let meter_provider = SdkMeterProvider::builder().with_reader(reader).build();
let result = meter_provider.force_flush();
Expand All @@ -637,11 +639,8 @@ mod tests {
#[test]
fn flush_repeat() {
// Arrange
let interval = std::time::Duration::from_millis(1);
let exporter = InMemoryMetricExporter::default();
let reader = PeriodicReader::builder(exporter.clone())
.with_interval(interval)
.build();
let reader = PeriodicReader::builder(exporter.clone()).build();

let meter_provider = SdkMeterProvider::builder().with_reader(reader).build();
let result = meter_provider.force_flush();
Expand All @@ -655,11 +654,8 @@ mod tests {
#[test]
fn periodic_reader_without_pipeline() {
// Arrange
let interval = std::time::Duration::from_millis(1);
let exporter = InMemoryMetricExporter::default();
let reader = PeriodicReader::builder(exporter.clone())
.with_interval(interval)
.build();
let reader = PeriodicReader::builder(exporter.clone()).build();

let rm = &mut ResourceMetrics {
resource: Resource::empty(),
Expand Down Expand Up @@ -801,11 +797,8 @@ mod tests {

fn collection_helper(trigger: fn(SdkMeterProvider)) {
// Arrange
let interval = std::time::Duration::from_millis(10);
let exporter = InMemoryMetricExporter::default();
let reader = PeriodicReader::builder(exporter.clone())
.with_interval(interval)
.build();
let reader = PeriodicReader::builder(exporter.clone()).build();
let (sender, receiver) = mpsc::channel();

let meter_provider = SdkMeterProvider::builder().with_reader(reader).build();
Expand Down Expand Up @@ -919,11 +912,8 @@ mod tests {
}

fn tokio_async_inside_observable_callback_helper(use_current_tokio_runtime: bool) {
let interval = std::time::Duration::from_millis(10);
let exporter = InMemoryMetricExporter::default();
let reader = PeriodicReader::builder(exporter.clone())
.with_interval(interval)
.build();
let reader = PeriodicReader::builder(exporter.clone()).build();

let meter_provider = SdkMeterProvider::builder().with_reader(reader).build();
let meter = meter_provider.meter("test");
Expand Down