TUN-3777: Fix /ready endpoint for classic tunnels

Classic tunnels flow was triggering an event for RegisteringTunnel for
every connection that was about to be established, and then a Connected
event for every connection established.

However, the RegistreringTunnel event had no connection ID, always
causing it to unset/disconnect the 0th connection making the /ready
endpoint report incorrect numbers for classic tunnels.

cmd/cloudflared/ui/launch_ui.go

@@ -135,7 +135,7 @@ func (data *uiModel) Launch(
 			data.edgeURL = event.URL
 		case connection.RegisteringTunnel:
 			if data.edgeURL == "" {
-				tunnelHostText.SetText("Registering tunnel...")
+				tunnelHostText.SetText(fmt.Sprintf("Registering tunnel connection %d...", event.Index))
 			}
 		}
 		app.Draw()

connection/observer.go

@@ -99,8 +99,8 @@ func trialZoneMsg(url string) []string {
 	}
 }
 
-func (o *Observer) sendRegisteringEvent() {
-	o.sendEvent(Event{EventType: RegisteringTunnel})
+func (o *Observer) sendRegisteringEvent(connIndex uint8) {
+	o.sendEvent(Event{Index: connIndex, EventType: RegisteringTunnel})
 }
 
 func (o *Observer) sendConnectedEvent(connIndex uint8, location string) {

connection/observer_test.go

@@ -53,13 +53,13 @@ func TestObserverEventsDontBlock(t *testing.T) {
 	}))
 
 	timeout := time.AfterFunc(5*time.Second, func() {
-		mu.Unlock()  // release the callback on timer expiration
+		mu.Unlock() // release the callback on timer expiration
 		t.Fatal("observer is blocked")
 	})
 
-	mu.Lock()  // block the callback
-	for i := 0; i < 2 * observerChannelBufferSize; i++ {
-		observer.sendRegisteringEvent()
+	mu.Lock() // block the callback
+	for i := 0; i < 2*observerChannelBufferSize; i++ {
+		observer.sendRegisteringEvent(0)
 	}
 	if pending := timeout.Stop(); pending {
 		// release the callback if timer hasn't expired yet

connection/rpc.go

@@ -138,7 +138,7 @@ const (
 )
 
 func (h *h2muxConnection) registerTunnel(ctx context.Context, credentialSetter CredentialManager, classicTunnel *ClassicTunnelConfig, registrationOptions *tunnelpogs.RegistrationOptions) error {
-	h.observer.sendRegisteringEvent()
+	h.observer.sendRegisteringEvent(registrationOptions.ConnectionID)
 
 	stream, err := h.newRPCStream(ctx, register)
 	if err != nil {

metrics/readiness_test.go

@@ -87,7 +87,7 @@ func TestReadinessEventHandling(t *testing.T) {
 	})
 	code, ready = rs.makeResponse()
 	assert.EqualValues(t, http.StatusOK, code)
-	assert.EqualValues(t, 2,  ready)
+	assert.EqualValues(t, 2, ready)
 
 	// one reconnecting => still ok
 	rs.OnTunnelEvent(connection.Event{
@@ -98,6 +98,15 @@ func TestReadinessEventHandling(t *testing.T) {
 	assert.EqualValues(t, http.StatusOK, code)
 	assert.EqualValues(t, 1, ready)
 
+	// Regression test for TUN-3777
+	rs.OnTunnelEvent(connection.Event{
+		Index:     1,
+		EventType: connection.RegisteringTunnel,
+	})
+	code, ready = rs.makeResponse()
+	assert.NotEqualValues(t, http.StatusOK, code)
+	assert.Zero(t, ready)
+
 	// other disconnected => not ok
 	rs.OnTunnelEvent(connection.Event{
 		Index:     1,