OpenTracing for Fission (#1079)

Added Opentracing integration using opencensus libraries for all Fission components.

environments/fetcher/fetcher.go

@@ -2,6 +2,7 @@ package fetcher
 
 import (
 	"bytes"
+	"context"
 	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
@@ -18,7 +19,9 @@ import (
 
 	"github.com/mholt/archiver"
 	"github.com/pkg/errors"
-	"github.com/satori/go.uuid"
+	uuid "github.com/satori/go.uuid"
+	"go.opencensus.io/plugin/ochttp"
+	"golang.org/x/net/context/ctxhttp"
 	k8serr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -35,6 +38,7 @@ type (
 		sharedConfigPath string
 		fissionClient    *crd.FissionClient
 		kubeClient       *kubernetes.Clientset
+		httpClient       *http.Client
 	}
 )
 
@@ -60,11 +64,14 @@ func MakeFetcher(sharedVolumePath string, sharedSecretPath string, sharedConfigP
 		sharedConfigPath: sharedConfigPath,
 		fissionClient:    fissionClient,
 		kubeClient:       kubeClient,
+		httpClient: &http.Client{
+			Transport: &ochttp.Transport{},
+		},
 	}, nil
 }
 
-func downloadUrl(url string, localPath string) error {
-	resp, err := http.Get(url)
+func downloadUrl(ctx context.Context, httpClient *http.Client, url string, localPath string) error {
+	resp, err := ctxhttp.Get(ctx, httpClient, url)
 	if err != nil {
 		return err
 	}
@@ -116,15 +123,11 @@ func getChecksum(path string) (*fission.Checksum, error) {
 	}, nil
 }
 
-func verifyChecksum(path string, checksum *fission.Checksum) error {
+func verifyChecksum(fileChecksum, checksum *fission.Checksum) error {
 	if checksum.Type != fission.ChecksumTypeSHA256 {
 		return fission.MakeError(fission.ErrorInvalidArgument, "Unsupported checksum type")
 	}
-	c, err := getChecksum(path)
-	if err != nil {
-		return err
-	}
-	if c.Sum != checksum.Sum {
+	if fileChecksum.Sum != checksum.Sum {
 		return fission.MakeError(fission.ErrorChecksumFail, "Checksum validation failed")
 	}
 	return nil
@@ -175,8 +178,7 @@ func (fetcher *Fetcher) FetchHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	log.Printf("fetcher received fetch request and started downloading: %v", req)
-	code, err := fetcher.Fetch(req)
+	code, err := fetcher.Fetch(r.Context(), req)
 	if err != nil {
 		http.Error(w, err.Error(), code)
 		return
@@ -217,7 +219,7 @@ func (fetcher *Fetcher) SpecializeHandler(w http.ResponseWriter, r *http.Request
 
 	//log.Printf("fetcher received fetch request and started downloading: %v", req)
 
-	err = fetcher.SpecializePod(req.FetchReq, req.LoadReq)
+	err = fetcher.SpecializePod(r.Context(), req.FetchReq, req.LoadReq)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		return
@@ -229,7 +231,7 @@ func (fetcher *Fetcher) SpecializeHandler(w http.ResponseWriter, r *http.Request
 
 // Fetch takes FetchRequest and makes the fetch call
 // It returns the HTTP code and error if any
-func (fetcher *Fetcher) Fetch(req fission.FunctionFetchRequest) (int, error) {
+func (fetcher *Fetcher) Fetch(ctx context.Context, req fission.FunctionFetchRequest) (int, error) {
 	// check that the requested filename is not an empty string and error out if so
 	if len(req.Filename) == 0 {
 		e := fmt.Sprintf("Fetch request received for an empty file name, request: %v", req)
@@ -248,7 +250,7 @@ func (fetcher *Fetcher) Fetch(req fission.FunctionFetchRequest) (int, error) {
 
 	if req.FetchType == fission.FETCH_URL {
 		// fetch the file and save it to the tmp path
-		err := downloadUrl(req.Url, tmpPath)
+		err := downloadUrl(ctx, fetcher.httpClient, req.Url, tmpPath)
 		if err != nil {
 			e := fmt.Sprintf("Failed to download url %v: %v", req.Url, err)
 			log.Printf(e)
@@ -289,14 +291,21 @@ func (fetcher *Fetcher) Fetch(req fission.FunctionFetchRequest) (int, error) {
 			}
 		} else {
 			// download and verify
-			err = downloadUrl(archive.URL, tmpPath)
+			err := downloadUrl(ctx, fetcher.httpClient, archive.URL, tmpPath)
 			if err != nil {
 				e := fmt.Sprintf("Failed to download url %v: %v", req.Url, err)
 				log.Printf(e)
 				return http.StatusBadRequest, errors.New(e)
 			}
 
-			err = verifyChecksum(tmpPath, &archive.Checksum)
+			checksum, err := getChecksum(tmpPath)
+			if err != nil {
+				e := fmt.Sprintf("Failed to get checksum: %v", err)
+				log.Printf(e)
+				return http.StatusBadRequest, errors.New(e)
+			}
+
+			err = verifyChecksum(checksum, &archive.Checksum)
 			if err != nil {
 				e := fmt.Sprintf("Failed to verify checksum: %v", err)
 				log.Printf(e)
@@ -454,7 +463,7 @@ func (fetcher *Fetcher) UploadHandler(w http.ResponseWriter, r *http.Request) {
 	log.Println("Starting upload...")
 	ssClient := storageSvcClient.MakeClient(req.StorageSvcUrl)
 
-	fileID, err := ssClient.Upload(dstFilepath, nil)
+	fileID, err := ssClient.Upload(r.Context(), dstFilepath, nil)
 	if err != nil {
 		e := fmt.Sprintf("Error uploading zip file: %v", err)
 		log.Println(e)
@@ -526,14 +535,14 @@ func (fetcher *Fetcher) unarchive(src string, dst string) error {
 	return nil
 }
 
-func (fetcher *Fetcher) SpecializePod(fetchReq fission.FunctionFetchRequest, loadReq fission.FunctionLoadRequest) error {
+func (fetcher *Fetcher) SpecializePod(ctx context.Context, fetchReq fission.FunctionFetchRequest, loadReq fission.FunctionLoadRequest) error {
 	startTime := time.Now()
 	defer func() {
 		elapsed := time.Since(startTime)
 		log.Printf("Elapsed time in fetch request = %v", elapsed)
 	}()
 
-	_, err := fetcher.Fetch(fetchReq)
+	_, err := fetcher.Fetch(ctx, fetchReq)
 	if err != nil {
 		return errors.Wrap(err, "Error fetching deploy package")
 	}