Skip to content

Commit 64633e1

Browse files
pkositsynpkositsyn
committed
bump opentelemetry-collector to v0.14.0
Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>
1 parent 740264b commit 64633e1

File tree

29 files changed

+133
-92
lines changed

29 files changed

+133
-92
lines changed

‎cmd/opentelemetry/app/exporter/badgerexporter/factory.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,17 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
9191

9292
// CreateTraceExporter creates Jaeger Cassandra trace exporter.
9393
// This function implements OTEL component.ExporterFactory interface.
94-
func (f Factory) CreateTraceExporter(
94+
func (f Factory) CreateTracesExporter(
9595
_ context.Context,
9696
params component.ExporterCreateParams,
9797
cfg configmodels.Exporter,
98-
) (component.TraceExporter, error) {
98+
) (component.TracesExporter, error) {
9999
config := cfg.(*Config)
100100
factory, err := f.createStorageFactory(params, config)
101101
if err != nil {
102102
return nil, err
103103
}
104-
return exporter.NewSpanWriterExporter(cfg, factory,
104+
return exporter.NewSpanWriterExporter(cfg, params, factory,
105105
exporterhelper.WithTimeout(config.TimeoutSettings),
106106
exporterhelper.WithQueue(config.QueueSettings),
107107
exporterhelper.WithRetry(config.RetrySettings))

‎cmd/opentelemetry/app/exporter/badgerexporter/factory_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestCreateTraceExporter(t *testing.T) {
3737
factory := NewFactory(func() *badger.Options {
3838
return opts
3939
})
40-
exporter, err := factory.CreateTraceExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, factory.CreateDefaultConfig())
40+
exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, factory.CreateDefaultConfig())
4141
require.NoError(t, err)
4242
assert.NotNil(t, exporter)
4343
}

‎cmd/opentelemetry/app/exporter/cassandraexporter/exporter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ import (
2424
)
2525

2626
// new creates Cassandra exporter/storage
27-
func new(config *Config, params component.ExporterCreateParams) (component.TraceExporter, error) {
27+
func new(config *Config, params component.ExporterCreateParams) (component.TracesExporter, error) {
2828
f := cassandra.NewFactory()
2929
f.InitFromOptions(&config.Options)
3030

3131
err := f.Initialize(metrics.NullFactory, params.Logger)
3232
if err != nil {
3333
return nil, err
3434
}
35-
return exporter.NewSpanWriterExporter(config, f,
35+
return exporter.NewSpanWriterExporter(config, params, f,
3636
exporterhelper.WithTimeout(config.TimeoutSettings),
3737
exporterhelper.WithQueue(config.QueueSettings),
3838
exporterhelper.WithRetry(config.RetrySettings))

‎cmd/opentelemetry/app/exporter/cassandraexporter/factory.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
7373

7474
// CreateTraceExporter creates Jaeger Cassandra trace exporter.
7575
// This function implements OTEL component.ExporterFactory interface.
76-
func (f Factory) CreateTraceExporter(
76+
func (f Factory) CreateTracesExporter(
7777
_ context.Context,
7878
params component.ExporterCreateParams,
7979
cfg configmodels.Exporter,
80-
) (component.TraceExporter, error) {
80+
) (component.TracesExporter, error) {
8181
config := cfg.(*Config)
8282
return new(config, params)
8383
}

‎cmd/opentelemetry/app/exporter/cassandraexporter/factory_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestCreateTraceExporter(t *testing.T) {
3737
factory := Factory{OptionsFactory: func() *cassandra.Options {
3838
return opts
3939
}}
40-
exporter, err := factory.CreateTraceExporter(context.Background(), component.ExporterCreateParams{}, factory.CreateDefaultConfig())
40+
exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, factory.CreateDefaultConfig())
4141
require.Nil(t, exporter)
4242
assert.Contains(t, err.Error(), "gocql: unable to create session")
4343
}

‎cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -222,21 +222,15 @@ func references(links pdata.SpanLinkSlice, parentSpanID pdata.SpanID, traceID db
222222
}
223223

224224
func convertSpanID(spanID pdata.SpanID) (dbmodel.SpanID, error) {
225-
spanIDInt, err := tracetranslator.BytesToUInt64SpanID(spanID.Bytes())
226-
if err != nil {
227-
return "", err
228-
}
225+
spanIDInt := tracetranslator.BytesToUInt64SpanID(spanID.Bytes())
229226
if spanIDInt == 0 {
230227
return "", errZeroSpanID
231228
}
232229
return dbmodel.SpanID(fmt.Sprintf("%016x", spanIDInt)), nil
233230
}
234231

235232
func convertTraceID(traceID pdata.TraceID) (dbmodel.TraceID, error) {
236-
high, low, err := tracetranslator.BytesToUInt64TraceID(traceID.Bytes())
237-
if err != nil {
238-
return "", err
239-
}
233+
high, low := tracetranslator.BytesToUInt64TraceID(traceID.Bytes())
240234
if low == 0 && high == 0 {
241235
return "", errZeroTraceID
242236
}

‎cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator_test.go

+26-20
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package esmodeltranslator
1616

1717
import (
18-
"encoding/binary"
1918
"fmt"
2019
"testing"
2120
"time"
@@ -30,8 +29,8 @@ import (
3029
)
3130

3231
var (
33-
traceID = pdata.NewTraceID([]byte("0123456789abcdef"))
34-
spanID = pdata.NewSpanID([]byte("01234567"))
32+
traceID = pdata.NewTraceID(Byte16ArrayFromString("0123456789abcdef"))
33+
spanID = pdata.NewSpanID(Byte8ArrayFromString("01234567"))
3534
)
3635

3736
func TestAttributeToKeyValue(t *testing.T) {
@@ -151,7 +150,7 @@ func TestConvertSpan(t *testing.T) {
151150
StartTimeMillis: 1,
152151
Tags: []dbmodel.KeyValue{
153152
{Key: "span.kind", Type: dbmodel.StringType, Value: "client"},
154-
{Key: "status.code", Type: dbmodel.StringType, Value: "STATUS_CODE_CANCELLED"},
153+
{Key: "status.code", Type: dbmodel.StringType, Value: "STATUS_CODE_OK"},
155154
{Key: "error", Type: dbmodel.BoolType, Value: "true"},
156155
{Key: "status.message", Type: dbmodel.StringType, Value: "messagetext"},
157156
{Key: "foo", Type: dbmodel.BoolType, Value: "true"},
@@ -196,9 +195,15 @@ func TestSpanEmptyRef(t *testing.T) {
196195
Duration: 1000,
197196
OperationName: "root",
198197
StartTimeMillis: 1,
199-
Tags: []dbmodel.KeyValue{}, // should not be nil
200-
Logs: []dbmodel.Log{}, // should not be nil
201-
References: []dbmodel.Reference{}, // should not be nil
198+
Tags: []dbmodel.KeyValue{}, // should not be nil
199+
Logs: []dbmodel.Log{}, // should not be nil
200+
References: []dbmodel.Reference{
201+
{
202+
RefType: "CHILD_OF",
203+
TraceID: "30313233343536373839616263646566",
204+
SpanID: "3031323334353637",
205+
},
206+
},
202207
Process: dbmodel.Process{
203208
ServiceName: "myservice",
204209
Tags: nil,
@@ -215,26 +220,16 @@ func TestEmpty(t *testing.T) {
215220
}
216221

217222
func TestErrorIDs(t *testing.T) {
218-
zero64Bytes := make([]byte, 16)
219-
binary.LittleEndian.PutUint64(zero64Bytes, 0)
220-
binary.LittleEndian.PutUint64(zero64Bytes, 0)
223+
var zero64Bytes [16]byte
224+
var zero32Bytes [8]byte
221225
tests := []struct {
222226
spanID pdata.SpanID
223227
traceID pdata.TraceID
224228
err string
225229
}{
226-
{
227-
traceID: pdata.NewTraceID([]byte("invalid-%")),
228-
err: "TraceID does not have 16 bytes",
229-
},
230-
{
231-
traceID: traceID,
232-
spanID: pdata.NewSpanID([]byte("invalid-%")),
233-
err: "SpanID does not have 8 bytes",
234-
},
235230
{
236231
traceID: traceID,
237-
spanID: pdata.NewSpanID(zero64Bytes[:8]),
232+
spanID: pdata.NewSpanID(zero32Bytes),
238233
err: errZeroSpanID.Error(),
239234
},
240235
{
@@ -274,7 +269,18 @@ func addSpan(traces pdata.Traces, name string, traceID pdata.TraceID, spanID pda
274269
span.SetName(name)
275270
span.SetTraceID(traceID)
276271
span.SetSpanID(spanID)
272+
span.SetParentSpanID(spanID)
277273
span.SetStartTime(pdata.TimestampUnixNano(time.Now().UnixNano()))
278274
span.SetEndTime(pdata.TimestampUnixNano(time.Now().UnixNano()))
279275
return span
280276
}
277+
278+
func Byte16ArrayFromString(s string) (result [16]byte) {
279+
copy(result[:], s)
280+
return
281+
}
282+
283+
func Byte8ArrayFromString(s string) (result [8]byte) {
284+
copy(result[:], s)
285+
return
286+
}

‎cmd/opentelemetry/app/exporter/elasticsearchexporter/exporter.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
)
2525

2626
// newExporter creates Elasticsearch exporter/storage.
27-
func newExporter(ctx context.Context, config *Config, params component.ExporterCreateParams) (component.TraceExporter, error) {
27+
func newExporter(ctx context.Context, config *Config, params component.ExporterCreateParams) (component.TracesExporter, error) {
2828
esCfg := config.GetPrimary()
2929
w, err := newEsSpanWriter(*esCfg, params.Logger, false, config.Name())
3030
if err != nil {
@@ -38,6 +38,7 @@ func newExporter(ctx context.Context, config *Config, params component.ExporterC
3838
}
3939
return exporterhelper.NewTraceExporter(
4040
config,
41+
params.Logger,
4142
w.WriteTraces,
4243
exporterhelper.WithTimeout(config.TimeoutSettings),
4344
exporterhelper.WithQueue(config.QueueSettings),

‎cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
7474

7575
// CreateTraceExporter creates Jaeger Elasticsearch trace exporter.
7676
// This function implements OTEL component.ExporterFactory interface.
77-
func (Factory) CreateTraceExporter(
77+
func (Factory) CreateTracesExporter(
7878
ctx context.Context,
7979
params component.ExporterCreateParams,
8080
cfg configmodels.Exporter,
81-
) (component.TraceExporter, error) {
81+
) (component.TracesExporter, error) {
8282
esCfg, ok := cfg.(*Config)
8383
if !ok {
8484
return nil, fmt.Errorf("could not cast configuration to %s", TypeStr)

‎cmd/opentelemetry/app/exporter/elasticsearchexporter/factory_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ func TestCreateTraceExporter(t *testing.T) {
4040
}}
4141
config := factory.CreateDefaultConfig().(*Config)
4242
config.Primary.Servers = []string{"http://foobardoesnotexists.test"}
43-
exporter, err := factory.CreateTraceExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, config)
43+
exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, config)
4444
require.Nil(t, exporter)
4545
assert.Contains(t, err.Error(), "no such host")
4646
}
4747

4848
func TestCreateTraceExporter_nilConfig(t *testing.T) {
4949
factory := &Factory{}
50-
exporter, err := factory.CreateTraceExporter(context.Background(), component.ExporterCreateParams{}, nil)
50+
exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, nil)
5151
require.Nil(t, exporter)
5252
assert.Contains(t, err.Error(), "could not cast configuration to jaeger_elasticsearch")
5353
}

‎cmd/opentelemetry/app/exporter/elasticsearchexporter/spanstore.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ const (
4646
serviceIndexBaseName = "jaeger-service"
4747
spanTypeName = "span"
4848
serviceTypeName = "service"
49-
indexDateFormat = "2006-01-02" // date format for index e.g. 2020-01-20
5049
)
5150

5251
// esSpanWriter holds components required for ES span writer
@@ -245,7 +244,7 @@ func bulkItemsToTraces(bulkItems []bulkItem) pdata.Traces {
245244
rss := traces.ResourceSpans().At(i)
246245
if !spanData.Resource.IsNil() {
247246
rss.Resource().InitEmpty()
248-
rss.Resource().Attributes().InitFromAttributeMap(spanData.Resource.Attributes())
247+
spanData.Resource.Attributes().CopyTo(rss.Resource().Attributes())
249248
}
250249
rss.InstrumentationLibrarySpans().Resize(1)
251250
ispans := rss.InstrumentationLibrarySpans().At(0)

‎cmd/opentelemetry/app/exporter/grpcpluginexporter/exporter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ import (
2424
)
2525

2626
// new creates gRPC exporter/storage.
27-
func new(config *Config, params component.ExporterCreateParams) (component.TraceExporter, error) {
27+
func new(config *Config, params component.ExporterCreateParams) (component.TracesExporter, error) {
2828
factory := storageGrpc.NewFactory()
2929
factory.InitFromOptions(config.Options)
3030
err := factory.Initialize(metrics.NullFactory, params.Logger)
3131
if err != nil {
3232
return nil, err
3333
}
34-
return storageOtelExporter.NewSpanWriterExporter(&config.ExporterSettings, factory,
34+
return storageOtelExporter.NewSpanWriterExporter(&config.ExporterSettings, params, factory,
3535
exporterhelper.WithTimeout(config.TimeoutSettings),
3636
exporterhelper.WithQueue(config.QueueSettings),
3737
exporterhelper.WithRetry(config.RetrySettings))

‎cmd/opentelemetry/app/exporter/grpcpluginexporter/factory.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
6767

6868
// CreateTraceExporter creates Jaeger gRPC trace exporter.
6969
// This function implements OTEL component.ExporterFactory interface.
70-
func (f Factory) CreateTraceExporter(
70+
func (f Factory) CreateTracesExporter(
7171
_ context.Context,
7272
params component.ExporterCreateParams,
7373
cfg configmodels.Exporter,
74-
) (component.TraceExporter, error) {
74+
) (component.TracesExporter, error) {
7575
grpcCfg := cfg.(*Config)
7676
return new(grpcCfg, params)
7777
}

‎cmd/opentelemetry/app/exporter/grpcpluginexporter/factory_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestCreateTraceExporter(t *testing.T) {
3636
factory := &Factory{OptionsFactory: func() *storageGrpc.Options {
3737
return opts
3838
}}
39-
exporter, err := factory.CreateTraceExporter(context.Background(), component.ExporterCreateParams{}, factory.CreateDefaultConfig())
39+
exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, factory.CreateDefaultConfig())
4040
require.Nil(t, exporter)
4141
assert.Contains(t, err.Error(), "error attempting to connect to plugin rpc client: fork/exec : no such file or directory")
4242
}

‎cmd/opentelemetry/app/exporter/jaegerexporter/jaeger_exporter.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
6060

6161
// CreateTraceExporter creates Jaeger trace exporter.
6262
// This function implements OTEL component.ExporterFactory interface.
63-
func (f Factory) CreateTraceExporter(
63+
func (f Factory) CreateTracesExporter(
6464
ctx context.Context,
6565
params component.ExporterCreateParams,
6666
cfg configmodels.Exporter,
67-
) (component.TraceExporter, error) {
68-
return f.Wrapped.CreateTraceExporter(ctx, params, cfg)
67+
) (component.TracesExporter, error) {
68+
return f.Wrapped.CreateTracesExporter(ctx, params, cfg)
6969
}
7070

7171
// CreateMetricsExporter creates a metrics exporter based on provided config.

‎cmd/opentelemetry/app/exporter/jaegerexporter/jaeger_exporter_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ func TestDefaultValueFromViper(t *testing.T) {
6464
cfg := f.CreateDefaultConfig().(*jaegerexporter.Config)
6565

6666
qs := exporterhelper.CreateDefaultQueueSettings()
67-
qs.Enabled = false
6867
assert.Equal(t, &jaegerexporter.Config{
6968
ExporterSettings: configmodels.ExporterSettings{
7069
TypeVal: "jaeger",

‎cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
9999

100100
// CreateTraceExporter creates Jaeger trace exporter.
101101
// This function implements OTEL component.ExporterFactory interface.
102-
func (f Factory) CreateTraceExporter(
102+
func (f Factory) CreateTracesExporter(
103103
ctx context.Context,
104104
params component.ExporterCreateParams,
105105
cfg configmodels.Exporter,
106-
) (component.TraceExporter, error) {
107-
return f.Wrapped.CreateTraceExporter(ctx, params, cfg)
106+
) (component.TracesExporter, error) {
107+
return f.Wrapped.CreateTracesExporter(ctx, params, cfg)
108108
}
109109

110110
// CreateMetricsExporter creates a metrics exporter based on provided config.

‎cmd/opentelemetry/app/exporter/memoryexporter/factory.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,16 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
8080

8181
// CreateTraceExporter creates Jaeger Kafka trace exporter.
8282
// This function implements OTEL component.ExporterFactory interface.
83-
func (f Factory) CreateTraceExporter(
83+
func (f Factory) CreateTracesExporter(
8484
_ context.Context,
8585
params component.ExporterCreateParams,
8686
cfg configmodels.Exporter,
87-
) (component.TraceExporter, error) {
87+
) (component.TracesExporter, error) {
8888
factory, err := f.createStorageFactory(params, cfg)
8989
if err != nil {
9090
return nil, err
9191
}
92-
return exporter.NewSpanWriterExporter(cfg, factory)
92+
return exporter.NewSpanWriterExporter(cfg, params, factory)
9393
}
9494

9595
// CreateMetricsExporter is not implemented.

‎cmd/opentelemetry/app/exporter/memoryexporter/factory_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestCreateTraceExporter(t *testing.T) {
3939

4040
v, _ := jConfig.Viperize(AddFlags)
4141
factory := NewFactory(v)
42-
exporter, err := factory.CreateTraceExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, factory.CreateDefaultConfig())
42+
exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, factory.CreateDefaultConfig())
4343
require.NoError(t, err)
4444
require.NotNil(t, exporter)
4545
}
@@ -48,7 +48,7 @@ func TestCreateTraceExporter_nilConfig(t *testing.T) {
4848
defer cleanup()
4949

5050
factory := &Factory{}
51-
exporter, err := factory.CreateTraceExporter(context.Background(), component.ExporterCreateParams{}, nil)
51+
exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, nil)
5252
require.Nil(t, exporter)
5353
assert.Contains(t, err.Error(), "could not cast configuration to jaeger_memory")
5454
}
@@ -84,11 +84,11 @@ func TestSingleton(t *testing.T) {
8484
f := NewFactory(viper.New())
8585
logger := zap.NewNop()
8686
assert.Nil(t, instance)
87-
exp, err := f.CreateTraceExporter(context.Background(), component.ExporterCreateParams{Logger: logger}, &Config{})
87+
exp, err := f.CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: logger}, &Config{})
8888
require.NoError(t, err)
8989
require.NotNil(t, exp)
9090
previousInstance := instance
91-
exp, err = f.CreateTraceExporter(context.Background(), component.ExporterCreateParams{Logger: logger}, &Config{})
91+
exp, err = f.CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: logger}, &Config{})
9292
require.NoError(t, err)
9393
require.NotNil(t, exp)
9494
assert.Equal(t, previousInstance, instance)

0 commit comments

Comments
 (0)