Skip to content

Commit

Permalink
[chore] remove usage of Clone method (open-telemetry#14600)
Browse files Browse the repository at this point in the history
Replacing in favour of CopyTo
  • Loading branch information
Alex Boten authored Sep 29, 2022
1 parent 455055d commit 46d8577
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions exporter/awskinesisexporter/internal/batch/encode_marshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ func (bm *batchMarshaller) Logs(ld plog.Logs) (*Batch, error) {
if errors.Is(err, ErrUnsupportedEncoding) {
return nil, err
}
errs = multierr.Append(errs, consumererror.NewLogs(err, export.Clone()))
errs = multierr.Append(errs, consumererror.NewLogs(err, export))
continue
}

if err := bt.AddRecord(data, bm.partitioner(export)); err != nil {
errs = multierr.Append(errs, consumererror.NewLogs(err, export.Clone()))
errs = multierr.Append(errs, consumererror.NewLogs(err, export))
}
}

Expand All @@ -89,12 +89,12 @@ func (bm *batchMarshaller) Traces(td ptrace.Traces) (*Batch, error) {
if errors.Is(err, ErrUnsupportedEncoding) {
return nil, err
}
errs = multierr.Append(errs, consumererror.NewTraces(err, export.Clone()))
errs = multierr.Append(errs, consumererror.NewTraces(err, export))
continue
}

if err := bt.AddRecord(data, bm.partitioner(span)); err != nil {
errs = multierr.Append(errs, consumererror.NewTraces(err, export.Clone()))
errs = multierr.Append(errs, consumererror.NewTraces(err, export))
}
}

Expand All @@ -121,12 +121,12 @@ func (bm *batchMarshaller) Metrics(md pmetric.Metrics) (*Batch, error) {
if errors.Is(err, ErrUnsupportedEncoding) {
return nil, err
}
errs = multierr.Append(errs, consumererror.NewMetrics(err, export.Clone()))
errs = multierr.Append(errs, consumererror.NewMetrics(err, export))
continue
}

if err := bt.AddRecord(data, bm.partitioner(export)); err != nil {
errs = multierr.Append(errs, consumererror.NewMetrics(err, export.Clone()))
errs = multierr.Append(errs, consumererror.NewMetrics(err, export))
}
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/resourcetotelemetry/resource_to_telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ func WrapMetricsExporter(set Settings, exporter component.MetricsExporter) compo
}

func convertToMetricsAttributes(md pmetric.Metrics) pmetric.Metrics {
cloneMd := md.Clone()
cloneMd := pmetric.NewMetrics()
md.CopyTo(cloneMd)
rms := cloneMd.ResourceMetrics()
for i := 0; i < rms.Len(); i++ {
resource := rms.At(i).Resource()
Expand Down

0 comments on commit 46d8577

Please sign in to comment.