Merge pull request #34 from muir/twentyeight

Twentyeight

.github/workflows/codecov.yml

@@ -13,6 +13,11 @@ jobs:
         with:
           go-version: '1.18'
       - name: Run coverage
-        run: go test ./... -race -coverprofile=coverage.txt -covermode=atomic -coverpkg github.com/muir/xop-go
+        run: make calculate_coverage
+
       - name: Upload coverage to Codecov
-        run: bash <(curl -s https://codecov.io/bash)
+        uses: codecov/codecov-action@v2
+        with:
+          verbose: true
+          flags: go_tests
+          fail_ci_if_error: true

Makefile

@@ -34,3 +34,21 @@ ${GOBIN}/enumer:;
 	-chmod -w $@
 	-rm $@.tmp
 
+calculate_coverage:
+	echo "mode: atomic" > coverage.txt
+	for d in $$(go list ./...); do \
+	  go test -race -covermode=atomic -coverprofile=profile.out -coverpkg=github.com/muir/xop-go/... $$d; \
+	  if [ -f profile.out ]; then \
+	    grep -v ^mode profile.out >> coverage.txt; \
+	    rm profile.out; \
+	  fi; \
+	done
+
+
+coverage: calculate_coverage
+	go tool cover -html=coverage.txt
+
+golanglint:
+	# binary will be $(go env GOPATH)/bin/golangci-lint
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.45.2
+	golangci-lint --version

TODO.md

@@ -41,6 +41,8 @@
   behavior.  Baseloggers could choose to ignore levels that are too low.  The logger itself
   could choose to discard when the level is too low.
 
+- support microsoft correlation vectors?  https://github.com/Microsoft/CorrelationVector-Go
+
 # Just do it (build ready)
 
 - move xoputil to internal/xoputil -- at least for now since
@@ -169,6 +171,11 @@
   - figure out a way to modify trace Baggage
   - add methods to query trace Baggage
 
+- How to do full-text (short-term) indexing of log lines
+
+  - Elastic
+  - [zinc](https://github.com/zinclabs/zinc)
+
 # Not build ready 
 
 - benchmarking

basegroup.go

@@ -93,10 +93,10 @@ func (s baseRequests) Flush() {
 	wg.Wait()
 }
 
-func (s baseSpans) Span(t time.Time, span trace.Bundle, descriptionOrName string) xopbase.Span {
+func (s baseSpans) Span(t time.Time, span trace.Bundle, descriptionOrName string, spanSequenceCode string) xopbase.Span {
 	baseSpans := make(baseSpans, len(s))
 	for i, ele := range s {
-		baseSpans[i] = ele.Span(t, span, descriptionOrName)
+		baseSpans[i] = ele.Span(t, span, descriptionOrName, spanSequenceCode)
 	}
 	return baseSpans
 }

basegroup.zzzgo

@@ -85,10 +85,10 @@ func (s baseRequests) Flush() {
 	wg.Wait()
 }
 
-func (s baseSpans) Span(t time.Time, span trace.Bundle, descriptionOrName string) xopbase.Span {
+func (s baseSpans) Span(t time.Time, span trace.Bundle, descriptionOrName string, spanSequenceCode string) xopbase.Span {
 	baseSpans := make(baseSpans, len(s))
 	for i, ele := range s {
-		baseSpans[i] = ele.Span(t, span, descriptionOrName)
+		baseSpans[i] = ele.Span(t, span, descriptionOrName, spanSequenceCode)
 	}
 	return baseSpans
 }

logger.go

@@ -166,7 +166,7 @@ func (old *Log) newChildLog(spanSeed spanSeed, description string, settings LogS
 	alloc.Log.span = &alloc.span
 	log := &alloc.Log
 
-	log.span.base = old.span.base.Span(time.Now(), spanSeed.traceBundle, description)
+	log.span.base = old.span.base.Span(time.Now(), spanSeed.traceBundle, description, log.span.seed.spanSequenceCode)
 	if len(spanSeed.loggers.Added) == 0 && len(spanSeed.loggers.Removed) == 0 {
 		log.span.buffered = old.span.buffered
 		log.span.referencesKept = old.span.referencesKept
@@ -217,7 +217,6 @@ func (old *Log) newChildLog(spanSeed spanSeed, description string, settings LogS
 		log.span.referencesKept = log.span.seed.loggers.List.ReferencesKept()
 	}
 	log.span.base.Boring(true)
-	log.Span().String(xopconst.SpanSequenceCode, log.span.seed.spanSequenceCode) // TODO: improve  (not efficient)
 	log.sendPrefill()
 	log.addMyselfAsDependent()
 	return log

trace/trace_test.go

@@ -12,8 +12,8 @@ func TestSetRandom(t *testing.T) {
 	trace := trace.NewTrace()
 	trace.RebuildSetNonZero()
 	trace.RandomizeSpanID()
-	a := trace.SpanIDString()
+	a := trace.SpanID().String()
 	trace.RandomizeSpanID()
-	b := trace.SpanIDString()
+	b := trace.SpanID().String()
 	assert.NotEqual(t, a, b)
 }

xopbase/base.go

@@ -51,7 +51,7 @@ type Request interface {
 
 type Span interface {
 	// Span creates a new Span that should inherit prefil but not data
-	Span(ts time.Time, span trace.Bundle, descriptionOrName string) Span
+	Span(ts time.Time, span trace.Bundle, descriptionOrName string, spanSequenceCode string) Span
 
 	// MetadataAny adds a key/value pair to describe the span.
 	MetadataAny(*xopconst.AnyAttribute, interface{})

xopbase/base.zzzgo

@@ -49,7 +49,7 @@ type Request interface {
 
 type Span interface {
 	// Span creates a new Span that should inherit prefil but not data
-	Span(ts time.Time, span trace.Bundle, descriptionOrName string) Span
+	Span(ts time.Time, span trace.Bundle, descriptionOrName string, spanSequenceCode string) Span
 
 	// MACRO BaseAttribute
 	// MetadataZZZ adds a key/value pair to describe the span.

xopjson/attributes.go

@@ -66,10 +66,10 @@ func (a *AttributeBuilder) Init(s *span) {
 	a.span = s
 }
 
-func (a *AttributeBuilder) Append(b *xoputil.JBuilder) {
+func (a *AttributeBuilder) Append(b *xoputil.JBuilder, onlyChanged bool) {
 	a.lock.Lock()
 	defer a.lock.Unlock()
-	if !a.anyChanged {
+	if (!a.anyChanged && onlyChanged) || (len(a.multiMap) == 0 && len(a.singleMap) == 0) {
 		return
 	}
 	a.anyChanged = false
@@ -78,7 +78,7 @@ func (a *AttributeBuilder) Append(b *xoputil.JBuilder) {
 		b.AppendBytes([]byte(`"attributes":{`)) // }
 	}
 	for _, m := range a.multiMap {
-		if m.Changed {
+		if m.Changed || !onlyChanged {
 			b.Comma()
 			b.AppendBytes(m.Builder.B)
 			// [
@@ -87,7 +87,7 @@ func (a *AttributeBuilder) Append(b *xoputil.JBuilder) {
 		}
 	}
 	for _, s := range a.singleMap {
-		if s.Changed {
+		if s.Changed || !onlyChanged {
 			b.Comma()
 			b.AppendBytes(s.KeyValue)
 			s.Changed = false

xopjson/attributes.zzzgo

@@ -60,10 +60,10 @@ func (a *AttributeBuilder) Init(s *span) {
 	a.span = s
 }
 
-func (a *AttributeBuilder) Append(b *xoputil.JBuilder) {
+func (a *AttributeBuilder) Append(b *xoputil.JBuilder, onlyChanged bool) {
 	a.lock.Lock()
 	defer a.lock.Unlock()
-	if !a.anyChanged {
+	if (!a.anyChanged && onlyChanged) || (len(a.multiMap) == 0 && len(a.singleMap) == 0) {
 		return
 	}
 	a.anyChanged = false
@@ -72,7 +72,7 @@ func (a *AttributeBuilder) Append(b *xoputil.JBuilder) {
 		b.AppendBytes([]byte(`"attributes":{`)) // }
 	}
 	for _, m := range a.multiMap {
-		if m.Changed {
+		if m.Changed || !onlyChanged {
 			b.Comma()
 			b.AppendBytes(m.Builder.B)
 			// [
@@ -81,7 +81,7 @@ func (a *AttributeBuilder) Append(b *xoputil.JBuilder) {
 		}
 	}
 	for _, s := range a.singleMap {
-		if s.Changed {
+		if s.Changed || !onlyChanged {
 			b.Comma()
 			b.AppendBytes(s.KeyValue)
 			s.Changed = false