threads / patch / 58939

patchhttp-fetch: invoke trace2_cmd_name()

Subject: [PATCH] http-fetch: invoke trace2_cmd_name()

## tl;dr

2 messages between Dec 12, 2022 and Dec 13, 2022. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Jonathan Tan· Dec 12, 2022, 22:46 UTC · lore
ee4512ed48 ("trace2: create new combined trace facility", 2019-02-
22) introduced trace2_cmd_name() and taught both the Git built-ins and
some non-built-ins to use it. However, http-fetch was not one of them
(perhaps due to its low usage at the time).

Teach http-fetch to invoke this function. After this patch, this function will be invoked right after argument parsing, just like in remote-curl.c.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
This was discovered at $DAYJOB after we noticed that there were command
names missing in the trace whenever a user did a fetch that involved
packfile offloading.
---
 http-fetch.c | 3 +++
 1 file changed, 3 insertions(+)
Show changes to http-fetch.c +3 −0
diff --git a/http-fetch.c b/http-fetch.c
index 31bc5c7767..258fec2068 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -5,6 +5,7 @@
 #include "walker.h"
 #include "strvec.h"
 #include "urlmatch.h"
+#include "trace2.h"
 
 static const char http_fetch_usage[] = "git http-fetch "
 "[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin | --packfile=hash | commit-id] url";
@@ -137,6 +138,8 @@ int cmd_main(int argc, const char **argv)
 	if (nongit)
 		die(_("not a git repository"));
 
+	trace2_cmd_name("http-fetch");
+
 	git_config(git_default_config, NULL);
 
 	if (packfile) {
-- 
2.39.0.rc1.256.g54fd8350bd-goog
Jeff Hostetler· Dec 13, 2022, 20:15 UTC · re: Jonathan Tan · lore

Re: [PATCH] http-fetch: invoke trace2_cmd_name()

On 12/12/22 5:46 PM, Jonathan Tan wrote:
Show 39 quoted lines
> ee4512ed48 ("trace2: create new combined trace facility", 2019-02-
> 22) introduced trace2_cmd_name() and taught both the Git built-ins and
> some non-built-ins to use it. However, http-fetch was not one of them
> (perhaps due to its low usage at the time).
> 
> Teach http-fetch to invoke this function. After this patch, this
> function will be invoked right after argument parsing, just like in
> remote-curl.c.
> 
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
> This was discovered at $DAYJOB after we noticed that there were command
> names missing in the trace whenever a user did a fetch that involved
> packfile offloading.
> ---
>   http-fetch.c | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/http-fetch.c b/http-fetch.c
> index 31bc5c7767..258fec2068 100644
> --- a/http-fetch.c
> +++ b/http-fetch.c
> @@ -5,6 +5,7 @@
>   #include "walker.h"
>   #include "strvec.h"
>   #include "urlmatch.h"
> +#include "trace2.h"
>   
>   static const char http_fetch_usage[] = "git http-fetch "
>   "[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin | --packfile=hash | commit-id] url";
> @@ -137,6 +138,8 @@ int cmd_main(int argc, const char **argv)
>   	if (nongit)
>   		die(_("not a git repository"));
>   
> +	trace2_cmd_name("http-fetch");
> +
>   	git_config(git_default_config, NULL);
>   
>   	if (packfile) {
LGTM

Thanks for catching this. Jeff

← back to recent threads