refine: the server-side http Request Body is always non-nil (#1291)

shvc · dashpole · web-flow · commit c12996dcae64 · 2023-02-22T10:25:26.000-05:00
* refine: the server-side http Request Body is always non-nil
---------

Co-authored-by: David Ashpole &lt;dashpole@google.com&gt;
diff --git a/plugin/ochttp/server.go b/plugin/ochttp/server.go
@@ -130,7 +130,7 @@ func (h *Handler) startTrace(w http.ResponseWriter, r *http.Request) (*http.Requ
 		}
 	}
 	span.AddAttributes(requestAttrs(r)...)
-	if r.Body == nil {
+	if r.Body == nil || r.Body == http.NoBody {
 		// TODO: Handle cases where ContentLength is not set.
 	} else if r.ContentLength > 0 {
 		span.AddMessageReceiveEvent(0, /* TODO: messageID */
@@ -156,7 +156,7 @@ func (h *Handler) startStats(w http.ResponseWriter, r *http.Request) (http.Respo
 		ctx:    ctx,
 		writer: w,
 	}
-	if r.Body == nil {
+	if r.Body == nil || r.Body == http.NoBody {
 		// TODO: Handle cases where ContentLength is not set.
 		track.reqSize = -1
 	} else if r.ContentLength > 0 {

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func (h Handler) startTrace(w http.ResponseWriter, r http.Request) (*http.Requ`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`span.AddAttributes(requestAttrs(r)...)`
`133`		`- if r.Body == nil {`
	`133`	`+ if r.Body == nil \|\| r.Body == http.NoBody {`
`134`	`134`	`// TODO: Handle cases where ContentLength is not set.`
`135`	`135`	`} else if r.ContentLength > 0 {`
`136`	`136`	`span.AddMessageReceiveEvent(0, /* TODO: messageID */`
`@@ -156,7 +156,7 @@ func (h Handler) startStats(w http.ResponseWriter, r http.Request) (http.Respo`
`156`	`156`	`ctx: ctx,`
`157`	`157`	`writer: w,`
`158`	`158`	`}`
`159`		`- if r.Body == nil {`
	`159`	`+ if r.Body == nil \|\| r.Body == http.NoBody {`
`160`	`160`	`// TODO: Handle cases where ContentLength is not set.`
`161`	`161`	`track.reqSize = -1`
`162`	`162`	`} else if r.ContentLength > 0 {`