From 6b4627e4603cfc461ca47411e9503a6708265a1c Mon Sep 17 00:00:00 2001
From: Steve Manuel <steve@dylib.so>
Date: Wed, 28 Feb 2024 12:55:51 -0800
Subject: [PATCH] fix: go sdk and api updates to latest (#161)

* fix: add small default to channel buffer

* fix: update go observe-api names for compat

* chore: remove old print statements
---
 go/trace_ctx.go               |  4 ++++
 observe-api/go/observe_api.go | 32 +++++++++++++++-----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/go/trace_ctx.go b/go/trace_ctx.go
index de4c60f..abfb2b6 100644
--- a/go/trace_ctx.go
+++ b/go/trace_ctx.go
@@ -33,6 +33,10 @@ func newTraceCtx(ctx context.Context, eventsChan chan TraceEvent, r wazero.Runti
 		return nil, err
 	}
 
+	if opts.ChannelBufferSize == 0 {
+		opts.ChannelBufferSize = 64 // set a reasonable minimum here so unset option doesn't block execution on an unbuffered channel
+	}
+
 	traceCtx := &TraceCtx{
 		adapter:     eventsChan,
 		raw:         make(chan RawEvent, opts.ChannelBufferSize),
diff --git a/observe-api/go/observe_api.go b/observe-api/go/observe_api.go
index 3b6ab28..3089c55 100644
--- a/observe-api/go/observe_api.go
+++ b/observe-api/go/observe_api.go
@@ -1,32 +1,29 @@
 package observe_api
 
-package main
-
 import (
-	"fmt"
 	"reflect"
 	"strings"
 	"unsafe"
 )
 
-//go:wasmimport dylibso_observe metric
-func metric(uint32, uint64, uint32)
+//go:wasmimport dylibso:observe/api metric
+func metric(uint32, uint32, uint32)
 
-//go:wasmimport dylibso_observe log
-func log(uint32, uint64, uint32)
+//go:wasmimport dylibso:observe/api log
+func log(uint32, uint32, uint32)
 
-//go:wasmimport dylibso_observe span_tags
-func span_tags(uint64, uint32)
+//go:wasmimport dylibso:observe/api span-tags
+func span_tags(uint32, uint32)
 
-//go:wasmimport dylibso_observe span_enter
-func span_enter(uint64, uint32)
+//go:wasmimport dylibso:observe/api span-enter
+func span_enter(uint32, uint32)
 
-//go:wasmimport dylibso_observe span_exit
+//go:wasmimport dylibso:observe/api span-exit
 func span_exit()
 
-func stringPointer(s *string) uint64 {
+func stringPointer(s *string) uint32 {
 	header := (*reflect.StringHeader)(unsafe.Pointer(s))
-	return uint64(header.Data)
+	return uint32(header.Data)
 }
 
 type MetricFormat int
@@ -69,7 +66,8 @@ type span struct {
 func NewSpan(name string) span {
 	ptr := stringPointer(&name)
 	span_enter(ptr, uint32(len(name)))
-	return span { name }
+	tags := []string{}
+	return span{name, tags}
 }
 
 func (s span) End() {
@@ -77,5 +75,5 @@ func (s span) End() {
 }
 
 func (s span) AddTags(tags ...string) {
-	SpanTags(tags...)
-}
\ No newline at end of file
+	SpanTags(tags)
+}