feat: always make sure to close request bodies

promhippie · Jun 5, 2023 · 8825ada · 8825ada
1 parent ea6222e
commit 8825ada
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/pkg/exporter/admin.go b/pkg/exporter/admin.go
@@ -378,8 +378,9 @@ func (c *AdminCollector) Collect(ch chan<- prometheus.Metric) {
 	defer cancel()
 
 	now := time.Now()
-	record, _, err := c.client.Admin.GetAdminStats(ctx)
+	record, resp, err := c.client.Admin.GetAdminStats(ctx)
 	c.duration.WithLabelValues("admin").Observe(time.Since(now).Seconds())
+	defer resp.Body.Close()
 
 	if err != nil {
 		level.Error(c.logger).Log(

diff --git a/pkg/exporter/billing.go b/pkg/exporter/billing.go
@@ -365,7 +365,8 @@ func (c *BillingCollector) getActionBilling() []*actionBilling {
 		}
 
 		record := &github.ActionBilling{}
-		_, err = c.client.Do(ctx, req, record)
+		resp, err := c.client.Do(ctx, req, record)
+		defer resp.Body.Close()
 
 		if err != nil {
 			level.Error(c.logger).Log(
@@ -387,7 +388,8 @@ func (c *BillingCollector) getActionBilling() []*actionBilling {
 	}
 
 	for _, name := range c.config.Orgs.Value() {
-		record, _, err := c.client.Billing.GetActionsBillingOrg(ctx, name)
+		record, resp, err := c.client.Billing.GetActionsBillingOrg(ctx, name)
+		defer resp.Body.Close()
 
 		if err != nil {
 			level.Error(c.logger).Log(
@@ -443,7 +445,8 @@ func (c *BillingCollector) getPackageBilling() []*packageBilling {
 		}
 
 		record := &github.PackageBilling{}
-		_, err = c.client.Do(ctx, req, record)
+		resp, err := c.client.Do(ctx, req, record)
+		defer resp.Body.Close()
 
 		if err != nil {
 			level.Error(c.logger).Log(
@@ -468,7 +471,8 @@ func (c *BillingCollector) getPackageBilling() []*packageBilling {
 		ctx, cancel := context.WithTimeout(context.Background(), c.config.Timeout)
 		defer cancel()
 
-		record, _, err := c.client.Billing.GetPackagesBillingOrg(ctx, name)
+		record, resp, err := c.client.Billing.GetPackagesBillingOrg(ctx, name)
+		defer resp.Body.Close()
 
 		if err != nil {
 			level.Error(c.logger).Log(
@@ -524,7 +528,8 @@ func (c *BillingCollector) getStorageBilling() []*storageBilling {
 		}
 
 		record := &github.StorageBilling{}
-		_, err = c.client.Do(ctx, req, record)
+		resp, err := c.client.Do(ctx, req, record)
+		defer resp.Body.Close()
 
 		if err != nil {
 			level.Error(c.logger).Log(
@@ -549,7 +554,8 @@ func (c *BillingCollector) getStorageBilling() []*storageBilling {
 		ctx, cancel := context.WithTimeout(context.Background(), c.config.Timeout)
 		defer cancel()
 
-		record, _, err := c.client.Billing.GetStorageBillingOrg(ctx, name)
+		record, resp, err := c.client.Billing.GetStorageBillingOrg(ctx, name)
+		defer resp.Body.Close()
 
 		if err != nil {
 			level.Error(c.logger).Log(

diff --git a/pkg/exporter/helper.go b/pkg/exporter/helper.go
@@ -46,6 +46,7 @@ func reposByOwnerAndName(ctx context.Context, client *github.Client, owner, repo
 			)
 
 			if err != nil {
+				resp.Body.Close()
 				return nil, err
 			}
 
@@ -55,9 +56,11 @@ func reposByOwnerAndName(ctx context.Context, client *github.Client, owner, repo
 			)
 
 			if resp.NextPage == 0 {
+				resp.Body.Close()
 				break
 			}
 
+			resp.Body.Close()
 			opts.Page = resp.NextPage
 		}
 

diff --git a/pkg/exporter/org.go b/pkg/exporter/org.go
@@ -167,8 +167,9 @@ func (c *OrgCollector) Collect(ch chan<- prometheus.Metric) {
 		defer cancel()
 
 		now := time.Now()
-		record, _, err := c.client.Organizations.Get(ctx, name)
+		record, resp, err := c.client.Organizations.Get(ctx, name)
 		c.duration.WithLabelValues("org").Observe(time.Since(now).Seconds())
+		defer resp.Body.Close()
 
 		if err != nil {
 			level.Error(c.logger).Log(

diff --git a/pkg/exporter/runner.go b/pkg/exporter/runner.go
@@ -393,6 +393,7 @@ func (c *RunnerCollector) pagedRepoRunners(ctx context.Context, owner, name stri
 		)
 
 		if err != nil {
+			resp.Body.Close()
 			return nil, err
 		}
 
@@ -402,9 +403,11 @@ func (c *RunnerCollector) pagedRepoRunners(ctx context.Context, owner, name stri
 		)
 
 		if resp.NextPage == 0 {
+			resp.Body.Close()
 			break
 		}
 
+		resp.Body.Close()
 		opts.Page = resp.NextPage
 	}
 
@@ -459,6 +462,7 @@ func (c *RunnerCollector) pagedEnterpriseRunners(ctx context.Context, name strin
 		)
 
 		if err != nil {
+			resp.Body.Close()
 			return nil, err
 		}
 
@@ -468,9 +472,11 @@ func (c *RunnerCollector) pagedEnterpriseRunners(ctx context.Context, name strin
 		)
 
 		if resp.NextPage == 0 {
+			resp.Body.Close()
 			break
 		}
 
+		resp.Body.Close()
 		opts.Page = resp.NextPage
 	}
 
@@ -525,6 +531,7 @@ func (c *RunnerCollector) pagedOrgRunners(ctx context.Context, name string) ([]*
 		)
 
 		if err != nil {
+			resp.Body.Close()
 			return nil, err
 		}
 
@@ -534,9 +541,11 @@ func (c *RunnerCollector) pagedOrgRunners(ctx context.Context, name string) ([]*
 		)
 
 		if resp.NextPage == 0 {
+			resp.Body.Close()
 			break
 		}
 
+		resp.Body.Close()
 		opts.Page = resp.NextPage
 	}
 

diff --git a/pkg/exporter/workflow.go b/pkg/exporter/workflow.go
@@ -248,6 +248,7 @@ func (c *WorkflowCollector) pagedRepoWorkflows(ctx context.Context, owner, name
 		)
 
 		if err != nil {
+			resp.Body.Close()
 			return nil, err
 		}
 
@@ -257,9 +258,11 @@ func (c *WorkflowCollector) pagedRepoWorkflows(ctx context.Context, owner, name
 		)
 
 		if resp.NextPage == 0 {
+			resp.Body.Close()
 			break
 		}
 
+		resp.Body.Close()
 		opts.Page = resp.NextPage
 	}