Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit 028feb2

Browse files
author
Ramon Nogueira
authored
Repro Stackdriver span Link issue (#690) (#692)
1 parent 328ab7a commit 028feb2

4 files changed

Lines changed: 34 additions & 16 deletions

File tree

exporter/stackdriver/stackdriver.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"context"
2626
"errors"
2727
"fmt"
28+
"log"
2829
"time"
2930

3031
traceapi "cloud.google.com/go/trace/apiv2"
@@ -135,3 +136,11 @@ func (e *Exporter) Flush() {
135136
e.statsExporter.Flush()
136137
e.traceExporter.Flush()
137138
}
139+
140+
func (o Options) handleError(err error) {
141+
if o.OnError != nil {
142+
o.OnError(err)
143+
return
144+
}
145+
log.Printf("Error exporting to Stackdriver: %v", err)
146+
}

exporter/stackdriver/stackdriver_test.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ func TestExport(t *testing.T) {
3636
t.Skip("STACKDRIVER_TEST_PROJECT_ID not set")
3737
}
3838

39-
exporter, err := NewExporter(Options{ProjectID: projectID})
39+
var exportErrors []error
40+
41+
exporter, err := NewExporter(Options{ProjectID: projectID, OnError: func(err error) {
42+
exportErrors = append(exportErrors, err)
43+
}})
4044
if err != nil {
4145
t.Fatal(err)
4246
}
@@ -56,7 +60,16 @@ func TestExport(t *testing.T) {
5660
// Test HTTP spans
5761

5862
handler := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
63+
64+
_, backgroundSpan := trace.StartSpan(context.Background(), "BackgroundWork")
65+
spanContext := backgroundSpan.SpanContext()
66+
time.Sleep(10 * time.Millisecond)
67+
backgroundSpan.End()
68+
69+
_, span := trace.StartSpan(req.Context(), "Sleep")
70+
span.AddLink(trace.Link{Type: trace.LinkTypeChild, TraceID: spanContext.TraceID, SpanID: spanContext.SpanID})
5971
time.Sleep(150 * time.Millisecond) // do work
72+
span.End()
6073
rw.Write([]byte("Hello, world!"))
6174
})
6275
server := httptest.NewServer(&ochttp.Handler{Handler: handler})
@@ -81,6 +94,10 @@ func TestExport(t *testing.T) {
8194
// Flush twice to expose issue of exporter creating traces internally (#557)
8295
exporter.Flush()
8396
exporter.Flush()
97+
98+
for _, err := range exportErrors {
99+
t.Error(err)
100+
}
84101
}
85102

86103
func TestGRPC(t *testing.T) {

exporter/stackdriver/stats.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"context"
1919
"errors"
2020
"fmt"
21-
"log"
2221
"os"
2322
"path"
2423
"strconv"
@@ -123,9 +122,9 @@ func (e *statsExporter) ExportView(vd *view.Data) {
123122
case bundler.ErrOversizedItem:
124123
go e.handleUpload(vd)
125124
case bundler.ErrOverflow:
126-
e.onError(errors.New("failed to upload: buffer full"))
125+
e.o.handleError(errors.New("failed to upload: buffer full"))
127126
default:
128-
e.onError(err)
127+
e.o.handleError(err)
129128
}
130129
}
131130

@@ -143,7 +142,7 @@ func getTaskValue() string {
143142
// of Data, as well as error handling.
144143
func (e *statsExporter) handleUpload(vds ...*view.Data) {
145144
if err := e.uploadStats(vds); err != nil {
146-
e.onError(err)
145+
e.o.handleError(err)
147146
}
148147
}
149148

@@ -155,14 +154,6 @@ func (e *statsExporter) Flush() {
155154
e.bundler.Flush()
156155
}
157156

158-
func (e *statsExporter) onError(err error) {
159-
if e.o.OnError != nil {
160-
e.o.OnError(err)
161-
return
162-
}
163-
log.Printf("Failed to export to Stackdriver Monitoring: %v", err)
164-
}
165-
166157
func (e *statsExporter) uploadStats(vds []*view.Data) error {
167158
span := trace.NewSpan(
168159
"go.opencensus.io/exporter/stackdriver.uploadStats",

exporter/stackdriver/trace.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
// Stackdriver.
3232
//
3333
type traceExporter struct {
34+
o Options
3435
projectID string
3536
bundler *bundler.Bundler
3637
// uploadFn defaults to uploadSpans; it can be replaced for tests.
@@ -53,6 +54,7 @@ func newTraceExporterWithClient(o Options, c *tracingclient.Client) *traceExport
5354
e := &traceExporter{
5455
projectID: o.ProjectID,
5556
client: c,
57+
o: o,
5658
}
5759
bundler := bundler.NewBundler((*trace.SpanData)(nil), func(bundle interface{}) {
5860
e.uploadFn(bundle.([]*trace.SpanData))
@@ -93,7 +95,7 @@ func (e *traceExporter) ExportSpan(s *trace.SpanData) {
9395
case bundler.ErrOverflow:
9496
e.overflowLogger.log()
9597
default:
96-
log.Println("OpenCensus Stackdriver exporter: failed to upload span:", err)
98+
e.o.handleError(err)
9799
}
98100
}
99101

@@ -123,8 +125,7 @@ func (e *traceExporter) uploadSpans(spans []*trace.SpanData) {
123125
err := e.client.BatchWriteSpans(ctx, &req)
124126
if err != nil {
125127
span.SetStatus(trace.Status{Code: 2, Message: err.Error()})
126-
// TODO: Allow configuring a logger for exporters.
127-
log.Printf("OpenCensus Stackdriver exporter: failed to upload %d spans: %v", len(spans), err)
128+
e.o.handleError(err)
128129
}
129130
}
130131

0 commit comments

Comments
 (0)