Skip to content

Commit

Permalink
Update core to latest, fix rename *Params to *Settings (#3691)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
bogdandrutu committed Jun 2, 2021
1 parent 4084546 commit aa32f1e
Show file tree
Hide file tree
Showing 405 changed files with 766 additions and 766 deletions.
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func TestLoadConfig(t *testing.T) {
}
assert.Equal(t, &expectedCfg, e1)

params := component.ExporterCreateParams{Logger: zap.NewNop()}
params := component.ExporterCreateSettings{Logger: zap.NewNop()}

// missing params
te, err := factory.CreateTracesExporter(context.Background(), params, e0)
Expand Down
6 changes: 3 additions & 3 deletions exporter/alibabacloudlogserviceexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,23 @@ func createDefaultConfig() config.Exporter {

func createTracesExporter(
_ context.Context,
params component.ExporterCreateParams,
params component.ExporterCreateSettings,
cfg config.Exporter,
) (component.TracesExporter, error) {
return newTracesExporter(params.Logger, cfg)
}

func createMetricsExporter(
_ context.Context,
params component.ExporterCreateParams,
params component.ExporterCreateSettings,
cfg config.Exporter,
) (exp component.MetricsExporter, err error) {
return newMetricsExporter(params.Logger, cfg)
}

func createLogsExporter(
_ context.Context,
params component.ExporterCreateParams,
params component.ExporterCreateSettings,
cfg config.Exporter,
) (exp component.LogsExporter, err error) {
return newLogsExporter(params.Logger, cfg)
Expand Down
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/pelletier/go-toml v1.8.0 // indirect
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750
go.uber.org/zap v1.17.0
gopkg.in/ini.v1 v1.57.0 // indirect
)
4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -914,8 +914,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc h1:lsdlvBcIfsgmf36qgzbrbjXRw/ptlHI5806ahxoUkeE=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750 h1:+wmsJlfvE1oNjB360VioBlLeaUeu5mlhTo9yeMY/hvo=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
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/awsemfexporter/emf_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ type emfExporter struct {
// New func creates an EMF Exporter instance with data push callback func
func New(
config config.Exporter,
params component.ExporterCreateParams,
params component.ExporterCreateSettings,
) (component.MetricsExporter, error) {
if config == nil {
return nil, errors.New("emf exporter config is nil")
Expand Down Expand Up @@ -96,7 +96,7 @@ func New(
// NewEmfExporter creates a new exporter using exporterhelper
func NewEmfExporter(
config config.Exporter,
params component.ExporterCreateParams,
params component.ExporterCreateSettings,
) (component.MetricsExporter, error) {
exp, err := New(config, params)
if err != nil {
Expand Down
22 changes: 11 additions & 11 deletions exporter/awsemfexporter/emf_exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func TestConsumeMetrics(t *testing.T) {
expCfg := factory.CreateDefaultConfig().(*Config)
expCfg.Region = "us-west-2"
expCfg.MaxRetries = 0
exp, err := New(expCfg, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := New(expCfg, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.Nil(t, err)
assert.NotNil(t, exp)

Expand Down Expand Up @@ -132,7 +132,7 @@ func TestConsumeMetricsWithOutputDestination(t *testing.T) {
expCfg.Region = "us-west-2"
expCfg.MaxRetries = 0
expCfg.OutputDestination = "stdout"
exp, err := New(expCfg, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := New(expCfg, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.Nil(t, err)
assert.NotNil(t, exp)

Expand Down Expand Up @@ -193,7 +193,7 @@ func TestConsumeMetricsWithLogGroupStreamConfig(t *testing.T) {
expCfg.MaxRetries = defaultRetryCount
expCfg.LogGroupName = "test-logGroupName"
expCfg.LogStreamName = "test-logStreamName"
exp, err := New(expCfg, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := New(expCfg, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.Nil(t, err)
assert.NotNil(t, exp)

Expand Down Expand Up @@ -260,7 +260,7 @@ func TestConsumeMetricsWithLogGroupStreamValidPlaceholder(t *testing.T) {
expCfg.MaxRetries = defaultRetryCount
expCfg.LogGroupName = "/aws/ecs/containerinsights/{ClusterName}/performance"
expCfg.LogStreamName = "{TaskId}"
exp, err := New(expCfg, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := New(expCfg, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.Nil(t, err)
assert.NotNil(t, exp)

Expand Down Expand Up @@ -329,7 +329,7 @@ func TestConsumeMetricsWithOnlyLogStreamPlaceholder(t *testing.T) {
expCfg.MaxRetries = defaultRetryCount
expCfg.LogGroupName = "test-logGroupName"
expCfg.LogStreamName = "{TaskId}"
exp, err := New(expCfg, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := New(expCfg, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.Nil(t, err)
assert.NotNil(t, exp)

Expand Down Expand Up @@ -398,7 +398,7 @@ func TestConsumeMetricsWithWrongPlaceholder(t *testing.T) {
expCfg.MaxRetries = defaultRetryCount
expCfg.LogGroupName = "test-logGroupName"
expCfg.LogStreamName = "{WrongKey}"
exp, err := New(expCfg, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := New(expCfg, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.Nil(t, err)
assert.NotNil(t, exp)

Expand Down Expand Up @@ -467,7 +467,7 @@ func TestPushMetricsDataWithErr(t *testing.T) {
expCfg.MaxRetries = 0
expCfg.LogGroupName = "test-logGroupName"
expCfg.LogStreamName = "test-logStreamName"
exp, err := New(expCfg, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := New(expCfg, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.Nil(t, err)
assert.NotNil(t, exp)

Expand Down Expand Up @@ -539,7 +539,7 @@ func TestNewExporterWithoutConfig(t *testing.T) {
os.Setenv("AWS_STS_REGIONAL_ENDPOINTS", "fake")

assert.Nil(t, expCfg.logger)
exp, err := New(expCfg, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := New(expCfg, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.NotNil(t, err)
assert.Nil(t, exp)
assert.NotNil(t, expCfg.logger)
Expand Down Expand Up @@ -574,7 +574,7 @@ func TestNewExporterWithMetricDeclarations(t *testing.T) {

obs, logs := observer.New(zap.WarnLevel)
logger := zap.New(obs)
exp, err := New(expCfg, component.ExporterCreateParams{Logger: logger})
exp, err := New(expCfg, component.ExporterCreateSettings{Logger: logger})
assert.Nil(t, err)
assert.NotNil(t, exp)

Expand All @@ -601,7 +601,7 @@ func TestNewExporterWithMetricDeclarations(t *testing.T) {
}

func TestNewExporterWithoutSession(t *testing.T) {
exp, err := New(nil, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := New(nil, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.NotNil(t, err)
assert.Nil(t, exp)
}
Expand All @@ -625,7 +625,7 @@ func TestNewEmfExporterWithoutConfig(t *testing.T) {
os.Setenv("AWS_STS_REGIONAL_ENDPOINTS", "fake")

assert.Nil(t, expCfg.logger)
exp, err := NewEmfExporter(expCfg, component.ExporterCreateParams{Logger: zap.NewNop()})
exp, err := NewEmfExporter(expCfg, component.ExporterCreateSettings{Logger: zap.NewNop()})
assert.NotNil(t, err)
assert.Nil(t, exp)
assert.NotNil(t, expCfg.logger)
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func createDefaultConfig() config.Exporter {

// createMetricsExporter creates a metrics exporter based on this config.
func createMetricsExporter(_ context.Context,
params component.ExporterCreateParams,
params component.ExporterCreateSettings,
config config.Exporter) (component.MetricsExporter, error) {

expCfg := config.(*Config)
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestCreateTracesExporter(t *testing.T) {
require.NoError(t, err)

ctx := context.Background()
exporter, err := factory.CreateTracesExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "1")])
exporter, err := factory.CreateTracesExporter(ctx, component.ExporterCreateSettings{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "1")])
assert.NotNil(t, err)
assert.Nil(t, exporter)
}
Expand All @@ -63,7 +63,7 @@ func TestCreateMetricsExporter(t *testing.T) {
require.NoError(t, err)

ctx := context.Background()
exporter, err := factory.CreateMetricsExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "1")])
exporter, err := factory.CreateMetricsExporter(ctx, component.ExporterCreateSettings{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "1")])
assert.Nil(t, err)
assert.NotNil(t, exporter)
}
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750
go.uber.org/zap v1.17.0
google.golang.org/protobuf v1.26.0
)
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1001,8 +1001,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc h1:lsdlvBcIfsgmf36qgzbrbjXRw/ptlHI5806ahxoUkeE=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750 h1:+wmsJlfvE1oNjB360VioBlLeaUeu5mlhTo9yeMY/hvo=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
go.opentelemetry.io/otel v0.20.0 h1:eaP0Fqu7SXHwvjiqDq83zImeehOHX8doTvU9AwXON8g=
go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=
Expand Down
2 changes: 1 addition & 1 deletion exporter/awskinesisexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func createDefaultConfig() config.Exporter {

func createTracesExporter(
_ context.Context,
params component.ExporterCreateParams,
params component.ExporterCreateSettings,
config config.Exporter,
) (component.TracesExporter, error) {
c := config.(*Config)
Expand Down
2 changes: 1 addition & 1 deletion exporter/awskinesisexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/pelletier/go-toml v1.8.0 // indirect
github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750
go.uber.org/zap v1.17.0
gopkg.in/ini.v1 v1.57.0 // indirect
)
4 changes: 2 additions & 2 deletions exporter/awskinesisexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1043,8 +1043,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc h1:lsdlvBcIfsgmf36qgzbrbjXRw/ptlHI5806ahxoUkeE=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750 h1:+wmsJlfvE1oNjB360VioBlLeaUeu5mlhTo9yeMY/hvo=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
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/awsprometheusremotewriteexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (af *awsFactory) Type() config.Type {
return typeStr
}

func (af *awsFactory) CreateMetricsExporter(ctx context.Context, params component.ExporterCreateParams,
func (af *awsFactory) CreateMetricsExporter(ctx context.Context, params component.ExporterCreateSettings,
cfg config.Exporter) (component.MetricsExporter, error) {
return af.ExporterFactory.CreateMetricsExporter(ctx, params, &cfg.(*Config).Config)
}
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsprometheusremotewriteexporter/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,26 +74,26 @@ func TestCreateMetricsExporter(t *testing.T) {
tests := []struct {
name string
cfg config.Exporter
params component.ExporterCreateParams
params component.ExporterCreateSettings
returnErrorOnCreate bool
returnErrorOnStart bool
}{
{
name: "success_case_with_auth",
cfg: validConfigWithAuth,
params: component.ExporterCreateParams{Logger: zap.NewNop()},
params: component.ExporterCreateSettings{Logger: zap.NewNop()},
returnErrorOnCreate: false,
},
{
name: "invalid_config_case",
cfg: invalidConfig,
params: component.ExporterCreateParams{Logger: zap.NewNop()},
params: component.ExporterCreateSettings{Logger: zap.NewNop()},
returnErrorOnCreate: true,
},
{
name: "invalid_tls_config_case",
cfg: invalidTLSConfig,
params: component.ExporterCreateParams{Logger: zap.NewNop()},
params: component.ExporterCreateSettings{Logger: zap.NewNop()},
returnErrorOnStart: true,
},
}
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsprometheusremotewriteexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/pelletier/go-toml v1.8.0 // indirect
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750
go.uber.org/zap v1.17.0
gopkg.in/ini.v1 v1.57.0 // indirect
)
4 changes: 2 additions & 2 deletions exporter/awsprometheusremotewriteexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1013,8 +1013,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc h1:lsdlvBcIfsgmf36qgzbrbjXRw/ptlHI5806ahxoUkeE=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750 h1:+wmsJlfvE1oNjB360VioBlLeaUeu5mlhTo9yeMY/hvo=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
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/awsxrayexporter/awsxray.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
// newTracesExporter creates an component.TracesExporter that converts to an X-Ray PutTraceSegments
// request and then posts the request to the configured region's X-Ray endpoint.
func newTracesExporter(
config config.Exporter, params component.ExporterCreateParams, cn awsutil.ConnAttr) (component.TracesExporter, error) {
config config.Exporter, params component.ExporterCreateSettings, cn awsutil.ConnAttr) (component.TracesExporter, error) {
typeLog := zap.String("type", string(config.ID().Type()))
nameLog := zap.String("name", config.ID().String())
logger := params.Logger
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/awsxray_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func initializeTracesExporter() component.TracesExporter {
config.(*Config).Region = "us-east-1"
config.(*Config).LocalMode = true
mconn := new(awsutil.Conn)
traceExporter, err := newTracesExporter(config, component.ExporterCreateParams{Logger: logger}, mconn)
traceExporter, err := newTracesExporter(config, component.ExporterCreateSettings{Logger: logger}, mconn)
if err != nil {
panic(err)
}
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func createDefaultConfig() config.Exporter {

func createTracesExporter(
_ context.Context,
params component.ExporterCreateParams,
params component.ExporterCreateSettings,
cfg config.Exporter,
) (component.TracesExporter, error) {
eCfg := cfg.(*Config)
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestCreateTracesExporter(t *testing.T) {
require.NoError(t, err)

ctx := context.Background()
exporter, err := factory.CreateTracesExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "customname")])
exporter, err := factory.CreateTracesExporter(ctx, component.ExporterCreateSettings{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "customname")])
assert.Nil(t, err)
assert.NotNil(t, exporter)
}
Expand All @@ -79,7 +79,7 @@ func TestCreateMetricsExporter(t *testing.T) {
require.NoError(t, err)

ctx := context.Background()
exporter, err := factory.CreateMetricsExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "customname")])
exporter, err := factory.CreateMetricsExporter(ctx, component.ExporterCreateSettings{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "customname")])
assert.NotNil(t, err)
assert.Nil(t, exporter)
}
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-00010101000000-000000000000
github.com/pelletier/go-toml v1.8.0 // indirect
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750
go.uber.org/zap v1.17.0
gopkg.in/ini.v1 v1.57.0 // indirect
)
Expand Down
4 changes: 2 additions & 2 deletions exporter/awsxrayexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1014,8 +1014,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc h1:lsdlvBcIfsgmf36qgzbrbjXRw/ptlHI5806ahxoUkeE=
go.opentelemetry.io/collector v0.27.1-0.20210602074751-622c0ccc86fc/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750 h1:+wmsJlfvE1oNjB360VioBlLeaUeu5mlhTo9yeMY/hvo=
go.opentelemetry.io/collector v0.27.1-0.20210602134904-017aa1dad750/go.mod h1:EuuWTgxcOvna623YhyhaUl0iQtiij10wVu8fBXvsEHw=
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/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func createDefaultConfig() config.Exporter {

func (f *factory) createTracesExporter(
ctx context.Context,
params component.ExporterCreateParams,
params component.ExporterCreateSettings,
cfg config.Exporter,
) (component.TracesExporter, error) {
exporterConfig, ok := cfg.(*Config)
Expand Down
Loading

0 comments on commit aa32f1e

Please sign in to comment.