Merge branch 'main' into alpha

tigrisdata-archive · Aug 18, 2022 · 74a8a2c · 74a8a2c
2 parents 8c236bf + fb91a42
commit 74a8a2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/server/config/options.go b/server/config/options.go
@@ -97,11 +97,11 @@ type SearchMetricsConfig struct {
 }
 
 type ObservabilityConfig struct {
-	Provider                   string `yaml:"provider" json:"provider"`
-	EnableObservabilityService bool   `yaml:"enable_observability_service" json:"enable_observability_service"`
-	ApiKey                     string `yaml:"api_key" json:"api_key"`
-	AppKey                     string `yaml:"app_key" json:"app_key"`
-	ProviderUrl                string `yaml:"provider_url" json:"provider_url"`
+	Provider    string `mapstructure:"provider" yaml:"provider" json:"provider"`
+	Enabled     bool   `mapstructure:"enabled" yaml:"enabled" json:"enabled"`
+	ApiKey      string `mapstructure:"api_key" yaml:"api_key" json:"api_key"`
+	AppKey      string `mapstructure:"app_key" yaml:"app_key" json:"app_key"`
+	ProviderUrl string `mapstructure:"provider_url" yaml:"provider_url" json:"provider_url"`
 }
 
 var DefaultConfig = Config{
@@ -152,7 +152,7 @@ var DefaultConfig = Config{
 		DataSizeLimit:        10000000000, // bytes
 	},
 	Observability: ObservabilityConfig{
-		EnableObservabilityService: false,
+		Enabled: false,
 	},
 }
 

diff --git a/server/services/v1/observability.go b/server/services/v1/observability.go
@@ -141,7 +141,7 @@ func newObservabilityService() *observabilityService {
 		}
 	}
 	log.Error().Str("observabilityProvider", config.DefaultConfig.Observability.Provider).Msg("Unable to configure external observability provider")
-	if config.DefaultConfig.Observability.EnableObservabilityService {
+	if config.DefaultConfig.Observability.Enabled {
 		panic("Unable to configure external observability provider")
 	}
 	return nil