Skip to content

Commit

Permalink
Upgrade otel collector, fix renames and helper logger (#1413)
Browse files Browse the repository at this point in the history
* Upgrade otel collector, fix renames and helper logger
* Use pdata.NewAttributeValueNull()

Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
bogdandrutu committed Oct 29, 2020
1 parent f305e19 commit 65f181d
Show file tree
Hide file tree
Showing 169 changed files with 548 additions and 282 deletions.
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/gogo/protobuf v1.3.1
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
go.uber.org/zap v1.16.0
google.golang.org/protobuf v1.25.0
)
4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1025,8 +1025,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757 h1:e9cTT0rxUG+x8fDbv3HqLfb1Lhb8FnBdSajp2WInouE=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func newMetricsExporter(logger *zap.Logger, cfg configmodels.Exporter) (componen

return exporterhelper.NewMetricsExporter(
cfg,
logger,
l.pushMetricsData)
}

Expand Down
1 change: 1 addition & 0 deletions exporter/alibabacloudlogserviceexporter/trace_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func newTraceExporter(logger *zap.Logger, cfg configmodels.Exporter) (component.

return exporterhelper.NewTraceExporter(
cfg,
logger,
l.pushTraceData)
}

Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ require (
github.com/golang/protobuf v1.4.2
github.com/google/uuid v1.1.2
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
go.uber.org/zap v1.16.0
)
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757 h1:e9cTT0rxUG+x8fDbv3HqLfb1Lhb8FnBdSajp2WInouE=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down
1 change: 1 addition & 0 deletions exporter/awsxrayexporter/awsxray.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ func NewTraceExporter(config configmodels.Exporter, logger *zap.Logger, cn connA
xrayClient := NewXRay(logger, awsConfig, session)
return exporterhelper.NewTraceExporter(
config,
logger,
func(ctx context.Context, td pdata.Traces) (totalDroppedSpans int, err error) {
logger.Debug("TraceExporter", typeLog, nameLog, zap.Int("#spans", td.SpanCount()))
totalDroppedSpans = 0
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxra
go 1.14

require (
github.com/aws/aws-sdk-go v1.35.14
github.com/aws/aws-sdk-go v1.35.17
github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
go.uber.org/zap v1.16.0
golang.org/x/net v0.0.0-20200822124328-c89045814202
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsxrayexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.35.14 h1:nucVVXXjAr9UkmYCBWxQWRuYa5KOlaXjuJGg2ulW0K0=
github.com/aws/aws-sdk-go v1.35.14/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
github.com/aws/aws-sdk-go v1.35.17 h1:zhahppAMdPvJ9GP302SMOPW5SNoAbnjdOyaTmxA9WJU=
github.com/aws/aws-sdk-go v1.35.17/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
Expand Down Expand Up @@ -1120,8 +1120,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757 h1:e9cTT0rxUG+x8fDbv3HqLfb1Lhb8FnBdSajp2WInouE=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsxrayexporter/translator/segment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -643,20 +643,20 @@ func constructDefaultResource() pdata.Resource {
resourceMap.InitEmptyWithCapacity(2)
resourceMap.InsertInt("key1", 1)
resourceMap.InsertString("key2", "value")
resourceMapVal := pdata.NewAttributeValue()
resourceMapVal := pdata.NewAttributeValueNull()
resourceMapVal.InitEmpty()
resourceMapVal.SetMapVal(resourceMap)
attrs.Insert(resourceMapKey, resourceMapVal)
resourceArray := pdata.NewAnyValueArray()
val1 := pdata.NewAttributeValue()
val1 := pdata.NewAttributeValueNull()
val1.InitEmpty()
val1.SetStringVal("foo")
val2 := pdata.NewAttributeValue()
val2 := pdata.NewAttributeValueNull()
val2.InitEmpty()
val2.SetStringVal("bar")
resourceArray.Append(val1)
resourceArray.Append(val2)
resourceArrayVal := pdata.NewAttributeValue()
resourceArrayVal := pdata.NewAttributeValueNull()
resourceArrayVal.InitEmpty()
resourceArrayVal.SetArrayVal(resourceArray)
attrs.Insert(resourceArrayKey, resourceArrayVal)
Expand Down
2 changes: 1 addition & 1 deletion exporter/azuremonitorexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/microsoft/ApplicationInsights-Go v0.4.3
github.com/stretchr/testify v1.6.1
github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
go.uber.org/zap v1.16.0
golang.org/x/net v0.0.0-20200822124328-c89045814202
google.golang.org/grpc v1.32.0
Expand Down
4 changes: 2 additions & 2 deletions exporter/azuremonitorexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1126,8 +1126,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757 h1:e9cTT0rxUG+x8fDbv3HqLfb1Lhb8FnBdSajp2WInouE=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down
2 changes: 1 addition & 1 deletion exporter/azuremonitorexporter/traceexporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ func newTraceExporter(config *Config, transportChannel transportChannel, logger
logger: logger,
}

return exporterhelper.NewTraceExporter(config, exporter.onTraceData)
return exporterhelper.NewTraceExporter(config, logger, exporter.onTraceData)
}
3 changes: 2 additions & 1 deletion exporter/carbonexporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

// newCarbonExporter returns a new Carbon exporter.
func newCarbonExporter(cfg *Config) (component.MetricsExporter, error) {
func newCarbonExporter(cfg *Config, params component.ExporterCreateParams) (component.MetricsExporter, error) {
// Resolve TCP address just to ensure that it is a valid one. It is better
// to fail here than at when the exporter is started.
if _, err := net.ResolveTCPAddr("tcp", cfg.Endpoint); err != nil {
Expand All @@ -46,6 +46,7 @@ func newCarbonExporter(cfg *Config) (component.MetricsExporter, error) {

return exporterhelper.NewMetricsExporter(
&cfg.ExporterSettings,
params.Logger,
sender.pushMetricsData,
exporterhelper.WithShutdown(sender.Shutdown))
}
Expand Down
6 changes: 4 additions & 2 deletions exporter/carbonexporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ import (
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/consumer/consumerdata"
"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/testutil"
"go.opentelemetry.io/collector/testutil/metricstestutil"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"
)

func TestNew(t *testing.T) {
Expand Down Expand Up @@ -66,7 +68,7 @@ func TestNew(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := newCarbonExporter(tt.config)
got, err := newCarbonExporter(tt.config, component.ExporterCreateParams{Logger: zap.NewNop()})
if tt.wantErr {
assert.Nil(t, got)
assert.Error(t, err)
Expand Down Expand Up @@ -147,7 +149,7 @@ func TestConsumeMetricsData(t *testing.T) {
}

config := &Config{Endpoint: addr, Timeout: 1000 * time.Millisecond}
exp, err := newCarbonExporter(config)
exp, err := newCarbonExporter(config, component.ExporterCreateParams{Logger: zap.NewNop()})
require.NoError(t, err)

require.NoError(t, exp.Start(context.Background(), componenttest.NewNopHost()))
Expand Down
4 changes: 2 additions & 2 deletions exporter/carbonexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ func createDefaultConfig() configmodels.Exporter {

func createMetricsExporter(
_ context.Context,
_ component.ExporterCreateParams,
params component.ExporterCreateParams,
config configmodels.Exporter,
) (component.MetricsExporter, error) {
exp, err := newCarbonExporter(config.(*Config))
exp, err := newCarbonExporter(config.(*Config), params)

if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion exporter/carbonexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.14
require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
go.uber.org/zap v1.16.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)
4 changes: 2 additions & 2 deletions exporter/carbonexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757 h1:e9cTT0rxUG+x8fDbv3HqLfb1Lhb8FnBdSajp2WInouE=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down
2 changes: 2 additions & 0 deletions exporter/datadogexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ func createMetricsExporter(

return exporterhelper.NewMetricsExporter(
cfg,
params.Logger,
exp.PushMetricsData,
exporterhelper.WithQueue(exporterhelper.CreateDefaultQueueSettings()),
exporterhelper.WithRetry(exporterhelper.CreateDefaultRetrySettings()),
Expand Down Expand Up @@ -139,6 +140,7 @@ func createTraceExporter(

return exporterhelper.NewTraceExporter(
cfg,
params.Logger,
exp.pushTraceData,
exporterhelper.WithShutdown(func(context.Context) error {
cancel()
Expand Down
4 changes: 2 additions & 2 deletions exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datado
go 1.14

require (
github.com/aws/aws-sdk-go v1.34.9
github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02
github.com/aws/aws-sdk-go v1.34.9
github.com/gogo/protobuf v1.3.1
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/stretchr/testify v1.6.1
github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect
go.opencensus.io v0.22.4
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
go.uber.org/zap v1.16.0
gopkg.in/DataDog/dd-trace-go.v1 v1.26.0
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0
Expand Down
4 changes: 2 additions & 2 deletions exporter/datadogexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1138,8 +1138,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757 h1:e9cTT0rxUG+x8fDbv3HqLfb1Lhb8FnBdSajp2WInouE=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down
4 changes: 2 additions & 2 deletions exporter/elasticexporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func newElasticTraceExporter(
if err != nil {
return nil, fmt.Errorf("cannot configure Elastic APM trace exporter: %v", err)
}
return exporterhelper.NewTraceExporter(cfg, func(ctx context.Context, traces pdata.Traces) (int, error) {
return exporterhelper.NewTraceExporter(cfg, params.Logger, func(ctx context.Context, traces pdata.Traces) (int, error) {
var dropped int
var errs []error
resourceSpansSlice := traces.ResourceSpans()
Expand All @@ -68,7 +68,7 @@ func newElasticMetricsExporter(
if err != nil {
return nil, fmt.Errorf("cannot configure Elastic APM metrics exporter: %v", err)
}
return exporterhelper.NewMetricsExporter(cfg, func(ctx context.Context, input pdata.Metrics) (int, error) {
return exporterhelper.NewMetricsExporter(cfg, params.Logger, func(ctx context.Context, input pdata.Metrics) (int, error) {
var dropped int
var errs []error
resourceMetricsSlice := input.ResourceMetrics()
Expand Down
2 changes: 1 addition & 1 deletion exporter/elasticexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/stretchr/testify v1.6.1
go.elastic.co/apm v1.8.1-0.20200515083825-95e54b2e24ea
go.elastic.co/fastjson v1.1.0
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
go.uber.org/zap v1.16.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)
4 changes: 2 additions & 2 deletions exporter/elasticexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1133,8 +1133,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757 h1:e9cTT0rxUG+x8fDbv3HqLfb1Lhb8FnBdSajp2WInouE=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down
2 changes: 1 addition & 1 deletion exporter/honeycombexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/honeycombio/libhoney-go v1.14.1
github.com/klauspost/compress v1.11.1
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
go.uber.org/zap v1.16.0
google.golang.org/grpc v1.32.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/honeycombexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1138,8 +1138,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757 h1:e9cTT0rxUG+x8fDbv3HqLfb1Lhb8FnBdSajp2WInouE=
go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down
1 change: 1 addition & 0 deletions exporter/honeycombexporter/honeycomb.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ func newHoneycombTraceExporter(cfg *Config, logger *zap.Logger) (component.Trace

return exporterhelper.NewTraceExporter(
cfg,
logger,
exporter.pushTraceData,
exporterhelper.WithShutdown(exporter.Shutdown))
}
Expand Down
3 changes: 2 additions & 1 deletion exporter/jaegerthrifthttpexporter/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/config/configtest"
"go.uber.org/zap"
)

func TestLoadConfig(t *testing.T) {
Expand Down Expand Up @@ -63,7 +64,7 @@ func TestLoadConfig(t *testing.T) {
}
assert.Equal(t, &expectedCfg, e1)

te, err := factory.CreateTraceExporter(context.Background(), component.ExporterCreateParams{}, e1)
te, err := factory.CreateTraceExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, e1)
require.NoError(t, err)
require.NotNil(t, te)
}
Loading

0 comments on commit 65f181d

Please sign in to comment.