Skip to content

add sql_trace_data for APM Mode #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chaudharysaket wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add sql_trace_data for APM Mode #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apm/apm_payload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ type LambdaData struct {
ErrorEventData []interface{} `json:"error_event_data"`
ErrorData []interface{} `json:"error_data"`
SpanEventData []interface{} `json:"span_event_data"`
SQLTraceData []interface{} `json:"sql_trace_data"`
UpdateLoadedModules []interface{} `json:"update_loaded_modules"`
TransactionSampleData []interface{} `json:"transaction_sample_data"`
}
Expand Down
12 changes: 0 additions & 12 deletions apm/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,6 @@ type Metadata struct {
FunctionVersion string `json:"function_version"`
}

type Data struct {
Error_data []interface{} `json:"error_data"`
AnalyticEventData []interface{} `json:"analytic_event_data"`
SpanEventData []interface{} `json:"span_event_data"`
MetricData []interface{} `json:"metric_data"`
}

type Input struct {
Metadata Metadata `json:"metadata"`
Data Data `json:"data"`
}


func compress(b []byte, gzipWriterPool *sync.Pool) (*bytes.Buffer, error) {
w := gzipWriterPool.Get().(*gzip.Writer)
Expand Down
8 changes: 8 additions & 0 deletions apm/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ func SendAPMTelemetry(ctx context.Context, payload []byte, conf *config.Configur
func extractTelemetryData(datav1 LambdaRawData, datav2 LambdaData, pv int) (struct {
MetricData []interface{}
SpanEventData []interface{}
SQLTraceData []interface{}
ErrorData []interface{}
ErrorEventData []interface{}
CustomEventData []interface{}
Expand All @@ -367,6 +368,7 @@ func extractTelemetryData(datav1 LambdaRawData, datav2 LambdaData, pv int) (stru
var telemetryData struct {
MetricData []interface{}
SpanEventData []interface{}
SQLTraceData []interface{}
ErrorData []interface{}
ErrorEventData []interface{}
CustomEventData []interface{}
Expand All @@ -383,6 +385,7 @@ func extractTelemetryData(datav1 LambdaRawData, datav2 LambdaData, pv int) (stru
telemetryData = struct {
MetricData []interface{}
SpanEventData []interface{}
SQLTraceData []interface{}
ErrorData []interface{}
ErrorEventData []interface{}
CustomEventData []interface{}
Expand All @@ -391,6 +394,7 @@ func extractTelemetryData(datav1 LambdaRawData, datav2 LambdaData, pv int) (stru
}{
MetricData: datav2.MetricData,
SpanEventData: datav2.SpanEventData,
SQLTraceData: datav2.SQLTraceData,
ErrorData: datav2.ErrorData,
ErrorEventData: datav2.ErrorEventData,
CustomEventData: datav2.CustomEventData,
Expand All @@ -405,6 +409,7 @@ func extractTelemetryData(datav1 LambdaRawData, datav2 LambdaData, pv int) (stru
telemetryData = struct {
MetricData []interface{}
SpanEventData []interface{}
SQLTraceData []interface{}
ErrorData []interface{}
ErrorEventData []interface{}
CustomEventData []interface{}
Expand All @@ -413,6 +418,7 @@ func extractTelemetryData(datav1 LambdaRawData, datav2 LambdaData, pv int) (stru
}{
MetricData: datav1.LambdaData.MetricData,
SpanEventData: datav1.LambdaData.SpanEventData,
SQLTraceData: datav1.LambdaData.SQLTraceData,
ErrorData: datav1.LambdaData.ErrorData,
ErrorEventData: datav1.LambdaData.ErrorEventData,
CustomEventData: datav1.LambdaData.CustomEventData,
Expand All @@ -427,6 +433,7 @@ func extractTelemetryData(datav1 LambdaRawData, datav2 LambdaData, pv int) (stru
func sendTelemetryData(ctx context.Context, data struct {
MetricData []interface{}
SpanEventData []interface{}
SQLTraceData []interface{}
ErrorData []interface{}
ErrorEventData []interface{}
CustomEventData []interface{}
Expand All @@ -437,6 +444,7 @@ func sendTelemetryData(ctx context.Context, data struct {
telemetryTasks := []telemetryType{
{data.MetricData, CmdMetrics},
{data.SpanEventData, CmdSpanEvents},
{data.SQLTraceData, cmdSlowSQLs},
{data.ErrorData, CmdErrorData},
{data.ErrorEventData, CmdErrorEvents},
{data.CustomEventData, CmdCustomEvents},
Expand Down
Loading