From 5146049bdceced2dc85aa23c95be0aadd1c14c43 Mon Sep 17 00:00:00 2001 From: inge4pres Date: Thu, 13 Feb 2025 09:49:29 +0100 Subject: [PATCH] amend metrics examples Signed-off-by: inge4pres --- examples/metrics/basic.zig | 5 ++--- examples/metrics/http_server.zig | 5 +---- src/sdk.zig | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/examples/metrics/basic.zig b/examples/metrics/basic.zig index c6b66fc..0b52339 100644 --- a/examples/metrics/basic.zig +++ b/examples/metrics/basic.zig @@ -18,8 +18,7 @@ pub fn main() !void { var in_mem = try sdk.InMemoryExporter.init(fba.allocator()); // Create an exporter and a a metric reader to aggregate the metrics - const exporter = try sdk.MetricExporter.new(fba.allocator(), &in_mem.exporter); - const mr = try sdk.MetricReader.init(fba.allocator(), exporter); + const mr = try sdk.MetricReader.init(fba.allocator(), &in_mem.exporter); defer mr.shutdown(); // Register the metric reader to the meter provider @@ -40,7 +39,7 @@ pub fn main() !void { // Print the metrics const stored_metrics = try in_mem.fetch(); - defer stored_metrics.deinit(); + defer fba.allocator().free(stored_metrics); std.debug.print("metric: {any}\n", .{stored_metrics}); } diff --git a/examples/metrics/http_server.zig b/examples/metrics/http_server.zig index 8616c15..807240c 100644 --- a/examples/metrics/http_server.zig +++ b/examples/metrics/http_server.zig @@ -92,10 +92,7 @@ fn setupTelemetry(allocator: std.mem.Allocator) !OTel { var in_mem = try sdk.InMemoryExporter.init(allocator); errdefer in_mem.deinit(); - const exporter = try sdk.MetricExporter.new(allocator, &in_mem.exporter); - errdefer exporter.shutdown(); - - const mr = try sdk.MetricReader.init(allocator, exporter); + const mr = try sdk.MetricReader.init(allocator, &in_mem.exporter); try mp.addReader(mr); diff --git a/src/sdk.zig b/src/sdk.zig index 717be00..5f9fc9c 100644 --- a/src/sdk.zig +++ b/src/sdk.zig @@ -12,7 +12,7 @@ test { pub const MeterProvider = @import("api/metrics/meter.zig").MeterProvider; pub const MetricReader = @import("sdk/metrics/reader.zig").MetricReader; pub const MetricExporter = @import("sdk/metrics/exporter.zig").MetricExporter; -pub const InMemoryExporter = @import("sdk/metrics/exporter.zig").ImMemoryExporter; +pub const InMemoryExporter = @import("sdk/metrics/exporter.zig").InMemoryExporter; pub const Counter = @import("api/metrics/instrument.zig").Counter; pub const UpDownCounter = @import("api/metrics/instrument.zig").Counter;