go/opentelemetry-go
go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-01-03 22:52:30 +02:00
Code Issues Releases Activity

refactor following review feedback

Browse Source
This commit is contained in:
Alex Boten 2020-06-09 13:59:22 -07:00
parent f30ac1e329
commit 6365fe9288
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
exporters/otlp/otlp.go
View File

@ -162,6 +162,13 @@ func (e *Exporter) enableConnections(cc *grpc.ClientConn) error {
return nil
}
func (e *Exporter) contextWithMetadata(ctx context.Context) context.Context {
if e.metadata.Len() > 0 {
return metadata.NewOutgoingContext(ctx, e.metadata)
}
return ctx
}
func (e *Exporter) dialToCollector() (*grpc.ClientConn, error) {
addr := e.prepareCollectorAddress()
@ -181,10 +188,7 @@ func (e *Exporter) dialToCollector() (*grpc.ClientConn, error) {
dialOpts = append(dialOpts, e.c.grpcDialOptions...)
}
ctx := context.Background()
if e.metadata.Len() > 0 {
ctx = metadata.NewOutgoingContext(ctx, e.metadata)
}
ctx := e.contextWithMetadata(context.Background())
return grpc.DialContext(ctx, addr, dialOpts...)
}
@ -249,11 +253,8 @@ func (e *Exporter) Export(parent context.Context, cps metricsdk.CheckpointSet) e
case <-ctx.Done():
return errContextCanceled
default:
if e.metadata.Len() > 0 {
ctx = metadata.NewOutgoingContext(ctx, e.metadata)
}
e.senderMu.Lock()
_, err := e.metricExporter.Export(ctx, &colmetricpb.ExportMetricsServiceRequest{
_, err := e.metricExporter.Export(e.contextWithMetadata(ctx), &colmetricpb.ExportMetricsServiceRequest{
ResourceMetrics: rms,
})
e.senderMu.Unlock()
@ -287,11 +288,8 @@ func (e *Exporter) uploadTraces(ctx context.Context, sdl []*tracesdk.SpanData) {
return
}
if e.metadata.Len() > 0 {
ctx = metadata.NewOutgoingContext(ctx, e.metadata)
}
e.senderMu.Lock()
_, err := e.traceExporter.Export(ctx, &coltracepb.ExportTraceServiceRequest{
_, err := e.traceExporter.Export(e.contextWithMetadata(ctx), &coltracepb.ExportTraceServiceRequest{
ResourceSpans: protoSpans,
})
e.senderMu.Unlock()

2
exporters/otlp/otlp_integration_test.go
View File

@ -23,6 +23,7 @@ import (
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metricpb "github.com/open-telemetry/opentelemetry-proto/gen/go/metrics/v1"
@ -422,5 +423,4 @@ func TestNewExporter_withHeaders(t *testing.T) {
headers := mc.getHeaders()
require.Len(t, headers.Get("header1"), 1)
assert.Equal(t, "value1", headers.Get("header1")[0])
}