From 8949a1cdfcf3ab1699e824858677ba9ff6e44b7f Mon Sep 17 00:00:00 2001
From: Abu Kashem <akashem@redhat.com>
Date: Mon, 22 Nov 2021 13:18:02 -0500
Subject: [PATCH] add trace step for transformResponseObject

Kubernetes-commit: 41cef06f66dd4d7e87ff852dc228ab69587be9de
---
 pkg/endpoints/handlers/create.go | 2 ++
 pkg/endpoints/handlers/delete.go | 4 ++++
 pkg/endpoints/handlers/get.go    | 5 ++---
 pkg/endpoints/handlers/patch.go  | 3 +++
 pkg/endpoints/handlers/update.go | 2 ++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkg/endpoints/handlers/create.go b/pkg/endpoints/handlers/create.go
index 21f0b0273..2809d9f62 100644
--- a/pkg/endpoints/handlers/create.go
+++ b/pkg/endpoints/handlers/create.go
@@ -215,6 +215,8 @@ func createHandler(r rest.NamedCreater, scope *RequestScope, admit admission.Int
 			status.Code = int32(code)
 		}
 
+		trace.Step("About to write a response")
+		defer trace.Step("Writing http response done")
 		transformResponseObject(ctx, scope, trace, req, w, code, outputMediaType, result)
 	}
 }
diff --git a/pkg/endpoints/handlers/delete.go b/pkg/endpoints/handlers/delete.go
index 05ccd3930..5f3d2c9b9 100644
--- a/pkg/endpoints/handlers/delete.go
+++ b/pkg/endpoints/handlers/delete.go
@@ -161,6 +161,8 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope *RequestSc
 			}
 		}
 
+		trace.Step("About to write a response")
+		defer trace.Step("Writing http response done")
 		transformResponseObject(ctx, scope, trace, req, w, status, outputMediaType, result)
 	}
 }
@@ -289,6 +291,8 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope *RequestSc
 			}
 		}
 
+		trace.Step("About to write a response")
+		defer trace.Step("Writing http response done")
 		transformResponseObject(ctx, scope, trace, req, w, http.StatusOK, outputMediaType, result)
 	}
 }
diff --git a/pkg/endpoints/handlers/get.go b/pkg/endpoints/handlers/get.go
index 6c09b4965..c1aa8dd4a 100644
--- a/pkg/endpoints/handlers/get.go
+++ b/pkg/endpoints/handlers/get.go
@@ -76,8 +76,8 @@ func getResourceHandler(scope *RequestScope, getter getterFunc) http.HandlerFunc
 		}
 
 		trace.Step("About to write a response")
+		defer trace.Step("Writing http response done")
 		transformResponseObject(ctx, scope, trace, req, w, http.StatusOK, outputMediaType, result)
-		trace.Step("Transformed response object")
 	}
 }
 
@@ -281,8 +281,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope *RequestScope, forceWatc
 			return
 		}
 		trace.Step("Listing from storage done")
-
+		defer trace.Step("Writing http response done", utiltrace.Field{"count", meta.LenList(result)})
 		transformResponseObject(ctx, scope, trace, req, w, http.StatusOK, outputMediaType, result)
-		trace.Step("Writing http response done", utiltrace.Field{"count", meta.LenList(result)})
 	}
 }
diff --git a/pkg/endpoints/handlers/patch.go b/pkg/endpoints/handlers/patch.go
index 6803baaa6..d407dcd50 100644
--- a/pkg/endpoints/handlers/patch.go
+++ b/pkg/endpoints/handlers/patch.go
@@ -246,6 +246,9 @@ func PatchResource(r rest.Patcher, scope *RequestScope, admit admission.Interfac
 		if wasCreated {
 			status = http.StatusCreated
 		}
+
+		trace.Step("About to write a response")
+		defer trace.Step("Writing http response done")
 		transformResponseObject(ctx, scope, trace, req, w, status, outputMediaType, result)
 	}
 }
diff --git a/pkg/endpoints/handlers/update.go b/pkg/endpoints/handlers/update.go
index 96eda0b9c..7009ae738 100644
--- a/pkg/endpoints/handlers/update.go
+++ b/pkg/endpoints/handlers/update.go
@@ -241,6 +241,8 @@ func UpdateResource(r rest.Updater, scope *RequestScope, admit admission.Interfa
 			status = http.StatusCreated
 		}
 
+		trace.Step("About to write a response")
+		defer trace.Step("Writing http response done")
 		transformResponseObject(ctx, scope, trace, req, w, status, outputMediaType, result)
 	}
 }