From 2ed40e804209dfd6e49628ecd4e262d4d6346b49 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Thu, 23 May 2024 18:36:57 +0200 Subject: [PATCH] add gui/composeview as part of available commands Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- internal/tracing/keyboard_metrics.go | 7 ++++++- pkg/compose/up.go | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/internal/tracing/keyboard_metrics.go b/internal/tracing/keyboard_metrics.go index 3317879dda1..036d636680d 100644 --- a/internal/tracing/keyboard_metrics.go +++ b/internal/tracing/keyboard_metrics.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/otel/attribute" ) -func KeyboardMetrics(ctx context.Context, enabled, isDockerDesktopActive, isWatchConfigured bool) { +func KeyboardMetrics(ctx context.Context, enabled, isDockerDesktopActive, isWatchConfigured, isDockerDesktopComposeUI bool) { commandAvailable := []string{} if isDockerDesktopActive { commandAvailable = append(commandAvailable, "gui") @@ -30,6 +30,11 @@ func KeyboardMetrics(ctx context.Context, enabled, isDockerDesktopActive, isWatc if isWatchConfigured { commandAvailable = append(commandAvailable, "watch") } + + if isDockerDesktopComposeUI { + commandAvailable = append(commandAvailable, "gui/composeview") + } + AddAttributeToSpan(ctx, attribute.Bool("navmenu.enabled", enabled), attribute.StringSlice("navmenu.command_available", commandAvailable)) diff --git a/pkg/compose/up.go b/pkg/compose/up.go index 0528ff35835..5c68a211766 100644 --- a/pkg/compose/up.go +++ b/pkg/compose/up.go @@ -97,10 +97,10 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options } else { isWatchConfigured := s.shouldWatch(project) isDockerDesktopActive := s.isDesktopIntegrationActive() - isDDComposeUI := s.isDesktopUIEnabled() - tracing.KeyboardMetrics(ctx, options.Start.NavigationMenu, isDockerDesktopActive, isWatchConfigured) + isDockerDesktopComposeUI := s.isDesktopUIEnabled() + tracing.KeyboardMetrics(ctx, options.Start.NavigationMenu, isDockerDesktopActive, isWatchConfigured, isDockerDesktopComposeUI) - formatter.NewKeyboardManager(ctx, isDockerDesktopActive, isWatchConfigured, isDDComposeUI, signalChan, s.Watch) + formatter.NewKeyboardManager(ctx, isDockerDesktopActive, isWatchConfigured, isDockerDesktopComposeUI, signalChan, s.Watch) if options.Start.Watch { formatter.KeyboardManager.StartWatch(ctx, project, options) }