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

Plugins: Move config factory to pluginsintegration package (#65716)

Browse Source 
* move config to pluginsintegration package

* change to all plugin toggle

* fixes

* fixes

* fix lerna

* fix test
This commit is contained in:
Will Browne
2023-04-05 13:40:08 +01:00
committed by GitHub
parent c9288868f4
commit bff9f4c890
12 changed files with 175 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/plugins/manager/loader/initializer/initializer.go
View File

@@ -70,14 +70,14 @@ func (i *Initializer) envVars(plugin *plugins.Plugin) []string {
if v, exists := i.cfg.PluginSettings[plugin.ID]["tracing"]; exists {
pluginTracingEnabled = v == "true"
}
if i.cfg.Opentelemetry.IsEnabled() && pluginTracingEnabled {
if i.cfg.Tracing.IsEnabled() && pluginTracingEnabled {
if plugin.Info.Version != "" {
hostEnv = append(hostEnv, fmt.Sprintf("GF_PLUGIN_VERSION=%s", plugin.Info.Version))
}
hostEnv = append(
hostEnv,
fmt.Sprintf("GF_INSTANCE_OTLP_ADDRESS=%s", i.cfg.Opentelemetry.Address),
fmt.Sprintf("GF_INSTANCE_OTLP_PROPAGATION=%s", i.cfg.Opentelemetry.Propagation),
fmt.Sprintf("GF_INSTANCE_OTLP_ADDRESS=%s", i.cfg.Tracing.OpenTelemetry.Address),
fmt.Sprintf("GF_INSTANCE_OTLP_PROPAGATION=%s", i.cfg.Tracing.OpenTelemetry.Propagation),
)
}

62
pkg/plugins/manager/loader/initializer/initializer_test.go
View File

@@ -185,7 +185,7 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
JSONData: plugins.JSONData{ID: pluginID},
}
defaultOtelCfg := config.OpentelemetryCfg{
defaultOTelCfg := config.OpenTelemetryCfg{
Address: "127.0.0.1:4317",
Propagation: "",
}
@@ -250,7 +250,7 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otel not configured",
cfg: &config.Cfg{
Opentelemetry: config.OpentelemetryCfg{},
Tracing: config.Tracing{},
},
plugin: defaultPlugin,
exp: expNoTracing,
@@ -258,7 +258,7 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otel not configured but plugin-tracing enabled",
cfg: &config.Cfg{
Opentelemetry: config.OpentelemetryCfg{},
Tracing: config.Tracing{},
PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
},
plugin: defaultPlugin,
@@ -267,7 +267,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otlp no propagation plugin enabled",
cfg: &config.Cfg{
Opentelemetry: defaultOtelCfg,
Tracing: config.Tracing{
OpenTelemetry: defaultOTelCfg,
},
PluginSettings: map[string]map[string]string{
pluginID: {"tracing": "true"},
},
@@ -278,7 +280,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otlp no propagation disabled by default",
cfg: &config.Cfg{
Opentelemetry: defaultOtelCfg,
Tracing: config.Tracing{
OpenTelemetry: defaultOTelCfg,
},
},
plugin: defaultPlugin,
exp: expNoTracing,
@@ -286,9 +290,11 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otlp propagation plugin enabled",
cfg: &config.Cfg{
Opentelemetry: config.OpentelemetryCfg{
Address: "127.0.0.1:4317",
Propagation: "w3c",
Tracing: config.Tracing{
OpenTelemetry: config.OpenTelemetryCfg{
Address: "127.0.0.1:4317",
Propagation: "w3c",
},
},
PluginSettings: map[string]map[string]string{
pluginID: {"tracing": "true"},
@@ -307,9 +313,11 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otlp enabled composite propagation",
cfg: &config.Cfg{
Opentelemetry: config.OpentelemetryCfg{
Address: "127.0.0.1:4317",
Propagation: "w3c,jaeger",
Tracing: config.Tracing{
OpenTelemetry: config.OpenTelemetryCfg{
Address: "127.0.0.1:4317",
Propagation: "w3c,jaeger",
},
},
PluginSettings: map[string]map[string]string{
pluginID: {"tracing": "true"},
@@ -328,9 +336,11 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otlp no propagation disabled by default",
cfg: &config.Cfg{
Opentelemetry: config.OpentelemetryCfg{
Address: "127.0.0.1:4317",
Propagation: "w3c",
Tracing: config.Tracing{
OpenTelemetry: config.OpenTelemetryCfg{
Address: "127.0.0.1:4317",
Propagation: "w3c",
},
},
},
plugin: defaultPlugin,
@@ -339,7 +349,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "disabled on plugin",
cfg: &config.Cfg{
Opentelemetry: defaultOtelCfg,
Tracing: config.Tracing{
OpenTelemetry: defaultOTelCfg,
},
PluginSettings: setting.PluginSettings{
pluginID: map[string]string{"tracing": "false"},
},
@@ -350,7 +362,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "disabled on plugin with other plugin settings",
cfg: &config.Cfg{
Opentelemetry: defaultOtelCfg,
Tracing: config.Tracing{
OpenTelemetry: defaultOTelCfg,
},
PluginSettings: map[string]map[string]string{
pluginID: {"some_other_option": "true"},
},
@@ -361,7 +375,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "enabled on plugin with other plugin settings",
cfg: &config.Cfg{
Opentelemetry: defaultOtelCfg,
Tracing: config.Tracing{
OpenTelemetry: defaultOTelCfg,
},
PluginSettings: map[string]map[string]string{
pluginID: {"some_other_option": "true", "tracing": "true"},
},
@@ -372,7 +388,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "GF_PLUGIN_VERSION is not present if tracing is disabled",
cfg: &config.Cfg{
Opentelemetry: config.OpentelemetryCfg{}, // no OTEL config
Tracing: config.Tracing{
OpenTelemetry: config.OpenTelemetryCfg{},
},
PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
},
plugin: defaultPlugin,
@@ -381,7 +399,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "GF_PLUGIN_VERSION is present if tracing is enabled and plugin has version",
cfg: &config.Cfg{
Opentelemetry: defaultOtelCfg,
Tracing: config.Tracing{
OpenTelemetry: defaultOTelCfg,
},
PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
},
plugin: defaultPlugin,
@@ -390,7 +410,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "GF_PLUGIN_VERSION is not present if tracing is enabled but plugin doesn't have a version",
cfg: &config.Cfg{
Opentelemetry: config.OpentelemetryCfg{},
Tracing: config.Tracing{
OpenTelemetry: config.OpenTelemetryCfg{},
},
PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
},
plugin: pluginWithoutVersion,