From cbc6ce9d4f8a37f9e50ce6bab153fb208248f9a9 Mon Sep 17 00:00:00 2001
From: Dominik Rosiek <drosiek@sumologic.com>
Date: Mon, 13 May 2024 13:10:41 +0200
Subject: [PATCH 1/2] sumologicexporter!: remove deprecated configuration
 options and remove unused code

Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
---
 .chloggen/drosiek-refactor.yaml               |  27 +++++
 exporter/sumologicexporter/README.md          |  45 -------
 exporter/sumologicexporter/config.go          | 110 ++++++++----------
 exporter/sumologicexporter/exporter.go        |  91 +++++----------
 exporter/sumologicexporter/exporter_test.go   |  71 +----------
 exporter/sumologicexporter/factory.go         |  11 +-
 exporter/sumologicexporter/filter.go          |  66 -----------
 exporter/sumologicexporter/filter_test.go     |  58 ---------
 exporter/sumologicexporter/sender.go          |  10 --
 exporter/sumologicexporter/sender_test.go     |  23 +---
 exporter/sumologicexporter/source_format.go   |  77 ------------
 .../sumologicexporter/source_format_test.go   |  97 ---------------
 12 files changed, 113 insertions(+), 573 deletions(-)
 create mode 100644 .chloggen/drosiek-refactor.yaml
 delete mode 100644 exporter/sumologicexporter/filter.go
 delete mode 100644 exporter/sumologicexporter/filter_test.go
 delete mode 100644 exporter/sumologicexporter/source_format.go
 delete mode 100644 exporter/sumologicexporter/source_format_test.go

diff --git a/.chloggen/drosiek-refactor.yaml b/.chloggen/drosiek-refactor.yaml
new file mode 100644
index 000000000000..adbfa46917f3
--- /dev/null
+++ b/.chloggen/drosiek-refactor.yaml
@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# 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. filelogreceiver)
+component: sumologicexporter
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: remove deprecated configuration options
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [32315]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]
diff --git a/exporter/sumologicexporter/README.md b/exporter/sumologicexporter/README.md
index 1e354760c4e0..4f81f94eee95 100644
--- a/exporter/sumologicexporter/README.md
+++ b/exporter/sumologicexporter/README.md
@@ -85,13 +85,6 @@ exporters:
     # default = 1_048_576 (1MB)
     max_request_body_size: <max_request_body_size>
 
-    # List of regexes for attributes which should be send as metadata
-    # default = []
-    #
-    # This option is unsupported:
-    # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture
-    metadata_attributes: [<regex>]
-
     # format to use when sending logs to Sumo Logic, default = otlp,
     log_format: {otlp, json, text}
 
@@ -105,44 +98,6 @@ exporters:
     # default = false
     decompose_otlp_histograms: {true, false}
 
-    # Template for Graphite format.
-    # this option affects graphite format only
-    # By default this is "%{_metric_}".
-    #
-    # Please regfer to Source temmplates for formatting explanation:
-    # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#source-templates
-    #
-    # This option is unsupported:
-    # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture
-    graphite_template: <template>
-
-    # Desired source category. Useful if you want to override the source category configured for the source.
-    #
-    # Please regfer to Source temmplates for formatting explanation:
-    # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#source-templates
-    #
-    # This option is unsupported:
-    # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture
-    source_category: <template>
-
-    # Desired source name. Useful if you want to override the source name configured for the source.
-    #
-    # Please regfer to Source temmplates for formatting explanation:
-    # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#source-templates
-    #
-    # This option is unsupported:
-    # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture
-    source_name: <template>
-
-    # Desired source host. Useful if you want to override the source hosy configured for the source.
-    #
-    # Please regfer to Source temmplates for formatting explanation:
-    # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#source-templates
-    #
-    # This option is unsupported:
-    # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture
-    source_host: <template>
-
     # timeout is the timeout for every attempt to send data to the backend,
     # maximum connection timeout is 55s, default = 5s
     timeout: <timeout>
diff --git a/exporter/sumologicexporter/config.go b/exporter/sumologicexporter/config.go
index 32457da54418..ba1e9e254474 100644
--- a/exporter/sumologicexporter/config.go
+++ b/exporter/sumologicexporter/config.go
@@ -46,22 +46,6 @@ type Config struct {
 	// Decompose OTLP Histograms into individual metrics, similar to how they're represented in Prometheus format
 	DecomposeOtlpHistograms bool `mapstructure:"decompose_otlp_histograms"`
 
-	// List of regexes for attributes which should be send as metadata
-	MetadataAttributes []string `mapstructure:"metadata_attributes"`
-
-	// Sumo specific options
-	// Desired source category.
-	// Useful if you want to override the source category configured for the source.
-	// Placeholders `%{attr_name}` will be replaced with attribute value for attr_name.
-	SourceCategory string `mapstructure:"source_category"`
-	// Desired source name.
-	// Useful if you want to override the source name configured for the source.
-	// Placeholders `%{attr_name}` will be replaced with attribute value for attr_name.
-	SourceName string `mapstructure:"source_name"`
-	// Desired host name.
-	// Useful if you want to override the source host configured for the source.
-	// Placeholders `%{attr_name}` will be replaced with attribute value for attr_name.
-	SourceHost string `mapstructure:"source_host"`
 	// Name of the client
 	Client string `mapstructure:"client"`
 
@@ -81,6 +65,53 @@ func createDefaultClientConfig() confighttp.ClientConfig {
 	}
 }
 
+func (cfg *Config) Validate() error {
+	switch cfg.LogFormat {
+	case OTLPLogFormat:
+	case JSONFormat:
+	case TextFormat:
+	default:
+		return fmt.Errorf("unexpected log format: %s", cfg.LogFormat)
+	}
+
+	switch cfg.MetricFormat {
+	case RemovedGraphiteFormat:
+		return fmt.Errorf("support for the graphite metric format was removed, please use prometheus or otlp instead")
+	case RemovedCarbon2Format:
+		return fmt.Errorf("support for the carbon2 metric format was removed, please use prometheus or otlp instead")
+	case PrometheusFormat:
+	case OTLPMetricFormat:
+	default:
+		return fmt.Errorf("unexpected metric format: %s", cfg.MetricFormat)
+	}
+
+	switch cfg.ClientConfig.Compression {
+	case configcompression.TypeGzip:
+	case configcompression.TypeDeflate:
+	case configcompression.TypeZstd:
+	case NoCompression:
+
+	default:
+		return fmt.Errorf("invalid compression encoding type: %v", cfg.ClientConfig.Compression)
+	}
+
+	if len(cfg.ClientConfig.Endpoint) == 0 && cfg.ClientConfig.Auth == nil {
+		return errors.New("no endpoint and no auth extension specified")
+	}
+
+	if _, err := url.Parse(cfg.ClientConfig.Endpoint); err != nil {
+		return fmt.Errorf("failed parsing endpoint URL: %s; err: %w",
+			cfg.ClientConfig.Endpoint, err,
+		)
+	}
+
+	if err := cfg.QueueSettings.Validate(); err != nil {
+		return fmt.Errorf("queue settings has invalid configuration: %w", err)
+	}
+
+	return nil
+}
+
 // LogFormatType represents log_format
 type LogFormatType string
 
@@ -141,50 +172,3 @@ const (
 	// DefaultStickySessionEnabled defines default StickySessionEnabled value
 	DefaultStickySessionEnabled bool = false
 )
-
-func (cfg *Config) Validate() error {
-	switch cfg.LogFormat {
-	case OTLPLogFormat:
-	case JSONFormat:
-	case TextFormat:
-	default:
-		return fmt.Errorf("unexpected log format: %s", cfg.LogFormat)
-	}
-
-	switch cfg.MetricFormat {
-	case RemovedGraphiteFormat:
-		return fmt.Errorf("support for the graphite metric format was removed, please use prometheus or otlp instead")
-	case RemovedCarbon2Format:
-		return fmt.Errorf("support for the carbon2 metric format was removed, please use prometheus or otlp instead")
-	case PrometheusFormat:
-	case OTLPMetricFormat:
-	default:
-		return fmt.Errorf("unexpected metric format: %s", cfg.MetricFormat)
-	}
-
-	switch cfg.ClientConfig.Compression {
-	case configcompression.TypeGzip:
-	case configcompression.TypeDeflate:
-	case configcompression.TypeZstd:
-	case NoCompression:
-
-	default:
-		return fmt.Errorf("invalid compression encoding type: %v", cfg.ClientConfig.Compression)
-	}
-
-	if len(cfg.ClientConfig.Endpoint) == 0 && cfg.ClientConfig.Auth == nil {
-		return errors.New("no endpoint and no auth extension specified")
-	}
-
-	if _, err := url.Parse(cfg.ClientConfig.Endpoint); err != nil {
-		return fmt.Errorf("failed parsing endpoint URL: %s; err: %w",
-			cfg.ClientConfig.Endpoint, err,
-		)
-	}
-
-	if err := cfg.QueueSettings.Validate(); err != nil {
-		return fmt.Errorf("queue settings has invalid configuration: %w", err)
-	}
-
-	return nil
-}
diff --git a/exporter/sumologicexporter/exporter.go b/exporter/sumologicexporter/exporter.go
index ccff5f6f2512..b12a8176d5fa 100644
--- a/exporter/sumologicexporter/exporter.go
+++ b/exporter/sumologicexporter/exporter.go
@@ -36,14 +36,11 @@ type sumologicexporter struct {
 	host   component.Host
 	logger *zap.Logger
 
-	sources             sourceFormats
-	filter              filter
-	prometheusFormatter prometheusFormatter
-	settings            component.TelemetrySettings
-
 	clientLock sync.RWMutex
 	client     *http.Client
 
+	prometheusFormatter prometheusFormatter
+
 	// Lock around data URLs is needed because the reconfiguration of the exporter
 	// can happen asynchronously whenever the exporter is re registering.
 	dataURLsLock   sync.RWMutex
@@ -60,65 +57,35 @@ type sumologicexporter struct {
 	id component.ID
 }
 
-func initExporter(cfg *Config, settings component.TelemetrySettings) (*sumologicexporter, error) {
-
-	if cfg.MetricFormat == RemovedGraphiteFormat {
-		settings.Logger.Error("`metric_format: graphite` nad `graphite_template` are no longer supported. See https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture for more information")
-	}
-
-	if cfg.MetricFormat == RemovedCarbon2Format {
-		settings.Logger.Error("`metric_format: carbon` is no longer supported. See https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture for more information")
-	}
-
-	if len(cfg.MetadataAttributes) > 0 {
-		settings.Logger.Warn("`metadata_attributes: []` is deprecated and is going to be removed in the future. See https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture for more information")
-	}
-
-	if cfg.SourceCategory != "" {
-		settings.Logger.Warn("`source_category: <template>` is deprecated and is going to be removed in the future. See https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture for more information")
-	}
-
-	if cfg.SourceHost != "" {
-		settings.Logger.Warn("`source_host: <template>` is deprecated and is going to be removed in the future. See https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture for more information")
-	}
-
-	if cfg.SourceName != "" {
-		settings.Logger.Warn("`source_name: <template>` is deprecated and is going to be removed in the future. See https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/sumologicexporter#migration-to-new-architecture for more information")
-	}
-
-	sfs := newSourceFormats(cfg)
-
-	f, err := newFilter(cfg.MetadataAttributes)
-	if err != nil {
-		return nil, err
-	}
-
-	pf := newPrometheusFormatter()
-
+func initExporter(cfg *Config, createSettings exporter.CreateSettings) *sumologicexporter {
 	se := &sumologicexporter{
-		logger:              settings.Logger,
-		config:              cfg,
-		sources:             sfs,
-		filter:              f,
-		prometheusFormatter: pf,
-		settings:            settings,
+		config: cfg,
+		logger: createSettings.Logger,
+		// NOTE: client is now set in start()
+		prometheusFormatter:     newPrometheusFormatter(),
+		id:                      createSettings.ID,
+		foundSumologicExtension: false,
 	}
 
-	return se, nil
+	se.logger.Info(
+		"Sumo Logic Exporter configured",
+		zap.String("log_format", string(cfg.LogFormat)),
+		zap.String("metric_format", string(cfg.MetricFormat)),
+	)
+
+	return se
 }
 
 func newLogsExporter(
+	ctx context.Context,
+	params exporter.CreateSettings,
 	cfg *Config,
-	set exporter.CreateSettings,
 ) (exporter.Logs, error) {
-	se, err := initExporter(cfg, set.TelemetrySettings)
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize the logs exporter: %w", err)
-	}
+	se := initExporter(cfg, params)
 
 	return exporterhelper.NewLogsExporter(
-		context.TODO(),
-		set,
+		ctx,
+		params,
 		cfg,
 		se.pushLogsData,
 		// Disable exporterhelper Timeout, since we are using a custom mechanism
@@ -132,17 +99,15 @@ func newLogsExporter(
 }
 
 func newMetricsExporter(
+	ctx context.Context,
+	params exporter.CreateSettings,
 	cfg *Config,
-	set exporter.CreateSettings,
 ) (exporter.Metrics, error) {
-	se, err := initExporter(cfg, set.TelemetrySettings)
-	if err != nil {
-		return nil, err
-	}
+	se := initExporter(cfg, params)
 
 	return exporterhelper.NewMetricsExporter(
-		context.TODO(),
-		set,
+		ctx,
+		params,
 		cfg,
 		se.pushMetricsData,
 		// Disable exporterhelper Timeout, since we are using a custom mechanism
@@ -286,8 +251,6 @@ func (se *sumologicexporter) pushLogsData(ctx context.Context, ld plog.Logs) err
 		se.logger,
 		se.config,
 		se.getHTTPClient(),
-		se.filter,
-		se.sources,
 		se.prometheusFormatter,
 		metricsURL,
 		logsURL,
@@ -365,8 +328,6 @@ func (se *sumologicexporter) pushMetricsData(ctx context.Context, md pmetric.Met
 		se.logger,
 		se.config,
 		se.getHTTPClient(),
-		se.filter,
-		se.sources,
 		se.prometheusFormatter,
 		metricsURL,
 		logsURL,
diff --git a/exporter/sumologicexporter/exporter_test.go b/exporter/sumologicexporter/exporter_test.go
index e2bfcc208bdb..9c8dfa76ce48 100644
--- a/exporter/sumologicexporter/exporter_test.go
+++ b/exporter/sumologicexporter/exporter_test.go
@@ -6,10 +6,8 @@ package sumologicexporter
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"net/http/httptest"
-	"strings"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -89,8 +87,7 @@ func prepareExporterTest(t *testing.T, cfg *Config, cb []func(w http.ResponseWri
 	cfg.ClientConfig.Endpoint = testServer.URL
 	cfg.ClientConfig.Auth = nil
 
-	exp, err := initExporter(cfg, createExporterCreateSettings().TelemetrySettings)
-	require.NoError(t, err)
+	exp := initExporter(cfg, createExporterCreateSettings())
 
 	require.NoError(t, exp.start(context.Background(), componenttest.NewNopHost()))
 
@@ -101,19 +98,6 @@ func prepareExporterTest(t *testing.T, cfg *Config, cb []func(w http.ResponseWri
 	}
 }
 
-func TestInitExporter(t *testing.T) {
-	_, err := initExporter(&Config{
-		LogFormat:        "json",
-		MetricFormat:     "carbon2",
-		CompressEncoding: "gzip",
-		ClientConfig: confighttp.ClientConfig{
-			Timeout:  defaultTimeout,
-			Endpoint: "test_endpoint",
-		},
-	}, componenttest.NewNopTelemetrySettings())
-	assert.NoError(t, err)
-}
-
 func TestAllSuccess(t *testing.T) {
 	test := prepareExporterTest(t, createTestConfig(), []func(w http.ResponseWriter, req *http.Request){
 		func(_ http.ResponseWriter, req *http.Request) {
@@ -142,14 +126,10 @@ func TestLogsResourceAttributesSentAsFields(t *testing.T) {
 			configFunc: func() *Config {
 				config := createTestConfig()
 				config.LogFormat = TextFormat
-				// config.MetadataAttributes = []string{".*"}
 				return config
 			},
 			callbacks: []func(w http.ResponseWriter, req *http.Request){
 				func(_ http.ResponseWriter, req *http.Request) {
-					// b, err := httputil.DumpRequest(req, true)
-					// assert.NoError(t, err)
-					// fmt.Printf("body:\n%s\n", string(b))
 					body := extractBody(t, req)
 					assert.Equal(t, "Example log\nAnother example log", body)
 					assert.Equal(t, "res_attr1=1, res_attr2=2", req.Header.Get("X-Sumo-Fields"))
@@ -260,7 +240,7 @@ func TestPartiallyFailed(t *testing.T) {
 }
 
 func TestInvalidHTTPCLient(t *testing.T) {
-	exp, err := initExporter(&Config{
+	exp := initExporter(&Config{
 		LogFormat:    "json",
 		MetricFormat: "otlp",
 		ClientConfig: confighttp.ClientConfig{
@@ -269,8 +249,7 @@ func TestInvalidHTTPCLient(t *testing.T) {
 				return nil, errors.New("roundTripperException")
 			},
 		},
-	}, createExporterCreateSettings().TelemetrySettings)
-	assert.NoError(t, err)
+	}, createExporterCreateSettings())
 
 	assert.EqualError(t,
 		exp.start(context.Background(), componenttest.NewNopHost()),
@@ -278,48 +257,6 @@ func TestInvalidHTTPCLient(t *testing.T) {
 	)
 }
 
-func TestPushFailedBatch(t *testing.T) {
-	t.Skip()
-
-	t.Parallel()
-
-	test := prepareExporterTest(t, createTestConfig(), []func(w http.ResponseWriter, req *http.Request){
-		func(w http.ResponseWriter, req *http.Request) {
-			w.WriteHeader(500)
-			body := extractBody(t, req)
-
-			expected := fmt.Sprintf(
-				"%s%s",
-				strings.Repeat("Example log\n", maxBufferSize-1),
-				"Example log",
-			)
-
-			assert.Equal(t, expected, body)
-			assert.Equal(t, "", req.Header.Get("X-Sumo-Fields"))
-		},
-		func(w http.ResponseWriter, req *http.Request) {
-			w.WriteHeader(200)
-			body := extractBody(t, req)
-
-			assert.Equal(t, `Example log`, body)
-			assert.Equal(t, "", req.Header.Get("X-Sumo-Fields"))
-		},
-	})
-
-	logs := logRecordsToLogs(exampleLog())
-	logs.ResourceLogs().EnsureCapacity(maxBufferSize + 1)
-	logs.MarkReadOnly()
-	log := logs.ResourceLogs().At(0)
-	rLogs := logs.ResourceLogs()
-
-	for i := 0; i < maxBufferSize; i++ {
-		log.CopyTo(rLogs.AppendEmpty())
-	}
-
-	err := test.exp.pushLogsData(context.Background(), logs)
-	assert.EqualError(t, err, "failed sending data: status: 500 Internal Server Error")
-}
-
 func TestPushLogs_DontRemoveSourceAttributes(t *testing.T) {
 	createLogs := func() plog.Logs {
 		logs := plog.NewLogs()
@@ -558,7 +495,7 @@ func TestMetricsPrometheusFormatMetadataFilter(t *testing.T) {
 	assert.NoError(t, err)
 }
 
-func TestGetSignalUrl(t *testing.T) {
+func TestGetSignalURL(t *testing.T) {
 	testCases := []struct {
 		description  string
 		signalType   component.Type
diff --git a/exporter/sumologicexporter/factory.go b/exporter/sumologicexporter/factory.go
index 9a5fbbf7087b..2918daed344f 100644
--- a/exporter/sumologicexporter/factory.go
+++ b/exporter/sumologicexporter/factory.go
@@ -35,9 +35,6 @@ func createDefaultConfig() component.Config {
 		MaxRequestBodySize: DefaultMaxRequestBodySize,
 		LogFormat:          DefaultLogFormat,
 		MetricFormat:       DefaultMetricFormat,
-		SourceCategory:     DefaultSourceCategory,
-		SourceName:         DefaultSourceName,
-		SourceHost:         DefaultSourceHost,
 		Client:             DefaultClient,
 
 		ClientConfig:         createDefaultClientConfig(),
@@ -48,11 +45,11 @@ func createDefaultConfig() component.Config {
 }
 
 func createLogsExporter(
-	_ context.Context,
+	ctx context.Context,
 	params exporter.CreateSettings,
 	cfg component.Config,
 ) (exporter.Logs, error) {
-	exp, err := newLogsExporter(cfg.(*Config), params)
+	exp, err := newLogsExporter(ctx, params, cfg.(*Config))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create the logs exporter: %w", err)
 	}
@@ -61,11 +58,11 @@ func createLogsExporter(
 }
 
 func createMetricsExporter(
-	_ context.Context,
+	ctx context.Context,
 	params exporter.CreateSettings,
 	cfg component.Config,
 ) (exporter.Metrics, error) {
-	exp, err := newMetricsExporter(cfg.(*Config), params)
+	exp, err := newMetricsExporter(ctx, params, cfg.(*Config))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create the metrics exporter: %w", err)
 	}
diff --git a/exporter/sumologicexporter/filter.go b/exporter/sumologicexporter/filter.go
deleted file mode 100644
index 6b5fe6e03824..000000000000
--- a/exporter/sumologicexporter/filter.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-package sumologicexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter"
-
-import (
-	"regexp"
-
-	"go.opentelemetry.io/collector/pdata/pcommon"
-)
-
-type filter struct {
-	regexes []*regexp.Regexp
-}
-
-func newFilter(flds []string) (filter, error) {
-	metadataRegexes := make([]*regexp.Regexp, len(flds))
-
-	for i, fld := range flds {
-		regex, err := regexp.Compile(fld)
-		if err != nil {
-			return filter{}, err
-		}
-
-		metadataRegexes[i] = regex
-	}
-
-	return filter{
-		regexes: metadataRegexes,
-	}, nil
-}
-
-// 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()
-
-	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.PutEmpty(k))
-					return true
-				}
-			}
-			return true
-		})
-	}
-	return newFields(returnValue)
-}
-
-// filterOut returns fields which don't match any of the filter regexes
-func (f *filter) filterOut(attributes pcommon.Map) fields {
-	returnValue := pcommon.NewMap()
-
-	attributes.Range(func(k string, v pcommon.Value) bool {
-		for _, regex := range f.regexes {
-			if regex.MatchString(k) {
-				return true
-			}
-		}
-		v.CopyTo(returnValue.PutEmpty(k))
-		return true
-	})
-	return newFields(returnValue)
-}
diff --git a/exporter/sumologicexporter/filter_test.go b/exporter/sumologicexporter/filter_test.go
deleted file mode 100644
index b9ede385543a..000000000000
--- a/exporter/sumologicexporter/filter_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-package sumologicexporter
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/pdata/pcommon"
-)
-
-func TestGetMetadata(t *testing.T) {
-	attributes1 := pcommon.NewMap()
-	attributes1.PutStr("key3", "to-be-overridden")
-	attributes1.PutStr("key1", "value1")
-	attributes1.PutStr("key2", "value2")
-	attributes1.PutStr("additional_key2", "value2")
-	attributes1.PutStr("additional_key3", "value3")
-	attributes2 := pcommon.NewMap()
-	attributes2.PutStr("additional_key1", "value1")
-	attributes2.PutStr("key3", "value3")
-
-	regexes := []string{"^key[12]", "^key3"}
-	f, err := newFilter(regexes)
-	require.NoError(t, err)
-
-	metadata := f.mergeAndFilterIn(attributes1, attributes2)
-	expected := fieldsFromMap(map[string]string{
-		"key1": "value1",
-		"key2": "value2",
-		"key3": "value3",
-	})
-	// Use string() because object comparison has not been reliable
-	assert.Equal(t, expected.string(), metadata.string())
-}
-
-func TestFilterOutMetadata(t *testing.T) {
-	attributes := pcommon.NewMap()
-	attributes.PutStr("key3", "value3")
-	attributes.PutStr("key1", "value1")
-	attributes.PutStr("key2", "value2")
-	attributes.PutStr("additional_key2", "value2")
-	attributes.PutStr("additional_key3", "value3")
-
-	regexes := []string{"^key[12]", "^key3"}
-	f, err := newFilter(regexes)
-	require.NoError(t, err)
-
-	data := f.filterOut(attributes)
-	expected := fieldsFromMap(map[string]string{
-		"additional_key2": "value2",
-		"additional_key3": "value3",
-	})
-	// Use string() because object comparison has not been reliable
-	assert.Equal(t, expected.string(), data.string())
-}
diff --git a/exporter/sumologicexporter/sender.go b/exporter/sumologicexporter/sender.go
index 1430bbf788ae..5ed1d491f2eb 100644
--- a/exporter/sumologicexporter/sender.go
+++ b/exporter/sumologicexporter/sender.go
@@ -113,8 +113,6 @@ type sender struct {
 	logger                     *zap.Logger
 	config                     *Config
 	client                     *http.Client
-	filter                     filter
-	sources                    sourceFormats
 	prometheusFormatter        prometheusFormatter
 	dataURLMetrics             string
 	dataURLLogs                string
@@ -125,9 +123,6 @@ type sender struct {
 }
 
 const (
-	// maxBufferSize defines size of the logBuffer (maximum number of plog.LogRecord entries)
-	maxBufferSize int = 1024 * 1024
-
 	headerContentType string = "Content-Type"
 	headerClient      string = "X-Sumo-Client"
 	headerHost        string = "X-Sumo-Host"
@@ -149,8 +144,6 @@ func newSender(
 	logger *zap.Logger,
 	cfg *Config,
 	cl *http.Client,
-	f filter,
-	s sourceFormats,
 	pf prometheusFormatter,
 	metricsURL string,
 	logsURL string,
@@ -163,8 +156,6 @@ func newSender(
 		logger:                     logger,
 		config:                     cfg,
 		client:                     cl,
-		filter:                     f,
-		sources:                    s,
 		prometheusFormatter:        pf,
 		dataURLMetrics:             metricsURL,
 		dataURLLogs:                logsURL,
@@ -673,7 +664,6 @@ func (s *sender) addRequestHeaders(req *http.Request, pipeline PipelineType, fld
 	}
 	return nil
 }
-
 func (s *sender) recordMetrics(duration time.Duration, count int64, req *http.Request, resp *http.Response, pipeline PipelineType) {
 	statusCode := 0
 
diff --git a/exporter/sumologicexporter/sender_test.go b/exporter/sumologicexporter/sender_test.go
index 5cd06ff0dd85..00e2d2b9200a 100644
--- a/exporter/sumologicexporter/sender_test.go
+++ b/exporter/sumologicexporter/sender_test.go
@@ -34,10 +34,13 @@ import (
 type senderTest struct {
 	reqCounter *int32
 	srv        *httptest.Server
-	exp        *sumologicexporter
 	s          *sender
 }
 
+// prepareSenderTest prepares sender test environment.
+// Provided cfgOpts additionally configure the sender after the sendible default
+// for tests have been applied.
+// The enclosed httptest.Server is closed automatically using test.Cleanup.
 func prepareSenderTest(t *testing.T, compression configcompression.Type, cb []func(w http.ResponseWriter, req *http.Request), cfgOpts ...func(*Config)) *senderTest {
 	var reqCounter int32
 	// generate a test server so we can capture and inspect the request
@@ -82,15 +85,6 @@ func prepareSenderTest(t *testing.T, compression configcompression.Type, cb []fu
 		cfgOpt(cfg)
 	}
 
-	exp, err := initExporter(cfg, componenttest.NewNopTelemetrySettings())
-	require.NoError(t, err)
-
-	f, err := newFilter([]string{})
-	require.NoError(t, err)
-
-	pf := newPrometheusFormatter()
-
-	err = exp.start(context.Background(), componenttest.NewNopHost())
 	require.NoError(t, err)
 
 	logger, err := zap.NewDevelopment()
@@ -99,18 +93,11 @@ func prepareSenderTest(t *testing.T, compression configcompression.Type, cb []fu
 	return &senderTest{
 		reqCounter: &reqCounter,
 		srv:        testServer,
-		exp:        exp,
 		s: newSender(
 			logger,
 			cfg,
 			client,
-			f,
-			sourceFormats{
-				host:     getTestSourceFormat("source_host"),
-				category: getTestSourceFormat("source_category"),
-				name:     getTestSourceFormat("source_name"),
-			},
-			pf,
+			newPrometheusFormatter(),
 			testServer.URL,
 			testServer.URL,
 			testServer.URL,
diff --git a/exporter/sumologicexporter/source_format.go b/exporter/sumologicexporter/source_format.go
deleted file mode 100644
index 3591c3be319e..000000000000
--- a/exporter/sumologicexporter/source_format.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-package sumologicexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter"
-
-import (
-	"fmt"
-	"regexp"
-)
-
-type sourceFormats struct {
-	name     sourceFormat
-	host     sourceFormat
-	category sourceFormat
-}
-
-type sourceFormat struct {
-	matches  []string
-	template string
-}
-
-const sourceRegex = `\%\{([\w\.]+)\}`
-
-// newSourceFormat builds sourceFormat basing on the regex and given text.
-// Regex is basing on the `sourceRegex` const
-// For given example text: `%{cluster}/%{namespace}“, it sets:
-//   - template to `%s/%s`, which can be used later by fmt.Sprintf
-//   - matches as map of (attribute) keys ({"cluster", "namespace"}) which will
-//     be used to put corresponding value into templates' `%s
-func newSourceFormat(r *regexp.Regexp, text string) sourceFormat {
-	matches := r.FindAllStringSubmatch(text, -1)
-	template := r.ReplaceAllString(text, "%s")
-
-	m := make([]string, len(matches))
-
-	for i, match := range matches {
-		m[i] = match[1]
-	}
-
-	return sourceFormat{
-		matches:  m,
-		template: template,
-	}
-}
-
-// newSourceFormats returns sourceFormats for name, host and category based on cfg
-func newSourceFormats(cfg *Config) sourceFormats {
-	r := regexp.MustCompile(sourceRegex)
-
-	return sourceFormats{
-		category: newSourceFormat(r, cfg.SourceCategory),
-		host:     newSourceFormat(r, cfg.SourceHost),
-		name:     newSourceFormat(r, cfg.SourceName),
-	}
-}
-
-// format converts sourceFormat to string.
-// Takes fields and put into template (%s placeholders) in order defined by matches
-func (s *sourceFormat) format(f fields) string {
-	labels := make([]any, 0, len(s.matches))
-
-	for _, matchset := range s.matches {
-		v, ok := f.orig.Get(matchset)
-		if ok {
-			labels = append(labels, v.AsString())
-		} else {
-			labels = append(labels, "")
-		}
-	}
-
-	return fmt.Sprintf(s.template, labels...)
-}
-
-// isSet returns true if template is non-empty
-func (s *sourceFormat) isSet() bool {
-	return len(s.template) > 0
-}
diff --git a/exporter/sumologicexporter/source_format_test.go b/exporter/sumologicexporter/source_format_test.go
deleted file mode 100644
index 86316972d77d..000000000000
--- a/exporter/sumologicexporter/source_format_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-package sumologicexporter
-
-import (
-	"regexp"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func getTestSourceFormat(template string) sourceFormat {
-	r := regexp.MustCompile(sourceRegex)
-
-	return newSourceFormat(r, template)
-}
-
-func TestNewSourceFormat(t *testing.T) {
-	expected := sourceFormat{
-		matches: []string{
-			"test",
-		},
-		template: "%s/test",
-	}
-
-	r := regexp.MustCompile(sourceRegex)
-
-	s := newSourceFormat(r, "%{test}/test")
-
-	assert.Equal(t, expected, s)
-}
-
-func TestNewSourceFormats(t *testing.T) {
-	expected := sourceFormats{
-		host: sourceFormat{
-			matches: []string{
-				"namespace",
-			},
-			template: "ns/%s",
-		},
-		name: sourceFormat{
-			matches: []string{
-				"pod",
-			},
-			template: "name/%s",
-		},
-		category: sourceFormat{
-			matches: []string{
-				"cluster",
-			},
-			template: "category/%s",
-		},
-	}
-
-	cfg := &Config{
-		SourceName:     "name/%{pod}",
-		SourceHost:     "ns/%{namespace}",
-		SourceCategory: "category/%{cluster}",
-	}
-
-	s := newSourceFormats(cfg)
-
-	assert.Equal(t, expected, s)
-}
-
-func TestFormat(t *testing.T) {
-	f := fieldsFromMap(map[string]string{
-		"key_1":        "value_1",
-		"key_2.subkey": "value_2",
-	})
-	s := getTestSourceFormat("%{key_1}/%{key_2.subkey}")
-	expected := "value_1/value_2"
-
-	result := s.format(f)
-	assert.Equal(t, expected, result)
-}
-
-func TestFormatNonExistingKey(t *testing.T) {
-	f := fieldsFromMap(map[string]string{"key_2": "value_2"})
-	s := getTestSourceFormat("%{key_1}/%{key_2}")
-
-	expected := "/value_2"
-
-	result := s.format(f)
-	assert.Equal(t, expected, result)
-}
-
-func TestIsSet(t *testing.T) {
-	s := getTestSourceFormat("%{key_1}/%{key_2}")
-	assert.True(t, s.isSet())
-}
-
-func TestIsNotSet(t *testing.T) {
-	s := getTestSourceFormat("")
-	assert.False(t, s.isSet())
-}

From 681152ab77a7cf7a60bb45a75160f78c52e5edb9 Mon Sep 17 00:00:00 2001
From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com>
Date: Tue, 14 May 2024 06:43:00 +0200
Subject: [PATCH 2/2] Update .chloggen/drosiek-refactor.yaml

---
 .chloggen/drosiek-refactor.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.chloggen/drosiek-refactor.yaml b/.chloggen/drosiek-refactor.yaml
index adbfa46917f3..736b4e46c23b 100644
--- a/.chloggen/drosiek-refactor.yaml
+++ b/.chloggen/drosiek-refactor.yaml
@@ -15,7 +15,9 @@ issues: [32315]
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
-subtext:
+subtext: |-
+  migration has been described in the following document
+  https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.100.0/exporter/sumologicexporter#migration-to-new-architecture
 
 # If your change doesn't affect end users or the exported elements of any package,
 # you should instead start your pull request title with [chore] or use the "Skip Changelog" label.