remove [incorrect] data version

Author: karlseguin

src/telemetry/lightpanda.zig

@@ -6,10 +6,10 @@ const Loop = @import("jsruntime").Loop;
 const Client = @import("asyncio").Client;
 const Event = @import("telemetry.zig").Event;
 const RunMode = @import("../app.zig").RunMode;
+const builtin = @import("builtin");
+const build_info = @import("build_info");
 
 const log = std.log.scoped(.telemetry);
-
-const DATA_VERSION = 1;
 const URL = "https://lightpanda.io/browser-stats";
 
 pub const LightPanda = struct {
@@ -37,15 +37,18 @@ pub const LightPanda = struct {
         self.client_context_pool.deinit();
     }
 
-    pub fn send(self: *LightPanda, iid: ?[]const u8, run_mode: RunMode, event: *const Event) !void {
+    pub fn send(self: *LightPanda, iid: ?[]const u8, run_mode: RunMode, event: Event) !void {
         var arena = std.heap.ArenaAllocator.init(self.allocator);
         errdefer arena.deinit();
 
         const resp_header_buffer = try arena.allocator().alloc(u8, 4096);
-        const body = try std.json.stringifyAlloc(arena.allocator(), EventWrap{
+        const body = try std.json.stringifyAlloc(arena.allocator(), .{
             .iid = iid,
-            .event = event,
             .run_mode = run_mode,
+            .os = builtin.os.tag,
+            .aarch = builtin.cpu.arch,
+            .version = build_info.git_commit,
+            .event = std.meta.activeTag(event),
         }, .{});
 
         const sending = try self.sending_pool.create();
@@ -161,40 +164,3 @@ const Sending = struct {
         self.request.deinit();
     }
 };
-
-// wraps a telemetry event so that we can serialize it to plausible's event endpoint
-const EventWrap = struct {
-    iid: ?[]const u8,
-    event: *const Event,
-    run_mode: RunMode,
-
-    const builtin = @import("builtin");
-    const build_info = @import("build_info");
-
-    pub fn jsonStringify(self: *const EventWrap, jws: anytype) !void {
-        try jws.beginObject();
-        try jws.objectField("iid");
-        try jws.write(self.iid);
-        try jws.objectField("event");
-        try jws.write(@tagName(self.event.*));
-        try jws.objectField("mode");
-        try jws.write(self.run_mode);
-        try jws.objectField("version");
-        try jws.write(DATA_VERSION);
-        try jws.objectField("os");
-        try jws.write(builtin.os.tag);
-        try jws.objectField("version");
-        try jws.write(build_info.git_commit);
-        try jws.objectField("arch");
-        try jws.write(builtin.cpu.arch);
-        switch (self.event.*) {
-            .run => {},
-            .navigate => {},
-            .flag => |f| {
-                try jws.objectField("flag");
-                try jws.write(f);
-            },
-        }
-        try jws.endObject();
-    }
-};

src/telemetry/telemetry.zig

@@ -52,7 +52,7 @@ fn TelemetryT(comptime P: type) type {
                 return;
             }
             const iid: ?[]const u8 = if (self.iid) |*iid| iid else null;
-            self.provider.send(iid, self.run_mode, &event) catch |err| {
+            self.provider.send(iid, self.run_mode, event) catch |err| {
                 log.warn("failed to record event: {}", .{err});
             };
         }
@@ -94,7 +94,7 @@ const NoopProvider = struct {
         return .{};
     }
     fn deinit(_: NoopProvider) void {}
-    pub fn send(_: NoopProvider, _: ?[]const u8, _: RunMode, _: *const Event) !void {}
+    pub fn send(_: NoopProvider, _: ?[]const u8, _: RunMode, _: Event) !void {}
 };
 
 extern fn setenv(name: [*:0]u8, value: [*:0]u8, override: c_int) c_int;
@@ -110,7 +110,7 @@ test "telemetry: disabled by environment" {
             return .{};
         }
         fn deinit(_: @This()) void {}
-        pub fn send(_: @This(), _: ?[]const u8, _: RunMode, _: *const Event) !void {
+        pub fn send(_: @This(), _: ?[]const u8, _: RunMode, _: Event) !void {
             unreachable;
         }
     };
@@ -169,7 +169,7 @@ const MockProvider = struct {
     fn deinit(self: *MockProvider) void {
         self.events.deinit(self.allocator);
     }
-    pub fn send(self: *MockProvider, iid: ?[]const u8, run_mode: RunMode, events: *const Event) !void {
+    pub fn send(self: *MockProvider, iid: ?[]const u8, run_mode: RunMode, events: Event) !void {
         if (self.iid == null) {
             try testing.expectEqual(null, self.run_mode);
             self.iid = iid.?;
@@ -178,6 +178,6 @@ const MockProvider = struct {
             try testing.expectEqualStrings(self.iid.?, iid.?);
             try testing.expectEqual(self.run_mode.?, run_mode);
         }
-        try self.events.append(self.allocator, events.*);
+        try self.events.append(self.allocator, events);
     }
 };