refactor: make buffer prettier

telemetry/log/memory/log.go

@@ -34,7 +34,7 @@ func (l *memoryLog) Read(opts ...log.ReadOption) ([]log.Record, error) {
 	if options.Count > 0 {
 		entries = l.buffer.Get(options.Count)
 	} else {
-		entries = l.buffer.Get(l.buffer.Size)
+		entries = l.buffer.Get(l.buffer.Options().Size)
 	}
 
 	records := []log.Record{}
@@ -63,9 +63,9 @@ func NewLog(opts ...log.LogOption) log.Log {
 	}
 
 	if s, ok := GetSizeFromContext(options.Context); ok && s > 0 {
-		l.buffer = memoryutils.NewBuffer(s)
+		l.buffer = memoryutils.NewBuffer(memoryutils.BufferWithSize(s))
 	} else {
-		l.buffer = memoryutils.NewBuffer(1024)
+		l.buffer = memoryutils.NewBuffer()
 	}
 
 	return l

telemetry/log/memory/log_test.go

@@ -14,7 +14,7 @@ func TestLogger(t *testing.T) {
 	service := "service.namespace"
 
 	logger := NewLog(log.LogWithPrefix(service), log.LogWithLevel(log.LevelDebug), LogWithSize(size))
-	require.Equal(t, size, logger.(*memoryLog).buffer.Size)
+	require.Equal(t, size, logger.(*memoryLog).buffer.Options().Size)
 
 	log.SetLogger(logger)
 

telemetry/trace/memory/trace.go

@@ -65,7 +65,7 @@ func (t *memoryTrace) Read(opts ...trace.ReadOption) ([]*trace.Span, error) {
 	if options.Count > 0 {
 		entries = t.buffer.Get(options.Count)
 	} else {
-		entries = t.buffer.Get(t.buffer.Size)
+		entries = t.buffer.Get(t.buffer.Options().Size)
 	}
 
 	spans := []*trace.Span{}
@@ -95,9 +95,9 @@ func NewTrace(opts ...trace.TraceOption) trace.Trace {
 	}
 
 	if s, ok := GetSizeFromContext(options.Context); ok && s > 0 {
-		t.buffer = memoryutils.NewBuffer(s)
+		t.buffer = memoryutils.NewBuffer(memoryutils.BufferWithSize(s))
 	} else {
-		t.buffer = memoryutils.NewBuffer(1024)
+		t.buffer = memoryutils.NewBuffer()
 	}
 
 	return t

telemetry/tracev2/memory/trace.go

@@ -93,7 +93,7 @@ func (t *memoryTrace) Read(opts ...tracev2.ReadOption) ([]*tracev2.SpanData, err
 	if options.Count > 0 {
 		entries = t.buffer.Get(options.Count)
 	} else {
-		entries = t.buffer.Get(t.buffer.Size)
+		entries = t.buffer.Get(t.buffer.Options().Size)
 	}
 
 	spans := []*tracev2.SpanData{}

telemetry/tracev2/utils.go

@@ -9,7 +9,6 @@ import (
 const (
 	traceParentKey = "traceparent"
 	spanParentKey  = "spanparent"
-	spanKey        = "span"
 )
 
 func ContextWithTraceParent(ctx context.Context, traceparent [16]byte) (context.Context, error) {

utils/memoryutils/memory_utils.go

@@ -5,8 +5,12 @@ import (
 	"time"
 )
 
+var (
+	defaultSize = 1024
+)
+
 type Buffer struct {
-	Size    int
+	options BufferOptions
 	mtx     sync.RWMutex
 	entries []*Entry
 }
@@ -16,6 +20,10 @@ type Entry struct {
 	Timestamp time.Time
 }
 
+func (m *Buffer) Options() BufferOptions {
+	return m.options
+}
+
 func (m *Buffer) Put(v interface{}) {
 	m.mtx.Lock()
 	defer m.mtx.Unlock()
@@ -31,7 +39,7 @@ func (m *Buffer) Put(v interface{}) {
 
 	// if the length of the entries is greater than the
 	// specified size, then trim down the buffer by 1
-	if len(m.entries) > m.Size {
+	if len(m.entries) > m.options.Size {
 		m.entries = m.entries[1:]
 	}
 }
@@ -51,9 +59,11 @@ func (m *Buffer) Get(n int) []*Entry {
 	return m.entries[delta:]
 }
 
-func NewBuffer(size int) *Buffer {
+func NewBuffer(opts ...BufferOption) *Buffer {
+	options := NewBufferOptions(opts...)
+
 	b := &Buffer{
-		Size:    size,
+		options: options,
 		mtx:     sync.RWMutex{},
 		entries: []*Entry{},
 	}

utils/memoryutils/memory_utils.test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestMemoryBuffer(t *testing.T) {
-	b := NewBuffer(10)
+	b := NewBuffer(BufferWithSize(10))
 
 	b.Put("foo")
 
@@ -16,7 +16,7 @@ func TestMemoryBuffer(t *testing.T) {
 	val := entries[0].Value.(string)
 	require.Equal(t, "foo", val)
 
-	b = NewBuffer(10)
+	b = NewBuffer(BufferWithSize(10))
 
 	for i := 0; i < 10; i++ {
 		b.Put(i)