npe fix and other touchups

clues.go

@@ -14,7 +14,7 @@ import (
 // such as OTEL communication.  Clues will use these optimistically in the
 // background to provide additional telemetry hook-ins.
 //
-// Clues will operate as expected in the event of an error, or of initialization
+// Clues will operate as expected in the event of an error, or if initialization
 // is not called.  This is a purely optional step.
 func Initialize(
 	ctx context.Context,

datanode.go

@@ -413,7 +413,7 @@ func (dn *dataNode) addSpan(
 	name string,
 ) (context.Context, *dataNode) {
 	if dn == nil || dn.otel == nil {
-		return ctx, dn.spawnDescendant()
+		return ctx, dn
 	}
 
 	ctx, span := dn.otel.tracer.Start(ctx, name)
@@ -428,7 +428,7 @@ func (dn *dataNode) addSpan(
 // If no span is present, no ops.
 func (dn *dataNode) closeSpan(ctx context.Context) *dataNode {
 	if dn == nil || dn.span == nil {
-		return dn.spawnDescendant()
+		return dn
 	}
 
 	dn.span.End()
@@ -449,10 +449,6 @@ func (dn *dataNode) addSpanAttributes(
 		return
 	}
 
-	if len(values) == 0 {
-		return
-	}
-
 	for k, v := range values {
 		dn.span.SetAttributes(attribute.String(k, stringify.Marshal(v, false)))
 	}

otel.go

@@ -75,7 +75,7 @@ func newOTELClient(
 	config OTELConfig,
 ) (*otelClient, error) {
 	// -- Resource
-	resource, err := resource.New(ctx, resource.WithAttributes(
+	srvResource, err := resource.New(ctx, resource.WithAttributes(
 		semconv.ServiceNameKey.String(serviceName)))
 	if err != nil {
 		return nil, WrapWC(ctx, err, "creating otel resource")
@@ -88,7 +88,7 @@ func newOTELClient(
 		// Note the use of insecure transport here. TLS is recommended in production.
 		grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
-		return nil, WrapWC(ctx, err, "creating new gRPC connection")
+		return nil, WrapWC(ctx, err, "creating new grpc connection")
 	}
 
 	exporter, err := otlptracegrpc.New(ctx, otlptracegrpc.WithGRPCConn(conn))
@@ -103,7 +103,7 @@ func newOTELClient(
 	batchSpanProcessor := sdkTrace.NewBatchSpanProcessor(exporter)
 
 	tracerProvider := sdkTrace.NewTracerProvider(
-		sdkTrace.WithResource(resource),
+		sdkTrace.WithResource(srvResource),
 		sdkTrace.WithSampler(sdkTrace.AlwaysSample()),
 		sdkTrace.WithSpanProcessor(batchSpanProcessor),
 		sdkTrace.WithRawSpanLimits(sdkTrace.SpanLimits{