IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

re-use fake trace + feature toggles (#56186)

Browse Source
This commit is contained in:
Will Browne 2022-10-04 10:15:10 +02:00 committed by GitHub
parent c83d576ffc
commit 4087ad413f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/plugins/manager/manager_integration_test.go
View File

@ -3,7 +3,6 @@ package manager
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"net/http"
"path/filepath" "path/filepath"
"strings" "strings"
"testing" "testing"
@ -13,7 +12,6 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient" "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"go.opentelemetry.io/otel/trace"
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
"github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/infra/tracing"
@ -57,8 +55,6 @@ func TestIntegrationPluginManager(t *testing.T) {
bundledPluginsPath, err := filepath.Abs("../../../plugins-bundled/internal") bundledPluginsPath, err := filepath.Abs("../../../plugins-bundled/internal")
require.NoError(t, err) require.NoError(t, err)
features := featuremgmt.WithFeatures()
// We use the raw config here as it forms the basis for the setting.Provider implementation // We use the raw config here as it forms the basis for the setting.Provider implementation
// The plugin manager also relies directly on the setting.Cfg struct to provide Grafana specific // The plugin manager also relies directly on the setting.Cfg struct to provide Grafana specific
// properties such as the loading paths // properties such as the loading paths
@ -81,11 +77,8 @@ func TestIntegrationPluginManager(t *testing.T) {
Azure: &azsettings.AzureSettings{}, Azure: &azsettings.AzureSettings{},
} }
tracer := &fakeTracer{} tracer := tracing.InitializeTracerForTest()
features := featuremgmt.WithFeatures()
license := &licensing.OSSLicensingService{
Cfg: cfg,
}
hcp := httpclient.NewProvider() hcp := httpclient.NewProvider()
am := azuremonitor.ProvideService(cfg, hcp, tracer) am := azuremonitor.ProvideService(cfg, hcp, tracer)
@ -102,14 +95,14 @@ func TestIntegrationPluginManager(t *testing.T) {
pg := postgres.ProvideService(cfg) pg := postgres.ProvideService(cfg)
my := mysql.ProvideService(cfg, hcp) my := mysql.ProvideService(cfg, hcp)
ms := mssql.ProvideService(cfg) ms := mssql.ProvideService(cfg)
sv2 := searchV2.ProvideService(cfg, sqlstore.InitTestDB(t), nil, nil, tracing.InitializeTracerForTest(), featuremgmt.WithFeatures(), nil, nil) sv2 := searchV2.ProvideService(cfg, sqlstore.InitTestDB(t), nil, nil, tracer, features, nil, nil)
graf := grafanads.ProvideService(cfg, sv2, nil) graf := grafanads.ProvideService(cfg, sv2, nil)
coreRegistry := coreplugin.ProvideCoreRegistry(am, cw, cm, es, grap, idb, lk, otsdb, pr, tmpo, td, pg, my, ms, graf) coreRegistry := coreplugin.ProvideCoreRegistry(am, cw, cm, es, grap, idb, lk, otsdb, pr, tmpo, td, pg, my, ms, graf)
pCfg := config.ProvideConfig(setting.ProvideProvider(cfg), cfg) pCfg := config.ProvideConfig(setting.ProvideProvider(cfg), cfg)
reg := registry.ProvideService() reg := registry.ProvideService()
l := loader.ProvideService(pCfg, license, signature.NewUnsignedAuthorizer(pCfg), reg, provider.ProvideService(coreRegistry)) l := loader.ProvideService(pCfg, &licensing.OSSLicensingService{Cfg: cfg}, signature.NewUnsignedAuthorizer(pCfg), reg, provider.ProvideService(coreRegistry))
ps, err := store.ProvideService(cfg, pCfg, reg, l) ps, err := store.ProvideService(cfg, pCfg, reg, l)
require.NoError(t, err) require.NoError(t, err)
@ -292,19 +285,3 @@ func verifyBackendProcesses(t *testing.T, ps []*plugins.Plugin) {
} }
} }
} }
type fakeTracer struct {
tracing.Tracer
}
func (ft *fakeTracer) Run(context.Context) error {
return nil
}
func (ft *fakeTracer) Start(ctx context.Context, _ string, _ ...trace.SpanStartOption) (context.Context, tracing.Span) {
return ctx, nil
}
func (ft *fakeTracer) Inject(context.Context, http.Header, tracing.Span) {
}