Metrics: isolate protobuf dependency

build.zig

@@ -1,20 +1,8 @@
 const std = @import("std");
 const protobuf = @import("protobuf");
 
-// Although this function looks imperative, note that its job is to
-// declaratively construct a build graph that will be executed by an external
-// runner.
 pub fn build(b: *std.Build) void {
-
-    // Standard target options allows the person running `zig build` to choose
-    // what target to build for. Here we do not override the defaults, which
-    // means any target is allowed, and the default is native. Other options
-    // for restricting supported target set are available.
     const target = b.standardTargetOptions(.{});
-
-    // Standard optimization options allow the person running `zig build` to select
-    // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
-    // set a preferred release mode, allowing the user to decide how to optimize.
     const optimize = b.standardOptimizeOption(.{});
 
     // Protobuf code generation from the OpenTelemetry proto files.
@@ -40,7 +28,7 @@ pub fn build(b: *std.Build) void {
         },
     });
 
-    // debug protoc generation
+    // Debug protoc generation in all builds
     protoc_step.verbose = true;
 
     const gen_proto = b.step("gen-proto", "Generates Zig files from protobuf definitions");
@@ -57,9 +45,6 @@ pub fn build(b: *std.Build) void {
 
     sdk_lib.root_module.addImport("protobuf", protobuf_dep.module("protobuf"));
 
-    // This declares intent for the library to be installed into the standard
-    // location when the user invokes the "install" step (the default step when
-    // running `zig build`).
     b.installArtifact(sdk_lib);
 
     // Providing a way for the user to request running the unit tests.
@@ -71,6 +56,7 @@ pub fn build(b: *std.Build) void {
         .root_source_file = b.path("src/sdk.zig"),
         .target = target,
         .optimize = optimize,
+        // Allow passing test filter using the build args.
         .filters = b.args orelse &[0][]const u8{},
     });
     sdk_unit_tests.root_module.addImport("protobuf", protobuf_dep.module("protobuf"));

build.zig.zon

@@ -32,8 +32,8 @@
         "build.zig",
         "build.zig.zon",
         "src",
-        // For example...
-        //"LICENSE",
-        //"README.md",
+        "examples",
+        "LICENSE",
+        "README.md",
     },
 }

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});
 }

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);