Deletes generated profile.proto file after use in perf_to_profile conversion

internal/driver/fetch.go

@@ -16,10 +16,8 @@ package driver
 
 import (
 	"bytes"
-	"encoding/base64"
 	"fmt"
 	"io"
-	"math/rand"
 	"net/http"
 	"net/url"
 	"os"
@@ -407,11 +405,16 @@ func profileProtoReader(path string, ui plugin.UI) (io.ReadCloser, error) {
 	}
 	if bytes.Equal(actualHeader, perfHeader) {
 		sourceFile.Close()
-		profileFile, convertErr := convertPerfData(path, ui)
+		profileFilePath, convertErr := convertPerfData(path, ui)
 		if convertErr != nil {
 			return nil, convertErr
 		}
-		return os.Open(profileFile)
+		profileFile, openErr := os.Open(profileFilePath)
+		if openErr != nil {
+			os.Remove(profileFilePath)
+			return nil, openErr
+		}
+		return DeleteOnClose(profileFile), nil
 	}
 	return sourceFile, nil
 }
@@ -423,19 +426,16 @@ func convertPerfData(perfPath string, ui plugin.UI) (string, error) {
 	ui.Print(fmt.Sprintf(
 		"Converting %s to a profile.proto... (May take a few minutes)",
 		perfPath))
-	randomBytes := make([]byte, 32)
-	_, randErr := rand.Read(randomBytes)
-	if randErr != nil {
-		return "", randErr
-	}
-	randomFileName := "/tmp/pprof_" +
-		base64.StdEncoding.EncodeToString(randomBytes)
-	cmd := exec.Command("perf_to_profile", perfPath, randomFileName)
+	profilePath, err := newTempFilePath("/tmp", "pprof_", ".pb.gz")
+	if err != nil {
+		return "", err
+	}
+	cmd := exec.Command("perf_to_profile", perfPath, profilePath)
 	if err := cmd.Run(); err != nil {
+		os.Remove(profilePath)
 		return "", err
 	}
-
-	return randomFileName, nil
+	return profilePath, nil
 }
 
 // adjustURL validates if a profile source is a URL and returns an

internal/driver/tempfile.go

@@ -21,16 +21,46 @@ import (
 	"sync"
 )
 
-// newTempFile returns an unused filename for output files.
-func newTempFile(dir, prefix, suffix string) (*os.File, error) {
+// newTempFilePath returns an unused path for output files.
+func newTempFilePath(dir, prefix, suffix string) (string, error) {
 	for index := 1; index < 10000; index++ {
 		path := filepath.Join(dir, fmt.Sprintf("%s%03d%s", prefix, index, suffix))
 		if _, err := os.Stat(path); err != nil {
-			return os.Create(path)
+			return path, nil
 		}
 	}
 	// Give up
-	return nil, fmt.Errorf("could not create file of the form %s%03d%s", prefix, 1, suffix)
+	return "", fmt.Errorf("could not create file of the form %s%03d%s", prefix, 1, suffix)
+}
+
+// newTempFile returns a new file with a random name for output files.
+func newTempFile(dir, prefix, suffix string) (*os.File, error) {
+	path, err := newTempFilePath(dir, prefix, suffix)
+	if err != nil {
+		return nil, err
+	}
+	return os.Create(path)
+}
+
+type VolatileFile struct {
+	*os.File
+}
+
+func (file VolatileFile) Close() error {
+	if err := file.File.Close(); err != nil {
+		return err
+	}
+	if err := os.Remove(file.Name()); err != nil {
+		return err
+	}
+	return nil
+}
+
+// DeleteOnClose deletes file on Close().
+func DeleteOnClose(file *os.File) VolatileFile {
+	return VolatileFile {
+		File: file,
+	}
 }
 
 var tempFiles []string