use utils/tracing/go

Signed-off-by: Bora M. Alper <[email protected]>

Author: boramalper

function-images/tests/chained-function-eventing/Dockerfile

@@ -20,21 +20,22 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-FROM vhiveease/golang:latest AS builder
+FROM golang:1.16-buster AS builder
 WORKDIR /app
-RUN apk add --no-cache make
+# RUN apk add --no-cache make
 # We use ARG and ENV to have a single Dockerfile for the all three programs.
 # https://vsupalov.com/docker-build-pass-environment-variables/
 ARG target_arg
 ENV target=$target_arg
-COPY . ./
+COPY . .
+WORKDIR /app/function-images/tests/chained-function-eventing
 # This is required if the final image is FROM scratch
 # See https://forums.docker.com/t/standard-init-linux-go-195-exec-user-process-caused-no-such-file-or-directory/43777/7
-ENV CGO_ENABLED=0
+ENV CGO_ENABLED=0 GOOS=linux GOARCH=amd64
 RUN make bin/${target}
 
-FROM scratch
+FROM golang:1.16-buster
 WORKDIR /app
 ARG target_arg
-COPY --from=builder /app/bin/${target_arg} /app/exe
+COPY --from=builder /app/function-images/tests/chained-function-eventing/bin/${target_arg} /app/exe
 ENTRYPOINT [ "/app/exe" ]

function-images/tests/chained-function-eventing/Makefile

@@ -37,7 +37,7 @@ bin/producer: producer/* producer/helloworld_grpc.pb.go producer/helloworld.pb.g
 
 TAG_PRODUCER = vhiveease/chained-functions-eventing-producer:latest
 image-producer: Dockerfile bin/producer
-	docker build --tag ${TAG_PRODUCER} --build-arg target_arg=producer .
+	docker build --tag ${TAG_PRODUCER} --build-arg target_arg=producer -f ./Dockerfile ../../..
 
 push-producer: image-producer
 	docker push ${TAG_PRODUCER}
@@ -48,7 +48,7 @@ bin/consumer: consumer/*
 
 TAG_CONSUMER = vhiveease/chained-functions-eventing-consumer:latest
 image-consumer: Dockerfile bin/consumer
-	docker build --tag ${TAG_CONSUMER} --build-arg target_arg=consumer .
+	docker build --tag ${TAG_CONSUMER} --build-arg target_arg=consumer -f ./Dockerfile ../../..
 
 push-consumer: image-consumer
 	docker push ${TAG_CONSUMER}

function-images/tests/chained-function-eventing/consumer/main.go

@@ -24,6 +24,7 @@ package main
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"log"
 	"reflect"
@@ -32,6 +33,7 @@ import (
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 
 	. "eventing/eventschemas"
+	tracing "github.com/ease-lab/vhive/utils/tracing/go"
 )
 
 func printContextInternals(ctx interface{}, inner bool) {
@@ -62,7 +64,9 @@ func printContextInternals(ctx interface{}, inner bool) {
 }
 
 func callback(ctx context.Context, event cloudevents.Event) (*cloudevents.Event, cloudevents.Result) {
-	printContextInternals(ctx, false)
+	span := tracing.Span{SpanName: "SayHello", TracerName: "consumer"}
+	ctx = span.StartSpan(ctx)
+	defer span.EndSpan()
 
 	var body GreetingEventBody
 	if err := event.DataAs(&body); err != nil {
@@ -80,10 +84,19 @@ func callback(ctx context.Context, event cloudevents.Event) (*cloudevents.Event,
 }
 
 func main() {
+	zipkinURL := flag.String("zipkin", "http://zipkin.istio-system.svc.cluster.local:9411/api/v2/spans", "zipkin url")
+	flag.Parse()
+
 	log.SetPrefix("Consumer: ")
 	log.SetFlags(log.Lmicroseconds | log.LUTC)
 	log.Println("started")
 
+	shutdown, err := tracing.InitBasicTracer(*zipkinURL, "consumer")
+	if err != nil {
+		log.Fatalln(err)
+	}
+	defer shutdown()
+
 	ceClient, err := cloudevents.NewClientHTTP()
 	if err != nil {
 		log.Fatalf("failed to create a CloudEvents client, %s", err)

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

@@ -2,13 +2,17 @@ module eventing
 
 go 1.16
 
+replace github.com/ease-lab/vhive/utils/tracing/go => ../../../utils/tracing/go
+
 require (
-	github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.4.1 // indirect
+	github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.4.1
 	github.com/cloudevents/sdk-go/v2 v2.4.1
 	github.com/containerd/containerd v1.5.2
+	github.com/ease-lab/vhive/utils/tracing/go v0.0.0-00010101000000-000000000000
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/uuid v1.2.0
 	github.com/kelseyhightower/envconfig v1.4.0
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
 	google.golang.org/grpc v1.38.0
 	google.golang.org/protobuf v1.26.0
 )