use default resource

We already set os.SetEnv("OTEL_SERVICE_NAME", cmd.Name()) if
it's not set, so don't have to do the merge here.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

cmd/docker/docker.go

@@ -26,7 +26,6 @@ import (
 	"github.com/spf13/pflag"
 	"go.opentelemetry.io/contrib/exporters/autoexport"
 	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
@@ -362,20 +361,7 @@ func initializeTracing() error {
 	}
 	sp := sdktrace.NewBatchSpanProcessor(exporter)
 
-	// create a default resource but specify the service name explicitly, or
-	// it will be `unknown_service:<name_of_exe>`
-	//
-	// N.B. a schemaless resource is used with the STABLE semconv value of
-	// `service.name` to avoid https://github.com/open-telemetry/opentelemetry-go/issues/2341
-	res, err := resource.Merge(
-		resource.Default(),
-		resource.NewSchemaless(
-			attribute.String("service.name", "docker-cli"),
-		),
-	)
-	if err != nil {
-		return fmt.Errorf("merging resource: %w", err)
-	}
+	res := resource.Default()
 
 	tp := sdktrace.NewTracerProvider(
 		sdktrace.WithSpanProcessor(sp),