From c70f0a615b402e07258303921b4f3c7da83508c6 Mon Sep 17 00:00:00 2001
From: Saket Chaudhary <saketchaudharynit@gmail.com>
Date: Thu, 28 Aug 2025 15:14:05 +0530
Subject: [PATCH] add sql_trace_data

---
 apm/apm_payload.go |  1 +
 apm/collector.go   | 12 ------------
 apm/connect.go     |  8 ++++++++
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/apm/apm_payload.go b/apm/apm_payload.go
index fef93431..fe7d48db 100644
--- a/apm/apm_payload.go
+++ b/apm/apm_payload.go
@@ -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"`
 }
diff --git a/apm/collector.go b/apm/collector.go
index c5029f31..ad2cd981 100644
--- a/apm/collector.go
+++ b/apm/collector.go
@@ -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)
diff --git a/apm/connect.go b/apm/connect.go
index dceb3640..e652c398 100644
--- a/apm/connect.go
+++ b/apm/connect.go
@@ -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{}
@@ -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{}
@@ -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{}
@@ -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,
@@ -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{}
@@ -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,
@@ -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{}
@@ -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},