add more properties

dylibso · Jul 20, 2023 · 80ddb5b · 80ddb5b
1 parent defc166
commit 80ddb5b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/go/adapter/datadog/adapter.go b/go/adapter/datadog/adapter.go
@@ -79,6 +79,9 @@ func (d *DatadogAdapter) HandleTraceEvent(te observe.TraceEvent) {
 
 		if meta, ok := te.AdapterMeta.(DatadogMetadata); ok {
 			topSpan := allSpans[0]
+			if topSpan.Meta == nil {
+				topSpan.Meta = make(map[string]string)
+			}
 			if meta.ResourceName != nil {
 				topSpan.Resource = *meta.ResourceName
 			}
@@ -88,6 +91,24 @@ func (d *DatadogAdapter) HandleTraceEvent(te observe.TraceEvent) {
 			if meta.HttpStatusCode != nil {
 				topSpan.Meta["http.status_code"] = fmt.Sprintf("%d", *meta.HttpStatusCode)
 			}
+			if meta.HttpClientIp != nil {
+				topSpan.Meta["http.client_ip"] = *meta.HttpClientIp
+			}
+			if meta.HttpRequestContentLength != nil {
+				topSpan.Meta["http.request.content_length"] = fmt.Sprintf("%d", *meta.HttpRequestContentLength)
+			}
+			if meta.HttpRequestContentLengthUncompressed != nil {
+				topSpan.Meta["http.request.content_length_uncompressed"] = fmt.Sprintf("%d", *meta.HttpRequestContentLengthUncompressed)
+			}
+			if meta.HttpResponseContentLength != nil {
+				topSpan.Meta["http.response.content_length"] = fmt.Sprintf("%d", *meta.HttpResponseContentLength)
+			}
+			if meta.HttpResponseContentLengthUncompressed != nil {
+				topSpan.Meta["http.response.content_length_uncompressed"] = fmt.Sprintf("%d", *meta.HttpResponseContentLengthUncompressed)
+			}
+			if meta.SpanKind != nil {
+				topSpan.Meta["span.kind"] = meta.SpanKind.String()
+			}
 		}
 
 		tt := d.Config.TraceType.String()
@@ -139,10 +160,16 @@ func (d *DatadogAdapter) makeCallSpans(event observe.CallEvent, parentId *uint64
 }
 
 type DatadogMetadata struct {
-	HttpUrl        *string
-	HttpMethod     *string
-	HttpStatusCode *int
-	ResourceName   *string
+	HttpUrl                               *string
+	HttpMethod                            *string
+	HttpStatusCode                        *int
+	ResourceName                          *string
+	HttpClientIp                          *string
+	HttpRequestContentLength              *int
+	HttpRequestContentLengthUncompressed  *int
+	HttpResponseContentLength             *int
+	HttpResponseContentLengthUncompressed *int
+	SpanKind                              *DatadogSpanKind
 }
 
 type DatadogSpanKind int

diff --git a/go/adapter/datadog_formatter/format.go b/go/adapter/datadog_formatter/format.go
@@ -37,7 +37,6 @@ func NewSpan(service string, traceId uint64, parentId *uint64, name string, star
 		Duration: uint64(end.Sub(start).Nanoseconds()),
 		Service:  service,
 		Resource: name,
-		Meta:     make(map[string]string),
 	}
 	return &span
 }

diff --git a/go/bin/datadog/main.go b/go/bin/datadog/main.go
@@ -52,11 +52,15 @@ func main() {
 	resourceName := "my-resource"
 	httpUrl := "https://example.com/my-endpoint"
 	httpStatusCode := 200
+	spanKind := datadog.Server
+	clientIp := "66.210.227.34"
 
 	meta := datadog.DatadogMetadata{
 		ResourceName:   &resourceName,
 		HttpUrl:        &httpUrl,
 		HttpStatusCode: &httpStatusCode,
+		SpanKind:       &spanKind,
+		HttpClientIp:   &clientIp,
 	}
 	traceCtx.Metadata(meta)