[exporter/sumologic] Make exporter not mutating data

The exporter unnecessary mutates log data just to temporarily copy resource attributes into log attributes. This change removes that redundant step which make the exporter not mutating anymore.

exporter/sumologicexporter/exporter.go

@@ -20,7 +20,6 @@ import (
  "net/http"
 
  "go.opentelemetry.io/collector/component"
- "go.opentelemetry.io/collector/consumer"
  "go.opentelemetry.io/collector/consumer/consumererror"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
  "go.opentelemetry.io/collector/pdata/pcommon"
@@ -84,7 +83,6 @@ func newLogsExporter(
  // Disable exporterhelper Timeout, since we are using a custom mechanism
  // within exporter itself
  exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
- exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: true}),
  exporterhelper.WithRetry(cfg.RetrySettings),
  exporterhelper.WithQueue(cfg.QueueSettings),
  exporterhelper.WithStart(se.start),
@@ -108,7 +106,6 @@ func newMetricsExporter(
  // Disable exporterhelper Timeout, since we are using a custom mechanism
  // within exporter itself
  exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
- exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: true}),
  exporterhelper.WithRetry(cfg.RetrySettings),
  exporterhelper.WithQueue(cfg.QueueSettings),
  exporterhelper.WithStart(se.start),
@@ -168,14 +165,7 @@ func (se *sumologicexporter) pushLogsData(ctx context.Context, ld plog.Logs) err
  for k := 0; k < logs.Len(); k++ {
  log := logs.At(k)
 
- // copy resource attributes into logs attributes
- // log attributes have precedence over resource attributes
- rl.Resource().Attributes().Range(func(k string, v pcommon.Value) bool {
- log.Attributes().Insert(k, v)
- return true
- })
-
- currentMetadata = sdr.filter.filterIn(log.Attributes())
+ currentMetadata = sdr.filter.mergeAndFilterIn(rl.Resource().Attributes(), log.Attributes())
 
  // If metadata differs from currently buffered, flush the buffer
  if currentMetadata.string() != previousMetadata.string() && previousMetadata.string() != "" {
@@ -274,7 +264,7 @@ func (se *sumologicexporter) pushMetricsData(ctx context.Context, md pmetric.Met
  attributes: attributes,
  }
 
- currentMetadata = sdr.filter.filterIn(attributes)
+ currentMetadata = sdr.filter.mergeAndFilterIn(attributes)
 
  // If metadata differs from currently buffered, flush the buffer
  if currentMetadata.string() != previousMetadata.string() && previousMetadata.string() != "" {

exporter/sumologicexporter/filter.go

@@ -41,19 +41,22 @@ func newFilter(flds []string) (filter, error) {
  }, nil
 }
 
-// filterIn returns fields which match at least one of the filter regexes
-func (f *filter) filterIn(attributes pcommon.Map) fields {
+// mergeAndFilterIn merges provided attribute maps and returns fields which match at least one of the filter regexes.
+// Later attribute maps take precedence over former ones.
+func (f *filter) mergeAndFilterIn(attrMaps ...pcommon.Map) fields {
  returnValue := pcommon.NewMap()
 
- attributes.Range(func(k string, v pcommon.Value) bool {
- for _, regex := range f.regexes {
- if regex.MatchString(k) {
- v.CopyTo(returnValue.UpsertEmpty(k))
- return true
+ for _, attributes := range attrMaps {
+ attributes.Range(func(k string, v pcommon.Value) bool {
+ for _, regex := range f.regexes {
+ if regex.MatchString(k) {
+ v.CopyTo(returnValue.UpsertEmpty(k))
+ return true
+ }
  }
- }
- return true
- })
+  return true
+ })
+ }
  returnValue.Sort()
  return newFields(returnValue)
 }

exporter/sumologicexporter/filter_test.go

@@ -23,18 +23,21 @@ import (
 )
 
 func TestGetMetadata(t *testing.T) {
- attributes := pcommon.NewMap()
- attributes.UpsertString("key3", "value3")
- attributes.UpsertString("key1", "value1")
- attributes.UpsertString("key2", "value2")
- attributes.UpsertString("additional_key2", "value2")
- attributes.UpsertString("additional_key3", "value3")
+ attributes1 := pcommon.NewMap()
+ attributes1.UpsertString("key3", "to-be-overridden")
+ attributes1.UpsertString("key1", "value1")
+ attributes1.UpsertString("key2", "value2")
+ attributes1.UpsertString("additional_key2", "value2")
+ attributes1.UpsertString("additional_key3", "value3")
+ attributes2 := pcommon.NewMap()
+ attributes2.UpsertString("additional_key1", "value1")
+ attributes2.UpsertString("key3", "value3")
 
  regexes := []string{"^key[12]", "^key3"}
  f, err := newFilter(regexes)
  require.NoError(t, err)
 
- metadata := f.filterIn(attributes)
+ metadata := f.mergeAndFilterIn(attributes1, attributes2)
  expected := fieldsFromMap(map[string]string{
  "key1": "value1",
  "key2": "value2",