Updates invoker, enables tracing and curtom port

Signed-off-by: Michal Baczun <[email protected]>

Author: Michal Baczun

.github/workflows/function-composition-push.yml

@@ -72,10 +72,10 @@ jobs:
       uses: docker/setup-buildx-action@v1
 
     - name: Build and push
-      working-directory: ./function-images/tests/chained-function-serving
+      working-directory: .
       run: |
-        make all-image
-        make all-image-push
+        make serving-all-image
+        make serving-all-image-push
 
   push-chained-functions-eventing:
       name: Push chained-functions-eventing-*

examples/invoker/client.go

@@ -36,20 +36,29 @@ import (
 	pb "github.com/ease-lab/vhive/examples/protobuf/helloworld"
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
+
+	tracing "github.com/ease-lab/vhive/utils/tracing/go"
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 )
 
 var (
-	completed int64
-	latSlice  LatencySlice
+	completed   int64
+	latSlice    LatencySlice
+	port        int
+	withTracing *bool
 )
 
 func main() {
 	urlFile := flag.String("urlFile", "urls.txt", "File with functions' URLs")
 	rps := flag.Int("rps", 1, "Target requests per second")
 	runDuration := flag.Int("time", 5, "Run the benchmark for X seconds")
 	latencyOutputFile := flag.String("latf", "lat.csv", "CSV file for the latency measurements in microseconds")
+	portFlag := flag.Int("port", 80, "The port to use for all function invokations")
+	withTracing = flag.Bool("trace", false, "Enable tracing in the client")
+	zipkin := flag.String("zipkin", "http://localhost:9411/api/v2/spans", "zipkin url")
 
 	flag.Parse()
+	port = *portFlag
 
 	log.Info("Reading the URLs from the file: ", *urlFile)
 
@@ -58,6 +67,11 @@ func main() {
 		log.Fatal("Failed to read the URL files: ", err)
 	}
 
+	if *withTracing {
+		shutdown := tracing.InitBasicTracer(*zipkin, "invoker")
+		defer shutdown()
+	}
+
 	realRPS := runBenchmark(urls, *runDuration, *rps)
 
 	writeLatencies(realRPS, *latencyOutputFile)
@@ -108,9 +122,17 @@ func runBenchmark(urls []string, runDuration, targetRPS int) (realRPS float64) {
 func invokeFunction(url string) {
 	defer getDuration(startMeasurement(url)) // measure entire invocation time
 
-	address := fmt.Sprintf("%s:%d", url, 80)
+	address := fmt.Sprintf("%s:%d", url, port)
 
-	conn, err := grpc.Dial(address, grpc.WithInsecure(), grpc.WithBlock())
+	fmt.Printf("Address used: %v\n", address)
+
+	var conn *grpc.ClientConn
+	var err error
+	if *withTracing {
+		conn, err = grpc.Dial(address, grpc.WithInsecure(), grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()))
+	} else {
+		conn, err = grpc.Dial(address, grpc.WithInsecure(), grpc.WithBlock())
+	}
 	if err != nil {
 		log.Fatalf("did not connect: %v", err)
 	}

function-images/tests/chained-function-serving/client/client.go

@@ -30,7 +30,6 @@ import (
 	"log"
 	"net"
 	"os"
-	"time"
 
 	"google.golang.org/grpc"
 

function-images/tests/chained-function-serving/consumer/consumer.go

@@ -3,7 +3,7 @@ module tests/chained-functions-serving
 go 1.16
 
 replace (
-	github.com/ease-lab/vhive/utils/tracing/go => /app/utils/tracing
+	github.com/ease-lab/vhive/utils/tracing/go => ./utils/tracing
 	tests/chained-functions-serving/proto => ./proto
 )
 

function-images/tests/chained-function-serving/go.mod

@@ -49,7 +49,8 @@ type producerServer struct {
 
 func (ps *producerServer) SayHello(ctx context.Context, req *pb.HelloRequest) (*pb.HelloReply, error) {
 	// establish a connection
-	conn, err := grpc.Dial(fmt.Sprintf("%v:%v", ps.consumerAddr, ps.consumerPort), grpc.WithInsecure(), grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()))
+	addr := fmt.Sprintf("%v:%v", ps.consumerAddr, ps.consumerPort)
+	conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()))
 	if err != nil {
 		log.Fatalf("[producer] fail to dial: %s", err)
 	}

function-images/tests/chained-function-serving/producer/producer.go

@@ -51,23 +51,24 @@ require (
 	github.com/containerd/containerd v1.5.2
 	github.com/davecgh/go-spew v1.1.1
 	github.com/ease-lab/vhive/examples/protobuf/helloworld v0.0.0-00010101000000-000000000000
+	github.com/ease-lab/vhive/utils/tracing/go v0.0.0-00010101000000-000000000000
 	github.com/firecracker-microvm/firecracker-containerd v0.0.0-00010101000000-000000000000
 	github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff
 	github.com/go-multierror/multierror v1.0.2
-	github.com/golang/protobuf v1.4.3
-	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/golang/protobuf v1.5.2
 	github.com/montanaflynn/stats v0.6.5
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.0
 	github.com/stretchr/testify v1.7.0
 	github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
 	github.com/wcharczuk/go-chart v2.0.1+incompatible
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
 	golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect
 	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
 	golang.org/x/sys v0.0.0-20210324051608-47abb6519492
 	gonum.org/v1/gonum v0.9.0
 	gonum.org/v1/plot v0.9.0
-	google.golang.org/grpc v1.34.0
+	google.golang.org/grpc v1.37.0
 	k8s.io/cri-api v0.20.6
 )