Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

refactor(observability): share protobuf field walk in OTLP parser (#386) (#387)

fx-kurumi9e57b5a5d30d
diff --git a/internal/observability/otlp.go b/internal/observability/otlp.go
index f2a3b9fe..158f48b9 100644
--- a/internal/observability/otlp.go
+++ b/internal/observability/otlp.go
@@ -228,66 +228,56 @@ func decodeOTLPProtobuf(body []byte) (otlpExport, bool) {
return otlpExport{ResourceSpans: spans}, true
}
-func walkResourceSpans(body []byte) []otlpResourceSpans {
- var out []otlpResourceSpans
- rest := body
+// forEachProtoField calls fn for every top-level field of msg in order and
+// stops silently at the first malformed field, keeping what was parsed so far.
+func forEachProtoField(msg []byte, fn func(num, wire int, val []byte)) {
+ rest := msg
for len(rest) > 0 {
num, wire, val, next, ok := readProtoField(rest)
if !ok {
- break
+ return
}
rest = next
+ fn(num, wire, val)
+ }
+}
+
+func walkResourceSpans(body []byte) []otlpResourceSpans {
+ var out []otlpResourceSpans
+ forEachProtoField(body, func(num, wire int, val []byte) {
if num == 1 && wire == 2 { // resource_spans
out = append(out, parseResourceSpans(val))
}
- }
+ })
return out
}
func parseResourceSpans(msg []byte) otlpResourceSpans {
var rs otlpResourceSpans
- rest := msg
- for len(rest) > 0 {
- num, wire, val, next, ok := readProtoField(rest)
- if !ok {
- break
- }
- rest = next
+ forEachProtoField(msg, func(num, wire int, val []byte) {
switch {
case num == 1 && wire == 2:
rs.Resource.Attributes = parseAttributes(val, 1)
case num == 2 && wire == 2:
rs.ScopeSpans = append(rs.ScopeSpans, parseScopeSpans(val))
}
- }
+ })
return rs
}
func parseScopeSpans(msg []byte) otlpScopeSpan {
var ss otlpScopeSpan
- rest := msg
- for len(rest) > 0 {
- num, wire, val, next, ok := readProtoField(rest)
- if !ok {
- break
- }
- rest = next
+ forEachProtoField(msg, func(num, wire int, val []byte) {
if num == 2 && wire == 2 {
ss.Spans = append(ss.Spans, parseSpan(val))
}
- }
+ })
return ss
}
func parseSpan(msg []byte) otlpSpan {
var span otlpSpan
- rest := msg
- for len(rest) > 0 {
- num, wire, val, next, ok := readProtoField(rest)
- if !ok {
- break
- }
- rest = next
+ forEachProtoField(msg, func(num, wire int, val []byte) {
switch {
case num == 1 && wire == 2:
span.TraceID = hex.EncodeToString(val)
@@ -306,7 +296,7 @@ func parseSpan(msg []byte) otlpSpan {
case num == 15 && wire == 2:
span.Status = parseStatus(val)
}
- }
+ })
return span
}
@@ -318,13 +308,7 @@ func parseStatus(msg []byte) struct {
Code int `json:"code"`
Message string `json:"message"`
}
- rest := msg
- for len(rest) > 0 {
- num, wire, val, next, ok := readProtoField(rest)
- if !ok {
- break
- }
- rest = next
+ forEachProtoField(msg, func(num, wire int, val []byte) {
if num == 2 && wire == 2 {
st.Message = string(val)
}
@@ -332,42 +316,30 @@ func parseStatus(msg []byte) struct {
n, _ := binary.Uvarint(val)
st.Code = int(n)
}
- }
+ })
return st
}
func parseAttributes(msg []byte, fieldNum int) []otlpKV {
var out []otlpKV
- rest := msg
- for len(rest) > 0 {
- num, wire, val, next, ok := readProtoField(rest)
- if !ok {
- break
- }
- rest = next
+ forEachProtoField(msg, func(num, wire int, val []byte) {
if num == fieldNum && wire == 2 {
out = append(out, parseKV(val)...)
}
- }
+ })
return out
}
func parseKV(msg []byte) []otlpKV {
var kv otlpKV
- rest := msg
- for len(rest) > 0 {
- num, wire, val, next, ok := readProtoField(rest)
- if !ok {
- break
- }
- rest = next
+ forEachProtoField(msg, func(num, wire int, val []byte) {
if num == 1 && wire == 2 {
kv.Key = string(val)
}
if num == 2 && wire == 2 {
kv.Value.StringValue = anyString(val)
}
- }
+ })
if kv.Key == "" {
return nil
}
diff --git a/internal/observability/proto_field_walk_test.go b/internal/observability/proto_field_walk_test.go
new file mode 100644
index 00000000..2f5c2252
--- /dev/null
+++ b/internal/observability/proto_field_walk_test.go
@@ -0,0 +1,60 @@
+package observability
+
+import (
+ "encoding/binary"
+ "reflect"
+ "testing"
+)
+
+type protoFieldVisit struct {
+ num, wire int
+ val string
+}
+
+func TestForEachProtoFieldVisitsFieldsInOrder(t *testing.T) {
+ msg := cvSProtoBytes(1, []byte("a"))
+ msg = append(msg, cvSProtoVarint(3, 7)...)
+ msg = append(msg, cvSProtoFixed64(7, 1)...)
+ msg = append(msg, cvSProtoBytes(9, []byte("bc"))...)
+
+ var got []protoFieldVisit
+ forEachProtoField(msg, func(num, wire int, val []byte) {
+ got = append(got, protoFieldVisit{num, wire, string(val)})
+ })
+ fixed := string(binary.LittleEndian.AppendUint64(nil, 1))
+ want := []protoFieldVisit{{1, 2, "a"}, {3, 0, "\x07"}, {7, 1, fixed}, {9, 2, "bc"}}
+ if !reflect.DeepEqual(got, want) {
+ t.Fatalf("visits = %#v, want %#v", got, want)
+ }
+}
+
+func TestForEachProtoFieldStopsAtMalformedFieldKeepingPrefix(t *testing.T) {
+ // A valid field followed by a length-delimited field that claims 5 bytes
+ // but carries only 1: the walk keeps the first field and stops.
+ msg := append(cvSProtoBytes(1, []byte("ok")), 0x12, 5, 1)
+ var got []protoFieldVisit
+ forEachProtoField(msg, func(num, wire int, val []byte) {
+ got = append(got, protoFieldVisit{num, wire, string(val)})
+ })
+ if want := []protoFieldVisit{{1, 2, "ok"}}; !reflect.DeepEqual(got, want) {
+ t.Fatalf("visits = %#v, want %#v", got, want)
+ }
+
+ calls := 0
+ for _, empty := range [][]byte{nil, {}} {
+ forEachProtoField(empty, func(int, int, []byte) { calls++ })
+ }
+ if calls != 0 {
+ t.Fatalf("empty input visited %d fields", calls)
+ }
+}
+
+func TestParseSpanKeepsFieldsBeforeTruncation(t *testing.T) {
+ span := cvSProtoBytes(5, []byte("op"))
+ span = append(span, cvSProtoBytes(9, append(cvSProtoBytes(1, []byte("k")), cvSProtoBytes(2, cvSProtoBytes(1, []byte("v")))...))...)
+ span = append(span, 0x7a, 9) // field 15 (status) truncated
+ got := parseSpan(span)
+ if got.Name != "op" || len(got.Attributes) != 1 || got.Attributes[0].Key != "k" || got.Attributes[0].Value.StringValue != "v" || got.Status.Code != 0 {
+ t.Fatalf("span = %#v", got)
+ }
+}