diff --git a/.chloggen/pdata-remove-moveto.yaml b/.chloggen/pdata-remove-moveto.yaml new file mode 100644 index 00000000000..b2f392d1839 --- /dev/null +++ b/.chloggen/pdata-remove-moveto.yaml @@ -0,0 +1,11 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: pdata + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove deprecated `[Metrics|Traces|Logs]MoveTo` methods. + +# One or more tracking issues or pull requests related to the change +issues: [7165] diff --git a/pdata/plog/logs.go b/pdata/plog/logs.go index 1947ad225ae..20bdbb485f8 100644 --- a/pdata/plog/logs.go +++ b/pdata/plog/logs.go @@ -36,14 +36,6 @@ func NewLogs() Logs { return newLogs(&otlpcollectorlog.ExportLogsServiceRequest{}) } -// MoveTo moves the Logs instance overriding the destination and -// resetting the current instance to its zero value. -// Deprecated: [1.0.0-rc5] The method can be replaced with a plain assignment. -func (ms Logs) MoveTo(dest Logs) { - *dest.getOrig() = *ms.getOrig() - *ms.getOrig() = otlpcollectorlog.ExportLogsServiceRequest{} -} - // CopyTo copies the Logs instance overriding the destination. func (ms Logs) CopyTo(dest Logs) { ms.ResourceLogs().CopyTo(dest.ResourceLogs()) diff --git a/pdata/plog/logs_test.go b/pdata/plog/logs_test.go index 64eba4d74d2..a8fbdad4760 100644 --- a/pdata/plog/logs_test.go +++ b/pdata/plog/logs_test.go @@ -116,15 +116,6 @@ func TestResourceLogsWireCompatibility(t *testing.T) { assert.EqualValues(t, logs.getOrig(), &gogoprotoRS2) } -func TestLogsMoveTo(t *testing.T) { - logs := NewLogs() - fillTestResourceLogsSlice(logs.ResourceLogs()) - dest := NewLogs() - logs.MoveTo(dest) - assert.EqualValues(t, NewLogs(), logs) - assert.EqualValues(t, generateTestResourceLogsSlice(), dest.ResourceLogs()) -} - func TestLogsCopyTo(t *testing.T) { logs := NewLogs() fillTestResourceLogsSlice(logs.ResourceLogs()) diff --git a/pdata/pmetric/metrics.go b/pdata/pmetric/metrics.go index bae9c73e7d8..e8d3a288091 100644 --- a/pdata/pmetric/metrics.go +++ b/pdata/pmetric/metrics.go @@ -41,14 +41,6 @@ func (ms Metrics) CopyTo(dest Metrics) { ms.ResourceMetrics().CopyTo(dest.ResourceMetrics()) } -// MoveTo moves the Metrics instance overriding the destination and -// resetting the current instance to its zero value. -// Deprecated: [1.0.0-rc5] The method can be replaced with a plain assignment. -func (ms Metrics) MoveTo(dest Metrics) { - *dest.getOrig() = *ms.getOrig() - *ms.getOrig() = otlpcollectormetrics.ExportMetricsServiceRequest{} -} - // ResourceMetrics returns the ResourceMetricsSlice associated with this Metrics. func (ms Metrics) ResourceMetrics() ResourceMetricsSlice { return newResourceMetricsSlice(&ms.getOrig().ResourceMetrics) diff --git a/pdata/pmetric/metrics_test.go b/pdata/pmetric/metrics_test.go index 54d026d3888..07c5e5e3f0b 100644 --- a/pdata/pmetric/metrics_test.go +++ b/pdata/pmetric/metrics_test.go @@ -193,15 +193,6 @@ func TestHistogramWithValidSum(t *testing.T) { assert.EqualValues(t, histo, dest) } -func TestMetricsMoveTo(t *testing.T) { - metrics := NewMetrics() - fillTestResourceMetricsSlice(metrics.ResourceMetrics()) - dest := NewMetrics() - metrics.MoveTo(dest) - assert.EqualValues(t, NewMetrics(), metrics) - assert.EqualValues(t, generateTestResourceMetricsSlice(), dest.ResourceMetrics()) -} - func TestOtlpToInternalReadOnly(t *testing.T) { md := newMetrics(&otlpcollectormetrics.ExportMetricsServiceRequest{ ResourceMetrics: []*otlpmetrics.ResourceMetrics{ diff --git a/pdata/ptrace/traces.go b/pdata/ptrace/traces.go index 757bd67f903..9c2baa76f12 100644 --- a/pdata/ptrace/traces.go +++ b/pdata/ptrace/traces.go @@ -36,14 +36,6 @@ func NewTraces() Traces { return newTraces(&otlpcollectortrace.ExportTraceServiceRequest{}) } -// MoveTo moves the Traces instance overriding the destination and -// resetting the current instance to its zero value. -// Deprecated: [1.0.0-rc5] The method can be replaced with a plain assignment. -func (ms Traces) MoveTo(dest Traces) { - *dest.getOrig() = *ms.getOrig() - *ms.getOrig() = otlpcollectortrace.ExportTraceServiceRequest{} -} - // CopyTo copies the Traces instance overriding the destination. func (ms Traces) CopyTo(dest Traces) { ms.ResourceSpans().CopyTo(dest.ResourceSpans()) diff --git a/pdata/ptrace/traces_test.go b/pdata/ptrace/traces_test.go index b2fc63529d6..9eded00eab6 100644 --- a/pdata/ptrace/traces_test.go +++ b/pdata/ptrace/traces_test.go @@ -117,15 +117,6 @@ func TestResourceSpansWireCompatibility(t *testing.T) { assert.EqualValues(t, traces.getOrig(), &gogoprotoRS2) } -func TestTracesMoveTo(t *testing.T) { - traces := NewTraces() - fillTestResourceSpansSlice(traces.ResourceSpans()) - dest := NewTraces() - traces.MoveTo(dest) - assert.EqualValues(t, NewTraces(), traces) - assert.EqualValues(t, generateTestResourceSpansSlice(), dest.ResourceSpans()) -} - func TestTracesCopyTo(t *testing.T) { traces := NewTraces() fillTestResourceSpansSlice(traces.ResourceSpans())