Merge pull request #358 from grafana/phone-home-fix

Initialize correctly bucket for reporting

Author: cyriltovena

pkg/phlare/modules.go

@@ -36,7 +36,6 @@ import (
 	"github.com/grafana/phlare/pkg/gen/push/v1/pushv1connect"
 	"github.com/grafana/phlare/pkg/gen/querier/v1/querierv1connect"
 	"github.com/grafana/phlare/pkg/ingester"
-	"github.com/grafana/phlare/pkg/objstore"
 	objstoreclient "github.com/grafana/phlare/pkg/objstore/client"
 	"github.com/grafana/phlare/pkg/objstore/providers/filesystem"
 	"github.com/grafana/phlare/pkg/openapiv2"
@@ -291,7 +290,7 @@ func (f *Phlare) initUsageReport() (services.Service, error) {
 
 	usagestats.Target(f.Cfg.Target.String())
 
-	var b objstore.Bucket
+	b := f.storageBucket
 	if f.storageBucket == nil {
 		if err := os.MkdirAll(f.Cfg.PhlareDB.DataPath, 0o777); err != nil {
 			return nil, fmt.Errorf("mkdir %s: %w", f.Cfg.PhlareDB.DataPath, err)
@@ -303,6 +302,11 @@ func (f *Phlare) initUsageReport() (services.Service, error) {
 		b = fs
 	}
 
+	if b == nil {
+		level.Warn(f.logger).Log("msg", "no storage bucket configured, usage report will not be sent")
+		return nil, nil
+	}
+
 	ur, err := usagestats.NewReporter(f.Cfg.Analytics, f.Cfg.Ingester.LifecyclerConfig.RingConfig.KVStore, b, f.logger, f.reg)
 	if err != nil {
 		level.Info(f.logger).Log("msg", "failed to initialize usage report", "err", err)