Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the OTLP exporter batching of traces #623

Merged
merged 1 commit into from
Apr 8, 2020
Merged

Update the OTLP exporter batching of traces #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions exporters/otlp/internal/transform/span.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (

apitrace "go.opentelemetry.io/otel/api/trace"
export "go.opentelemetry.io/otel/sdk/export/trace"
"go.opentelemetry.io/otel/sdk/resource"
)

const (
Expand All @@ -33,11 +32,17 @@ func SpanData(sdl []*export.SpanData) []*tracepb.ResourceSpans {
if len(sdl) == 0 {
return nil
}
rsm := make(map[*resource.Resource]*tracepb.ResourceSpans)
// Group by the unique string representation of the Resource.
rsm := make(map[string]*tracepb.ResourceSpans)

for _, sd := range sdl {
if sd != nil {
rs, ok := rsm[sd.Resource]
var key string
if sd.Resource != nil {
key = sd.Resource.String()
}

rs, ok := rsm[key]
if !ok {
rs = &tracepb.ResourceSpans{
Resource: Resource(sd.Resource),
Expand All @@ -47,7 +52,7 @@ func SpanData(sdl []*export.SpanData) []*tracepb.ResourceSpans {
},
},
}
rsm[sd.Resource] = rs
rsm[key] = rs
}
rs.InstrumentationLibrarySpans[0].Spans =
append(rs.InstrumentationLibrarySpans[0].Spans, span(sd))
Expand Down
8 changes: 6 additions & 2 deletions exporters/otlp/internal/transform/span_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ func TestSpanData(t *testing.T) {
ParentSpanId: []byte{0xEF, 0xEE, 0xED, 0xEC, 0xEB, 0xEA, 0xE9, 0xE8},
Name: spanData.Name,
Kind: tracepb.Span_SERVER,
StartTimeUnixNano: uint64(1585674086000001234),
EndTimeUnixNano: uint64(1585674096000001234),
StartTimeUnixNano: uint64(startTime.UnixNano()),
EndTimeUnixNano: uint64(endTime.UnixNano()),
Status: status(spanData.StatusCode, spanData.StatusMessage),
Events: spanEvents(spanData.MessageEvents),
Links: links(spanData.Links),
Expand Down Expand Up @@ -369,3 +369,7 @@ func TestRootSpanData(t *testing.T) {
// Empty means root span.
assert.Nil(t, got, "incorrect transform of root parent span ID")
}

func TestSpanDataNilResource(t *testing.T) {
assert.NotPanics(t, func() { SpanData([]*export.SpanData{{}}) })
}
0 exporters/otlp/otlp_test.go → exporters/otlp/otlp_integration_test.go
View file
Open in desktop
File renamed without changes.
253 changes: 253 additions & 0 deletions exporters/otlp/otlp_span_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package otlp

import (
"context"
"testing"
"time"

coltracepb "github.com/open-telemetry/opentelemetry-proto/gen/go/collector/trace/v1"
commonpb "github.com/open-telemetry/opentelemetry-proto/gen/go/common/v1"
resourcepb "github.com/open-telemetry/opentelemetry-proto/gen/go/resource/v1"
tracepb "github.com/open-telemetry/opentelemetry-proto/gen/go/trace/v1"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"

"go.opentelemetry.io/otel/api/core"
apitrace "go.opentelemetry.io/otel/api/trace"
tracesdk "go.opentelemetry.io/otel/sdk/export/trace"
"go.opentelemetry.io/otel/sdk/resource"
)

type traceServiceClientStub struct {
rs []tracepb.ResourceSpans
}

func (t *traceServiceClientStub) Export(ctx context.Context, in *coltracepb.ExportTraceServiceRequest, opts ...grpc.CallOption) (*coltracepb.ExportTraceServiceResponse, error) {
for _, rs := range in.GetResourceSpans() {
if rs == nil {
continue
}
t.rs = append(t.rs, *rs)
}
return &coltracepb.ExportTraceServiceResponse{}, nil
}

func (t *traceServiceClientStub) ResourceSpans() []tracepb.ResourceSpans {
return t.rs
}

func (t *traceServiceClientStub) Reset() {
t.rs = nil
}

func TestExportSpans(t *testing.T) {
tsc := &traceServiceClientStub{}
exp := NewUnstartedExporter()
exp.traceExporter = tsc
exp.started = true

// March 31, 2020 5:01:26 1234nanos (UTC)
startTime := time.Unix(1585674086, 1234)
endTime := startTime.Add(10 * time.Second)

for _, test := range []struct {
sd []*tracesdk.SpanData
want []tracepb.ResourceSpans
}{
{
[]*tracesdk.SpanData(nil),
[]tracepb.ResourceSpans(nil),
},
{
[]*tracesdk.SpanData{},
[]tracepb.ResourceSpans(nil),
},
{
[]*tracesdk.SpanData{
{
SpanContext: core.SpanContext{
TraceID: core.TraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}),
SpanID: core.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}),
TraceFlags: byte(1),
},
SpanKind: apitrace.SpanKindServer,
Name: "parent process",
StartTime: startTime,
EndTime: endTime,
Attributes: []core.KeyValue{
core.Key("user").String("alice"),
core.Key("authenticated").Bool(true),
},
StatusCode: codes.OK,
StatusMessage: "Ok",
Resource: resource.New(core.Key("instance").String("tester-a")),
},
{
SpanContext: core.SpanContext{
TraceID: core.TraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}),
SpanID: core.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 2}),
TraceFlags: byte(1),
},
ParentSpanID: core.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}),
SpanKind: apitrace.SpanKindInternal,
Name: "internal process",
StartTime: startTime,
EndTime: endTime,
Attributes: []core.KeyValue{
core.Key("user").String("alice"),
core.Key("authenticated").Bool(true),
},
StatusCode: codes.OK,
StatusMessage: "Ok",
Resource: resource.New(core.Key("instance").String("tester-a")),
},
{
SpanContext: core.SpanContext{
TraceID: core.TraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}),
SpanID: core.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}),
TraceFlags: byte(1),
},
SpanKind: apitrace.SpanKindServer,
Name: "parent process",
StartTime: startTime,
EndTime: endTime,
Attributes: []core.KeyValue{
core.Key("user").String("bob"),
core.Key("authenticated").Bool(false),
},
StatusCode: codes.Unauthenticated,
StatusMessage: "Unauthenticated",
Resource: resource.New(core.Key("instance").String("tester-b")),
},
},
[]tracepb.ResourceSpans{
{
Resource: &resourcepb.Resource{
Attributes: []*commonpb.AttributeKeyValue{
{
Key: "instance",
Type: commonpb.AttributeKeyValue_STRING,
StringValue: "tester-a",
},
},
},
InstrumentationLibrarySpans: []*tracepb.InstrumentationLibrarySpans{
{
Spans: []*tracepb.Span{
{
TraceId: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
SpanId: []byte{0, 0, 0, 0, 0, 0, 0, 1},
Name: "parent process",
Kind: tracepb.Span_SERVER,
StartTimeUnixNano: uint64(startTime.UnixNano()),
EndTimeUnixNano: uint64(endTime.UnixNano()),
Attributes: []*commonpb.AttributeKeyValue{
{
Key: "user",
Type: commonpb.AttributeKeyValue_STRING,
StringValue: "alice",
},
{
Key: "authenticated",
Type: commonpb.AttributeKeyValue_BOOL,
BoolValue: true,
},
},
Status: &tracepb.Status{
Code: tracepb.Status_Ok,
Message: "Ok",
},
},
{
TraceId: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
SpanId: []byte{0, 0, 0, 0, 0, 0, 0, 2},
ParentSpanId: []byte{0, 0, 0, 0, 0, 0, 0, 1},
Name: "internal process",
Kind: tracepb.Span_INTERNAL,
StartTimeUnixNano: uint64(startTime.UnixNano()),
EndTimeUnixNano: uint64(endTime.UnixNano()),
Attributes: []*commonpb.AttributeKeyValue{
{
Key: "user",
Type: commonpb.AttributeKeyValue_STRING,
StringValue: "alice",
},
{
Key: "authenticated",
Type: commonpb.AttributeKeyValue_BOOL,
BoolValue: true,
},
},
Status: &tracepb.Status{
Code: tracepb.Status_Ok,
Message: "Ok",
},
},
},
},
},
},
{
Resource: &resourcepb.Resource{
Attributes: []*commonpb.AttributeKeyValue{
{
Key: "instance",
Type: commonpb.AttributeKeyValue_STRING,
StringValue: "tester-b",
},
},
},
InstrumentationLibrarySpans: []*tracepb.InstrumentationLibrarySpans{
{
Spans: []*tracepb.Span{
{
TraceId: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2},
SpanId: []byte{0, 0, 0, 0, 0, 0, 0, 1},
Name: "parent process",
Kind: tracepb.Span_SERVER,
StartTimeUnixNano: uint64(startTime.UnixNano()),
EndTimeUnixNano: uint64(endTime.UnixNano()),
Attributes: []*commonpb.AttributeKeyValue{
{
Key: "user",
Type: commonpb.AttributeKeyValue_STRING,
StringValue: "bob",
},
{
Key: "authenticated",
Type: commonpb.AttributeKeyValue_BOOL,
BoolValue: false,
},
},
Status: &tracepb.Status{
Code: tracepb.Status_Unauthenticated,
Message: "Unauthenticated",
},
},
},
},
},
},
},
},
} {
tsc.Reset()
exp.ExportSpans(context.Background(), test.sd)
assert.ElementsMatch(t, test.want, tsc.ResourceSpans())
}
}