[kernel-1116] rename capture session -> browser telemetry

server/Makefile

@@ -16,7 +16,7 @@ $(RECORDING_DIR):
 # 3. go mod tidy to pull deps
 oapi-generate:
 	pnpm i -g @apiture/openapi-down-convert
-	openapi-down-convert --input openapi.yaml --output openapi-3.0.yaml
+	openapi-down-convert --input openapi.yaml --output openapi-3.0.yaml --allOf
 	go tool oapi-codegen -config ./oapi-codegen.yaml ./openapi-3.0.yaml
 	@echo "Fixing oapi-codegen issue https://github.com/oapi-codegen/oapi-codegen/issues/1764..."
 	go run ./scripts/oapi/patch_sse_methods -file ./lib/oapi/oapi.go -expected-replacements 4

server/cmd/api/api/api.go

@@ -10,9 +10,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/kernel/kernel-images/server/lib/capturesession"
 	"github.com/kernel/kernel-images/server/lib/cdpmonitor"
 	"github.com/kernel/kernel-images/server/lib/devtoolsproxy"
+	"github.com/kernel/kernel-images/server/lib/telemetry"
 	"github.com/kernel/kernel-images/server/lib/events"
 	"github.com/kernel/kernel-images/server/lib/logger"
 	"github.com/kernel/kernel-images/server/lib/nekoclient"
@@ -81,13 +81,13 @@ type ApiService struct {
 	// when multiple CDP fast-path resizes fire in quick succession.
 	xvfbResizeMu sync.Mutex
 
-	// CDP event pipeline and cdpMonitor.
-	eventStream     *events.EventStream
-	captureSession  *capturesession.CaptureSession
-	cdpMonitor      cdpMonitorController
-	monitorMu       sync.Mutex
-	lifecycleCtx    context.Context
-	lifecycleCancel context.CancelFunc
+	// Telemetry event pipeline and CDP monitor.
+	eventStream      *events.EventStream
+	telemetrySession *telemetry.TelemetrySession
+	cdpMonitor       cdpMonitorController
+	monitorMu        sync.Mutex
+	lifecycleCtx     context.Context
+	lifecycleCancel  context.CancelFunc
 }
 
 var _ oapi.StrictServerInterface = (*ApiService)(nil)
@@ -98,8 +98,8 @@ func New(
 	upstreamMgr *devtoolsproxy.UpstreamManager,
 	stz scaletozero.PinnedController,
 	nekoAuthClient *nekoclient.AuthClient,
-	captureSession *capturesession.CaptureSession,
-	eventStream    *events.EventStream,
+	telemetrySession *telemetry.TelemetrySession,
+	eventStream      *events.EventStream,
 	displayNum int,
 ) (*ApiService, error) {
 	switch {
@@ -111,18 +111,18 @@ func New(
 		return nil, fmt.Errorf("upstreamMgr cannot be nil")
 	case nekoAuthClient == nil:
 		return nil, fmt.Errorf("nekoAuthClient cannot be nil")
-	case captureSession == nil:
-		return nil, fmt.Errorf("captureSession cannot be nil")
+	case telemetrySession == nil:
+		return nil, fmt.Errorf("telemetrySession cannot be nil")
 	case eventStream == nil:
 		return nil, fmt.Errorf("eventStream cannot be nil")
 	}
 
-	mon := cdpmonitor.New(upstreamMgr, captureSession.Publish, displayNum, slog.Default())
+	mon := cdpmonitor.New(upstreamMgr, telemetrySession.Publish, displayNum, slog.Default())
 	ctx, cancel := context.WithCancel(context.Background())
 
 	return &ApiService{
-		recordManager:   recordManager,
-		factory:         factory,
+		recordManager:     recordManager,
+		factory:           factory,
 		defaultRecorderID: "default",
 		watches:           make(map[string]*fsWatch),
 		procs:             make(map[string]*processHandle),
@@ -131,7 +131,7 @@ func New(
 		nekoAuthClient:    nekoAuthClient,
 		policy:            &policy.Policy{},
 		eventStream:       eventStream,
-		captureSession:    captureSession,
+		telemetrySession:  telemetrySession,
 		cdpMonitor:        mon,
 		lifecycleCtx:      ctx,
 		lifecycleCancel:   cancel,
@@ -357,7 +357,7 @@ func (s *ApiService) Shutdown(ctx context.Context) error {
 	s.monitorMu.Lock()
 	s.lifecycleCancel()
 	s.cdpMonitor.Stop()
-	s.captureSession.Stop()
+	s.telemetrySession.Stop()
 	s.monitorMu.Unlock()
 	return s.recordManager.StopAll(ctx)
 }

server/cmd/api/api/api_test.go

@@ -11,8 +11,8 @@ import (
 
 	"log/slog"
 
-	"github.com/kernel/kernel-images/server/lib/capturesession"
 	"github.com/kernel/kernel-images/server/lib/devtoolsproxy"
+	"github.com/kernel/kernel-images/server/lib/telemetry"
 	"github.com/kernel/kernel-images/server/lib/events"
 	"github.com/kernel/kernel-images/server/lib/nekoclient"
 	oapi "github.com/kernel/kernel-images/server/lib/oapi"
@@ -305,20 +305,20 @@ func newMockNekoClient(t *testing.T) *nekoclient.AuthClient {
 	return client
 }
 
-func newCaptureSession(t *testing.T) (*capturesession.CaptureSession, *events.EventStream) {
+func newTelemetrySession(t *testing.T) (*telemetry.TelemetrySession, *events.EventStream) {
 	t.Helper()
 	es, err := events.NewEventStream(events.EventStreamConfig{RingCapacity: 64})
 	if err != nil {
 		t.Fatal(err)
 	}
-	return capturesession.NewCaptureSession(es), es
+	return telemetry.NewTelemetrySession(es), es
 }
 
-// newSvc constructs an ApiService with a fresh capture session and event stream.
+// newSvc constructs an ApiService with a fresh telemetry session and event stream.
 func newSvc(t *testing.T, mgr recorder.RecordManager) (*ApiService, error) {
 	t.Helper()
-	cs, es := newCaptureSession(t)
-	return New(mgr, newMockFactory(), newTestUpstreamManager(), scaletozero.NewNoopController(), newMockNekoClient(t), cs, es, 0)
+	ts, es := newTelemetrySession(t)
+	return New(mgr, newMockFactory(), newTestUpstreamManager(), scaletozero.NewNoopController(), newMockNekoClient(t), ts, es, 0)
 }
 
 func TestApiService_PatchChromiumFlags(t *testing.T) {