diff --git a/acceptance/libs/telemetry/dummy-without-server/out.upload.txt b/acceptance/telemetry/dummy-without-server/out.upload.txt
similarity index 100%
rename from acceptance/libs/telemetry/dummy-without-server/out.upload.txt
rename to acceptance/telemetry/dummy-without-server/out.upload.txt
diff --git a/acceptance/libs/telemetry/dummy-without-server/output.txt b/acceptance/telemetry/dummy-without-server/output.txt
similarity index 100%
rename from acceptance/libs/telemetry/dummy-without-server/output.txt
rename to acceptance/telemetry/dummy-without-server/output.txt
diff --git a/acceptance/libs/telemetry/dummy-without-server/script b/acceptance/telemetry/dummy-without-server/script
similarity index 100%
rename from acceptance/libs/telemetry/dummy-without-server/script
rename to acceptance/telemetry/dummy-without-server/script
diff --git a/acceptance/libs/telemetry/dummy-without-server/test.toml b/acceptance/telemetry/dummy-without-server/test.toml
similarity index 100%
rename from acceptance/libs/telemetry/dummy-without-server/test.toml
rename to acceptance/telemetry/dummy-without-server/test.toml
diff --git a/acceptance/libs/telemetry/dummy/out.requests.txt b/acceptance/telemetry/dummy/out.requests.txt
similarity index 100%
rename from acceptance/libs/telemetry/dummy/out.requests.txt
rename to acceptance/telemetry/dummy/out.requests.txt
diff --git a/acceptance/libs/telemetry/dummy/out.upload.txt b/acceptance/telemetry/dummy/out.upload.txt
similarity index 100%
rename from acceptance/libs/telemetry/dummy/out.upload.txt
rename to acceptance/telemetry/dummy/out.upload.txt
diff --git a/acceptance/libs/telemetry/dummy/output.txt b/acceptance/telemetry/dummy/output.txt
similarity index 100%
rename from acceptance/libs/telemetry/dummy/output.txt
rename to acceptance/telemetry/dummy/output.txt
diff --git a/acceptance/libs/telemetry/dummy/script b/acceptance/telemetry/dummy/script
similarity index 100%
rename from acceptance/libs/telemetry/dummy/script
rename to acceptance/telemetry/dummy/script
diff --git a/acceptance/libs/telemetry/dummy/test.toml b/acceptance/telemetry/dummy/test.toml
similarity index 100%
rename from acceptance/libs/telemetry/dummy/test.toml
rename to acceptance/telemetry/dummy/test.toml
diff --git a/acceptance/libs/telemetry/upload/out.requests.txt b/acceptance/telemetry/upload/out.requests.txt
similarity index 100%
rename from acceptance/libs/telemetry/upload/out.requests.txt
rename to acceptance/telemetry/upload/out.requests.txt
diff --git a/acceptance/libs/telemetry/upload/output.txt b/acceptance/telemetry/upload/output.txt
similarity index 100%
rename from acceptance/libs/telemetry/upload/output.txt
rename to acceptance/telemetry/upload/output.txt
diff --git a/acceptance/libs/telemetry/upload/script b/acceptance/telemetry/upload/script
similarity index 100%
rename from acceptance/libs/telemetry/upload/script
rename to acceptance/telemetry/upload/script
diff --git a/acceptance/libs/telemetry/upload/stdin b/acceptance/telemetry/upload/stdin
similarity index 100%
rename from acceptance/libs/telemetry/upload/stdin
rename to acceptance/telemetry/upload/stdin
diff --git a/acceptance/libs/telemetry/upload/test.toml b/acceptance/telemetry/upload/test.toml
similarity index 100%
rename from acceptance/libs/telemetry/upload/test.toml
rename to acceptance/telemetry/upload/test.toml
diff --git a/libs/telemetry/protos/databricks_cli_log.go b/libs/telemetry/protos/databricks_cli_log.go
index ad969e915..64baa6b38 100644
--- a/libs/telemetry/protos/databricks_cli_log.go
+++ b/libs/telemetry/protos/databricks_cli_log.go
@@ -24,9 +24,11 @@ type ExecutionContext struct {
 	FromWebTerminal bool `json:"from_web_terminal,omitempty"`
 
 	// Time taken for the CLI command to execute.
+	// We want to serialize the zero value as well so the omitempty tag is not set.
 	ExecutionTimeMs int64 `json:"execution_time_ms"`
 
 	// Exit code of the CLI command.
+	// We want to serialize the zero value as well so the omitempty tag is not set.
 	ExitCode int64 `json:"exit_code"`
 }