Skip to content

Remove pdata deprecated funcs from 2 versions ago #5219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2022
Merged

Remove pdata deprecated funcs from 2 versions ago #5219

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22508a6
Remove pdata deprecated funcs from 2 versions ago
bogdandrutu Apr 14, 2022
45c793a
Merge branch 'main' into rmdeppdata
bogdandrutu Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### 🛑 Breaking changes 🛑

- Remove pdata deprecated funcs from 2 versions (v0.48.0) ago. (#5219)

### 🚩 Deprecations 🚩

### 💡 Enhancements 💡
Expand Down
29 changes: 0 additions & 29 deletions model/pdata/common.go
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions model/pdata/common_alias.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ import "go.opentelemetry.io/collector/pdata/pcommon"
// Deprecated: [v0.49.0] Use pcommon.ValueType instead.
type ValueType = pcommon.ValueType

// AttributeValueType is an alias for pcommon.ValueType type.
// Deprecated: [v0.48.0] Use ValueType instead.
type AttributeValueType = pcommon.ValueType

const (
// Deprecated: [v0.49.0] Use pcommon.ValueTypeEmpty instead.
ValueTypeEmpty = pcommon.ValueTypeEmpty
Expand All @@ -51,39 +47,12 @@ const (

// Deprecated: [v0.49.0] Use pcommon.ValueTypeBytes instead.
ValueTypeBytes = pcommon.ValueTypeBytes

// Deprecated: [v0.48.0] Use ValueTypeEmpty instead.
AttributeValueTypeEmpty = pcommon.ValueTypeEmpty

// Deprecated: [v0.48.0] Use ValueTypeString instead.
AttributeValueTypeString = pcommon.ValueTypeString

// Deprecated: [v0.48.0] Use ValueTypeInt instead.
AttributeValueTypeInt = pcommon.ValueTypeInt

// Deprecated: [v0.48.0] Use ValueTypeDouble instead.
AttributeValueTypeDouble = pcommon.ValueTypeDouble

// Deprecated: [v0.48.0] Use ValueTypeBool instead.
AttributeValueTypeBool = pcommon.ValueTypeBool

// Deprecated: [v0.48.0] Use ValueTypeMap instead.
AttributeValueTypeMap = pcommon.ValueTypeMap

// Deprecated: [v0.48.0] Use ValueTypeSlice instead.
AttributeValueTypeArray = pcommon.ValueTypeSlice

// Deprecated: [v0.48.0] Use ValueTypeBytes instead.
AttributeValueTypeBytes = pcommon.ValueTypeBytes
)

// Value is an alias for pcommon.Value struct.
// Deprecated: [v0.49.0] Use pcommon.Value instead.
type Value = pcommon.Value

// Deprecated: [v0.48.0] Use Value instead.
type AttributeValue = pcommon.Value

// Aliases for functions to create pcommon.Value.
var (

Expand All @@ -110,39 +79,12 @@ var (

// Deprecated: [v0.49.0] Use pcommon.NewValueBytes instead.
NewValueBytes = pcommon.NewValueBytes

// Deprecated: [v0.48.0] Use NewValueEmpty instead.
NewAttributeValueEmpty = pcommon.NewValueEmpty

// Deprecated: [v0.48.0] Use NewValueString instead.
NewAttributeValueString = pcommon.NewValueString

// Deprecated: [v0.48.0] Use NewValueInt instead.
NewAttributeValueInt = pcommon.NewValueInt

// Deprecated: [v0.48.0] Use NewValueDouble instead.
NewAttributeValueDouble = pcommon.NewValueDouble

// Deprecated: [v0.48.0] Use NewValueBool instead.
NewAttributeValueBool = pcommon.NewValueBool

// Deprecated: [v0.48.0] Use NewValueMap instead.
NewAttributeValueMap = pcommon.NewValueMap

// Deprecated: [v0.48.0] Use NewValueSlice instead.
NewAttributeValueArray = pcommon.NewValueSlice

// Deprecated: [v0.48.0] Use NewValueBytes instead.
NewAttributeValueBytes = pcommon.NewValueBytes
)

// Map is an alias for pcommon.Map struct.
// Deprecated: [v0.49.0] Use pcommon.Map instead.
type Map = pcommon.Map

// Deprecated: [v0.48.0] Use Map instead.
type AttributeMap = pcommon.Map

// Aliases for functions to create pcommon.Map.
var (
// Deprecated: [v0.49.0] Use pcommon.NewMap instead.
Expand All @@ -151,18 +93,3 @@ var (
// Deprecated: [v0.49.0] Use pcommon.NewMapFromRaw instead.
NewMapFromRaw = pcommon.NewMapFromRaw
)

// Deprecated: [v0.48.0] Use NewMap instead.
var NewAttributeMap = pcommon.NewMap

// Deprecated: [v0.48.0] Use Slice instead.
type AttributeValueSlice = pcommon.Slice

// Deprecated: [v0.48.0] Use NewSlice instead.
var NewAttributeValueSlice = pcommon.NewSlice

// Deprecated: [v0.48.0] Use InstrumentationScope instead.
type InstrumentationLibrary = pcommon.InstrumentationScope

// Deprecated: [v0.48.0] Use NewInstrumentationScope instead.
var NewInstrumentationLibrary = pcommon.NewInstrumentationScope
59 changes: 0 additions & 59 deletions model/pdata/common_test.go
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions model/pdata/logs_alias.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,3 @@ const (
// Deprecated: [v0.49.0] Use plog.SeverityNumberFATAL4 instead.
SeverityNumberFATAL4 = plog.SeverityNumberFATAL4
)

// Deprecated: [v0.48.0] Use ScopeLogsSlice instead.
type InstrumentationLibraryLogsSlice = plog.ScopeLogsSlice

// Deprecated: [v0.48.0] Use NewScopeLogsSlice instead.
var NewInstrumentationLibraryLogsSlice = plog.NewScopeLogsSlice

// Deprecated: [v0.48.0] Use ScopeLogs instead.
type InstrumentationLibraryLogs = plog.ScopeLogs

// Deprecated: [v0.48.0] Use NewScopeLogs instead.
var NewInstrumentationLibraryLogs = plog.NewScopeLogs
12 changes: 0 additions & 12 deletions model/pdata/metrics_alias.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,3 @@ const (
// Deprecated: [v0.49.0] Use pmetric.MetricValueTypeDouble instead.
MetricValueTypeDouble = pmetric.MetricValueTypeDouble
)

// Deprecated: [v0.48.0] Use ScopeMetricsSlice instead.
type InstrumentationLibraryMetricsSlice = pmetric.ScopeMetricsSlice

// Deprecated: [v0.48.0] Use NewScopeMetricsSlice instead.
var NewInstrumentationLibraryMetricsSlice = pmetric.NewScopeMetricsSlice

// Deprecated: [v0.48.0] Use ScopeMetrics instead.
type InstrumentationLibraryMetrics = pmetric.ScopeMetrics

// Deprecated: [v0.48.0] Use NewScopeMetrics instead.
var NewInstrumentationLibraryMetrics = pmetric.NewScopeMetrics
12 changes: 0 additions & 12 deletions model/pdata/traces_alias.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,3 @@ const (
// Deprecated: [v0.49.0] Use ptrace.StatusCodeError instead.
StatusCodeError = ptrace.StatusCodeError
)

// Deprecated: [v0.48.0] Use ScopeSpansSlice instead.
type InstrumentationLibrarySpansSlice = ptrace.ScopeSpansSlice

// Deprecated: [v0.48.0] Use NewScopeSpansSlice instead.
var NewInstrumentationLibrarySpansSlice = ptrace.NewScopeSpansSlice

// Deprecated: [v0.48.0] Use ScopeSpans instead.
type InstrumentationLibrarySpans = ptrace.ScopeSpans

// Deprecated: [v0.48.0] Use NewScopeSpans instead.
var NewInstrumentationLibrarySpans = ptrace.NewScopeSpans
10 changes: 0 additions & 10 deletions pdata/internal/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,3 @@ const (

// String returns the string representation of the SeverityNumber.
func (sn SeverityNumber) String() string { return otlplogs.SeverityNumber(sn).String() }

// Deprecated: [v0.48.0] Use ScopeLogs instead.
func (ms ResourceLogs) InstrumentationLibraryLogs() ScopeLogsSlice {
return ms.ScopeLogs()
}

// Deprecated: [v0.48.0] Use Scope instead.
func (ms ScopeLogs) InstrumentationLibrary() InstrumentationScope {
return ms.Scope()
}
10 changes: 0 additions & 10 deletions pdata/internal/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,3 @@ func (ot OptionalType) String() string {
}
return ""
}

// Deprecated: [v0.48.0] Use ScopeMetrics instead.
func (ms ResourceMetrics) InstrumentationLibraryMetrics() ScopeMetricsSlice {
return ms.ScopeMetrics()
}

// Deprecated: [v0.48.0] Use Scope instead.
func (ms ScopeMetrics) InstrumentationLibrary() InstrumentationScope {
return ms.Scope()
}
10 changes: 0 additions & 10 deletions pdata/internal/traces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,3 @@ const (

// String returns the string representation of the StatusCode.
func (sc StatusCode) String() string { return otlptrace.Status_StatusCode(sc).String() }

// Deprecated: [v0.48.0] Use ScopeSpans instead.
func (ms ResourceSpans) InstrumentationLibrarySpans() ScopeSpansSlice {
return ms.ScopeSpans()
}

// Deprecated: [v0.48.0] Use Scope instead.
func (ms ScopeSpans) InstrumentationLibrary() InstrumentationScope {
return ms.Scope()
}