Plugins: Refactoring: Move plugins tracing env vars to separate func (#66170)

pull/66180/head
Giuseppe Guerra 3 years ago committed by GitHub
parent 536fad5b61
commit 652c6dbd22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      pkg/plugins/manager/loader/initializer/initializer.go

@ -67,25 +67,30 @@ func (i *Initializer) envVars(plugin *plugins.Plugin) []string {
hostEnv = append(hostEnv, i.awsEnvVars()...) hostEnv = append(hostEnv, i.awsEnvVars()...)
hostEnv = append(hostEnv, i.secureSocksProxyEnvVars()...) hostEnv = append(hostEnv, i.secureSocksProxyEnvVars()...)
hostEnv = append(hostEnv, azsettings.WriteToEnvStr(i.cfg.Azure)...) hostEnv = append(hostEnv, azsettings.WriteToEnvStr(i.cfg.Azure)...)
hostEnv = append(hostEnv, i.tracingEnvVars(plugin)...)
// Tracing ev := getPluginSettings(plugin.ID, i.cfg).asEnvVar("GF_PLUGIN", hostEnv)
return ev
}
func (i *Initializer) tracingEnvVars(plugin *plugins.Plugin) []string {
var pluginTracingEnabled bool var pluginTracingEnabled bool
if v, exists := i.cfg.PluginSettings[plugin.ID]["tracing"]; exists { if v, exists := i.cfg.PluginSettings[plugin.ID]["tracing"]; exists {
pluginTracingEnabled = v == "true" pluginTracingEnabled = v == "true"
} }
if i.cfg.Tracing.IsEnabled() && pluginTracingEnabled { if !i.cfg.Tracing.IsEnabled() || !pluginTracingEnabled {
return nil
}
var vars []string
if plugin.Info.Version != "" { if plugin.Info.Version != "" {
hostEnv = append(hostEnv, fmt.Sprintf("GF_PLUGIN_VERSION=%s", plugin.Info.Version)) vars = append(vars, fmt.Sprintf("GF_PLUGIN_VERSION=%s", plugin.Info.Version))
} }
hostEnv = append( return append(
hostEnv, vars,
fmt.Sprintf("GF_INSTANCE_OTLP_ADDRESS=%s", i.cfg.Tracing.OpenTelemetry.Address), fmt.Sprintf("GF_INSTANCE_OTLP_ADDRESS=%s", i.cfg.Tracing.OpenTelemetry.Address),
fmt.Sprintf("GF_INSTANCE_OTLP_PROPAGATION=%s", i.cfg.Tracing.OpenTelemetry.Propagation), fmt.Sprintf("GF_INSTANCE_OTLP_PROPAGATION=%s", i.cfg.Tracing.OpenTelemetry.Propagation),
) )
}
ev := getPluginSettings(plugin.ID, i.cfg).asEnvVar("GF_PLUGIN", hostEnv)
return ev
} }
func (i *Initializer) awsEnvVars() []string { func (i *Initializer) awsEnvVars() []string {

Loading…
Cancel
Save