diff --git a/exporter/alibabacloudlogserviceexporter/config.go b/exporter/alibabacloudlogserviceexporter/config.go index f074e4eb0db4..425481038e25 100644 --- a/exporter/alibabacloudlogserviceexporter/config.go +++ b/exporter/alibabacloudlogserviceexporter/config.go @@ -18,7 +18,7 @@ import "go.opentelemetry.io/collector/config" // Config defines configuration for AlibabaCloud Log Service exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` // LogService's Endpoint, https://www.alibabacloud.com/help/doc-detail/29008.htm // for AlibabaCloud Kubernetes(or ECS), set {region-id}-intranet.log.aliyuncs.com, eg cn-hangzhou-intranet.log.aliyuncs.com; // others set {region-id}.log.aliyuncs.com, eg cn-hangzhou.log.aliyuncs.com diff --git a/exporter/alibabacloudlogserviceexporter/config_test.go b/exporter/alibabacloudlogserviceexporter/config_test.go index a3b0fc42a976..bbd9e95d2f06 100644 --- a/exporter/alibabacloudlogserviceexporter/config_test.go +++ b/exporter/alibabacloudlogserviceexporter/config_test.go @@ -50,7 +50,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters[expectedName] expectedCfg := Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ TypeVal: config.Type(typeStr), NameVal: expectedName, }, diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go index 5e6b90bcd7d6..e3bf730df94a 100644 --- a/exporter/alibabacloudlogserviceexporter/factory.go +++ b/exporter/alibabacloudlogserviceexporter/factory.go @@ -40,10 +40,7 @@ func NewFactory() component.ExporterFactory { // CreateDefaultConfig creates the default configuration for exporter. func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), } } diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index e56084c46c80..02be8795c43e 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index d58ba39645f7..c8b4b9afede9 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -907,8 +907,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go index 967bb5a960f3..b734737841cd 100644 --- a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/translator/conventions" "go.uber.org/zap" @@ -54,9 +55,10 @@ func createSimpleLogData(numberOfLogs int) pdata.Logs { func TestNewLogsExporter(t *testing.T) { got, err := newLogsExporter(zap.NewNop(), &Config{ - Endpoint: "us-west-1.log.aliyuncs.com", - Project: "demo-project", - Logstore: "demo-logstore", + ExporterSettings: config.NewExporterSettings(typeStr), + Endpoint: "us-west-1.log.aliyuncs.com", + Project: "demo-project", + Logstore: "demo-logstore", }) assert.NoError(t, err) require.NotNil(t, got) @@ -69,10 +71,11 @@ func TestNewLogsExporter(t *testing.T) { func TestSTSTokenExporter(t *testing.T) { got, err := newLogsExporter(zap.NewNop(), &Config{ - Endpoint: "us-west-1.log.aliyuncs.com", - Project: "demo-project", - Logstore: "demo-logstore", - TokenFilePath: path.Join(".", "testdata", "config.yaml"), + ExporterSettings: config.NewExporterSettings(typeStr), + Endpoint: "us-west-1.log.aliyuncs.com", + Project: "demo-project", + Logstore: "demo-logstore", + TokenFilePath: path.Join(".", "testdata", "config.yaml"), }) assert.NoError(t, err) require.NotNil(t, got) diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go index ecc8a26ba371..a5db7e7f938e 100644 --- a/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go @@ -22,6 +22,7 @@ import ( metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/testutil/metricstestutil" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -29,9 +30,10 @@ import ( func TestNewMetricsExporter(t *testing.T) { got, err := newMetricsExporter(zap.NewNop(), &Config{ - Endpoint: "us-west-1.log.aliyuncs.com", - Project: "demo-project", - Logstore: "demo-logstore", + ExporterSettings: config.NewExporterSettings(typeStr), + Endpoint: "us-west-1.log.aliyuncs.com", + Project: "demo-project", + Logstore: "demo-logstore", }) assert.NoError(t, err) require.NotNil(t, got) diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go index 03f16b5c7d8c..3a2065f941b4 100644 --- a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go +++ b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.uber.org/zap" ) @@ -27,9 +28,10 @@ import ( func TestNewTraceExporter(t *testing.T) { got, err := newTraceExporter(zap.NewNop(), &Config{ - Endpoint: "cn-hangzhou.log.aliyuncs.com", - Project: "demo-project", - Logstore: "demo-logstore", + ExporterSettings: config.NewExporterSettings(typeStr), + Endpoint: "cn-hangzhou.log.aliyuncs.com", + Project: "demo-project", + Logstore: "demo-logstore", }) assert.NoError(t, err) require.NotNil(t, got) diff --git a/exporter/awsemfexporter/config.go b/exporter/awsemfexporter/config.go index d56244c93c4e..4ffe666458a0 100644 --- a/exporter/awsemfexporter/config.go +++ b/exporter/awsemfexporter/config.go @@ -28,7 +28,7 @@ var ( // Config defines configuration for AWS EMF exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` // LogGroupName is the name of CloudWatch log group which defines group of log streams // that share the same retention, monitoring, and access control settings. LogGroupName string `mapstructure:"log_group_name"` diff --git a/exporter/awsemfexporter/config_test.go b/exporter/awsemfexporter/config_test.go index 7fe74b88bc69..30389ee49990 100644 --- a/exporter/awsemfexporter/config_test.go +++ b/exporter/awsemfexporter/config_test.go @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { r1.Validate() assert.Equal(t, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/1"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/1"}, LogGroupName: "", LogStreamName: "", Endpoint: "", @@ -70,7 +70,7 @@ func TestLoadConfig(t *testing.T) { r2.Validate() assert.Equal(t, r2, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"}, LogGroupName: "", LogStreamName: "", Endpoint: "", @@ -97,7 +97,7 @@ func TestConfigValidate(t *testing.T) { {unit: "Megabytes", metricName: "memory_usage"}, } config := &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"}, RequestTimeoutSeconds: 30, MaxRetries: 1, DimensionRollupOption: "ZeroAndSingleDimensionRollup", diff --git a/exporter/awsemfexporter/factory.go b/exporter/awsemfexporter/factory.go index 707768d0c7b4..7003f30d0a1d 100644 --- a/exporter/awsemfexporter/factory.go +++ b/exporter/awsemfexporter/factory.go @@ -38,10 +38,7 @@ func NewFactory() component.ExporterFactory { // CreateDefaultConfig creates the default configuration for exporter. func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), LogGroupName: "", LogStreamName: "", Namespace: "", diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index c0d45f3c8205..3b71f10891cc 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -17,7 +17,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws 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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 5f5a02c326fa..e4fc28f4feb3 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -1047,8 +1047,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng= go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg= go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc= diff --git a/exporter/awskinesisexporter/config.go b/exporter/awskinesisexporter/config.go index 50f0d41cd7a4..8d5a24832dbe 100644 --- a/exporter/awskinesisexporter/config.go +++ b/exporter/awskinesisexporter/config.go @@ -42,7 +42,7 @@ type KPLConfig struct { // Config contains the main configuration options for the awskinesis exporter type Config struct { - config.ExporterSettings `mapstructure:",squash"` + *config.ExporterSettings `mapstructure:"-"` AWS AWSConfig `mapstructure:"aws"` KPL KPLConfig `mapstructure:"kpl"` diff --git a/exporter/awskinesisexporter/config_test.go b/exporter/awskinesisexporter/config_test.go index d551ef20e625..165334be1010 100644 --- a/exporter/awskinesisexporter/config_test.go +++ b/exporter/awskinesisexporter/config_test.go @@ -42,10 +42,7 @@ func TestDefaultConfig(t *testing.T) { assert.Equal(t, e, &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: "awskinesis", - NameVal: "awskinesis", - }, + ExporterSettings: config.NewExporterSettings(typeStr), AWS: AWSConfig{ Region: "us-west-2", }, @@ -83,10 +80,7 @@ func TestConfig(t *testing.T) { assert.Equal(t, e, &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: "awskinesis", - NameVal: "awskinesis", - }, + ExporterSettings: config.NewExporterSettings(typeStr), AWS: AWSConfig{ StreamName: "test-stream", KinesisEndpoint: "awskinesis.mars-1.aws.galactic", diff --git a/exporter/awskinesisexporter/factory.go b/exporter/awskinesisexporter/factory.go index 5179a59112e3..e8a01caa5f7c 100644 --- a/exporter/awskinesisexporter/factory.go +++ b/exporter/awskinesisexporter/factory.go @@ -39,10 +39,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), AWS: AWSConfig{ Region: "us-west-2", }, diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 3100eb79ef1f..0168f91d52d0 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -12,7 +12,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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index e89a00c0e055..9f3958c330a3 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -1077,8 +1077,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/awsprometheusremotewriteexporter/config_test.go b/exporter/awsprometheusremotewriteexporter/config_test.go index 2b694a7ea830..beff92238bc0 100644 --- a/exporter/awsprometheusremotewriteexporter/config_test.go +++ b/exporter/awsprometheusremotewriteexporter/config_test.go @@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["awsprometheusremotewrite/2"] cfgComplete := &Config{ Config: prw.Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ NameVal: "awsprometheusremotewrite/2", TypeVal: "awsprometheusremotewrite", }, diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod index 5bc837511dc1..c0d84a76513a 100644 --- a/exporter/awsprometheusremotewriteexporter/go.mod +++ b/exporter/awsprometheusremotewriteexporter/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum index 23cfb6a656ab..5efc4dfb8d7d 100644 --- a/exporter/awsprometheusremotewriteexporter/go.sum +++ b/exporter/awsprometheusremotewriteexporter/go.sum @@ -1047,8 +1047,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/awsxrayexporter/config.go b/exporter/awsxrayexporter/config.go index 551474f2f8fc..668e04ce8923 100644 --- a/exporter/awsxrayexporter/config.go +++ b/exporter/awsxrayexporter/config.go @@ -18,7 +18,7 @@ import "go.opentelemetry.io/collector/config" // Config defines configuration for AWS X-Ray exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` // Maximum number of concurrent calls to AWS X-Ray to upload documents. NumberOfWorkers int `mapstructure:"num_workers"` // X-Ray service endpoint to which the collector sends segment documents. diff --git a/exporter/awsxrayexporter/config_test.go b/exporter/awsxrayexporter/config_test.go index f4bda39f63c2..133d4d2c6d33 100644 --- a/exporter/awsxrayexporter/config_test.go +++ b/exporter/awsxrayexporter/config_test.go @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Exporters["awsxray/customname"].(*Config) assert.Equal(t, r1, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsxray/customname"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsxray/customname"}, NumberOfWorkers: 8, Endpoint: "", RequestTimeoutSeconds: 30, diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go index 1320a3df502a..b60e9d6bf64e 100644 --- a/exporter/awsxrayexporter/factory.go +++ b/exporter/awsxrayexporter/factory.go @@ -37,10 +37,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), NumberOfWorkers: 8, Endpoint: "", RequestTimeoutSeconds: 30, diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go index c84b58b5245e..9184fff4a422 100644 --- a/exporter/awsxrayexporter/factory_test.go +++ b/exporter/awsxrayexporter/factory_test.go @@ -33,10 +33,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), NumberOfWorkers: 8, Endpoint: "", RequestTimeoutSeconds: 30, diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 62b8720f3d2d..128858e62427 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray 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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 golang.org/x/net v0.0.0-20210119194325-5f4716e94777 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 23cfb6a656ab..5efc4dfb8d7d 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -1047,8 +1047,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/azuremonitorexporter/config.go b/exporter/azuremonitorexporter/config.go index 56496a0fbc5d..0384088ce1b0 100644 --- a/exporter/azuremonitorexporter/config.go +++ b/exporter/azuremonitorexporter/config.go @@ -22,10 +22,9 @@ import ( // Config defines configuration for Azure Monitor type Config struct { - // squash ensures fields are correctly decoded in embedded struct. - config.ExporterSettings `mapstructure:",squash"` - Endpoint string `mapstructure:"endpoint"` - InstrumentationKey string `mapstructure:"instrumentation_key"` - MaxBatchSize int `mapstructure:"maxbatchsize"` - MaxBatchInterval time.Duration `mapstructure:"maxbatchinterval"` + *config.ExporterSettings `mapstructure:"-"` + Endpoint string `mapstructure:"endpoint"` + InstrumentationKey string `mapstructure:"instrumentation_key"` + MaxBatchSize int `mapstructure:"maxbatchsize"` + MaxBatchInterval time.Duration `mapstructure:"maxbatchinterval"` } diff --git a/exporter/azuremonitorexporter/config_test.go b/exporter/azuremonitorexporter/config_test.go index e1a382d44166..fdc14d819485 100644 --- a/exporter/azuremonitorexporter/config_test.go +++ b/exporter/azuremonitorexporter/config_test.go @@ -52,7 +52,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal( t, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: exporterType}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: exporterType}, Endpoint: defaultEndpoint, InstrumentationKey: "abcdefg", MaxBatchSize: 100, diff --git a/exporter/azuremonitorexporter/factory.go b/exporter/azuremonitorexporter/factory.go index 014a55ea5f35..8562a2bc8105 100644 --- a/exporter/azuremonitorexporter/factory.go +++ b/exporter/azuremonitorexporter/factory.go @@ -52,10 +52,7 @@ type factory struct { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), Endpoint: defaultEndpoint, MaxBatchSize: 1024, MaxBatchInterval: 10 * time.Second, diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index b2fde4fcdfa7..8160f0c2bbc8 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 golang.org/x/net v0.0.0-20210119194325-5f4716e94777 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 4c76e524425f..a58538e20fd7 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -1057,8 +1057,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/carbonexporter/config.go b/exporter/carbonexporter/config.go index 7f44c567e0e3..18a8e8c81c44 100644 --- a/exporter/carbonexporter/config.go +++ b/exporter/carbonexporter/config.go @@ -28,7 +28,7 @@ const ( // Config defines configuration for Carbon exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` // Endpoint specifies host and port to send metrics in the Carbon plaintext // format. The default value is defined by the DefaultEndpoint constant. diff --git a/exporter/carbonexporter/config_test.go b/exporter/carbonexporter/config_test.go index dd7bd2b17559..13290588fa21 100644 --- a/exporter/carbonexporter/config_test.go +++ b/exporter/carbonexporter/config_test.go @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters[expectedName] expectedCfg := Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ TypeVal: config.Type(typeStr), NameVal: expectedName, }, diff --git a/exporter/carbonexporter/exporter.go b/exporter/carbonexporter/exporter.go index cc8bb1d39e64..65f9dce67209 100644 --- a/exporter/carbonexporter/exporter.go +++ b/exporter/carbonexporter/exporter.go @@ -45,7 +45,7 @@ func newCarbonExporter(cfg *Config, params component.ExporterCreateParams) (comp } return exporterhelper.NewMetricsExporter( - &cfg.ExporterSettings, + cfg, params.Logger, sender.pushMetricsData, exporterhelper.WithShutdown(sender.Shutdown)) diff --git a/exporter/carbonexporter/exporter_test.go b/exporter/carbonexporter/exporter_test.go index 113652f20c45..5b58ad86a301 100644 --- a/exporter/carbonexporter/exporter_test.go +++ b/exporter/carbonexporter/exporter_test.go @@ -33,6 +33,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/testutil/metricstestutil" @@ -54,14 +55,16 @@ func TestNew(t *testing.T) { { name: "invalid_tcp_addr", config: &Config{ - Endpoint: "http://localhost:2003", + ExporterSettings: config.NewExporterSettings(typeStr), + Endpoint: "http://localhost:2003", }, wantErr: true, }, { name: "invalid_timeout", config: &Config{ - Timeout: -5 * time.Second, + ExporterSettings: config.NewExporterSettings(typeStr), + Timeout: -5 * time.Second, }, wantErr: true, }, diff --git a/exporter/carbonexporter/factory.go b/exporter/carbonexporter/factory.go index c2da0829002b..4091e844d2c9 100644 --- a/exporter/carbonexporter/factory.go +++ b/exporter/carbonexporter/factory.go @@ -37,12 +37,9 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - Endpoint: DefaultEndpoint, - Timeout: DefaultSendTimeout, + ExporterSettings: config.NewExporterSettings(typeStr), + Endpoint: DefaultEndpoint, + Timeout: DefaultSendTimeout, } } diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index c364f8a78dc9..5b1d3711cb88 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/datadogexporter/config/config.go b/exporter/datadogexporter/config/config.go index 50452d30f684..8fc66f54b2fc 100644 --- a/exporter/datadogexporter/config/config.go +++ b/exporter/datadogexporter/config/config.go @@ -146,7 +146,7 @@ func (t *TagsConfig) GetHostTags() []string { // Config defines configuration for the Datadog exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` TagsConfig `mapstructure:",squash"` diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index 9bd8218d3e0d..a98b9c388360 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -45,11 +45,7 @@ func NewFactory() component.ExporterFactory { // createDefaultConfig creates the default exporter configuration func createDefaultConfig() config.Exporter { return &ddconfig.Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - + ExporterSettings: config.NewExporterSettings(typeStr), API: ddconfig.APIConfig{ Key: "$DD_API_KEY", // Must be set if using API Site: "$DD_SITE", // If not provided, set during config sanitization diff --git a/exporter/datadogexporter/factory_test.go b/exporter/datadogexporter/factory_test.go index 392ce2ecb20f..66a70b08e6ae 100644 --- a/exporter/datadogexporter/factory_test.go +++ b/exporter/datadogexporter/factory_test.go @@ -44,10 +44,7 @@ func TestCreateDefaultConfig(t *testing.T) { // Note: the default configuration created by CreateDefaultConfig // still has the unresolved environment variables. assert.Equal(t, &ddconfig.Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), API: ddconfig.APIConfig{ Key: "$DD_API_KEY", @@ -102,7 +99,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) assert.Equal(t, &ddconfig.Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ NameVal: "datadog/api", TypeVal: typeStr, }, @@ -145,7 +142,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) assert.Equal(t, &ddconfig.Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ NameVal: "datadog/default", TypeVal: typeStr, }, @@ -228,7 +225,7 @@ func TestLoadConfigEnvVariables(t *testing.T) { // Check that settings with env variables get overridden when explicitly set in config require.NoError(t, err) assert.Equal(t, &ddconfig.Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ NameVal: "datadog/api2", TypeVal: typeStr, }, @@ -274,7 +271,7 @@ func TestLoadConfigEnvVariables(t *testing.T) { // Check that settings with env variables get taken into account when // no settings are given. assert.Equal(t, &ddconfig.Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ NameVal: "datadog/default2", TypeVal: typeStr, }, @@ -390,9 +387,10 @@ func TestOnlyMetadata(t *testing.T) { ctx := context.Background() cfg := &ddconfig.Config{ - API: ddconfig.APIConfig{Key: "notnull"}, - Metrics: ddconfig.MetricsConfig{TCPAddr: confignet.TCPAddr{Endpoint: server.URL}}, - Traces: ddconfig.TracesConfig{TCPAddr: confignet.TCPAddr{Endpoint: server.URL}}, + ExporterSettings: config.NewExporterSettings(typeStr), + API: ddconfig.APIConfig{Key: "notnull"}, + Metrics: ddconfig.MetricsConfig{TCPAddr: confignet.TCPAddr{Endpoint: server.URL}}, + Traces: ddconfig.TracesConfig{TCPAddr: confignet.TCPAddr{Endpoint: server.URL}}, SendMetadata: true, OnlyMetadata: true, diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index b3b4170aa4ea..833e25a389b3 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -20,7 +20,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tinylib/msgp v1.1.5 // indirect github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/DataDog/dd-trace-go.v1 v1.29.1 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 3c71501bfa20..aeed9bffe3da 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -1084,8 +1084,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/datadogexporter/traces_exporter_test.go b/exporter/datadogexporter/traces_exporter_test.go index 0f4ac5bc026b..49520e7c56ee 100644 --- a/exporter/datadogexporter/traces_exporter_test.go +++ b/exporter/datadogexporter/traces_exporter_test.go @@ -29,6 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + otelconfig "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer/pdata" "go.uber.org/zap" @@ -61,6 +62,7 @@ func testTraceExporterHelper(td pdata.Traces, t *testing.T) []string { defer server.Close() cfg := config.Config{ + ExporterSettings: otelconfig.NewExporterSettings(typeStr), API: config.APIConfig{ Key: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", }, diff --git a/exporter/dynatraceexporter/config/config.go b/exporter/dynatraceexporter/config/config.go index 857b37fd423a..5d693852d125 100644 --- a/exporter/dynatraceexporter/config/config.go +++ b/exporter/dynatraceexporter/config/config.go @@ -26,7 +26,7 @@ import ( // Config defines configuration for the Dynatrace exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` confighttp.HTTPClientSettings `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` diff --git a/exporter/dynatraceexporter/config/config_test.go b/exporter/dynatraceexporter/config/config_test.go index 21f516f0a0cf..9071ef334958 100644 --- a/exporter/dynatraceexporter/config/config_test.go +++ b/exporter/dynatraceexporter/config/config_test.go @@ -23,11 +23,10 @@ import ( func TestConfig_Sanitize(t *testing.T) { type fields struct { - ExporterSettings config.ExporterSettings - APIToken string - Endpoint string - Tags []string - Prefix string + APIToken string + Endpoint string + Tags []string + Prefix string } tests := []struct { name string @@ -58,7 +57,7 @@ func TestConfig_Sanitize(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { c := &Config{ - ExporterSettings: tt.fields.ExporterSettings, + ExporterSettings: config.NewExporterSettings("dynatrace"), APIToken: tt.fields.APIToken, HTTPClientSettings: confighttp.HTTPClientSettings{Endpoint: tt.fields.Endpoint}, Tags: tt.fields.Tags, diff --git a/exporter/dynatraceexporter/factory.go b/exporter/dynatraceexporter/factory.go index ee3c5207f96d..d555ad6d2237 100644 --- a/exporter/dynatraceexporter/factory.go +++ b/exporter/dynatraceexporter/factory.go @@ -42,12 +42,9 @@ func NewFactory() component.ExporterFactory { // createDefaultConfig creates the default exporter configuration func createDefaultConfig() config.Exporter { return &dtconfig.Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - RetrySettings: exporterhelper.DefaultRetrySettings(), - QueueSettings: exporterhelper.DefaultQueueSettings(), + ExporterSettings: config.NewExporterSettings(typeStr), + RetrySettings: exporterhelper.DefaultRetrySettings(), + QueueSettings: exporterhelper.DefaultQueueSettings(), ResourceToTelemetrySettings: exporterhelper.ResourceToTelemetrySettings{ Enabled: false, }, diff --git a/exporter/dynatraceexporter/factory_test.go b/exporter/dynatraceexporter/factory_test.go index a1e97aaae154..149cb97adeae 100644 --- a/exporter/dynatraceexporter/factory_test.go +++ b/exporter/dynatraceexporter/factory_test.go @@ -39,12 +39,9 @@ func TestCreateDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &dtconfig.Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - RetrySettings: exporterhelper.DefaultRetrySettings(), - QueueSettings: exporterhelper.DefaultQueueSettings(), + ExporterSettings: config.NewExporterSettings(typeStr), + RetrySettings: exporterhelper.DefaultRetrySettings(), + QueueSettings: exporterhelper.DefaultQueueSettings(), ResourceToTelemetrySettings: exporterhelper.ResourceToTelemetrySettings{ Enabled: false, }, @@ -72,7 +69,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) assert.Equal(t, &dtconfig.Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ NameVal: "dynatrace/valid", TypeVal: typeStr, }, diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 517009fab62e..0d5be960dccf 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/elasticexporter/config.go b/exporter/elasticexporter/config.go index 1503623c47bf..5e30c2e9b724 100644 --- a/exporter/elasticexporter/config.go +++ b/exporter/elasticexporter/config.go @@ -23,7 +23,7 @@ import ( // Config defines configuration for Elastic APM exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` + *config.ExporterSettings `mapstructure:"-"` configtls.TLSClientSetting `mapstructure:",squash"` // APMServerURLs holds the APM Server URL. diff --git a/exporter/elasticexporter/config_test.go b/exporter/elasticexporter/config_test.go index a2e22f4d1456..4845d7e7ea7e 100644 --- a/exporter/elasticexporter/config_test.go +++ b/exporter/elasticexporter/config_test.go @@ -51,7 +51,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Exporters["elastic/customname"].(*Config) assert.Equal(t, r1, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "elastic/customname"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "elastic/customname"}, APMServerURL: "https://elastic.example.com", APIKey: "RTNxMjlXNEJt", SecretToken: "hunter2", diff --git a/exporter/elasticexporter/factory.go b/exporter/elasticexporter/factory.go index 0afe3dad476e..f6ef8de488be 100644 --- a/exporter/elasticexporter/factory.go +++ b/exporter/elasticexporter/factory.go @@ -39,10 +39,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), } } diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod index 878163483ddf..2c3833aa4665 100644 --- a/exporter/elasticexporter/go.mod +++ b/exporter/elasticexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/stretchr/testify v1.7.0 go.elastic.co/apm v1.9.1-0.20201218004853-18a8126106c6 go.elastic.co/fastjson v1.1.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect howett.net/plist v0.0.0-20201026045517-117a925f2150 // indirect diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum index 4f095e0624c5..8dcbf17a30a0 100644 --- a/exporter/elasticexporter/go.sum +++ b/exporter/elasticexporter/go.sum @@ -1065,8 +1065,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/elasticsearchexporter/config.go b/exporter/elasticsearchexporter/config.go index b35f619c3693..d198938040cd 100644 --- a/exporter/elasticsearchexporter/config.go +++ b/exporter/elasticsearchexporter/config.go @@ -27,7 +27,7 @@ import ( // Config defines configuration for Elastic exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` + *config.ExporterSettings `mapstructure:"-"` // Endpoints holds the Elasticsearch URLs the exporter should send events to. // diff --git a/exporter/elasticsearchexporter/config_test.go b/exporter/elasticsearchexporter/config_test.go index 895f9fe7eefe..b10d7aabe37c 100644 --- a/exporter/elasticsearchexporter/config_test.go +++ b/exporter/elasticsearchexporter/config_test.go @@ -45,7 +45,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Exporters["elasticsearch/customname"].(*Config) assert.Equal(t, r1, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "elasticsearch/customname"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "elasticsearch/customname"}, Endpoints: []string{"https://elastic.example.com:9200"}, CloudID: "TRNMxjXlNJEt", Index: "myindex", diff --git a/exporter/elasticsearchexporter/factory.go b/exporter/elasticsearchexporter/factory.go index 56a7a1463829..5584e90a5500 100644 --- a/exporter/elasticsearchexporter/factory.go +++ b/exporter/elasticsearchexporter/factory.go @@ -40,10 +40,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), HTTPClientSettings: HTTPClientSettings{ Timeout: 90 * time.Second, }, diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index f71453d7fd85..a9dd52799706 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 6920a9f1cbd4..9f72f46e5201 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -1048,8 +1048,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/f5cloudexporter/config_test.go b/exporter/f5cloudexporter/config_test.go index c37be4dddde4..4f08f785e2b4 100644 --- a/exporter/f5cloudexporter/config_test.go +++ b/exporter/f5cloudexporter/config_test.go @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { actualCfg := exporter.(*Config) expectedCfg := &Config{ Config: otlphttp.Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ NameVal: "f5cloud/allsettings", TypeVal: "f5cloud", }, @@ -88,11 +88,10 @@ func TestConfig_sanitize(t *testing.T) { const validSource = "tests" type fields struct { - ExporterSettings config.ExporterSettings - Endpoint string - Source string - CredentialFile string - Audience string + Endpoint string + Source string + CredentialFile string + Audience string } tests := []struct { name string @@ -151,7 +150,7 @@ func TestConfig_sanitize(t *testing.T) { t.Run(tt.name, func(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.ExporterSettings = tt.fields.ExporterSettings + cfg.ExporterSettings = config.NewExporterSettings(typeStr) cfg.Endpoint = tt.fields.Endpoint cfg.Source = tt.fields.Source cfg.AuthConfig = AuthConfig{ diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 51cc473fe764..84abc03a75e9 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84 google.golang.org/api v0.43.0 diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index 2330e2189e85..185ae6375c9d 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -1051,8 +1051,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/googlecloudexporter/config.go b/exporter/googlecloudexporter/config.go index bab0f89073c5..3e95922ddfe4 100644 --- a/exporter/googlecloudexporter/config.go +++ b/exporter/googlecloudexporter/config.go @@ -22,10 +22,10 @@ import ( // Config defines configuration for Google Cloud exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - ProjectID string `mapstructure:"project"` - UserAgent string `mapstructure:"user_agent"` - Endpoint string `mapstructure:"endpoint"` + *config.ExporterSettings `mapstructure:"-"` + ProjectID string `mapstructure:"project"` + UserAgent string `mapstructure:"user_agent"` + Endpoint string `mapstructure:"endpoint"` // Only has effect if Endpoint is not "" UseInsecure bool `mapstructure:"use_insecure"` diff --git a/exporter/googlecloudexporter/config_test.go b/exporter/googlecloudexporter/config_test.go index 00cbabf336cd..01b42ac79652 100644 --- a/exporter/googlecloudexporter/config_test.go +++ b/exporter/googlecloudexporter/config_test.go @@ -48,7 +48,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Exporters["googlecloud/customname"].(*Config) assert.Equal(t, r1, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "googlecloud/customname"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "googlecloud/customname"}, ProjectID: "my-project", UserAgent: "opentelemetry-collector-contrib {{version}}", Endpoint: "test-endpoint", diff --git a/exporter/googlecloudexporter/factory.go b/exporter/googlecloudexporter/factory.go index ad3bbb3ec6cc..6e4c16b633c6 100644 --- a/exporter/googlecloudexporter/factory.go +++ b/exporter/googlecloudexporter/factory.go @@ -51,14 +51,11 @@ func NewFactory() component.ExporterFactory { // createDefaultConfig creates the default configuration for exporter. func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout}, - RetrySettings: exporterhelper.DefaultRetrySettings(), - QueueSettings: exporterhelper.DefaultQueueSettings(), - UserAgent: "opentelemetry-collector-contrib {{version}}", + ExporterSettings: config.NewExporterSettings(typeStr), + TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout}, + RetrySettings: exporterhelper.DefaultRetrySettings(), + QueueSettings: exporterhelper.DefaultQueueSettings(), + UserAgent: "opentelemetry-collector-contrib {{version}}", } } diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 2f5ff98290d6..912b446e73e4 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.opentelemetry.io/otel v0.19.0 go.opentelemetry.io/otel/sdk v0.19.0 go.opentelemetry.io/otel/trace v0.19.0 diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 64f1a5fb70fb..2dbc4f10f9d9 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -1059,8 +1059,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng= go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg= go.opentelemetry.io/otel/metric v0.19.0 h1:dtZ1Ju44gkJkYvo+3qGqVXmf88tc+a42edOywypengg= diff --git a/exporter/googlecloudexporter/googlecloud_test.go b/exporter/googlecloudexporter/googlecloud_test.go index 6c823a934dc2..c35c93fba12d 100644 --- a/exporter/googlecloudexporter/googlecloud_test.go +++ b/exporter/googlecloudexporter/googlecloud_test.go @@ -25,6 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/testutil/metricstestutil" @@ -65,17 +66,19 @@ func TestGoogleCloudTraceExport(t *testing.T) { { name: "Standard", cfg: &Config{ - ProjectID: "idk", - Endpoint: "127.0.0.1:8080", - UseInsecure: true, + ExporterSettings: config.NewExporterSettings(typeStr), + ProjectID: "idk", + Endpoint: "127.0.0.1:8080", + UseInsecure: true, }, }, { name: "Standard_WithoutSendingQueue", cfg: &Config{ - ProjectID: "idk", - Endpoint: "127.0.0.1:8080", - UseInsecure: true, + ExporterSettings: config.NewExporterSettings(typeStr), + ProjectID: "idk", + Endpoint: "127.0.0.1:8080", + UseInsecure: true, QueueSettings: exporterhelper.QueueSettings{ Enabled: false, }, @@ -185,10 +188,11 @@ func TestGoogleCloudMetricExport(t *testing.T) { } sde, err := newGoogleCloudMetricsExporter(&Config{ - ProjectID: "idk", - Endpoint: "127.0.0.1:8080", - UserAgent: "MyAgent {{version}}", - UseInsecure: true, + ExporterSettings: config.NewExporterSettings(typeStr), + ProjectID: "idk", + Endpoint: "127.0.0.1:8080", + UserAgent: "MyAgent {{version}}", + UseInsecure: true, GetClientOptions: func() []option.ClientOption { return clientOptions }, diff --git a/exporter/honeycombexporter/config.go b/exporter/honeycombexporter/config.go index 29e131929020..3f124460f61b 100644 --- a/exporter/honeycombexporter/config.go +++ b/exporter/honeycombexporter/config.go @@ -17,7 +17,7 @@ package honeycombexporter import "go.opentelemetry.io/collector/config" type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` // APIKey is the authentication token associated with the Honeycomb account. APIKey string `mapstructure:"api_key"` // Dataset is the Honeycomb dataset to send events to. diff --git a/exporter/honeycombexporter/config_test.go b/exporter/honeycombexporter/config_test.go index bd2c409946e4..03bb915d3b86 100644 --- a/exporter/honeycombexporter/config_test.go +++ b/exporter/honeycombexporter/config_test.go @@ -45,7 +45,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Exporters["honeycomb/customname"].(*Config) assert.Equal(t, r1, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "honeycomb/customname"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "honeycomb/customname"}, APIKey: "test-apikey", Dataset: "test-dataset", APIURL: "https://api.testhost.io", @@ -53,7 +53,7 @@ func TestLoadConfig(t *testing.T) { r2 := cfg.Exporters["honeycomb/sample_rate"].(*Config) assert.Equal(t, r2, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "honeycomb/sample_rate"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "honeycomb/sample_rate"}, APIURL: "https://api.honeycomb.io", SampleRate: 5, SampleRateAttribute: "custom.sample_rate", diff --git a/exporter/honeycombexporter/factory.go b/exporter/honeycombexporter/factory.go index 3d22d74cdc17..3fff52911c84 100644 --- a/exporter/honeycombexporter/factory.go +++ b/exporter/honeycombexporter/factory.go @@ -37,10 +37,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), APIKey: "", Dataset: "", APIURL: "https://api.honeycomb.io", diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index 4494c0004980..fecd27b5540b 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index be92b9b66559..46aaec080a88 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -1068,8 +1068,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/honeycombexporter/honeycomb_test.go b/exporter/honeycombexporter/honeycomb_test.go index 4df51193b898..85d25cba3cbc 100644 --- a/exporter/honeycombexporter/honeycomb_test.go +++ b/exporter/honeycombexporter/honeycomb_test.go @@ -33,6 +33,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -102,6 +103,7 @@ func testTraceExporter(td pdata.Traces, t *testing.T, cfg *Config) []honeycombDa func baseConfig() *Config { return &Config{ + ExporterSettings: config.NewExporterSettings(typeStr), APIKey: "test", Dataset: "test", Debug: false, diff --git a/exporter/jaegerthrifthttpexporter/config.go b/exporter/jaegerthrifthttpexporter/config.go index dab76611fa33..970e64033505 100644 --- a/exporter/jaegerthrifthttpexporter/config.go +++ b/exporter/jaegerthrifthttpexporter/config.go @@ -22,7 +22,7 @@ import ( // Config defines configuration for Jaeger Thrift over HTTP exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` // URL is the URL to send the Jaeger trace data to (e.g.: // http://some.url:14268/api/traces). diff --git a/exporter/jaegerthrifthttpexporter/config_test.go b/exporter/jaegerthrifthttpexporter/config_test.go index 11ad357def57..0908728ac6cc 100644 --- a/exporter/jaegerthrifthttpexporter/config_test.go +++ b/exporter/jaegerthrifthttpexporter/config_test.go @@ -51,7 +51,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters[expectedName] expectedCfg := Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ TypeVal: config.Type(typeStr), NameVal: expectedName, }, diff --git a/exporter/jaegerthrifthttpexporter/factory.go b/exporter/jaegerthrifthttpexporter/factory.go index 7452ae5cbb3f..c7198de27476 100644 --- a/exporter/jaegerthrifthttpexporter/factory.go +++ b/exporter/jaegerthrifthttpexporter/factory.go @@ -40,11 +40,8 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - Timeout: defaultHTTPTimeout, + ExporterSettings: config.NewExporterSettings(typeStr), + Timeout: defaultHTTPTimeout, } } diff --git a/exporter/jaegerthrifthttpexporter/factory_test.go b/exporter/jaegerthrifthttpexporter/factory_test.go index c28669723bf1..dc203afde65e 100644 --- a/exporter/jaegerthrifthttpexporter/factory_test.go +++ b/exporter/jaegerthrifthttpexporter/factory_test.go @@ -55,11 +55,8 @@ func TestCreateInstanceViaFactory(t *testing.T) { func TestFactory_CreateTraceExporter(t *testing.T) { config := &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - URL: "http://some.other.location/api/traces", + ExporterSettings: config.NewExporterSettings(typeStr), + URL: "http://some.other.location/api/traces", Headers: map[string]string{ "added-entry": "added value", "dot.test": "test", @@ -82,33 +79,24 @@ func TestFactory_CreateTraceExporterFails(t *testing.T) { { name: "empty_url", config: &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), }, errorMessage: "\"jaeger_thrift\" config requires a valid \"url\": parse \"\": empty url", }, { name: "invalid_url", config: &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - URL: ".localhost:123", + ExporterSettings: config.NewExporterSettings(typeStr), + URL: ".localhost:123", }, errorMessage: "\"jaeger_thrift\" config requires a valid \"url\": parse \".localhost:123\": invalid URI for request", }, { name: "negative_duration", config: &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - URL: "localhost:123", - Timeout: -2 * time.Second, + ExporterSettings: config.NewExporterSettings(typeStr), + URL: "localhost:123", + Timeout: -2 * time.Second, }, errorMessage: "\"jaeger_thrift\" config requires a positive value for \"timeout\"", }, diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index d02b680ea960..966301e0358f 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/loadbalancingexporter/config.go b/exporter/loadbalancingexporter/config.go index 5b3e2d2df7cd..bc558f26f2a9 100644 --- a/exporter/loadbalancingexporter/config.go +++ b/exporter/loadbalancingexporter/config.go @@ -21,9 +21,9 @@ import ( // Config defines configuration for the exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` - Protocol Protocol `mapstructure:"protocol"` - Resolver ResolverSettings `mapstructure:"resolver"` + *config.ExporterSettings `mapstructure:"-"` + Protocol Protocol `mapstructure:"protocol"` + Resolver ResolverSettings `mapstructure:"resolver"` } // Protocol holds the individual protocol-specific settings. Only OTLP is supported at the moment. diff --git a/exporter/loadbalancingexporter/factory.go b/exporter/loadbalancingexporter/factory.go index d9da70a12bbf..d8d4c882c280 100644 --- a/exporter/loadbalancingexporter/factory.go +++ b/exporter/loadbalancingexporter/factory.go @@ -46,10 +46,7 @@ func createDefaultConfig() config.Exporter { otlpDefaultCfg := otlpFactory.CreateDefaultConfig().(*otlpexporter.Config) return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), Protocol: Protocol{ OTLP: *otlpDefaultCfg, }, diff --git a/exporter/loadbalancingexporter/factory_test.go b/exporter/loadbalancingexporter/factory_test.go index c659f034b5d0..c970981b9009 100644 --- a/exporter/loadbalancingexporter/factory_test.go +++ b/exporter/loadbalancingexporter/factory_test.go @@ -29,10 +29,7 @@ func TestTraceExporterGetsCreatedWithValidConfiguration(t *testing.T) { factory := NewFactory() creationParams := component.ExporterCreateParams{Logger: zap.NewNop()} cfg := &Config{ - ExporterSettings: config.ExporterSettings{ - NameVal: "loadbalancing", - TypeVal: "loadbalancing", - }, + ExporterSettings: config.NewExporterSettings(typeStr), Resolver: ResolverSettings{ Static: &StaticResolver{Hostnames: []string{"endpoint-1"}}, }, @@ -51,10 +48,7 @@ func TestLogExporterGetsCreatedWithValidConfiguration(t *testing.T) { factory := NewFactory() creationParams := component.ExporterCreateParams{Logger: zap.NewNop()} cfg := &Config{ - ExporterSettings: config.ExporterSettings{ - NameVal: "loadbalancing", - TypeVal: "loadbalancing", - }, + ExporterSettings: config.NewExporterSettings(typeStr), Resolver: ResolverSettings{ Static: &StaticResolver{Hostnames: []string{"endpoint-1"}}, }, diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 9c368415eb9e..cfcf231c4580 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 015cbe307f18..46bc922def07 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -1026,8 +1026,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/loadbalancingexporter/log_exporter_test.go b/exporter/loadbalancingexporter/log_exporter_test.go index de866213e85e..f6de68fee146 100644 --- a/exporter/loadbalancingexporter/log_exporter_test.go +++ b/exporter/loadbalancingexporter/log_exporter_test.go @@ -28,6 +28,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenthelper" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" "go.uber.org/zap" @@ -46,7 +47,9 @@ func TestNewLogsExporter(t *testing.T) { }, { "empty", - &Config{}, + &Config{ + ExporterSettings: config.NewExporterSettings(typeStr), + }, errNoResolver, }, } { @@ -76,12 +79,12 @@ func TestLogExporterStart(t *testing.T) { "ok", func() *logExporterImp { // prepare - config := simpleConfig() + cfg := simpleConfig() params := component.ExporterCreateParams{ Logger: zap.NewNop(), } - p, _ := newLogsExporter(params, config) + p, _ := newLogsExporter(params, cfg) return p }(), nil, @@ -90,13 +93,13 @@ func TestLogExporterStart(t *testing.T) { "error", func() *logExporterImp { // prepare - config := simpleConfig() + cfg := simpleConfig() params := component.ExporterCreateParams{ Logger: zap.NewNop(), } - lb, _ := newLoadBalancer(params, config, nil) - p, _ := newLogsExporter(params, config) + lb, _ := newLoadBalancer(params, cfg, nil) + p, _ := newLogsExporter(params, cfg) lb.res = &mockResolver{ onStart: func(context.Context) error { @@ -407,7 +410,8 @@ func TestRollingUpdatesWhenConsumeLogs(t *testing.T) { } res.resInterval = 10 * time.Millisecond - config := &Config{ + cfg := &Config{ + ExporterSettings: config.NewExporterSettings(typeStr), Resolver: ResolverSettings{ DNS: &DNSResolver{Hostname: "service-1", Port: ""}, }, @@ -416,11 +420,11 @@ func TestRollingUpdatesWhenConsumeLogs(t *testing.T) { componentFactory := func(ctx context.Context, endpoint string) (component.Exporter, error) { return newNopMockLogsExporter(), nil } - lb, err := newLoadBalancer(params, config, componentFactory) + lb, err := newLoadBalancer(params, cfg, componentFactory) require.NotNil(t, lb) require.NoError(t, err) - p, err := newLogsExporter(params, config) + p, err := newLogsExporter(params, cfg) require.NotNil(t, p) require.NoError(t, err) diff --git a/exporter/loadbalancingexporter/trace_exporter.go b/exporter/loadbalancingexporter/trace_exporter.go index b1ae861efab0..16befc68ba81 100644 --- a/exporter/loadbalancingexporter/trace_exporter.go +++ b/exporter/loadbalancingexporter/trace_exporter.go @@ -73,6 +73,7 @@ func newTracesExporter(params component.ExporterCreateParams, cfg config.Exporte func buildExporterConfig(cfg *Config, endpoint string) otlpexporter.Config { oCfg := cfg.Protocol.OTLP + oCfg.ExporterSettings = config.NewExporterSettings("otlp") oCfg.Endpoint = endpoint return oCfg } diff --git a/exporter/loadbalancingexporter/trace_exporter_test.go b/exporter/loadbalancingexporter/trace_exporter_test.go index bd8f6ddd6dfa..5937b4599c4d 100644 --- a/exporter/loadbalancingexporter/trace_exporter_test.go +++ b/exporter/loadbalancingexporter/trace_exporter_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenthelper" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" @@ -514,6 +515,7 @@ func simpleTraceWithID(id pdata.TraceID) pdata.Traces { func simpleConfig() *Config { return &Config{ + ExporterSettings: config.NewExporterSettings(typeStr), Resolver: ResolverSettings{ Static: &StaticResolver{Hostnames: []string{"endpoint-1"}}, }, diff --git a/exporter/logzioexporter/config.go b/exporter/logzioexporter/config.go index 395417eecb9b..f1887517daf1 100644 --- a/exporter/logzioexporter/config.go +++ b/exporter/logzioexporter/config.go @@ -22,11 +22,11 @@ import ( // Config contains Logz.io specific configuration such as Account TracesToken, Region, etc. type Config struct { - config.ExporterSettings `mapstructure:",squash"` - TracesToken string `mapstructure:"account_token"` // Your Logz.io Account Token, can be found at https://app.logz.io/#/dashboard/settings/general - MetricsToken string `mapstructure:"metrics_token"` // Your Logz.io Metrics Token, can be found at https://docs.logz.io/user-guide/accounts/finding-your-metrics-account-token/ - Region string `mapstructure:"region"` // Your Logz.io 2-letter region code, can be found at https://docs.logz.io/user-guide/accounts/account-region.html#available-regions - CustomEndpoint string `mapstructure:"custom_endpoint"` // Custom endpoint to ship traces to. Use only for dev and tests. + *config.ExporterSettings `mapstructure:"-"` + TracesToken string `mapstructure:"account_token"` // Your Logz.io Account Token, can be found at https://app.logz.io/#/dashboard/settings/general + MetricsToken string `mapstructure:"metrics_token"` // Your Logz.io Metrics Token, can be found at https://docs.logz.io/user-guide/accounts/finding-your-metrics-account-token/ + Region string `mapstructure:"region"` // Your Logz.io 2-letter region code, can be found at https://docs.logz.io/user-guide/accounts/account-region.html#available-regions + CustomEndpoint string `mapstructure:"custom_endpoint"` // Custom endpoint to ship traces to. Use only for dev and tests. } func (c *Config) validate() error { diff --git a/exporter/logzioexporter/config_test.go b/exporter/logzioexporter/config_test.go index db099454537c..1a83d4f87030 100644 --- a/exporter/logzioexporter/config_test.go +++ b/exporter/logzioexporter/config_test.go @@ -42,7 +42,7 @@ func TestLoadConfig(tester *testing.T) { cfgExp := cfg.Exporters["logzio/2"].(*Config) assert.Equal(tester, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: typeStr, NameVal: "logzio/2"}, + ExporterSettings: &config.ExporterSettings{TypeVal: typeStr, NameVal: "logzio/2"}, TracesToken: "logzioTESTtoken", Region: "eu", CustomEndpoint: "https://some-url.com:8888", diff --git a/exporter/logzioexporter/exporter_test.go b/exporter/logzioexporter/exporter_test.go index 19e08a569a93..7047c8edebf6 100644 --- a/exporter/logzioexporter/exporter_test.go +++ b/exporter/logzioexporter/exporter_test.go @@ -31,6 +31,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/translator/internaldata" "go.uber.org/zap" @@ -96,8 +97,9 @@ func TestNullTokenConfig(tester *testing.T) { func TestEmptyNode(tester *testing.T) { cfg := Config{ - TracesToken: "test", - Region: "eu", + ExporterSettings: config.NewExporterSettings(typeStr), + TracesToken: "test", + Region: "eu", } testTraceExporter(internaldata.OCToTraces(nil, nil, nil), tester, &cfg) } @@ -141,9 +143,10 @@ func TestPushTraceData(tester *testing.T) { rw.WriteHeader(http.StatusOK) })) cfg := Config{ - TracesToken: "test", - Region: "eu", - CustomEndpoint: server.URL, + ExporterSettings: config.NewExporterSettings(typeStr), + TracesToken: "test", + Region: "eu", + CustomEndpoint: server.URL, } defer server.Close() @@ -172,9 +175,10 @@ func TestPushTraceData(tester *testing.T) { func TestPushMetricsData(tester *testing.T) { cfg := Config{ - MetricsToken: "test", - Region: "eu", - CustomEndpoint: "url", + ExporterSettings: config.NewExporterSettings(typeStr), + MetricsToken: "test", + Region: "eu", + CustomEndpoint: "url", } md := pdata.NewMetrics() diff --git a/exporter/logzioexporter/factory.go b/exporter/logzioexporter/factory.go index 7209c8d99c27..f7af6625a8b3 100644 --- a/exporter/logzioexporter/factory.go +++ b/exporter/logzioexporter/factory.go @@ -34,12 +34,9 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - Region: "", - TracesToken: "", + ExporterSettings: config.NewExporterSettings(typeStr), + Region: "", + TracesToken: "", } } diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 1fe7ed9817d4..71f4c300a878 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index 1170375419d5..201edf19543f 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -1077,8 +1077,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/lokiexporter/config.go b/exporter/lokiexporter/config.go index fd2f00bfdb3d..92052354fb90 100644 --- a/exporter/lokiexporter/config.go +++ b/exporter/lokiexporter/config.go @@ -26,7 +26,7 @@ import ( // Config defines configuration for Loki exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index 8f6d3364196b..1a2aad46951e 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { actualCfg := cfg.Exporters["loki/allsettings"].(*Config) expectedCfg := Config{ - ExporterSettings: config.ExporterSettings{TypeVal: typeStr, NameVal: "loki/allsettings"}, + ExporterSettings: &config.ExporterSettings{TypeVal: typeStr, NameVal: "loki/allsettings"}, HTTPClientSettings: confighttp.HTTPClientSettings{ Headers: map[string]string{ "x-custom-header": "loki_rocks", @@ -95,12 +95,11 @@ func TestConfig_validate(t *testing.T) { } type fields struct { - ExporterSettings config.ExporterSettings - Endpoint string - Source string - CredentialFile string - Audience string - Labels LabelsConfig + Endpoint string + Source string + CredentialFile string + Audience string + Labels LabelsConfig } tests := []struct { name string @@ -169,7 +168,7 @@ func TestConfig_validate(t *testing.T) { t.Run(tt.name, func(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.ExporterSettings = tt.fields.ExporterSettings + cfg.ExporterSettings = config.NewExporterSettings(typeStr) cfg.Endpoint = tt.fields.Endpoint cfg.Labels = tt.fields.Labels diff --git a/exporter/lokiexporter/factory.go b/exporter/lokiexporter/factory.go index 9255def8cb02..fb98c1516dc7 100644 --- a/exporter/lokiexporter/factory.go +++ b/exporter/lokiexporter/factory.go @@ -37,10 +37,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", Timeout: 30 * time.Second, diff --git a/exporter/lokiexporter/factory_test.go b/exporter/lokiexporter/factory_test.go index 3e93f78f26a2..b77e57138d8a 100644 --- a/exporter/lokiexporter/factory_test.go +++ b/exporter/lokiexporter/factory_test.go @@ -23,6 +23,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/testutil" @@ -57,6 +58,7 @@ func TestFactory_CreateLogExporter(t *testing.T) { { name: "with valid config", config: Config{ + ExporterSettings: config.NewExporterSettings(typeStr), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://" + testutil.GetAvailableLocalAddress(t), }, @@ -69,6 +71,7 @@ func TestFactory_CreateLogExporter(t *testing.T) { { name: "with invalid config", config: Config{ + ExporterSettings: config.NewExporterSettings(typeStr), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", }, @@ -78,6 +81,7 @@ func TestFactory_CreateLogExporter(t *testing.T) { { name: "with forced bad configuration (for coverage)", config: Config{ + ExporterSettings: config.NewExporterSettings(typeStr), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index adb71e77fd84..3df7c15d7b2e 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/prometheus/common v0.20.0 github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/grpc v1.36.1 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/newrelicexporter/config.go b/exporter/newrelicexporter/config.go index ffee10ce3119..6d8c1bff234e 100644 --- a/exporter/newrelicexporter/config.go +++ b/exporter/newrelicexporter/config.go @@ -23,7 +23,7 @@ import ( // Config defines configuration options for the New Relic exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` // APIKey is the required authentication credentials for New Relic APIs. This field specifies the default key. APIKey string `mapstructure:"apikey"` diff --git a/exporter/newrelicexporter/config_test.go b/exporter/newrelicexporter/config_test.go index ec8a20f62a51..37daa0f8ccfe 100644 --- a/exporter/newrelicexporter/config_test.go +++ b/exporter/newrelicexporter/config_test.go @@ -53,7 +53,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Exporters["newrelic/alt"].(*Config) assert.Equal(t, r1, &Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ TypeVal: config.Type(typeStr), NameVal: "newrelic/alt", }, diff --git a/exporter/newrelicexporter/factory.go b/exporter/newrelicexporter/factory.go index d31efdae67ff..02746be5a584 100644 --- a/exporter/newrelicexporter/factory.go +++ b/exporter/newrelicexporter/factory.go @@ -37,11 +37,8 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - Timeout: time.Second * 15, + ExporterSettings: config.NewExporterSettings(typeStr), + Timeout: time.Second * 15, } } diff --git a/exporter/newrelicexporter/go.mod b/exporter/newrelicexporter/go.mod index a3e781e25e62..16a608da9bad 100644 --- a/exporter/newrelicexporter/go.mod +++ b/exporter/newrelicexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/genproto v0.0.0-20210302174412-5ede27ff9881 google.golang.org/grpc v1.36.1 diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum index b586c3ca73fa..77bf2ae8c66d 100644 --- a/exporter/newrelicexporter/go.sum +++ b/exporter/newrelicexporter/go.sum @@ -1048,8 +1048,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/sapmexporter/config.go b/exporter/sapmexporter/config.go index 7cbe2b9a14ab..34262747aefe 100644 --- a/exporter/sapmexporter/config.go +++ b/exporter/sapmexporter/config.go @@ -32,7 +32,7 @@ const ( // Config defines configuration for SAPM exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` // Endpoint is the destination to where traces will be sent to in SAPM format. // It must be a full URL and include the scheme, port and path e.g, https://ingest.signalfx.com/v2/trace diff --git a/exporter/sapmexporter/config_test.go b/exporter/sapmexporter/config_test.go index ae156626b622..85f7fb0a0c09 100644 --- a/exporter/sapmexporter/config_test.go +++ b/exporter/sapmexporter/config_test.go @@ -50,7 +50,7 @@ func TestLoadConfig(t *testing.T) { r1 := cfg.Exporters["sapm/customname"].(*Config) assert.Equal(t, r1, &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "sapm/customname"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "sapm/customname"}, Endpoint: "test-endpoint", AccessToken: "abcd1234", NumWorkers: 3, diff --git a/exporter/sapmexporter/exporter_test.go b/exporter/sapmexporter/exporter_test.go index f3a51be05afe..1c60fcef8251 100644 --- a/exporter/sapmexporter/exporter_test.go +++ b/exporter/sapmexporter/exporter_test.go @@ -37,7 +37,7 @@ import ( func TestCreateTraceExporter(t *testing.T) { config := &Config{ - ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "sapm/customname"}, + ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "sapm/customname"}, Endpoint: "test-endpoint", AccessToken: "abcd1234", NumWorkers: 3, diff --git a/exporter/sapmexporter/factory.go b/exporter/sapmexporter/factory.go index d01dd2884525..5ab9c43252fc 100644 --- a/exporter/sapmexporter/factory.go +++ b/exporter/sapmexporter/factory.go @@ -39,11 +39,8 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - NumWorkers: defaultNumWorkers, + ExporterSettings: config.NewExporterSettings(typeStr), + NumWorkers: defaultNumWorkers, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ AccessTokenPassthrough: true, }, diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 94c7203cc017..ce13e0a10b44 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.0.0-00010101000000-000000000000 github.com/signalfx/sapm-proto v0.7.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index b2e17d104096..39cd5f0454e0 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -1157,8 +1157,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/sentryexporter/config.go b/exporter/sentryexporter/config.go index 68ec1e183ff8..4bd2093842a1 100644 --- a/exporter/sentryexporter/config.go +++ b/exporter/sentryexporter/config.go @@ -18,7 +18,7 @@ import "go.opentelemetry.io/collector/config" // Config defines the configuration for the Sentry Exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` // DSN to report transaction to Sentry. If the DSN is not set, no trace will be sent to Sentry. DSN string `mapstructure:"dsn"` } diff --git a/exporter/sentryexporter/config_test.go b/exporter/sentryexporter/config_test.go index 4a582d154ab2..5acc486bcb6d 100644 --- a/exporter/sentryexporter/config_test.go +++ b/exporter/sentryexporter/config_test.go @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters["sentry/2"] assert.Equal(t, e1, &Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ NameVal: "sentry/2", TypeVal: "sentry", }, diff --git a/exporter/sentryexporter/factory.go b/exporter/sentryexporter/factory.go index 5d302d53dae2..8d3240c4a487 100644 --- a/exporter/sentryexporter/factory.go +++ b/exporter/sentryexporter/factory.go @@ -38,10 +38,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), } } diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index d37792d1de6b..ce88efd5c0a4 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 240f935f7703..3ee2d10cca60 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -1119,8 +1119,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/signalfxexporter/config.go b/exporter/signalfxexporter/config.go index a16043088fe1..b9a89f39c437 100644 --- a/exporter/signalfxexporter/config.go +++ b/exporter/signalfxexporter/config.go @@ -35,7 +35,7 @@ const ( // Config defines configuration for SignalFx exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/signalfxexporter/config_test.go b/exporter/signalfxexporter/config_test.go index 2c2eb51224f9..f2434d4dd851 100644 --- a/exporter/signalfxexporter/config_test.go +++ b/exporter/signalfxexporter/config_test.go @@ -63,7 +63,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters[expectedName] expectedCfg := Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ TypeVal: config.Type(typeStr), NameVal: expectedName, }, @@ -199,7 +199,6 @@ func TestConfig_getOptionsFromConfig(t *testing.T) { return translator } type fields struct { - ExporterSettings config.ExporterSettings AccessToken string Realm string IngestURL string @@ -317,7 +316,7 @@ func TestConfig_getOptionsFromConfig(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { cfg := &Config{ - ExporterSettings: tt.fields.ExporterSettings, + ExporterSettings: config.NewExporterSettings(typeStr), AccessToken: tt.fields.AccessToken, Realm: tt.fields.Realm, IngestURL: tt.fields.IngestURL, diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 150490e1d32e..0849e7d34b1b 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -35,6 +35,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -62,31 +63,35 @@ func TestNew(t *testing.T) { { name: "bad config fails", config: &Config{ - APIURL: "abc", + ExporterSettings: config.NewExporterSettings(typeStr), + APIURL: "abc", }, wantErr: true, }, { name: "fails to create metrics converter", config: &Config{ - AccessToken: "test", - Realm: "realm", - ExcludeMetrics: []dpfilters.MetricFilter{{}}, + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "test", + Realm: "realm", + ExcludeMetrics: []dpfilters.MetricFilter{{}}, }, wantErr: true, }, { name: "successfully create exporter", config: &Config{ - AccessToken: "someToken", - Realm: "xyz", - TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 1 * time.Second}, - Headers: nil, + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "someToken", + Realm: "xyz", + TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 1 * time.Second}, + Headers: nil, }, }, { name: "create exporter with host metadata syncer", config: &Config{ + ExporterSettings: config.NewExporterSettings(typeStr), AccessToken: "someToken", Realm: "xyz", TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 1 * time.Second}, @@ -456,25 +461,26 @@ func TestNewEventExporter(t *testing.T) { assert.EqualError(t, err, "nil config") assert.Nil(t, got) - config := &Config{ - AccessToken: "someToken", - IngestURL: "asdf://:%", - TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 1 * time.Second}, - Headers: nil, + cfg := &Config{ + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "someToken", + IngestURL: "asdf://:%", + TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 1 * time.Second}, + Headers: nil, } - got, err = newEventExporter(config, zap.NewNop()) + got, err = newEventExporter(cfg, zap.NewNop()) assert.NotNil(t, err) assert.Nil(t, got) - config = &Config{ + cfg = &Config{ AccessToken: "someToken", Realm: "xyz", TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: 1 * time.Second}, Headers: nil, } - got, err = newEventExporter(config, zap.NewNop()) + got, err = newEventExporter(cfg, zap.NewNop()) assert.NoError(t, err) require.NotNil(t, got) diff --git a/exporter/signalfxexporter/factory.go b/exporter/signalfxexporter/factory.go index 4af22bfa32ae..4f67858aad41 100644 --- a/exporter/signalfxexporter/factory.go +++ b/exporter/signalfxexporter/factory.go @@ -55,13 +55,10 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultHTTPTimeout}, - RetrySettings: exporterhelper.DefaultRetrySettings(), - QueueSettings: exporterhelper.DefaultQueueSettings(), + ExporterSettings: config.NewExporterSettings(typeStr), + TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultHTTPTimeout}, + RetrySettings: exporterhelper.DefaultRetrySettings(), + QueueSettings: exporterhelper.DefaultQueueSettings(), AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ AccessTokenPassthrough: true, }, diff --git a/exporter/signalfxexporter/factory_test.go b/exporter/signalfxexporter/factory_test.go index bab380ee5bf3..d883de7b9cfc 100644 --- a/exporter/signalfxexporter/factory_test.go +++ b/exporter/signalfxexporter/factory_test.go @@ -112,12 +112,9 @@ func TestCreateInstanceViaFactory(t *testing.T) { func TestCreateMetricsExporter_CustomConfig(t *testing.T) { config := &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - AccessToken: "testToken", - Realm: "us1", + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "testToken", + Realm: "us1", Headers: map[string]string{ "added-entry": "added value", "dot.test": "test", @@ -139,24 +136,18 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { { name: "negative_duration", config: &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - AccessToken: "testToken", - Realm: "lab", - TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: -2 * time.Second}, + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "testToken", + Realm: "lab", + TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: -2 * time.Second}, }, errorMessage: "failed to process \"signalfx\" config: cannot have a negative \"timeout\"", }, { name: "empty_realm_and_urls", config: &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - AccessToken: "testToken", + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "testToken", }, errorMessage: "failed to process \"signalfx\" config: requires a non-empty \"realm\"," + " or \"ingest_url\" and \"api_url\" should be explicitly set", @@ -164,12 +155,9 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { { name: "empty_realm_and_api_url", config: &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - AccessToken: "testToken", - IngestURL: "http://localhost:123", + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "testToken", + IngestURL: "http://localhost:123", }, errorMessage: "failed to process \"signalfx\" config: requires a non-empty \"realm\"," + " or \"ingest_url\" and \"api_url\" should be explicitly set", @@ -267,12 +255,9 @@ func TestDefaultTranslationRules(t *testing.T) { func TestCreateMetricsExporterWithDefaultExcludeMetrics(t *testing.T) { config := &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - AccessToken: "testToken", - Realm: "us1", + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "testToken", + Realm: "us1", } te, err := createMetricsExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, config) @@ -285,12 +270,9 @@ func TestCreateMetricsExporterWithDefaultExcludeMetrics(t *testing.T) { func TestCreateMetricsExporterWithExcludeMetrics(t *testing.T) { config := &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - AccessToken: "testToken", - Realm: "us1", + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "testToken", + Realm: "us1", ExcludeMetrics: []dpfilters.MetricFilter{ { MetricNames: []string{"metric1"}, @@ -308,13 +290,10 @@ func TestCreateMetricsExporterWithExcludeMetrics(t *testing.T) { func TestCreateMetricsExporterWithEmptyExcludeMetrics(t *testing.T) { config := &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - AccessToken: "testToken", - Realm: "us1", - ExcludeMetrics: []dpfilters.MetricFilter{}, + ExporterSettings: config.NewExporterSettings(typeStr), + AccessToken: "testToken", + Realm: "us1", + ExcludeMetrics: []dpfilters.MetricFilter{}, } te, err := createMetricsExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, config) diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index d083b385597b..0d4e8b586626 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201202163743-65b4fa925fc8 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index f764cb5af818..0ccde489ec4f 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -1071,8 +1071,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/splunkhecexporter/config.go b/exporter/splunkhecexporter/config.go index 14c47b8b3b68..af667fcf3549 100644 --- a/exporter/splunkhecexporter/config.go +++ b/exporter/splunkhecexporter/config.go @@ -32,7 +32,7 @@ const ( // Config defines configuration for Splunk exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index 04890f1b69f7..a9fb7ad9b17a 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -54,7 +54,7 @@ func TestLoadConfig(t *testing.T) { e1 := cfg.Exporters[expectedName] expectedCfg := Config{ - ExporterSettings: config.ExporterSettings{ + ExporterSettings: &config.ExporterSettings{ TypeVal: config.Type(typeStr), NameVal: expectedName, }, diff --git a/exporter/splunkhecexporter/factory.go b/exporter/splunkhecexporter/factory.go index 8400d5ea455e..1c78a99977f6 100644 --- a/exporter/splunkhecexporter/factory.go +++ b/exporter/splunkhecexporter/factory.go @@ -43,10 +43,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: defaultHTTPTimeout, }, diff --git a/exporter/splunkhecexporter/factory_test.go b/exporter/splunkhecexporter/factory_test.go index 5c922a28e6f8..037d5e7d192b 100644 --- a/exporter/splunkhecexporter/factory_test.go +++ b/exporter/splunkhecexporter/factory_test.go @@ -123,12 +123,9 @@ func TestCreateInstanceViaFactory(t *testing.T) { func TestFactory_CreateMetricsExporter(t *testing.T) { config := &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - Token: "testToken", - Endpoint: "https://example.com:8000", + ExporterSettings: config.NewExporterSettings(typeStr), + Token: "testToken", + Endpoint: "https://example.com:8000", } params := component.ExporterCreateParams{Logger: zap.NewNop()} @@ -146,22 +143,16 @@ func TestFactory_CreateMetricsExporterFails(t *testing.T) { { name: "empty_endpoint", config: &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - Token: "token", + ExporterSettings: config.NewExporterSettings(typeStr), + Token: "token", }, errorMessage: "failed to process \"splunk_hec\" config: requires a non-empty \"endpoint\"", }, { name: "empty_token", config: &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - Endpoint: "https://example.com:8000", + ExporterSettings: config.NewExporterSettings(typeStr), + Endpoint: "https://example.com:8000", }, errorMessage: "failed to process \"splunk_hec\" config: requires a non-empty \"token\"", }, diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index b76fcb5ff25a..8ff930d62226 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index b4dcf7188ce7..aa21f43f77a4 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -1027,8 +1027,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod index e12b93ddfba6..01d1b0146ded 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index ff6512ef30bf..16912b503669 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -1022,8 +1022,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng= go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg= go.opentelemetry.io/otel/metric v0.19.0 h1:dtZ1Ju44gkJkYvo+3qGqVXmf88tc+a42edOywypengg= diff --git a/exporter/sumologicexporter/config.go b/exporter/sumologicexporter/config.go index 2440a529c70c..8272ecaeb18a 100644 --- a/exporter/sumologicexporter/config.go +++ b/exporter/sumologicexporter/config.go @@ -24,7 +24,7 @@ import ( // Config defines configuration for Sumo Logic exporter. type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/sumologicexporter/factory.go b/exporter/sumologicexporter/factory.go index 2e6c3df62068..4c0d1716eff1 100644 --- a/exporter/sumologicexporter/factory.go +++ b/exporter/sumologicexporter/factory.go @@ -43,10 +43,7 @@ func createDefaultConfig() config.Exporter { qs.Enabled = false return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), CompressEncoding: DefaultCompressEncoding, MaxRequestBodySize: DefaultMaxRequestBodySize, diff --git a/exporter/sumologicexporter/factory_test.go b/exporter/sumologicexporter/factory_test.go index 18d81caa6c8f..26872478ab3e 100644 --- a/exporter/sumologicexporter/factory_test.go +++ b/exporter/sumologicexporter/factory_test.go @@ -38,10 +38,7 @@ func TestCreateDefaultConfig(t *testing.T) { qs.Enabled = false assert.Equal(t, cfg, &Config{ - ExporterSettings: config.ExporterSettings{ - NameVal: typeStr, - TypeVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), CompressEncoding: "gzip", MaxRequestBodySize: 1_048_576, LogFormat: "json", diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 8c1e9818d3db..094fb37c79a2 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -12,6 +12,6 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/exporter/uptraceexporter/config.go b/exporter/uptraceexporter/config.go index 80810116a5de..8feb0dfee457 100644 --- a/exporter/uptraceexporter/config.go +++ b/exporter/uptraceexporter/config.go @@ -21,7 +21,7 @@ import ( ) type Config struct { - config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + *config.ExporterSettings `mapstructure:"-"` confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` exporterhelper.RetrySettings `mapstructure:"retry_on_failure"` diff --git a/exporter/uptraceexporter/config_test.go b/exporter/uptraceexporter/config_test.go index a72b2a0f47d2..6985159a682a 100644 --- a/exporter/uptraceexporter/config_test.go +++ b/exporter/uptraceexporter/config_test.go @@ -41,14 +41,11 @@ func TestLoadConfig(t *testing.T) { require.Equal(t, 2, len(cfg.Exporters)) c0 := cfg.Exporters["uptrace"].(*Config) - require.Equal(t, config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: "uptrace", - }, c0.ExporterSettings) + require.Equal(t, config.NewExporterSettings(typeStr), c0.ExporterSettings) require.Equal(t, "https://api.uptrace.dev@example.com/1", c0.DSN) c1 := cfg.Exporters["uptrace/customname"].(*Config) - require.Equal(t, config.ExporterSettings{ + require.Equal(t, &config.ExporterSettings{ TypeVal: config.Type(typeStr), NameVal: "uptrace/customname", }, c1.ExporterSettings) diff --git a/exporter/uptraceexporter/factory.go b/exporter/uptraceexporter/factory.go index 6233e7941a03..4e9d0554d074 100644 --- a/exporter/uptraceexporter/factory.go +++ b/exporter/uptraceexporter/factory.go @@ -39,10 +39,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.ExporterSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, + ExporterSettings: config.NewExporterSettings(typeStr), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", // not used Timeout: 30 * time.Second, diff --git a/exporter/uptraceexporter/go.mod b/exporter/uptraceexporter/go.mod index 53252d3d3c07..2e644f822a43 100644 --- a/exporter/uptraceexporter/go.mod +++ b/exporter/uptraceexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/uptrace/uptrace-go v0.19.4 github.com/vmihailenco/msgpack/v5 v5.3.1 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.opentelemetry.io/otel v0.19.0 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/uptraceexporter/go.sum b/exporter/uptraceexporter/go.sum index 06b304a5a262..0d014ea69b2c 100644 --- a/exporter/uptraceexporter/go.sum +++ b/exporter/uptraceexporter/go.sum @@ -1056,8 +1056,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= go.opentelemetry.io/contrib v0.19.0 h1:x6Josyb/V+aDHg6IozzmZMaOhE+0Jb2NvEAM4/0Gftc= go.opentelemetry.io/contrib v0.19.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.19.0 h1:bol92QNY0BMTWfGlqxYipDf/pX9//kGsNdR95zX72Pk= diff --git a/extension/fluentbitextension/config.go b/extension/fluentbitextension/config.go index 07acd31b4890..6812486658cf 100644 --- a/extension/fluentbitextension/config.go +++ b/extension/fluentbitextension/config.go @@ -20,7 +20,7 @@ import ( // Config has the configuration for the fluentbit extension. type Config struct { - config.ExtensionSettings `mapstructure:",squash"` + *config.ExtensionSettings `mapstructure:"-"` // The TCP `host:port` to which the subprocess should send log entries. // This is required unless you are overridding `args` and providing the diff --git a/extension/fluentbitextension/config_test.go b/extension/fluentbitextension/config_test.go index 7900a91e0241..f868389d4085 100644 --- a/extension/fluentbitextension/config_test.go +++ b/extension/fluentbitextension/config_test.go @@ -42,7 +42,7 @@ func TestLoadConfig(t *testing.T) { ext1 := cfg.Extensions["fluentbit/1"] assert.Equal(t, &Config{ - ExtensionSettings: config.ExtensionSettings{ + ExtensionSettings: &config.ExtensionSettings{ TypeVal: "fluentbit", NameVal: "fluentbit/1", }, diff --git a/extension/fluentbitextension/factory.go b/extension/fluentbitextension/factory.go index de8b8ad2269b..c81b59966c9a 100644 --- a/extension/fluentbitextension/factory.go +++ b/extension/fluentbitextension/factory.go @@ -37,10 +37,7 @@ func NewFactory() component.ExtensionFactory { func createDefaultConfig() config.Extension { return &Config{ - ExtensionSettings: config.ExtensionSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, + ExtensionSettings: config.NewExtensionSettings(typeStr), } } diff --git a/extension/fluentbitextension/factory_test.go b/extension/fluentbitextension/factory_test.go index 4a5861d5b9ef..bd8b64c62214 100644 --- a/extension/fluentbitextension/factory_test.go +++ b/extension/fluentbitextension/factory_test.go @@ -29,12 +29,8 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - ExtensionSettings: config.ExtensionSettings{ - NameVal: typeStr, - TypeVal: typeStr, - }, - }, - cfg) + ExtensionSettings: config.NewExtensionSettings(typeStr), + }, cfg) assert.NoError(t, configcheck.ValidateConfig(cfg)) ext, err := createExtension(context.Background(), component.ExtensionCreateParams{Logger: zap.NewNop()}, cfg) diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index c24f219d7051..aced09acae88 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -6,6 +6,6 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/shirou/gopsutil v3.21.2+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index 015cbe307f18..46bc922def07 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -1026,8 +1026,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/extension/httpforwarder/config.go b/extension/httpforwarder/config.go index 7a2772359b3b..3cbfa3530977 100644 --- a/extension/httpforwarder/config.go +++ b/extension/httpforwarder/config.go @@ -21,7 +21,7 @@ import ( // Config defines configuration for http forwarder extension. type Config struct { - config.ExtensionSettings `mapstructure:",squash"` + *config.ExtensionSettings `mapstructure:"-"` // Ingress holds config settings for HTTP server listening for requests. Ingress confighttp.HTTPServerSettings `mapstructure:"ingress"` diff --git a/extension/httpforwarder/factory.go b/extension/httpforwarder/factory.go index e82ddf924381..8a8412198ba9 100644 --- a/extension/httpforwarder/factory.go +++ b/extension/httpforwarder/factory.go @@ -42,10 +42,7 @@ func NewFactory() component.ExtensionFactory { func createDefaultConfig() config.Extension { return &Config{ - ExtensionSettings: config.ExtensionSettings{ - TypeVal: typeStr, - NameVal: string(typeStr), - }, + ExtensionSettings: config.NewExtensionSettings(typeStr), Ingress: confighttp.HTTPServerSettings{ Endpoint: defaultEndpoint, }, diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 66ffce3a0ff7..e5f181a9438a 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 9193c164a0a9..52770070f873 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -889,8 +889,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/extension/observer/hostobserver/config.go b/extension/observer/hostobserver/config.go index 03fb4c6143b9..822292fc7af9 100644 --- a/extension/observer/hostobserver/config.go +++ b/extension/observer/hostobserver/config.go @@ -22,7 +22,7 @@ import ( // Config defines configuration for host observer. type Config struct { - config.ExtensionSettings `mapstructure:",squash"` + *config.ExtensionSettings `mapstructure:"-"` // RefreshInterval determines how frequency at which the observer // needs to poll for collecting information about new processes. diff --git a/extension/observer/hostobserver/config_test.go b/extension/observer/hostobserver/config_test.go index 75c5a72581ed..5ebcafd5e6fb 100644 --- a/extension/observer/hostobserver/config_test.go +++ b/extension/observer/hostobserver/config_test.go @@ -45,7 +45,7 @@ func TestLoadConfig(t *testing.T) { ext1 := cfg.Extensions["host_observer/all_settings"] assert.Equal(t, &Config{ - ExtensionSettings: config.ExtensionSettings{ + ExtensionSettings: &config.ExtensionSettings{ TypeVal: "host_observer", NameVal: "host_observer/all_settings", }, diff --git a/extension/observer/hostobserver/factory.go b/extension/observer/hostobserver/factory.go index 570e640e350f..44b59106a722 100644 --- a/extension/observer/hostobserver/factory.go +++ b/extension/observer/hostobserver/factory.go @@ -40,11 +40,8 @@ func NewFactory() component.ExtensionFactory { func createDefaultConfig() config.Extension { return &Config{ - ExtensionSettings: config.ExtensionSettings{ - TypeVal: typeStr, - NameVal: string(typeStr), - }, - RefreshInterval: defaultCollectionInterval * time.Second, + ExtensionSettings: config.NewExtensionSettings(typeStr), + RefreshInterval: defaultCollectionInterval * time.Second, } } diff --git a/extension/observer/hostobserver/factory_test.go b/extension/observer/hostobserver/factory_test.go index 5a6279447116..f0bd044bd2d3 100644 --- a/extension/observer/hostobserver/factory_test.go +++ b/extension/observer/hostobserver/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" ) @@ -32,7 +33,9 @@ func TestCreateMetricsReceiver(t *testing.T) { hostObserver, err := createExtension( context.Background(), component.ExtensionCreateParams{}, - &Config{}, + &Config{ + ExtensionSettings: config.NewExtensionSettings(typeStr), + }, ) require.NoError(t, err) require.NotNil(t, hostObserver) diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 83768df7303c..99db02c9e2a0 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/shirou/gopsutil v3.21.2+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/extension/observer/k8sobserver/config.go b/extension/observer/k8sobserver/config.go index a0ab7ce083fe..1b43b7c4d8de 100644 --- a/extension/observer/k8sobserver/config.go +++ b/extension/observer/k8sobserver/config.go @@ -22,8 +22,8 @@ import ( // Config defines configuration for k8s attributes processor. type Config struct { - config.ExtensionSettings `mapstructure:",squash"` - k8sconfig.APIConfig `mapstructure:",squash"` + *config.ExtensionSettings `mapstructure:"-"` + k8sconfig.APIConfig `mapstructure:",squash"` // Node should be set to the node name to limit discovered endpoints to. For example, node name can // be set using the downward API inside the collector pod spec as follows: diff --git a/extension/observer/k8sobserver/config_test.go b/extension/observer/k8sobserver/config_test.go index 238096e78a11..c70ca902c440 100644 --- a/extension/observer/k8sobserver/config_test.go +++ b/extension/observer/k8sobserver/config_test.go @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { ext1 := cfg.Extensions["k8s_observer/1"] assert.Equal(t, &Config{ - ExtensionSettings: config.ExtensionSettings{ + ExtensionSettings: &config.ExtensionSettings{ TypeVal: "k8s_observer", NameVal: "k8s_observer/1", }, diff --git a/extension/observer/k8sobserver/factory.go b/extension/observer/k8sobserver/factory.go index 44e35320e579..b6cb9a840d76 100644 --- a/extension/observer/k8sobserver/factory.go +++ b/extension/observer/k8sobserver/factory.go @@ -50,11 +50,8 @@ func (f *Factory) Type() config.Type { // CreateDefaultConfig creates the default configuration for the extension. func (f *Factory) CreateDefaultConfig() config.Extension { return &Config{ - ExtensionSettings: config.ExtensionSettings{ - TypeVal: typeStr, - NameVal: string(typeStr), - }, - APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, + ExtensionSettings: config.NewExtensionSettings(typeStr), + APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, } } diff --git a/extension/observer/k8sobserver/factory_test.go b/extension/observer/k8sobserver/factory_test.go index ee4ce9f2b6b4..5b08be0b1c42 100644 --- a/extension/observer/k8sobserver/factory_test.go +++ b/extension/observer/k8sobserver/factory_test.go @@ -43,11 +43,8 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { factory := Factory{createK8sClientset: nilClient} cfg := factory.CreateDefaultConfig() assert.Equal(t, &Config{ - ExtensionSettings: config.ExtensionSettings{ - TypeVal: typeStr, - NameVal: string(typeStr), - }, - APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, + ExtensionSettings: config.NewExtensionSettings(typeStr), + APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, }, cfg) diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 77d29301b0dc..e5614cbb1ea5 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -14,7 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig 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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect k8s.io/api v0.20.5 diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index d698e14ea8f3..ee310db81516 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -1051,8 +1051,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/go.mod b/go.mod index 1fd6ed5bdf59..6261faf226bd 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 ) diff --git a/go.sum b/go.sum index f6af1cc60f28..c76ad4b70daa 100644 --- a/go.sum +++ b/go.sum @@ -1491,8 +1491,8 @@ 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.22.0/go.mod h1:sBkAGYUQSh1f+owCK0aPV2uLcUB6rPHEOWjdvuE2SdQ= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng= go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg= go.opentelemetry.io/otel/metric v0.19.0 h1:dtZ1Ju44gkJkYvo+3qGqVXmf88tc+a42edOywypengg= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 1b2aefe0b204..591daa986b11 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -5,6 +5,6 @@ go 1.15 require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index 123ed592f08f..278f7e73fb9f 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -895,8 +895,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/internal/stanza/go.mod b/internal/stanza/go.mod index b30b7f26e1c6..9c624b37ae0b 100644 --- a/internal/stanza/go.mod +++ b/internal/stanza/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/open-telemetry/opentelemetry-log-collection v0.16.1-0.20210315170618-aa8d82509c31 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/internal/stanza/go.sum b/internal/stanza/go.sum index a58b3f6083f6..416e78af3c0a 100644 --- a/internal/stanza/go.sum +++ b/internal/stanza/go.sum @@ -936,8 +936,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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.22.0/go.mod h1:sBkAGYUQSh1f+owCK0aPV2uLcUB6rPHEOWjdvuE2SdQ= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 2ff2c7f6737b..7b17bbb892e0 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -9,7 +9,7 @@ require ( github.com/jstemmer/go-junit-report v0.9.1 github.com/pavius/impi v0.0.3 github.com/tcnksm/ghr v0.13.0 - go.opentelemetry.io/collector/cmd/checkdoc v0.23.1-0.20210331231428-f8bdcf682f15 - go.opentelemetry.io/collector/cmd/issuegenerator v0.23.1-0.20210331231428-f8bdcf682f15 - go.opentelemetry.io/collector/cmd/mdatagen v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector/cmd/checkdoc v0.23.1-0.20210331235005-1edaf40cedaf + go.opentelemetry.io/collector/cmd/issuegenerator v0.23.1-0.20210331235005-1edaf40cedaf + go.opentelemetry.io/collector/cmd/mdatagen v0.23.1-0.20210331235005-1edaf40cedaf ) diff --git a/internal/tools/go.sum b/internal/tools/go.sum index cf61fdfbec12..70550bdeb5fc 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -682,12 +682,12 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= 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/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/cmd/checkdoc v0.23.1-0.20210331231428-f8bdcf682f15 h1:rvTWYYe2uvV/Z/isKFLdKIPZHzngqwDUmeoh9w7wgA4= -go.opentelemetry.io/collector/cmd/checkdoc v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:ocXcey1UOABwvbGLqOrCPY5TDxEV+T5XW4KoEicDZfs= -go.opentelemetry.io/collector/cmd/issuegenerator v0.23.1-0.20210331231428-f8bdcf682f15 h1:I7jSZ/rsNAgRf/O7yhvQWaYmOzN6BVSAMcUgeJuv+kE= -go.opentelemetry.io/collector/cmd/issuegenerator v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:RAUZ03z9JaCu9D+ox5p7LDcv/d4D02EiBJg0sOOzoVY= -go.opentelemetry.io/collector/cmd/mdatagen v0.23.1-0.20210331231428-f8bdcf682f15 h1:7mdgVvZuNcD53mcWAjlj+Cx+j4PYkow+IzJc1S7ckpM= -go.opentelemetry.io/collector/cmd/mdatagen v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:oWCxEeYMK/9i6cQEVs5YCWr5Q5KZn9uxnLLQxm8j/S4= +go.opentelemetry.io/collector/cmd/checkdoc v0.23.1-0.20210331235005-1edaf40cedaf h1:bHQrIx67XhMSw1n5iwxQlO3mnVzSmv3mBSitCGjVtA8= +go.opentelemetry.io/collector/cmd/checkdoc v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:ocXcey1UOABwvbGLqOrCPY5TDxEV+T5XW4KoEicDZfs= +go.opentelemetry.io/collector/cmd/issuegenerator v0.23.1-0.20210331235005-1edaf40cedaf h1:QGdTZvxgg8gbf+/+DNzhx9GJ8V4ZWMZoN67RDLvJBjg= +go.opentelemetry.io/collector/cmd/issuegenerator v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:RAUZ03z9JaCu9D+ox5p7LDcv/d4D02EiBJg0sOOzoVY= +go.opentelemetry.io/collector/cmd/mdatagen v0.23.1-0.20210331235005-1edaf40cedaf h1:Uj3EDNupBEA8ywlshB5jn8cd9+JR53qOlm65aM1u4TE= +go.opentelemetry.io/collector/cmd/mdatagen v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:oWCxEeYMK/9i6cQEVs5YCWr5Q5KZn9uxnLLQxm8j/S4= 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= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index dba0a3654a32..c2c791f4eb91 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,5 +4,5 @@ go 1.14 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 08f5cbf481d4..817347088f5a 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -870,8 +870,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index 37484f5fe605..88ebe4c180ae 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,5 +4,5 @@ go 1.14 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf ) diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index 08f5cbf481d4..817347088f5a 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -870,8 +870,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/pkg/batchpertrace/go.mod b/pkg/batchpertrace/go.mod index e5ba27c0a674..4db99df17226 100644 --- a/pkg/batchpertrace/go.mod +++ b/pkg/batchpertrace/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf ) replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal => ../batchpersignal diff --git a/pkg/batchpertrace/go.sum b/pkg/batchpertrace/go.sum index 08f5cbf481d4..817347088f5a 100644 --- a/pkg/batchpertrace/go.sum +++ b/pkg/batchpertrace/go.sum @@ -870,8 +870,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/processor/groupbyattrsprocessor/config.go b/processor/groupbyattrsprocessor/config.go index b51dd36b275d..446e0566c2ee 100644 --- a/processor/groupbyattrsprocessor/config.go +++ b/processor/groupbyattrsprocessor/config.go @@ -20,7 +20,7 @@ import ( // Config is the configuration for the processor. type Config struct { - config.ProcessorSettings `mapstructure:",squash"` + *config.ProcessorSettings `mapstructure:"-"` // GroupByKeys describes the attribute names that are going to be used for grouping. // Must include at least one attribute name. diff --git a/processor/groupbyattrsprocessor/config_test.go b/processor/groupbyattrsprocessor/config_test.go index 130a41af94ba..1a4fb5f2bb01 100644 --- a/processor/groupbyattrsprocessor/config_test.go +++ b/processor/groupbyattrsprocessor/config_test.go @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { conf := cfg.Processors["groupbyattrs/custom"] assert.Equal(t, conf, &Config{ - ProcessorSettings: config.ProcessorSettings{ + ProcessorSettings: &config.ProcessorSettings{ TypeVal: "groupbyattrs", NameVal: "groupbyattrs/custom", }, diff --git a/processor/groupbyattrsprocessor/factory.go b/processor/groupbyattrsprocessor/factory.go index 1676057c4ced..ba54eac067fa 100644 --- a/processor/groupbyattrsprocessor/factory.go +++ b/processor/groupbyattrsprocessor/factory.go @@ -56,11 +56,8 @@ func NewFactory() component.ProcessorFactory { // createDefaultConfig creates the default configuration for the processor. func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: typeStr, - NameVal: string(typeStr), - }, - GroupByKeys: []string{}, + ProcessorSettings: config.NewProcessorSettings(typeStr), + GroupByKeys: []string{}, } } diff --git a/processor/groupbyattrsprocessor/factory_test.go b/processor/groupbyattrsprocessor/factory_test.go index a09ef75cf8a1..db3ac31cdb04 100644 --- a/processor/groupbyattrsprocessor/factory_test.go +++ b/processor/groupbyattrsprocessor/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.uber.org/zap" ) @@ -31,7 +32,8 @@ func TestDefaultConfiguration(t *testing.T) { func TestCreateTestProcessor(t *testing.T) { cfg := &Config{ - GroupByKeys: []string{"foo"}, + ProcessorSettings: config.NewProcessorSettings(typeStr), + GroupByKeys: []string{"foo"}, } params := component.ProcessorCreateParams{ diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 69bc36221f56..0bb2cdec25ba 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -13,7 +13,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/processor/groupbytraceprocessor/config.go b/processor/groupbytraceprocessor/config.go index 71ded0c2b27c..3fc086b7057f 100644 --- a/processor/groupbytraceprocessor/config.go +++ b/processor/groupbytraceprocessor/config.go @@ -22,7 +22,7 @@ import ( // Config is the configuration for the processor. type Config struct { - config.ProcessorSettings `mapstructure:",squash"` + *config.ProcessorSettings `mapstructure:"-"` // NumTraces is the max number of traces to keep in memory waiting for the duration. // Default: 1_000_000. diff --git a/processor/groupbytraceprocessor/factory.go b/processor/groupbytraceprocessor/factory.go index 5b2f417b9b11..e187cb758798 100644 --- a/processor/groupbytraceprocessor/factory.go +++ b/processor/groupbytraceprocessor/factory.go @@ -55,12 +55,9 @@ func NewFactory() component.ProcessorFactory { // createDefaultConfig creates the default configuration for the processor. func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: typeStr, - NameVal: string(typeStr), - }, - NumTraces: defaultNumTraces, - WaitDuration: defaultWaitDuration, + ProcessorSettings: config.NewProcessorSettings(typeStr), + NumTraces: defaultNumTraces, + WaitDuration: defaultWaitDuration, // not supported for now DiscardOrphans: defaultDiscardOrphans, diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index a0723e1c9b0e..ca79fcdefa63 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,7 +6,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index cffa99ad1556..bba480bf5e63 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -890,8 +890,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/processor/k8sprocessor/config.go b/processor/k8sprocessor/config.go index 1801a40a5472..0a0b854a1b43 100644 --- a/processor/k8sprocessor/config.go +++ b/processor/k8sprocessor/config.go @@ -22,7 +22,7 @@ import ( // Config defines configuration for k8s attributes processor. type Config struct { - config.ProcessorSettings `mapstructure:",squash"` + *config.ProcessorSettings `mapstructure:"-"` k8sconfig.APIConfig `mapstructure:",squash"` diff --git a/processor/k8sprocessor/config_test.go b/processor/k8sprocessor/config_test.go index 3a8ead0fb78b..2dff0584aca8 100644 --- a/processor/k8sprocessor/config_test.go +++ b/processor/k8sprocessor/config_test.go @@ -49,17 +49,14 @@ func TestLoadConfig(t *testing.T) { p0 := cfg.Processors["k8s_tagger"] assert.Equal(t, p0, &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: "k8s_tagger", - NameVal: "k8s_tagger", - }, - APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, + ProcessorSettings: config.NewProcessorSettings(typeStr), + APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, }) p1 := cfg.Processors["k8s_tagger/2"] assert.Equal(t, p1, &Config{ - ProcessorSettings: config.ProcessorSettings{ + ProcessorSettings: &config.ProcessorSettings{ TypeVal: "k8s_tagger", NameVal: "k8s_tagger/2", }, diff --git a/processor/k8sprocessor/factory.go b/processor/k8sprocessor/factory.go index 0699bc3f25d6..d44c6fcdf739 100644 --- a/processor/k8sprocessor/factory.go +++ b/processor/k8sprocessor/factory.go @@ -47,11 +47,8 @@ func NewFactory() component.ProcessorFactory { func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: config.Type(typeStr), - NameVal: typeStr, - }, - APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, + ProcessorSettings: config.NewProcessorSettings(typeStr), + APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, } } diff --git a/processor/k8sprocessor/go.mod b/processor/k8sprocessor/go.mod index 0c931a97a7fd..a815181c2536 100644 --- a/processor/k8sprocessor/go.mod +++ b/processor/k8sprocessor/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect k8s.io/api v0.20.5 diff --git a/processor/k8sprocessor/go.sum b/processor/k8sprocessor/go.sum index d698e14ea8f3..ee310db81516 100644 --- a/processor/k8sprocessor/go.sum +++ b/processor/k8sprocessor/go.sum @@ -1051,8 +1051,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/processor/metricstransformprocessor/config.go b/processor/metricstransformprocessor/config.go index 1b86b48a24eb..d0c996ffe196 100644 --- a/processor/metricstransformprocessor/config.go +++ b/processor/metricstransformprocessor/config.go @@ -55,7 +55,7 @@ const ( // Config defines configuration for Resource processor. type Config struct { - config.ProcessorSettings `mapstructure:",squash"` + *config.ProcessorSettings `mapstructure:"-"` // Transform specifies a list of transforms on metrics with each transform focusing on one metric. Transforms []Transform `mapstructure:"transforms"` diff --git a/processor/metricstransformprocessor/config_test.go b/processor/metricstransformprocessor/config_test.go index 8ae5fbd7c9e2..a46e69fd2ff7 100644 --- a/processor/metricstransformprocessor/config_test.go +++ b/processor/metricstransformprocessor/config_test.go @@ -35,10 +35,7 @@ func TestLoadingFullConfig(t *testing.T) { configFile: "config_full.yaml", filterName: "metricstransform", expCfg: &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: "metricstransform", - NameVal: "metricstransform", - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), Transforms: []Transform{ { MetricIncludeFilter: FilterConfig{ @@ -55,7 +52,7 @@ func TestLoadingFullConfig(t *testing.T) { configFile: "config_full.yaml", filterName: "metricstransform/multiple", expCfg: &Config{ - ProcessorSettings: config.ProcessorSettings{ + ProcessorSettings: &config.ProcessorSettings{ TypeVal: "metricstransform", NameVal: "metricstransform/multiple", }, @@ -142,10 +139,7 @@ func TestLoadingFullConfig(t *testing.T) { configFile: "config_deprecated.yaml", filterName: "metricstransform", expCfg: &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: "metricstransform", - TypeVal: typeStr, - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), Transforms: []Transform{ { MetricName: "old_name", diff --git a/processor/metricstransformprocessor/factory.go b/processor/metricstransformprocessor/factory.go index 57895d0f3d60..0df9ebfe8e49 100644 --- a/processor/metricstransformprocessor/factory.go +++ b/processor/metricstransformprocessor/factory.go @@ -43,10 +43,7 @@ func NewFactory() component.ProcessorFactory { func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), } } diff --git a/processor/metricstransformprocessor/factory_test.go b/processor/metricstransformprocessor/factory_test.go index afb13f0dfe38..9402bf8ca6df 100644 --- a/processor/metricstransformprocessor/factory_test.go +++ b/processor/metricstransformprocessor/factory_test.go @@ -41,10 +41,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() assert.Equal(t, cfg, &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: typeStr, - TypeVal: typeStr, - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), }) assert.NoError(t, configcheck.ValidateConfig(cfg)) } diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index c689de23ab11..194b5ce45aa9 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/processor/metricstransformprocessor/metrics_transform_processor_group_test.go b/processor/metricstransformprocessor/metrics_transform_processor_group_test.go index 51791d85cd1a..5b536a60cf60 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_group_test.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_group_test.go @@ -172,10 +172,7 @@ func TestMetricsGrouping(t *testing.T) { p := newMetricsTransformProcessor(zap.NewExample(), test.transforms) mtp, err := processorhelper.NewMetricsProcessor(&Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), }, next, p, processorhelper.WithCapabilities(processorCapabilities)) require.NoError(t, err) diff --git a/processor/metricstransformprocessor/metrics_transform_processor_test.go b/processor/metricstransformprocessor/metrics_transform_processor_test.go index 4e86b86f56ee..2f7193af9748 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_test.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_test.go @@ -40,10 +40,7 @@ func TestMetricsTransformProcessor(t *testing.T) { mtp, err := processorhelper.NewMetricsProcessor( &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), }, next, p, diff --git a/processor/resourcedetectionprocessor/config.go b/processor/resourcedetectionprocessor/config.go index 4f5355c0d35f..f8726901d90e 100644 --- a/processor/resourcedetectionprocessor/config.go +++ b/processor/resourcedetectionprocessor/config.go @@ -25,7 +25,7 @@ import ( // Config defines configuration for Resource processor. type Config struct { - config.ProcessorSettings `mapstructure:",squash"` + *config.ProcessorSettings `mapstructure:"-"` // Detectors is an ordered list of named detectors that should be // run to attempt to detect resource information. Detectors []string `mapstructure:"detectors"` diff --git a/processor/resourcedetectionprocessor/config_test.go b/processor/resourcedetectionprocessor/config_test.go index 6ef55bc57ec7..656547f2b04d 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -44,7 +44,7 @@ func TestLoadConfig(t *testing.T) { p2 := cfg.Processors["resourcedetection/gce"] assert.Equal(t, p2, &Config{ - ProcessorSettings: config.ProcessorSettings{ + ProcessorSettings: &config.ProcessorSettings{ TypeVal: "resourcedetection", NameVal: "resourcedetection/gce", }, @@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) { p3 := cfg.Processors["resourcedetection/ec2"] assert.Equal(t, p3, &Config{ - ProcessorSettings: config.ProcessorSettings{ + ProcessorSettings: &config.ProcessorSettings{ TypeVal: "resourcedetection", NameVal: "resourcedetection/ec2", }, diff --git a/processor/resourcedetectionprocessor/factory.go b/processor/resourcedetectionprocessor/factory.go index b0fd4ba7fbc4..98c4e6edd65f 100644 --- a/processor/resourcedetectionprocessor/factory.go +++ b/processor/resourcedetectionprocessor/factory.go @@ -87,13 +87,10 @@ func (*factory) Type() config.Type { func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, - Detectors: []string{env.TypeStr}, - Timeout: 5 * time.Second, - Override: true, + ProcessorSettings: config.NewProcessorSettings(typeStr), + Detectors: []string{env.TypeStr}, + Timeout: 5 * time.Second, + Override: true, } } diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 7fb616f06d17..da24eb73459d 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index ee020a991207..14d8494c28f8 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -1054,8 +1054,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go index dd26e5b27bed..5cb69a3fd8c1 100644 --- a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go +++ b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go @@ -26,6 +26,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/translator/internaldata" @@ -169,7 +170,12 @@ func TestResourceProcessor(t *testing.T) { tt.detectorKeys = []string{"mock"} } - cfg := &Config{Override: tt.override, Detectors: tt.detectorKeys, Timeout: time.Second} + cfg := &Config{ + ProcessorSettings: config.NewProcessorSettings(typeStr), + Override: tt.override, + Detectors: tt.detectorKeys, + Timeout: time.Second, + } // Test trace consuner ttn := new(consumertest.TracesSink) diff --git a/processor/routingprocessor/config.go b/processor/routingprocessor/config.go index b4dcb3a93126..a665a777e3b6 100644 --- a/processor/routingprocessor/config.go +++ b/processor/routingprocessor/config.go @@ -20,7 +20,7 @@ import ( // Config defines configuration for the Routing processor. type Config struct { - config.ProcessorSettings `mapstructure:",squash"` + *config.ProcessorSettings `mapstructure:"-"` // DefaultExporters contains the list of exporters to use when a more specific record can't be found in the routing table. // Optional. diff --git a/processor/routingprocessor/config_test.go b/processor/routingprocessor/config_test.go index fdd3727c4fbe..b4d8cc0b7431 100644 --- a/processor/routingprocessor/config_test.go +++ b/processor/routingprocessor/config_test.go @@ -46,12 +46,9 @@ func TestLoadConfig(t *testing.T) { parsed := cfg.Processors["routing"] assert.Equal(t, parsed, &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: "routing", - TypeVal: "routing", - }, - DefaultExporters: []string{"otlp"}, - FromAttribute: "X-Tenant", + ProcessorSettings: config.NewProcessorSettings(typeStr), + DefaultExporters: []string{"otlp"}, + FromAttribute: "X-Tenant", Table: []RoutingTableItem{ { Value: "acme", diff --git a/processor/routingprocessor/factory.go b/processor/routingprocessor/factory.go index 51ad9956b89d..9b3e73cdcb08 100644 --- a/processor/routingprocessor/factory.go +++ b/processor/routingprocessor/factory.go @@ -39,10 +39,7 @@ func NewFactory() component.ProcessorFactory { func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), } } diff --git a/processor/routingprocessor/factory_test.go b/processor/routingprocessor/factory_test.go index e9ca2e899942..6dfb6947ad85 100644 --- a/processor/routingprocessor/factory_test.go +++ b/processor/routingprocessor/factory_test.go @@ -34,12 +34,9 @@ func TestProcessorGetsCreatedWithValidConfiguration(t *testing.T) { factory := NewFactory() creationParams := component.ProcessorCreateParams{Logger: zap.NewNop()} cfg := &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: "routing", - TypeVal: "routing", - }, - DefaultExporters: []string{"otlp"}, - FromAttribute: "X-Tenant", + ProcessorSettings: config.NewProcessorSettings(typeStr), + DefaultExporters: []string{"otlp"}, + FromAttribute: "X-Tenant", Table: []RoutingTableItem{ { Value: "acme", @@ -75,12 +72,9 @@ func TestProcessorFailsToBeCreatedWhenRouteHasNoExporters(t *testing.T) { factory := NewFactory() creationParams := component.ProcessorCreateParams{Logger: zap.NewNop()} cfg := &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: "routing", - TypeVal: "routing", - }, - DefaultExporters: []string{"otlp"}, - FromAttribute: "X-Tenant", + ProcessorSettings: config.NewProcessorSettings(typeStr), + DefaultExporters: []string{"otlp"}, + FromAttribute: "X-Tenant", Table: []RoutingTableItem{ { Value: "acme", @@ -101,13 +95,10 @@ func TestProcessorFailsToBeCreatedWhenNoRoutesExist(t *testing.T) { factory := NewFactory() creationParams := component.ProcessorCreateParams{Logger: zap.NewNop()} cfg := &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: "routing", - TypeVal: "routing", - }, - DefaultExporters: []string{"otlp"}, - FromAttribute: "X-Tenant", - Table: []RoutingTableItem{}, + ProcessorSettings: config.NewProcessorSettings(typeStr), + DefaultExporters: []string{"otlp"}, + FromAttribute: "X-Tenant", + Table: []RoutingTableItem{}, } // test @@ -123,11 +114,8 @@ func TestProcessorFailsWithNoFromAttribute(t *testing.T) { factory := NewFactory() creationParams := component.ProcessorCreateParams{Logger: zap.NewNop()} cfg := &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: "routing", - TypeVal: "routing", - }, - DefaultExporters: []string{"otlp"}, + ProcessorSettings: config.NewProcessorSettings(typeStr), + DefaultExporters: []string{"otlp"}, Table: []RoutingTableItem{ { Value: "acme", @@ -149,12 +137,9 @@ func TestShouldNotFailWhenNextIsProcessor(t *testing.T) { factory := NewFactory() creationParams := component.ProcessorCreateParams{Logger: zap.NewNop()} cfg := &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: "routing", - TypeVal: "routing", - }, - DefaultExporters: []string{"otlp"}, - FromAttribute: "X-Tenant", + ProcessorSettings: config.NewProcessorSettings(typeStr), + DefaultExporters: []string{"otlp"}, + FromAttribute: "X-Tenant", Table: []RoutingTableItem{ { Value: "acme", @@ -178,12 +163,9 @@ func TestShutdown(t *testing.T) { factory := NewFactory() creationParams := component.ProcessorCreateParams{Logger: zap.NewNop()} cfg := &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: "routing", - TypeVal: "routing", - }, - DefaultExporters: []string{"otlp"}, - FromAttribute: "X-Tenant", + ProcessorSettings: config.NewProcessorSettings(typeStr), + DefaultExporters: []string{"otlp"}, + FromAttribute: "X-Tenant", Table: []RoutingTableItem{ { Value: "acme", diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index be2c643c6f16..31ff2fa9b24a 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/grpc v1.36.1 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/processor/routingprocessor/routing_test.go b/processor/routingprocessor/routing_test.go index 06aca8c9bfca..7d9448aef917 100644 --- a/processor/routingprocessor/routing_test.go +++ b/processor/routingprocessor/routing_test.go @@ -127,10 +127,7 @@ func TestRegisterExportersForValidRoute(t *testing.T) { otlpExpFactory := otlpexporter.NewFactory() creationParams := component.ExporterCreateParams{Logger: zap.NewNop()} otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.ExporterSettings{ - NameVal: "otlp", - TypeVal: "otlp", - }, + ExporterSettings: config.NewExporterSettings("otlp"), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, @@ -195,10 +192,7 @@ func TestErrorRequestedExporterNotFoundForDefaultRoute(t *testing.T) { otlpExpFactory := otlpexporter.NewFactory() creationParams := component.ExporterCreateParams{Logger: zap.NewNop()} otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.ExporterSettings{ - NameVal: "otlp", - TypeVal: "otlp", - }, + ExporterSettings: config.NewExporterSettings("otlp"), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, @@ -238,10 +232,7 @@ func TestInvalidExporter(t *testing.T) { require.NoError(t, err) otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.ExporterSettings{ - NameVal: "otlp", - TypeVal: "otlp", - }, + ExporterSettings: config.NewExporterSettings("otlp"), } host := &mockHost{ Host: componenttest.NewNopHost(), diff --git a/processor/spanmetricsprocessor/config.go b/processor/spanmetricsprocessor/config.go index edd5f3c95f59..1ce14d12b5a9 100644 --- a/processor/spanmetricsprocessor/config.go +++ b/processor/spanmetricsprocessor/config.go @@ -28,7 +28,7 @@ type Dimension struct { // Config defines the configuration options for spanmetricsprocessor. type Config struct { - config.ProcessorSettings `mapstructure:",squash"` + *config.ProcessorSettings `mapstructure:"-"` // MetricsExporter is the name of the metrics exporter to use to ship metrics. MetricsExporter string `mapstructure:"metrics_exporter"` diff --git a/processor/spanmetricsprocessor/config_test.go b/processor/spanmetricsprocessor/config_test.go index 44b327b0c454..3689334366c1 100644 --- a/processor/spanmetricsprocessor/config_test.go +++ b/processor/spanmetricsprocessor/config_test.go @@ -82,10 +82,7 @@ func TestLoadConfig(t *testing.T) { require.NotNil(t, cfg) assert.Equal(t, &Config{ - ProcessorSettings: config.ProcessorSettings{ - NameVal: "spanmetrics", - TypeVal: "spanmetrics", - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), MetricsExporter: tc.wantMetricsExporter, LatencyHistogramBuckets: tc.wantLatencyHistogramBuckets, Dimensions: tc.wantDimensions, diff --git a/processor/spanmetricsprocessor/factory.go b/processor/spanmetricsprocessor/factory.go index c8f1218abbf8..687c1f570335 100644 --- a/processor/spanmetricsprocessor/factory.go +++ b/processor/spanmetricsprocessor/factory.go @@ -39,10 +39,7 @@ func NewFactory() component.ProcessorFactory { func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), } } diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 7fdeab0e1f44..c79244634e11 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/grpc v1.36.1 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index 3b1cb605338a..c42c909ad139 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -468,10 +468,7 @@ func buildSpan(span span) pdata.Span { func newOTLPExporters(t *testing.T) (*otlpexporter.Config, component.MetricsExporter, component.TracesExporter) { otlpExpFactory := otlpexporter.NewFactory() otlpConfig := &otlpexporter.Config{ - ExporterSettings: config.ExporterSettings{ - NameVal: "otlp", - TypeVal: "otlp", - }, + ExporterSettings: config.NewExporterSettings("otlp"), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: "example.com:1234", }, diff --git a/processor/tailsamplingprocessor/config.go b/processor/tailsamplingprocessor/config.go index 8ade0f97e18b..cdbb98a64667 100644 --- a/processor/tailsamplingprocessor/config.go +++ b/processor/tailsamplingprocessor/config.go @@ -79,7 +79,7 @@ type RateLimitingCfg struct { // Config holds the configuration for tail-based sampling. type Config struct { - config.ProcessorSettings `mapstructure:",squash"` + *config.ProcessorSettings `mapstructure:"-"` // DecisionWait is the desired wait time from the arrival of the first span of // trace until the decision about sampling it or not is evaluated. DecisionWait time.Duration `mapstructure:"decision_wait"` diff --git a/processor/tailsamplingprocessor/config_test.go b/processor/tailsamplingprocessor/config_test.go index 8f73e539432d..8f3a673c286f 100644 --- a/processor/tailsamplingprocessor/config_test.go +++ b/processor/tailsamplingprocessor/config_test.go @@ -39,10 +39,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, cfg.Processors["tail_sampling"], &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: "tail_sampling", - NameVal: "tail_sampling", - }, + ProcessorSettings: config.NewProcessorSettings(typeStr), DecisionWait: 10 * time.Second, NumTraces: 100, ExpectedNewTracesPerSec: 10, diff --git a/processor/tailsamplingprocessor/factory.go b/processor/tailsamplingprocessor/factory.go index 073cbffc7e7d..a64d8179d4c4 100644 --- a/processor/tailsamplingprocessor/factory.go +++ b/processor/tailsamplingprocessor/factory.go @@ -49,12 +49,9 @@ func NewFactory() component.ProcessorFactory { func createDefaultConfig() config.Processor { return &Config{ - ProcessorSettings: config.ProcessorSettings{ - TypeVal: typeStr, - NameVal: typeStr, - }, - DecisionWait: 30 * time.Second, - NumTraces: 50000, + ProcessorSettings: config.NewProcessorSettings(typeStr), + DecisionWait: 30 * time.Second, + NumTraces: 50000, } } diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index 9613c5d4d6df..6a03839f0a1f 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 901cda893d87..279288216f0a 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index f7d561de4eb3..1fee5a54ec00 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -1050,8 +1050,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index eac5c295ba4c..154965dca426 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -15,7 +15,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray 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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index 23cfb6a656ab..5efc4dfb8d7d 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -1047,8 +1047,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index e42881679948..364855677611 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -15,7 +15,7 @@ require ( github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 83034fb4a80e..37f21074a034 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index f60235d632df..25e458c5b5cb 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index b2a6a4c8d691..909ed729e558 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -1042,8 +1042,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index f2d8ab656e9a..ff4cd75261d4 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 2a908e92839c..70e9ac6d9116 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-log-collection v0.16.1-0.20210315170618-aa8d82509c31 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 4d3d2649578c..04a5794f4b15 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -1071,8 +1071,8 @@ 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.22.0/go.mod h1:sBkAGYUQSh1f+owCK0aPV2uLcUB6rPHEOWjdvuE2SdQ= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index dca35ee4c09f..a8b4a782c592 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,6 +6,6 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tinylib/msgp v1.1.5 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 7e4a5851f796..32795bd6c399 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -1031,8 +1031,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index aadd48d59066..bf09b7a80c18 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/shirou/gopsutil v3.21.2+incompatible github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.9.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/atomic v1.7.0 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index b9a6b855e926..a0ad79b50849 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -1071,8 +1071,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index aa94670db81f..bddd58d8cd08 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,7 +12,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata 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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/atomic v1.7.0 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index f7f41a8fd3fc..2dfc591f3139 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -923,8 +923,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 88faf843d223..b264c25aef88 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -5,6 +5,6 @@ go 1.14 require ( github.com/Shopify/sarama v1.28.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 015cbe307f18..46bc922def07 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -1026,8 +1026,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 1bcb06e47f4f..1bc4cb87e4b3 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 642997e16984..f0860e6b246a 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -1048,8 +1048,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index b2141eed0579..ce53745781aa 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common 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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index d6993855af7f..c4aed4060a4d 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -1054,8 +1054,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 8ad9d78172b9..fb2dfccdaa36 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 6a8b0e04268f..7f64298eee39 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -1053,8 +1053,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index b190f4390ed3..b77fe5f2c8f6 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -15,7 +15,7 @@ require ( github.com/prometheus/common v0.20.0 github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index e8784fd3e65e..5d07fbf9516f 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -1048,8 +1048,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 0608a13c1ca9..dfdd6bfe63e1 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -17,7 +17,7 @@ require ( github.com/spf13/cast v1.3.1 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 1700d769f714..fedf41e0f3b7 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common 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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 00c46a305395..a9f8239b86a8 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -920,8 +920,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index a35188fcb4cc..2055cd94fc0f 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/signalfx/sapm-proto v0.7.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index b2e17d104096..39cd5f0454e0 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -1157,8 +1157,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 3c16c5979994..5a59f05c962f 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index f764cb5af818..0ccde489ec4f 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1071,8 +1071,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index 2a68bdffcecd..1c2088909671 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -37,6 +37,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" @@ -165,9 +166,10 @@ func Test_signalfxeceiver_EndToEnd(t *testing.T) { } expCfg := &signalfxexporter.Config{ - IngestURL: "http://" + addr + "/v2/datapoint", - APIURL: "http://localhost", - AccessToken: "access_token", + ExporterSettings: config.NewExporterSettings("signalfx"), + IngestURL: "http://" + addr + "/v2/datapoint", + APIURL: "http://localhost", + AccessToken: "access_token", } exp, err := signalfxexporter.NewFactory().CreateMetricsExporter( context.Background(), diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index ee132f18508d..e00daee8ddb1 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/prometheus/common v0.20.0 github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect k8s.io/client-go v0.20.5 diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 02e5fad68792..fb120c5adfc4 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -1050,8 +1050,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index ddbe9d8128f8..237c46dd66b5 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index e38e4531cd81..f2de87e91762 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -1029,8 +1029,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index 1cbee25c07ad..0d5ab4988527 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -34,6 +34,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" @@ -561,9 +562,9 @@ func Test_Logs_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - config := createDefaultConfig().(*Config) - config.Endpoint = "localhost:0" - config.initialize() + cfg := createDefaultConfig().(*Config) + cfg.Endpoint = "localhost:0" + cfg.initialize() receivedSplunkLogs := make(chan []byte) endServer := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { @@ -576,6 +577,7 @@ func Test_Logs_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { factory := splunkhecexporter.NewFactory() exporterConfig := splunkhecexporter.Config{ + ExporterSettings: config.NewExporterSettings("splunkhec"), Token: "ignored", SourceType: "defaultsourcetype", Index: "defaultindex", @@ -588,7 +590,7 @@ func Test_Logs_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { }, &exporterConfig) exporter.Start(context.Background(), nil) assert.NoError(t, err) - rcv, err := NewLogsReceiver(zap.NewNop(), *config, exporter) + rcv, err := NewLogsReceiver(zap.NewNop(), *cfg, exporter) assert.NoError(t, err) currentTime := float64(time.Now().UnixNano()) / 1e6 @@ -659,9 +661,9 @@ func Test_Metrics_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - config := createDefaultConfig().(*Config) - config.Endpoint = "localhost:0" - config.initialize() + cfg := createDefaultConfig().(*Config) + cfg.Endpoint = "localhost:0" + cfg.initialize() receivedSplunkMetrics := make(chan []byte) endServer := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { @@ -674,6 +676,7 @@ func Test_Metrics_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { factory := splunkhecexporter.NewFactory() exporterConfig := splunkhecexporter.Config{ + ExporterSettings: config.NewExporterSettings("splunkhec"), Token: "ignored", SourceType: "defaultsourcetype", Index: "defaultindex", @@ -686,7 +689,7 @@ func Test_Metrics_splunkhecReceiver_IndexSourceTypePassthrough(t *testing.T) { }, &exporterConfig) exporter.Start(context.Background(), nil) assert.NoError(t, err) - rcv, err := NewMetricsReceiver(zap.NewNop(), *config, exporter) + rcv, err := NewMetricsReceiver(zap.NewNop(), *cfg, exporter) assert.NoError(t, err) currentTime := float64(time.Now().UnixNano()) / 1e6 diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index b8aa964c79bd..305dd4268038 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.opentelemetry.io/otel v0.19.0 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index ee518622b01f..9b0d88367423 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng= go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg= go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 6ad8c59201c9..685e7de77298 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-log-collection v0.16.1-0.20210315170618-aa8d82509c31 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 0a4069cba4a6..22a1e3f286c1 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -944,8 +944,8 @@ 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.22.0/go.mod h1:sBkAGYUQSh1f+owCK0aPV2uLcUB6rPHEOWjdvuE2SdQ= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 1c074a209d61..643ca413abf4 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.26.0 ) diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 714729077d05..5ec22f6fd0b4 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index e1ee3f4f406b..ab3b3563c768 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -1046,8 +1046,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index c5eba792e042..7a5baffe64b7 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common 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.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index cda704543391..bbfb811602e8 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -1052,8 +1052,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/testbed/datasenders/carbon.go b/testbed/datasenders/carbon.go index 9434c890599d..7c3a2e4598e7 100644 --- a/testbed/datasenders/carbon.go +++ b/testbed/datasenders/carbon.go @@ -20,6 +20,7 @@ import ( "time" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/testbed/testbed" "go.uber.org/zap" @@ -49,12 +50,12 @@ func NewCarbonDataSender(port int) *CarbonDataSender { // Start the sender. func (cs *CarbonDataSender) Start() error { + factory := carbonexporter.NewFactory() cfg := &carbonexporter.Config{ - Endpoint: cs.GetEndpoint().String(), - Timeout: 5 * time.Second, + ExporterSettings: config.NewExporterSettings(factory.Type()), + Endpoint: cs.GetEndpoint().String(), + Timeout: 5 * time.Second, } - - factory := carbonexporter.NewFactory() params := component.ExporterCreateParams{Logger: zap.L()} exporter, err := factory.CreateMetricsExporter(context.Background(), params, cfg) diff --git a/testbed/datasenders/sapm.go b/testbed/datasenders/sapm.go index 0f429a6889d3..e136408914c5 100644 --- a/testbed/datasenders/sapm.go +++ b/testbed/datasenders/sapm.go @@ -19,6 +19,7 @@ import ( "fmt" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/testbed/testbed" "go.uber.org/zap" @@ -48,14 +49,15 @@ func NewSapmDataSender(port int) *SapmDataSender { // Start the sender. func (je *SapmDataSender) Start() error { + factory := sapmexporter.NewFactory() cfg := &sapmexporter.Config{ + ExporterSettings: config.NewExporterSettings(factory.Type()), Endpoint: fmt.Sprintf("http://%s/v2/trace", je.GetEndpoint()), DisableCompression: true, AccessToken: "MyToken", } var err error - factory := sapmexporter.NewFactory() params := component.ExporterCreateParams{Logger: zap.L()} exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) diff --git a/testbed/datasenders/signalfx.go b/testbed/datasenders/signalfx.go index 06890226f914..c1bfbcf868c8 100644 --- a/testbed/datasenders/signalfx.go +++ b/testbed/datasenders/signalfx.go @@ -19,6 +19,7 @@ import ( "fmt" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/testbed/testbed" "go.uber.org/zap" @@ -48,13 +49,14 @@ func NewSFxMetricDataSender(port int) *SFxMetricsDataSender { // Start the sender. func (sf *SFxMetricsDataSender) Start() error { + factory := signalfxexporter.NewFactory() cfg := &signalfxexporter.Config{ - IngestURL: fmt.Sprintf("http://%s/v2/datapoint", sf.GetEndpoint()), - APIURL: "http://localhost", - AccessToken: "access_token", + ExporterSettings: config.NewExporterSettings(factory.Type()), + IngestURL: fmt.Sprintf("http://%s/v2/datapoint", sf.GetEndpoint()), + APIURL: "http://localhost", + AccessToken: "access_token", } - factory := signalfxexporter.NewFactory() params := component.ExporterCreateParams{Logger: zap.L()} exporter, err := factory.CreateMetricsExporter(context.Background(), params, cfg) diff --git a/testbed/go.mod b/testbed/go.mod index 31782c9685b8..54fcda16abbe 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -15,7 +15,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 github.com/tinylib/msgp v1.1.5 // indirect - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 ) diff --git a/testbed/go.sum b/testbed/go.sum index 5438a9870d44..65d53e08b9bb 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1224,8 +1224,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 746f66cc9677..79dbc06b7ae4 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/gorilla/mux v1.8.0 github.com/pelletier/go-toml v1.8.0 // indirect - go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15 + go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index eabe4ec2e759..916a96a418cf 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -891,8 +891,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.23.1-0.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM= -go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0= +go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM= 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=