Adds tracing module

Updates chained serving producer and consumer to use module

(temporary) Adds client, modification to the dockerfile and updated main makefile

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

Author: Michal Baczun

Makefile

@@ -138,5 +138,22 @@ test-cri:
 
 test-cri-travis: # Testing in travis is deprecated
 	$(MAKE) -C cri test-travis
+    
+serving-all-image: serving-producer-image serving-consumer-image
+
+serving-all-image-push: serving-producer-image-push serving-consumer-image-push
+    
+serving-producer-image: ./function-images/tests/chained-function-serving/Dockerfile ./function-images/tests/chained-function-serving/producer/producer.go ./function-images/tests/chained-function-serving/proto/prodcon.pb.go ./function-images/tests/chained-function-serving/proto/prodcon_grpc.pb.go
+	docker build --tag vhiveease/chained-functions-serving-producer:latest --build-arg target_arg=producer -f ./function-images/tests/chained-function-serving/Dockerfile .
+
+serving-producer-image-push: serving-producer-image
+	docker push vhiveease/chained-functions-serving-producer:latest
+
+
+serving-consumer-image: ./function-images/tests/chained-function-serving/Dockerfile ./function-images/tests/chained-function-serving/consumer/consumer.go ./function-images/tests/chained-function-serving/proto/prodcon.pb.go ./function-images/tests/chained-function-serving/proto/prodcon_grpc.pb.go
+	docker build --tag vhiveease/chained-functions-serving-consumer:latest --build-arg target_arg=consumer -f ./function-images/tests/chained-function-serving/Dockerfile .
+
+serving-consumer-image-push: serving-consumer-image
+	docker push vhiveease/chained-functions-serving-consumer:latest
 
 .PHONY: test-orch $(SUBDIRS) test-subdirs

function-images/tests/chained-function-serving/Dockerfile

@@ -28,7 +28,8 @@ RUN apk add --no-cache make
 # https://vsupalov.com/docker-build-pass-environment-variables/
 ARG target_arg
 ENV target=$target_arg
-COPY . ./
+COPY ./function-images/tests/chained-function-serving/ ./
+COPY ./utils/tracing/go ./utils/tracing
 RUN mkdir /log
 RUN go mod download && \
    CGO_ENABLED=0 GOOS=linux go build -v -o ./${target}-bin ./${target}/

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

@@ -0,0 +1,109 @@
+// MIT License
+//
+// Copyright (c) 2021 Michal Baczun and EASE lab
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+	"os"
+
+	"google.golang.org/grpc"
+
+	pb "github.com/ease-lab/vhive/examples/protobuf/helloworld"
+
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/exporters/trace/zipkin"
+	"go.opentelemetry.io/otel/propagation"
+	"go.opentelemetry.io/otel/sdk/resource"
+	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+	"go.opentelemetry.io/otel/semconv"
+)
+
+const (
+	serviceName = "client"
+	id          = 3
+)
+
+var logger = log.New(os.Stderr, "zipkin-example", log.Ldate|log.Ltime|log.Llongfile)
+
+// initTracer creates a new trace provider instance and registers it as global trace provider.
+func initTracer(url string) func() {
+	// Create Zipkin Exporter and install it as a global tracer.
+	//
+	// For demoing purposes, always sample. In a production application, you should
+	// configure the sampler to a trace.ParentBased(trace.TraceIDRatioBased) set at the desired
+	// ratio.
+	exporter, err := zipkin.NewRawExporter(
+		url,
+		zipkin.WithLogger(logger),
+		zipkin.WithSDKOptions(sdktrace.WithSampler(sdktrace.AlwaysSample())),
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+	tp := sdktrace.NewTracerProvider(
+		sdktrace.WithSampler(sdktrace.AlwaysSample()),
+		sdktrace.WithSyncer(exporter),
+		sdktrace.WithResource(resource.NewWithAttributes(
+			semconv.ServiceNameKey.String(serviceName),
+			attribute.Int64("ID", id),
+		)),
+	)
+	otel.SetTracerProvider(tp)
+	otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
+	return func() {
+		_ = tp.Shutdown(context.Background())
+	}
+}
+
+func main() {
+	//strings := flag.Int("s", 1, "Number of strings to send")
+	address := flag.String("addr", "localhost", "Server IP address")
+	clientPort := flag.Int("pc", 3031, "Client Port")
+	url := flag.String("zipkin", "http://localhost:9411/api/v2/spans", "zipkin url")
+	flag.Parse()
+
+	shutdown := initTracer(*url)
+	defer shutdown()
+
+	fmt.Printf("Client using address: %v\n", *address)
+
+	conn, err := grpc.Dial(fmt.Sprintf("%v:%v", *address, *clientPort), grpc.WithInsecure(), grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()))
+	if err != nil {
+		log.Fatalf("fail to dial: %s", err)
+	}
+	defer conn.Close()
+
+	client := pb.NewGreeterClient(conn)
+	empty, err := client.SayHello(context.Background(), &pb.HelloRequest{Name: "client"})
+	fmt.Printf("Client output: %v, %v\n", empty, err)
+	if err != nil {
+		log.Fatalf("Failed to produce strings: %s", err)
+	}
+	fmt.Printf("client closing\n")
+
+}

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

@@ -30,10 +30,14 @@ import (
 	"log"
 	"net"
 	"os"
+	"time"
 
 	"google.golang.org/grpc"
 
 	pb "tests/chained-functions-serving/proto"
+
+	tracing "github.com/ease-lab/vhive/utils/tracing/go"
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 )
 
 type consumerServer struct {
@@ -60,17 +64,21 @@ func (s *consumerServer) ConsumeStream(stream pb.ProducerConsumer_ConsumeStreamS
 
 func main() {
 	port := flag.Int("ps", 80, "Port")
+	url := flag.String("zipkin", "http://zipkin.istio-system.svc.cluster.local:9411/api/v2/spans", "zipkin url")
 	flag.Parse()
 
 	log.SetOutput(os.Stdout)
 
+	shutdown := tracing.InitBasicTracer(*url, "consumer")
+	defer shutdown()
+
 	//set up server
 	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))
 	if err != nil {
 		log.Fatalf("[consumer] failed to listen: %v", err)
 	}
 
-	grpcServer := grpc.NewServer()
+	grpcServer := grpc.NewServer(grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()))
 	s := consumerServer{}
 	pb.RegisterProducerConsumerServer(grpcServer, &s)
 

function-images/tests/chained-function-serving/docker-compose.yml

@@ -23,12 +23,19 @@
 version: "3.7"
 
 services:
+    zipkin:
+        image: openzipkin/zipkin
+        ports:
+            - 9411:9411
     consumer:
         image: vhiveease/chained-functions-serving-consumer
         volumes:
             - log-volume:/log
         command:
             - -ps=3030
+            - -zipkin=http://zipkin:9411/api/v2/spans
+        depends_on: 
+            - zipkin
 
     producer:
         image: vhiveease/chained-functions-serving-producer
@@ -40,8 +47,10 @@ services:
             - -addr=consumer
             - -ps=3031
             - -pc=3030
+            - -zipkin=http://zipkin:9411/api/v2/spans
         depends_on:
             - consumer
+            - zipkin
 
 volumes:
     log-volume:

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

@@ -2,10 +2,18 @@ module tests/chained-functions-serving
 
 go 1.16
 
-replace tests/chained-functions-serving/proto => ./proto
+replace (
+	github.com/ease-lab/vhive/utils/tracing/go => /app/utils/tracing
+	tests/chained-functions-serving/proto => ./proto
+)
 
 require (
 	github.com/ease-lab/vhive/examples/protobuf/helloworld v0.0.0-20210608114032-dab7e310da45
+	github.com/ease-lab/vhive/utils/tracing/go v0.0.0-00010101000000-000000000000
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
+	go.opentelemetry.io/otel v0.20.0
+	go.opentelemetry.io/otel/exporters/trace/zipkin v0.20.0
+	go.opentelemetry.io/otel/sdk v0.20.0
 	google.golang.org/grpc v1.38.0
 	google.golang.org/protobuf v1.26.0
 )