Skip to content

Commit

Permalink
Close jaeger gRPC connection
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel González Lopes <[email protected]>
  • Loading branch information
dgzlopes committed Mar 11, 2021
1 parent f2a7f3d commit 1a6f9cb
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions cmd/tempo-vulture/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@ func main() {
<-tickerWrite.C

rand.Seed((time.Now().Unix() / interval) * interval)
c, err := newJaegerGRPCClient(tempoPushURL)
conn, reporter, err := newJaegerGRPCClient(tempoPushURL)
if err != nil {
glog.Error("error creating grpc client", err)
metricErrorTotal.Inc()
conn.Close()
continue
}

Expand All @@ -84,15 +85,18 @@ func main() {
if err != nil {
glog.Error("error injecting org id ", err)
metricErrorTotal.Inc()
conn.Close()
continue
}
err = c.EmitBatch(ctx, makeThriftBatch(traceIDHigh, traceIDLow))
err = reporter.EmitBatch(ctx, makeThriftBatch(traceIDHigh, traceIDLow))
if err != nil {
glog.Error("error pushing batch to Tempo ", err)
metricErrorTotal.Inc()
conn.Close()
continue
}
}
conn.Close()
}
}()

Expand Down Expand Up @@ -131,26 +135,26 @@ func main() {
log.Fatal(http.ListenAndServe(prometheusListenAddress, nil))
}

func newJaegerGRPCClient(endpoint string) (*jaeger_grpc.Reporter, error) {
func newJaegerGRPCClient(endpoint string) (*grpc.ClientConn, *jaeger_grpc.Reporter, error) {
// remove scheme and port
u, err := url.Parse(endpoint)
if err != nil {
return nil, err
return nil, nil, err
}
host, _, err := net.SplitHostPort(u.Host)
if err != nil {
return nil, err
return nil, nil, err
}
// new jaeger grpc exporter
conn, err := grpc.Dial(host+":14250", grpc.WithInsecure())
if err != nil {
return nil, err
return nil, nil, err
}
logger, err := zap.NewDevelopment()
if err != nil {
return nil, err
return nil, nil, err
}
return jaeger_grpc.NewReporter(conn, nil, logger), err
return conn, jaeger_grpc.NewReporter(conn, nil, logger), err
}

func generateRandomString() string {
Expand Down

0 comments on commit 1a6f9cb

Please sign in to comment.