From 8fb2424fd27479405e594441d3dc34ac7a87aecd Mon Sep 17 00:00:00 2001
From: Dan Adler <dadlerj@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:49:02 -0800
Subject: [PATCH] Don't do expensive ping queries for dotcom; these are causing
 timeouts (#58291)

---
 internal/updatecheck/client.go | 54 +++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/internal/updatecheck/client.go b/internal/updatecheck/client.go
index 1aafafecd75..cf541803ef7 100644
--- a/internal/updatecheck/client.go
+++ b/internal/updatecheck/client.go
@@ -601,11 +601,13 @@ func updateBody(ctx context.Context, logger log.Logger, db database.DB) (io.Read
 	if err != nil {
 		logFunc("getAndMarshalBatchChangesUsageJSON failed", log.Error(err))
 	}
-	r.GrowthStatistics, err = getAndMarshalGrowthStatisticsJSON(ctx, db)
-	if err != nil {
-		logFunc("getAndMarshalGrowthStatisticsJSON failed", log.Error(err))
+	// We don't bother doing this on Sourcegraph.com as it is expensive and not needed.
+	if !envvar.SourcegraphDotComMode() {
+		r.GrowthStatistics, err = getAndMarshalGrowthStatisticsJSON(ctx, db)
+		if err != nil {
+			logFunc("getAndMarshalGrowthStatisticsJSON failed", log.Error(err))
+		}
 	}
-
 	r.SavedSearches, err = getAndMarshalSavedSearchesJSON(ctx, db)
 	if err != nil {
 		logFunc("getAndMarshalSavedSearchesJSON failed", log.Error(err))
@@ -671,9 +673,12 @@ func updateBody(ctx context.Context, logger log.Logger, db database.DB) (io.Read
 		logFunc("getAndMarshalIDEExtensionsUsageJSON failed", log.Error(err))
 	}
 
-	r.MigratedExtensionsUsage, err = getAndMarshalMigratedExtensionsUsageJSON(ctx, db)
-	if err != nil {
-		logFunc("getAndMarshalMigratedExtensionsUsageJSON failed", log.Error(err))
+	// We don't bother doing this on Sourcegraph.com as it is expensive and not needed.
+	if !envvar.SourcegraphDotComMode() {
+		r.MigratedExtensionsUsage, err = getAndMarshalMigratedExtensionsUsageJSON(ctx, db)
+		if err != nil {
+			logFunc("getAndMarshalMigratedExtensionsUsageJSON failed", log.Error(err))
+		}
 	}
 
 	r.CodeHostVersions, err = getAndMarshalCodeHostVersionsJSON(ctx, db)
@@ -720,23 +725,26 @@ func updateBody(ctx context.Context, logger log.Logger, db database.DB) (io.Read
 		}
 	}()
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		r.NewCodeIntelUsage, err = getAndMarshalAggregatedCodeIntelUsageJSON(ctx, db)
-		if err != nil {
-			logFunc("getAndMarshalAggregatedCodeIntelUsageJSON failed", log.Error(err))
-		}
-	}()
+	// We don't bother doing these on Sourcegraph.com as they are expensive and not needed.
+	if !envvar.SourcegraphDotComMode() {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			r.NewCodeIntelUsage, err = getAndMarshalAggregatedCodeIntelUsageJSON(ctx, db)
+			if err != nil {
+				logFunc("getAndMarshalAggregatedCodeIntelUsageJSON failed", log.Error(err))
+			}
+		}()
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		r.SearchUsage, err = getAndMarshalAggregatedSearchUsageJSON(ctx, db)
-		if err != nil {
-			logFunc("getAndMarshalAggregatedSearchUsageJSON failed", log.Error(err))
-		}
-	}()
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			r.SearchUsage, err = getAndMarshalAggregatedSearchUsageJSON(ctx, db)
+			if err != nil {
+				logFunc("getAndMarshalAggregatedSearchUsageJSON failed", log.Error(err))
+			}
+		}()
+	}
 
 	wg.Wait()