Send facts when installation occurs during Run (treeverse#1403)

itaiad200 · web-flow · commit 7d2105093edf · 2021-02-04T14:54:06.000+02:00
diff --git a/api/controller.go b/api/controller.go
@@ -241,6 +241,7 @@ func (c *Controller) SetupLakeFSHandler() setupop.SetupLakeFSHandler {
 			c.deps.Logger.Error("failed to write metadata after setup")
 		} else {
 			c.deps.Collector.SetInstallationID(metadata[auth.InstallationIDKeyName])
+			c.deps.Collector.CollectMetadata(convertMetadata(metadata))
 		}
 		c.deps.Collector.CollectEvent("global", "init")
 		return setupop.NewSetupLakeFSOK().WithPayload(&models.CredentialsWithSecret{
@@ -251,6 +252,20 @@ func (c *Controller) SetupLakeFSHandler() setupop.SetupLakeFSHandler {
 	})
 }
 
+func convertMetadata(metadata map[string]string) *stats.Metadata {
+	res := &stats.Metadata{
+		InstallationID: metadata[auth.InstallationIDKeyName],
+	}
+
+	for k, v := range metadata {
+		res.Entries = append(res.Entries, stats.MetadataEntry{
+			Name:  k,
+			Value: v,
+		})
+	}
+	return res
+}
+
 func (c *Controller) GetCurrentUserHandler() authop.GetCurrentUserHandler {
 	return authop.GetCurrentUserHandlerFunc(func(params authop.GetCurrentUserParams, user *models.User) middleware.Responder {
 		return authop.NewGetCurrentUserOK().WithPayload(&authop.GetCurrentUserOKBody{
diff --git a/api/controller_test.go b/api/controller_test.go
@@ -1372,7 +1372,7 @@ func TestController_SetupLakeFSHandler(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			clt, _ := setupClient(t, "", testutil.WithGetDBApplyDDL(false))
+			clt, deps := setupClient(t, "", testutil.WithGetDBApplyDDL(false))
 			t.Run("fresh start", func(t *testing.T) {
 				res, err := clt.Setup.SetupLakeFS(setup.NewSetupLakeFSParamsWithTimeout(timeout).WithUser(&c.user))
 				if c.errorDefaultCode != 0 {
@@ -1420,6 +1420,15 @@ func TestController_SetupLakeFSHandler(t *testing.T) {
 				if foundCreds.Payload.AccessKeyID != creds.AccessKeyID {
 					t.Fatalf("Access key ID '%s', expected '%s'", foundCreds.Payload.AccessKeyID, creds.AccessKeyID)
 				}
+				if len(deps.collector.metadata) != 1 {
+					t.Fatal("Failed to collect metadata")
+				}
+				if deps.collector.metadata[0].InstallationID == "" {
+					t.Fatal("Empty installationID")
+				}
+				if len(deps.collector.metadata[0].Entries) < 5 {
+					t.Fatalf("There should be at least 5 metadata entries: %s", deps.collector.metadata[0].Entries)
+				}
 			})
 
 			if c.errorDefaultCode == 0 {
diff --git a/api/serve_test.go b/api/serve_test.go
@@ -35,11 +35,16 @@ type dependencies struct {
 	blocks      block.Adapter
 	cataloger   catalog.Cataloger
 	authService *auth.DBAuthService
+	collector   *nullCollector
 }
 
-type nullCollector struct{}
+type nullCollector struct {
+	metadata []*stats.Metadata
+}
 
-func (m *nullCollector) CollectMetadata(_ *stats.Metadata) {}
+func (m *nullCollector) CollectMetadata(metadata *stats.Metadata) {
+	m.metadata = append(m.metadata, metadata)
+}
 
 func (m *nullCollector) CollectEvent(_, _ string) {}
 
@@ -87,20 +92,23 @@ func setupHandler(t testing.TB, blockstoreType string, opts ...testutil.GetDBOpt
 		_ = cataloger.Close()
 	})
 
+	collector := &nullCollector{}
+
 	handler := api.Serve(api.Dependencies{
 		Cataloger:       cataloger,
 		Auth:            authService,
 		BlockAdapter:    blockAdapter,
 		MetadataManager: meta,
 		Migrator:        migrator,
-		Collector:       &nullCollector{},
+		Collector:       collector,
 		Logger:          logging.Default(),
 	})
 
 	return handler, &dependencies{
 		blocks:      blockAdapter,
 		authService: authService,
 		cataloger:   cataloger,
+		collector:   collector,
 	}
 }
 
