Skip to content

Commit

Permalink
Merge pull request #89 from intergral/frame_data
Browse files Browse the repository at this point in the history
fix(frame): fix missing data in frame storage/response
  • Loading branch information
Umaaz authored Mar 14, 2024
2 parents 1c4e394 + ba128b6 commit 9c5f1e4
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<!-- main START -->
# main (unreleased)
- **[BUGFIX]**: fix missing data in frame response [#89](https://github.com/intergral/deep/pull/89) [@Umaaz](https://github.com/Umaaz)
<!-- main START -->

<!-- main START -->
# 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): 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)
<!-- main START -->

<!-- 1.0.4 START -->
Expand Down
5 changes: 4 additions & 1 deletion modules/distributor/forwarder/otlpgrpc/forwarder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package otlpgrpc

import (
"context"
"errors"
"net"
"testing"

Expand Down Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions pkg/deepdb/encoding/vparquet/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down Expand Up @@ -341,6 +342,10 @@ func convertFrame(frame *deepTP.StackFrame) StackFrame {
if frame.AppFrame != nil {
appFrame = *frame.AppFrame
}
nativeFrame := false
if frame.NativeFrame != nil {
nativeFrame = *frame.NativeFrame
}
return StackFrame{
FileName: frame.FileName,
MethodName: frame.MethodName,
Expand All @@ -353,6 +358,7 @@ func convertFrame(frame *deepTP.StackFrame) StackFrame {
TranspiledColumnNumber: frame.TranspiledColumnNumber,
Variables: convertChildren(frame.Variables),
AppFrame: appFrame,
NativeFrame: nativeFrame,
ShortPath: frame.ShortPath,
}
}
Expand Down Expand Up @@ -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,
Expand All @@ -700,6 +710,8 @@ func parquetConvertFrame(frame StackFrame) *deepTP.StackFrame {
TranspiledColumnNumber: frame.TranspiledColumnNumber,
Variables: parquetConvertChildren(frame.Variables),
AppFrame: appFrame,
NativeFrame: nativeframe,
ShortPath: frame.ShortPath,
}
}

Expand Down

0 comments on commit 9c5f1e4

Please sign in to comment.