artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't do expensive ping queries for dotcom; these are causing timeouts (#58291)

Browse Source
This commit is contained in:
Dan Adler 2023-11-13 15:49:02 -08:00 committed by GitHub
parent 3cd17a5faa
commit 8fb2424fd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
internal/updatecheck/client.go
View File

@ -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()