Chore: Add grafana-apiserver (#70721)

* add grafana-apiserver
* remove watchset & move provisioning and http server to background
services
* remove scheme
* otel fixes (#70874)
* remove module ProvideRegistry test
* use certgenerator from apiserver package
* Control collector/pdata from going to v1.0.0-rc8 (as Tempo 1.5.1 would have it)

pkg/modules/registry/registry.go

@@ -3,9 +3,11 @@ package registry
 import (
 	"github.com/grafana/dskit/services"
 
+	"github.com/grafana/grafana-apiserver/pkg/certgenerator"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/modules"
 	"github.com/grafana/grafana/pkg/server/backgroundsvcs"
+	grafanaapiserver "github.com/grafana/grafana/pkg/services/grafana-apiserver"
 )
 
 type Registry interface{}
@@ -17,12 +19,16 @@ type registry struct {
 
 func ProvideRegistry(
 	moduleManager modules.Manager,
+	apiServer grafanaapiserver.Service,
 	backgroundServiceRunner *backgroundsvcs.BackgroundServiceRunner,
+	certGenerator certgenerator.ServiceInterface,
 ) *registry {
 	return newRegistry(
 		log.New("modules.registry"),
 		moduleManager,
+		apiServer,
 		backgroundServiceRunner,
+		certGenerator,
 	)
 }
 
@@ -41,7 +47,6 @@ func newRegistry(logger log.Logger, moduleManager modules.Manager, svcs ...servi
 		})
 	}
 
-	// Register module targets
 	logger.Debug("Registering module", "name", modules.All)
 	r.moduleManager.RegisterModule(modules.All, nil)
 

pkg/modules/registry/registry_test.go

@@ -9,31 +9,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/modules"
-	"github.com/grafana/grafana/pkg/server/backgroundsvcs"
 )
 
-func TestProvideRegistry(t *testing.T) {
-	var registeredInvisibleModules []string
-	var registeredModules []string
-
-	moduleManager := &modules.MockModuleManager{
-		RegisterModuleFunc: func(name string, initFn func() (services.Service, error)) {
-			registeredModules = append(registeredModules, name)
-		},
-		RegisterInvisibleModuleFunc: func(name string, initFn func() (services.Service, error)) {
-			registeredInvisibleModules = append(registeredInvisibleModules, name)
-		},
-	}
-
-	svcRegistry := backgroundsvcs.NewBackgroundServiceRegistry()
-	svcRunner := backgroundsvcs.ProvideBackgroundServiceRunner(svcRegistry)
-
-	r := ProvideRegistry(moduleManager, svcRunner)
-	require.NotNil(t, r)
-	require.Equal(t, []string{modules.BackgroundServices}, registeredInvisibleModules)
-	require.Equal(t, []string{modules.All}, registeredModules)
-}
-
 func TestNewRegistry(t *testing.T) {
 	var registeredInvisibleModules []string
 	var registeredModules []string