Merge pull request #1601 from zikaeroh/fix-gomods

Fix broken otel example module, tidy

Author: vmihailenco

example/otel/example-client.go

@@ -9,43 +9,21 @@ import (
 	"github.com/go-redis/redis/v8"
 	"github.com/go-redis/redis/v8/extra/redisotel"
 	"go.opentelemetry.io/otel"
-	meterStdout "go.opentelemetry.io/otel/exporters/metric/stdout"
-	traceStdout "go.opentelemetry.io/otel/exporters/trace/stdout"
+	"go.opentelemetry.io/otel/exporters/stdout"
 	"go.opentelemetry.io/otel/sdk/metric/controller/push"
+	"go.opentelemetry.io/otel/sdk/metric/processor/basic"
+	"go.opentelemetry.io/otel/sdk/metric/selector/simple"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
 func main() {
-	<-time.After(1 * time.Second)
+	stop := runExporter()
+	defer stop()
 
 	rdb := redis.NewClient(&redis.Options{
 		Addr: ":6379",
 	})
 
-	meterExporter, err := meterStdout.NewExportPipeline(meterStdout.Config{PrettyPrint: true},
-		push.WithPeriod(1*time.Second))
-	if err != nil {
-		log.Fatal(err.Error())
-	} else {
-		otel.SetMeterProvider(meterExporter.Provider())
-	}
-
-	traceExporter, err := traceStdout.NewExporter(traceStdout.Options{
-		PrettyPrint: true,
-	})
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-
-	if tp, err := sdktrace.NewProvider(
-		sdktrace.WithSyncer(traceExporter),
-		sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}),
-	); err != nil {
-		log.Fatal(err.Error())
-	} else {
-		otel.SetTraceProvider(tp)
-	}
-
 	rdb.AddHook(redisotel.TracingHook{})
 
 	ctx := context.Background()
@@ -77,3 +55,27 @@ func main() {
 	<-time.After(5 * time.Second)
 	span.End()
 }
+
+func runExporter() func() {
+	exporter, err := stdout.NewExporter(stdout.WithPrettyPrint())
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	tp := sdktrace.NewTracerProvider(
+		sdktrace.WithSyncer(exporter),
+		sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}),
+	)
+	otel.SetTracerProvider(tp)
+
+	pusher := push.New(
+		basic.New(
+			simple.NewWithExactDistribution(),
+			exporter,
+		),
+		exporter,
+		push.WithPeriod(1*time.Second),
+	)
+	pusher.Start()
+	return pusher.Stop
+}

example/otel/go.mod

@@ -1,14 +1,15 @@
-module github.com/go-redis/redis/example
+module github.com/go-redis/redis/example/otel
 
 go 1.14
 
 require (
-	github.com/benbjohnson/clock v1.0.3 // indirect
 	github.com/go-redis/redis/v8 v8.4.4
-	github.com/opentracing/opentracing-go v1.1.1-0.20190913142402-a7454ce5950e // indirect
+	github.com/go-redis/redis/v8/extra/redisotel v0.0.0-00010101000000-000000000000
 	go.opentelemetry.io/otel v0.15.0
+	go.opentelemetry.io/otel/exporters/stdout v0.15.0
 	go.opentelemetry.io/otel/sdk v0.15.0
-	google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 // indirect
 )
 
 replace github.com/go-redis/redis/v8 => ../../
+
+replace github.com/go-redis/redis/v8/extra/redisotel => ../../extra/redisotel