From b1cbe2c694ee5bf5f346cfd000b240e2f63fd06e Mon Sep 17 00:00:00 2001 From: moh-osman3 Date: Mon, 12 Aug 2024 09:55:30 -0400 Subject: [PATCH] gofmt --- .../trace/exporters/otlp/otelcol/client.go | 11 ++++------- .../exporters/otlp/otelcol/client_test.go | 19 +++++++++++-------- .../sdk/trace/exporters/otlp/otelcol/size.go | 4 ---- .../trace/exporters/otlp/otelcol/size_test.go | 19 +++++++++---------- 4 files changed, 24 insertions(+), 29 deletions(-) diff --git a/lightstep/sdk/trace/exporters/otlp/otelcol/client.go b/lightstep/sdk/trace/exporters/otlp/otelcol/client.go index b569ff5d..7213403d 100644 --- a/lightstep/sdk/trace/exporters/otlp/otelcol/client.go +++ b/lightstep/sdk/trace/exporters/otlp/otelcol/client.go @@ -17,12 +17,11 @@ package otelcol import ( "context" "errors" - "fmt" "time" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter" - "github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor" "github.com/open-telemetry/otel-arrow/collector/admission" + "github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configcompression" "go.opentelemetry.io/collector/config/configgrpc" @@ -123,8 +122,6 @@ func (c *client) ExportSpans(ctx context.Context, spans []trace.ReadOnlySpan) (r for _, span := range spans { spanSz += sizeOfROSpan(span) } - fmt.Println("SPAN SIZE") - fmt.Println(spanSz) retErr = c.boundedQueue.Acquire(ctx, int64(spanSz)) if retErr != nil { return @@ -154,10 +151,10 @@ func (c *client) Shutdown(ctx context.Context) error { func NewDefaultConfig() Config { cfg := Config{ - SelfMetrics: true, - SelfSpans: true, + SelfMetrics: true, + SelfSpans: true, AdmissionLimitMiB: 64, - WaiterLimit: 1000, + WaiterLimit: 1000, Batcher: concurrentbatchprocessor.Config{ Timeout: time.Second, SendBatchSize: 1000, diff --git a/lightstep/sdk/trace/exporters/otlp/otelcol/client_test.go b/lightstep/sdk/trace/exporters/otlp/otelcol/client_test.go index 9a5f2533..a8423d0e 100644 --- a/lightstep/sdk/trace/exporters/otlp/otelcol/client_test.go +++ b/lightstep/sdk/trace/exporters/otlp/otelcol/client_test.go @@ -25,6 +25,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver" + // "github.com/open-telemetry/otel-arrow/collector/admission" "github.com/stretchr/testify/suite" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" @@ -44,7 +45,6 @@ import ( resourcev1 "go.opentelemetry.io/proto/otlp/resource/v1" tracev1 "go.opentelemetry.io/proto/otlp/trace/v1" - // "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" ) @@ -201,7 +201,7 @@ func (t *clientTestSuite) TestSpan() { { Resource: &resourcev1.Resource{ Attributes: []*commonpb.KeyValue{ - &commonpb.KeyValue{ + { Key: "property", Value: &commonpb.AnyValue{ Value: &commonpb.AnyValue_StringValue{ @@ -209,7 +209,7 @@ func (t *clientTestSuite) TestSpan() { }, }, }, - &commonpb.KeyValue{ + { Key: "service.name", Value: &commonpb.AnyValue{ Value: &commonpb.AnyValue_StringValue{ @@ -220,12 +220,12 @@ func (t *clientTestSuite) TestSpan() { }, }, ScopeSpans: []*tracev1.ScopeSpans{ - &tracev1.ScopeSpans{ + { Scope: &commonpb.InstrumentationScope{ Name: "test-tracer", }, Spans: []*tracev1.Span{ - &tracev1.Span{ + { SpanId: []byte(unqSpanID), TraceId: []byte(unqTraceID), Kind: tracev1.Span_SPAN_KIND_SERVER, @@ -235,7 +235,7 @@ func (t *clientTestSuite) TestSpan() { Message: "failed", }, Attributes: []*commonpb.KeyValue{ - &commonpb.KeyValue{ + { Key: "test-attribute-1", Value: &commonpb.AnyValue{ Value: &commonpb.AnyValue_StringValue{ @@ -388,6 +388,9 @@ func (t *clientTestSuite) TestSpanSizeTooLarge() { // AdmissionLimitMiB is 0 so we should have no traces arriving. t.Equal(0, len(t.sink.AllTraces())) - t.assertTimestamps() -} \ No newline at end of file + + roSpans := []sdktrace.ReadOnlySpan{span.(sdktrace.ReadOnlySpan), child.(sdktrace.ReadOnlySpan)} + err = exp.ExportSpans(ctx, roSpans) + t.ErrorContains(err, "request size larger than configured limit") +} diff --git a/lightstep/sdk/trace/exporters/otlp/otelcol/size.go b/lightstep/sdk/trace/exporters/otlp/otelcol/size.go index 32039c49..de5f8139 100644 --- a/lightstep/sdk/trace/exporters/otlp/otelcol/size.go +++ b/lightstep/sdk/trace/exporters/otlp/otelcol/size.go @@ -1,7 +1,6 @@ package otelcol import ( - "fmt" math_bits "math/bits" "go.opentelemetry.io/otel/attribute" @@ -81,8 +80,6 @@ func sizeOfSpanLinks(links []trace.Link) int { sz += 1 + sovTrace(uint64(link.DroppedAttributeCount)) } } - fmt.Println("LINK SZ") - fmt.Println(sz) return sz } @@ -101,7 +98,6 @@ func sizeOfSpanEvents(events []trace.Event) int { return sz } - func sizeOfROSpan(span trace.ReadOnlySpan) int { sz := 0 sz += sizeOfSpanString(span.Name()) diff --git a/lightstep/sdk/trace/exporters/otlp/otelcol/size_test.go b/lightstep/sdk/trace/exporters/otlp/otelcol/size_test.go index 91d9400e..38edacde 100644 --- a/lightstep/sdk/trace/exporters/otlp/otelcol/size_test.go +++ b/lightstep/sdk/trace/exporters/otlp/otelcol/size_test.go @@ -12,9 +12,9 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" - "go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" + "go.opentelemetry.io/otel/trace" ) func TestSizeOfSimpleROSpan(t *testing.T) { @@ -26,23 +26,23 @@ func TestSizeOfSimpleROSpan(t *testing.T) { numSpanLinks int }{ { - name: "simple", + name: "simple", numSpanAttrs: 10, }, { - name: "many_attributes", + name: "many_attributes", numSpanAttrs: 100000, }, { - name: "with_events", - numSpanAttrs: 100000, + name: "with_events", + numSpanAttrs: 100000, numSpanEvents: 10000, }, { - name: "with_links", - numSpanAttrs: 100000, + name: "with_links", + numSpanAttrs: 100000, numSpanEvents: 10000, - numSpanLinks: 1000, + numSpanLinks: 1000, }, } for _, tt := range tests { @@ -90,10 +90,9 @@ func TestSizeOfSimpleROSpan(t *testing.T) { protobufSz := float64(len(data)) ROSpanSz := float64(sizeOfROSpan(roSpan)) - percentDiff := math.Abs((ROSpanSz - protobufSz)/protobufSz) + percentDiff := math.Abs((ROSpanSz - protobufSz) / protobufSz) assert.LessOrEqual(t, percentDiff, 0.1) - fmt.Println(percentDiff) }) } }