fix(evpn-bridge): make tracer optional

Signed-off-by: Dimitrios Markou <dimitrios.markou@ericsson.com>
opiproject · May 14, 2024 · 3342b84 · 3342b84
1 parent d33fbef
commit 3342b84
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/pkg/utils/frr.go b/pkg/utils/frr.go
@@ -16,6 +16,7 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 )
 
 const (
@@ -64,13 +65,18 @@ type FrrWrapper struct {
 
 // NewFrrWrapper creates initialized instance of FrrWrapper with default address
 func NewFrrWrapper() *FrrWrapper {
-	return NewFrrWrapperWithArgs(defaultAddress)
+	return NewFrrWrapperWithArgs(defaultAddress, true)
 }
 
 // NewFrrWrapperWithArgs creates initialized instance of FrrWrapper
-func NewFrrWrapperWithArgs(address string) *FrrWrapper {
-	// default tracer name is good for now
-	return &FrrWrapper{address: address, tracer: otel.Tracer("")}
+func NewFrrWrapperWithArgs(address string, enableTracer bool) *FrrWrapper {
+	frrWrapper := &FrrWrapper{address: address}
+	frrWrapper.tracer = noop.NewTracerProvider().Tracer("")
+	if enableTracer {
+		// default tracer name is good for now
+		frrWrapper.tracer = otel.Tracer("")
+	}
+	return frrWrapper
 }
 
 // build time check that struct implements interface

diff --git a/pkg/utils/netlink.go b/pkg/utils/netlink.go
@@ -19,6 +19,7 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 )
 
 // Netlink represents limited subset of functions from netlink package
@@ -73,7 +74,18 @@ type NetlinkWrapper struct {
 
 // NewNetlinkWrapper creates initialized instance of NetlinkWrapper
 func NewNetlinkWrapper() *NetlinkWrapper {
-	return &NetlinkWrapper{tracer: otel.Tracer("")}
+	return NewNetlinkWrapperWithArgs(true)
+}
+
+// NewNetlinkWrapperWithArgs creates initialized instance of NetlinkWrapper
+// based on passing arguments
+func NewNetlinkWrapperWithArgs(enableTracer bool) *NetlinkWrapper {
+	netlinkWrapper := &NetlinkWrapper{}
+	netlinkWrapper.tracer = noop.NewTracerProvider().Tracer("")
+	if enableTracer {
+		netlinkWrapper.tracer = otel.Tracer("")
+	}
+	return netlinkWrapper
 }
 
 // build time check that struct implements interface