change how defaults are initialized so we don't break static resolver…

… config parsing
open-telemetry · May 25, 2022 · aa8095b · aa8095b
1 parent f0aecbf
commit aa8095b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/exporter/loadbalancingexporter/config.go b/exporter/loadbalancingexporter/config.go
@@ -38,18 +38,6 @@ type ResolverSettings struct {
 	DNS    *DNSResolver    `mapstructure:"dns"`
 }
 
-func createDefaultResolverSettings() ResolverSettings {
-	return ResolverSettings{
-		Static: nil,
-		DNS: &DNSResolver{
-			Hostname: "",
-			Port:     "",
-			Interval: defaultResInterval,
-			Timeout:  defaultResTimeout,
-		},
-	}
-}
-
 // StaticResolver defines the configuration for the resolver providing a fixed list of backends
 type StaticResolver struct {
 	Hostnames []string `mapstructure:"hostnames"`

diff --git a/exporter/loadbalancingexporter/factory.go b/exporter/loadbalancingexporter/factory.go
@@ -17,6 +17,7 @@ package loadbalancingexporter // import "github.com/open-telemetry/opentelemetry
 
 import (
 	"context"
+
 	"go.opencensus.io/stats/view"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config"
@@ -49,7 +50,6 @@ func createDefaultConfig() config.Exporter {
 		Protocol: Protocol{
 			OTLP: *otlpDefaultCfg,
 		},
-		Resolver: createDefaultResolverSettings(),
 	}
 }
 

diff --git a/exporter/loadbalancingexporter/resolver_dns.go b/exporter/loadbalancingexporter/resolver_dns.go
@@ -63,6 +63,12 @@ func newDNSResolver(logger *zap.Logger, hostname string, port string, interval t
 	if len(hostname) == 0 {
 		return nil, errNoHostname
 	}
+	if interval == 0 {
+		interval = defaultResInterval
+	}
+	if timeout == 0 {
+		timeout = defaultResTimeout
+	}
 
 	return &dnsResolver{
 		logger:      logger,