chore: minor code cleanup (#11472)

Came across these in the work to support v0.3.0 of the configuration schema, split them into a separate PR to reduce complexity of the review. Signed-off-by: Alex Boten <[email protected]>
open-telemetry · Oct 16, 2024 · 20c28ba · 20c28ba
1 parent 4f79e0d
commit 20c28ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/service/service.go b/service/service.go
@@ -136,7 +136,7 @@ func New(ctx context.Context, set Settings, cfg Config) (*Service, error) {
 
 	mp, err := telFactory.CreateMeterProvider(ctx, telset, &cfg.Telemetry)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create metric provider: %w", err)
+		return nil, fmt.Errorf("failed to create meter provider: %w", err)
 	}
 
 	logsAboutMeterProvider(logger, cfg.Telemetry.Metrics, mp)

diff --git a/service/telemetry/attributes.go b/service/telemetry/attributes.go
@@ -13,10 +13,8 @@ func attributes(set Settings, cfg Config) map[string]interface{} {
 	for k, v := range cfg.Resource {
 		if v != nil {
 			attrs[k] = *v
-		}
-
-		// the new value is nil, delete the existing key
-		if _, ok := attrs[k]; ok && v == nil {
+		} else {
+			// the new value is nil, delete the existing key
 			delete(attrs, k)
 		}
 	}