Skip to content

Commit

Permalink
Remove all deprecated funcs/structs from v0.46.0
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
bogdandrutu committed Mar 14, 2022
1 parent 317c08e commit be329e0
Show file tree
Hide file tree
Showing 18 changed files with 8 additions and 231 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Remove `Type` funcs in pdata (#4933)
- Rename `pdata.AttributeMap.Delete` to `pdata.AttributeMap.Remove` (#4914)
- pdata: deprecate funcs working with InternalRep (#4957)
- Remove all deprecated funcs/structs from v0.46.0 (#4995)

### 💡 Enhancements 💡

Expand Down
3 changes: 0 additions & 3 deletions cmd/builder/internal/builder/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ type Module struct {
Path string `mapstructure:"path"` // an optional path to the local version of this module
}

// Deprecated: [v0.46.0] Use NewDefaultConfig instead
var DefaultConfig = NewDefaultConfig

// NewDefaultConfig creates a new config, with default values
func NewDefaultConfig() Config {
log, err := zap.NewDevelopment()
Expand Down
4 changes: 2 additions & 2 deletions cmd/builder/internal/builder/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ func TestInvalidModule(t *testing.T) {
}
}

func TestDefaultConfig(t *testing.T) {
cfg := DefaultConfig()
func TestNewDefaultConfig(t *testing.T) {
cfg := NewDefaultConfig()
require.NoError(t, cfg.ParseModules())
require.NoError(t, cfg.Validate())
}
8 changes: 4 additions & 4 deletions cmd/builder/internal/builder/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ import (
)

func TestGenerateDefault(t *testing.T) {
require.NoError(t, Generate(DefaultConfig()))
require.NoError(t, Generate(NewDefaultConfig()))
}

func TestGenerateInvalidCollectorVersion(t *testing.T) {
cfg := DefaultConfig()
cfg := NewDefaultConfig()
cfg.Distribution.OtelColVersion = "invalid"
err := Generate(cfg)
require.NoError(t, err)
}

func TestGenerateInvalidOutputPath(t *testing.T) {
cfg := DefaultConfig()
cfg := NewDefaultConfig()
cfg.Distribution.OutputPath = "/invalid"
err := Generate(cfg)
require.Error(t, err)
Expand All @@ -49,7 +49,7 @@ func TestGenerateAndCompileDefault(t *testing.T) {
log.Fatal(err)
}
defer os.RemoveAll(dir)
cfg := DefaultConfig()
cfg := NewDefaultConfig()
cfg.Distribution.OutputPath = dir

// we override this version, otherwise this would break during releases
Expand Down
6 changes: 0 additions & 6 deletions component/componenthelper/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ import (
"go.opentelemetry.io/collector/component"
)

// Deprecated: [v0.46.0] use component.StartFunc.
type StartFunc = component.StartFunc

// Deprecated: [v0.46.0] use component.ShutdownFunc.
type ShutdownFunc = component.ShutdownFunc

// Option represents the possible options for New.
type Option func(*baseComponent)

Expand Down
3 changes: 0 additions & 3 deletions config/confighttp/confighttp.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ type HTTPClientSettings struct {
IdleConnTimeout *time.Duration `mapstructure:"idle_conn_timeout"`
}

// Deprecated: [v0.46.0] Use NewDefaultHTTPClientSettings instead.
var DefaultHTTPClientSettings = NewDefaultHTTPClientSettings

// NewDefaultHTTPClientSettings returns HTTPClientSettings type object with
// the default values of 'MaxIdleConns' and 'IdleConnTimeout'.
// Other config options are not added as they are initialized with 'zero value' by GoLang as default.
Expand Down
3 changes: 0 additions & 3 deletions exporter/exporterhelper/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ type TimeoutSettings struct {
Timeout time.Duration `mapstructure:"timeout"`
}

// Deprecated: [v0.46.0] use NewDefaultTimeoutSettings instead.
var DefaultTimeoutSettings = NewDefaultTimeoutSettings

// NewDefaultTimeoutSettings returns the default settings for TimeoutSettings.
func NewDefaultTimeoutSettings() TimeoutSettings {
return TimeoutSettings{
Expand Down
46 changes: 0 additions & 46 deletions exporter/exporterhelper/factory.go

This file was deleted.

3 changes: 0 additions & 3 deletions exporter/exporterhelper/queued_retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ type RetrySettings struct {
MaxElapsedTime time.Duration `mapstructure:"max_elapsed_time"`
}

// Deprecated: [v0.46.0] use NewDefaultRetrySettings instead.
var DefaultRetrySettings = NewDefaultRetrySettings

// NewDefaultRetrySettings returns the default settings for RetrySettings.
func NewDefaultRetrySettings() RetrySettings {
return RetrySettings{
Expand Down
3 changes: 0 additions & 3 deletions exporter/exporterhelper/queued_retry_experimental.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ type QueueSettings struct {
PersistentStorageEnabled bool `mapstructure:"persistent_storage_enabled"`
}

// Deprecated: [v0.46.0] use NewDefaultQueueSettings instead.
var DefaultQueueSettings = NewDefaultQueueSettings

// NewDefaultQueueSettings returns the default settings for QueueSettings.
func NewDefaultQueueSettings() QueueSettings {
return QueueSettings{
Expand Down
3 changes: 0 additions & 3 deletions exporter/exporterhelper/queued_retry_inmemory.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ type QueueSettings struct {
QueueSize int `mapstructure:"queue_size"`
}

// Deprecated: [v0.46.0] use NewDefaultQueueSettings instead.
var DefaultQueueSettings = NewDefaultQueueSettings

// NewDefaultQueueSettings returns the default settings for QueueSettings.
func NewDefaultQueueSettings() QueueSettings {
return QueueSettings{
Expand Down
38 changes: 0 additions & 38 deletions extension/extensionhelper/factory.go

This file was deleted.

3 changes: 0 additions & 3 deletions internal/testcomponents/example_factories.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ func ExampleComponents() (
return
}

// Deprecated: [v0.46.0] use NewDefaultFactories instead.
var DefaultFactories = NewDefaultFactories

// NewDefaultFactories returns the set of components in "testdata/otelcol-config.yaml". This is only used by tests.
func NewDefaultFactories() (component.Factories, error) {
var errs error
Expand Down
4 changes: 1 addition & 3 deletions model/internal/pdata/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -511,9 +511,7 @@ func (am AttributeMap) Get(key string) (AttributeValue, bool) {
return AttributeValue{nil}, false
}

// Delete deletes the entry associated with the key and returns true if the key
// was present in the map, otherwise returns false.
// Deprecated: [v0.46.0] Use Remove instead.
// Deprecated: [v0.47.0] Use Remove instead.
func (am AttributeMap) Delete(key string) bool {
return am.Remove(key)
}
Expand Down
46 changes: 0 additions & 46 deletions processor/processorhelper/factory.go

This file was deleted.

16 changes: 0 additions & 16 deletions receiver/receiverhelper/doc.go

This file was deleted.

46 changes: 0 additions & 46 deletions receiver/receiverhelper/factory.go

This file was deleted.

3 changes: 0 additions & 3 deletions receiver/scraperhelper/scrapercontroller.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ type ScraperControllerSettings struct {
CollectionInterval time.Duration `mapstructure:"collection_interval"`
}

// Deprecated: [v0.46.0] use NewDefaultScraperControllerSettings instead.
var DefaultScraperControllerSettings = NewDefaultScraperControllerSettings

// NewDefaultScraperControllerSettings returns default scraper controller
// settings with a collection interval of one minute.
func NewDefaultScraperControllerSettings(cfgType config.Type) ScraperControllerSettings {
Expand Down

0 comments on commit be329e0

Please sign in to comment.