fill empty event names + delete instrumentationname

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>

pkg/networkservice/common/metrics/server.go

@@ -28,7 +28,6 @@ import (
 	"go.opentelemetry.io/otel/metric/global"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
-	"github.com/networkservicemesh/sdk/pkg/tools/opentelemetry"
 )
 
 type metricServer struct {
@@ -40,7 +39,7 @@ type metricServer struct {
 func NewServer() networkservice.NetworkServiceServer {
 	return &metricServer{
 		recorderMap: make(map[string]metric.Int64Histogram),
-		meter:       global.Meter(opentelemetry.InstrumentationName),
+		meter:       global.Meter(""),
 	}
 }
 

pkg/tools/log/spanlogger/span.go

@@ -25,8 +25,6 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	opentelemetry "go.opentelemetry.io/otel/trace"
-
-	opentelemetrynsm "github.com/networkservicemesh/sdk/pkg/tools/opentelemetry"
 )
 
 // Span - unified interface for opentracing/opentelemetry spans
@@ -81,12 +79,13 @@ func newOTSpan(ctx context.Context, operationName string, additionalFields map[s
 
 // Opentelemetry span
 type otelSpan struct {
-	span opentelemetry.Span
+	span          opentelemetry.Span
+	operationName string
 }
 
 func (otelsp *otelSpan) Log(level, format string, v ...interface{}) {
 	otelsp.span.AddEvent(
-		"",
+		otelsp.operationName,
 		opentelemetry.WithAttributes([]attribute.KeyValue{
 			attribute.String("event", level),
 			attribute.String("message", fmt.Sprintf(format, v...)),
@@ -96,7 +95,7 @@ func (otelsp *otelSpan) Log(level, format string, v ...interface{}) {
 
 func (otelsp *otelSpan) LogObject(k, v interface{}) {
 	otelsp.span.AddEvent(
-		"",
+		otelsp.operationName,
 		opentelemetry.WithAttributes([]attribute.KeyValue{
 			attribute.String(fmt.Sprintf("%v", k), fmt.Sprintf("%v", v)),
 		}...),
@@ -126,8 +125,8 @@ func newOTELSpan(ctx context.Context, operationName string, additionalFields map
 		add = append(add, attribute.String(k, fmt.Sprint(v)))
 	}
 
-	ctx, span := otel.Tracer(opentelemetrynsm.InstrumentationName).Start(ctx, operationName)
+	ctx, span := otel.Tracer("").Start(ctx, operationName)
 	span.SetAttributes(add...)
 
-	return ctx, &otelSpan{span: span}
+	return ctx, &otelSpan{span: span, operationName: operationName}
 }

pkg/tools/opentelemetry/opentelemetry.go

@@ -35,11 +35,6 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/tools/log"
 )
 
-const (
-	// InstrumentationName - denotes the library that provides the instrumentation
-	InstrumentationName = "NSM"
-)
-
 type opentelemetry struct {
 	io.Closer