From 5e813ca026dccc6392cf3b387d2a5da5c000471a Mon Sep 17 00:00:00 2001 From: Ben Donnelly Date: Wed, 21 Feb 2024 18:09:53 +0000 Subject: [PATCH 1/4] fix(frame): fix missing data in frame storage/response --- pkg/deepdb/encoding/vparquet/schema.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/deepdb/encoding/vparquet/schema.go b/pkg/deepdb/encoding/vparquet/schema.go index a20c037..af0dd59 100644 --- a/pkg/deepdb/encoding/vparquet/schema.go +++ b/pkg/deepdb/encoding/vparquet/schema.go @@ -162,6 +162,7 @@ type StackFrame struct { TranspiledColumnNumber *uint32 `parquet:",snappy,optional"` Variables []VariableID `parquet:""` AppFrame bool `parquet:""` + NativeFrame bool `parquet:""` ShortPath *string `parquet:",snappy,dict,optional"` } @@ -341,6 +342,10 @@ func convertFrame(frame *deepTP.StackFrame) StackFrame { if frame.AppFrame != nil { appFrame = *frame.AppFrame } + nativeFrame := false + if frame.AppFrame != nil { + nativeFrame = *frame.NativeFrame + } return StackFrame{ FileName: frame.FileName, MethodName: frame.MethodName, @@ -353,6 +358,7 @@ func convertFrame(frame *deepTP.StackFrame) StackFrame { TranspiledColumnNumber: frame.TranspiledColumnNumber, Variables: convertChildren(frame.Variables), AppFrame: appFrame, + NativeFrame: nativeFrame, ShortPath: frame.ShortPath, } } @@ -688,6 +694,10 @@ func parquetConvertFrame(frame StackFrame) *deepTP.StackFrame { if frame.AppFrame { appFrame = &trueBool } + var nativeframe *bool = nil + if frame.NativeFrame { + nativeframe = &trueBool + } return &deepTP.StackFrame{ FileName: frame.FileName, MethodName: frame.MethodName, @@ -700,6 +710,8 @@ func parquetConvertFrame(frame StackFrame) *deepTP.StackFrame { TranspiledColumnNumber: frame.TranspiledColumnNumber, Variables: parquetConvertChildren(frame.Variables), AppFrame: appFrame, + NativeFrame: nativeframe, + ShortPath: frame.ShortPath, } } From cf35db970b80f44768f1757946036edc9895d0ad Mon Sep 17 00:00:00 2001 From: Ben Donnelly Date: Wed, 21 Feb 2024 18:11:41 +0000 Subject: [PATCH 2/4] fix(frame): fix missing data in frame storage/response --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eb0d33..a4ed67f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # main (unreleased) - **[ENHANCEMENT]**: Update deep proto version to support new properties on tracepoints [#78](https://github.com/intergral/deep/pull/78) [@Umaaz](https://github.com/Umaaz) -- **[ENHANCEMENT]**: change(builds): change builds to use goreleaser [#79](https://github.com/intergral/deep/pull/79) [@Umaaz](https://github.com/Umaaz) +- **[ENHANCEMENT]**: change builds to use goreleaser [#79](https://github.com/intergral/deep/pull/79) [@Umaaz](https://github.com/Umaaz) +- **[BUGFIX]**: fix missing data in frame response [#89](https://github.com/intergral/deep/pull/89) [@Umaaz](https://github.com/Umaaz) From 1ef167181480afc6596ad62a70e960e4ac81ba2d Mon Sep 17 00:00:00 2001 From: Ben Donnelly Date: Thu, 14 Mar 2024 15:34:36 +0000 Subject: [PATCH 3/4] fix(frame): fix missing type in convert frame --- pkg/deepdb/encoding/vparquet/schema.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/deepdb/encoding/vparquet/schema.go b/pkg/deepdb/encoding/vparquet/schema.go index af0dd59..eb83b32 100644 --- a/pkg/deepdb/encoding/vparquet/schema.go +++ b/pkg/deepdb/encoding/vparquet/schema.go @@ -343,7 +343,7 @@ func convertFrame(frame *deepTP.StackFrame) StackFrame { appFrame = *frame.AppFrame } nativeFrame := false - if frame.AppFrame != nil { + if frame.NativeFrame != nil { nativeFrame = *frame.NativeFrame } return StackFrame{ From ba128b6328244a01488b0b89d3e0965f9f77c093 Mon Sep 17 00:00:00 2001 From: Ben Donnelly Date: Thu, 14 Mar 2024 17:07:35 +0000 Subject: [PATCH 4/4] fix(test): fix race condition in test clean up update CHANGELOG.md --- CHANGELOG.md | 6 +++++- modules/distributor/forwarder/otlpgrpc/forwarder_test.go | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4ed67f..833d15f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ # main (unreleased) +- **[BUGFIX]**: fix missing data in frame response [#89](https://github.com/intergral/deep/pull/89) [@Umaaz](https://github.com/Umaaz) + + + +# 1.0.5 (08/02/2024) - **[ENHANCEMENT]**: Update deep proto version to support new properties on tracepoints [#78](https://github.com/intergral/deep/pull/78) [@Umaaz](https://github.com/Umaaz) - **[ENHANCEMENT]**: change builds to use goreleaser [#79](https://github.com/intergral/deep/pull/79) [@Umaaz](https://github.com/Umaaz) -- **[BUGFIX]**: fix missing data in frame response [#89](https://github.com/intergral/deep/pull/89) [@Umaaz](https://github.com/Umaaz) diff --git a/modules/distributor/forwarder/otlpgrpc/forwarder_test.go b/modules/distributor/forwarder/otlpgrpc/forwarder_test.go index 15531d6..6435aa7 100644 --- a/modules/distributor/forwarder/otlpgrpc/forwarder_test.go +++ b/modules/distributor/forwarder/otlpgrpc/forwarder_test.go @@ -19,6 +19,7 @@ package otlpgrpc import ( "context" + "errors" "net" "testing" @@ -80,7 +81,9 @@ func newListener(t *testing.T, srv ptraceotlp.Server) *bufconn.Listener { ptraceotlp.RegisterServer(s, srv) go func() { err := s.Serve(l) - require.NoError(t, err) + if !errors.Is(err, grpc.ErrServerStopped) { + require.NoError(t, err) + } }() return l