move log resource merge to WithResource

open-telemetry · Sep 6, 2024 · 649d3b2 · 649d3b2
1 parent 9235dff
commit 649d3b2
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/sdk/log/provider.go b/sdk/log/provider.go
@@ -42,12 +42,6 @@ func newProviderConfig(opts []LoggerProviderOption) providerConfig {
 
 	if c.resource == nil {
 		c.resource = resource.Default()
-	} else {
-		var err error
-		c.resource, err = resource.Merge(resource.Environment(), c.resource)
-		if err != nil {
-			otel.Handle(err)
-		}
 	}
 
 	c.attrCntLim = c.attrCntLim.Resolve(
@@ -203,7 +197,11 @@ func (fn loggerProviderOptionFunc) apply(c providerConfig) providerConfig {
 // go.opentelemetry.io/otel/sdk/resource package will be used.
 func WithResource(res *resource.Resource) LoggerProviderOption {
 	return loggerProviderOptionFunc(func(cfg providerConfig) providerConfig {
-		cfg.resource = res
+		var err error
+		cfg.resource, err = resource.Merge(resource.Environment(), res)
+		if err != nil {
+			otel.Handle(err)
+		}
 		return cfg
 	})
 }