rename NewAppLogEmitterFactory method

Author: corporatemax

src/cmd/syslog-agent/app/syslog_agent_mtls_test.go

@@ -144,9 +144,6 @@ var _ = Describe("SyslogAgent with mTLS", func() {
 		}
 		agentMetrics = metricsHelpers.NewMetricsRegistry()
 		agentLogr = log.New(GinkgoWriter, "", log.LstdFlags)
-
-		defaultFactory := syslog.NewDefaultAppLogEmitterFactory()
-		factory = &defaultFactory
 	})
 
 	JustBeforeEach(func() {
@@ -160,7 +157,9 @@ var _ = Describe("SyslogAgent with mTLS", func() {
 			agentCfg.Cache.PollingInterval = 10 * time.Millisecond
 		}
 
-		agent = app.NewSyslogAgent(agentCfg, agentMetrics, agentLogr, factory)
+		factory := syslog.NewAppLogEmitterFactory()
+
+		agent = app.NewSyslogAgent(agentCfg, agentMetrics, agentLogr, &factory)
 		go agent.Run()
 	})
 

src/cmd/syslog-agent/app/syslog_agent_test.go

@@ -124,9 +124,6 @@ var _ = Describe("SyslogAgent", func() {
 		}
 		agentMetrics = metricsHelpers.NewMetricsRegistry()
 		agentLogr = log.New(GinkgoWriter, "", log.LstdFlags)
-
-		defaultFactory := syslog.NewDefaultAppLogEmitterFactory()
-		factory = &defaultFactory
 	})
 
 	JustBeforeEach(func() {
@@ -140,7 +137,9 @@ var _ = Describe("SyslogAgent", func() {
 			agentCfg.Cache.PollingInterval = 10 * time.Millisecond
 		}
 
-		agent = app.NewSyslogAgent(agentCfg, agentMetrics, agentLogr, factory)
+		factory := syslog.NewAppLogEmitterFactory()
+
+		agent = app.NewSyslogAgent(agentCfg, agentMetrics, agentLogr, &factory)
 		go agent.Run()
 	})
 

src/cmd/syslog-agent/main.go

@@ -34,7 +34,7 @@ func main() {
 		),
 	)
 
-	factory := syslog.NewDefaultAppLogEmitterFactory()
+	factory := syslog.NewAppLogEmitterFactory()
 
 	app.NewSyslogAgent(cfg, m, logger, &factory).Run()
 }

src/internal/testhelper/spy_app_log_emitter.go

@@ -18,6 +18,6 @@ func (factory *SpyAppLogEmitterFactory) SourceIndex() string {
 func (factory *SpyAppLogEmitterFactory) NewAppLogEmitter(logClient syslog.LogClient, sourceIndex string) syslog.AppLogEmitter {
 	factory.logClient = logClient
 	factory.sourceIndex = sourceIndex
-	emitterFactory := syslog.NewDefaultAppLogEmitterFactory()
+	emitterFactory := syslog.NewAppLogEmitterFactory()
 	return emitterFactory.NewAppLogEmitter(logClient, sourceIndex)
 }

src/pkg/egress/syslog/app_log_emitter.go

@@ -49,6 +49,6 @@ func (factory *DefaultAppLogEmitterFactory) NewAppLogEmitter(logClient LogClient
 	}
 }
 
-func NewDefaultAppLogEmitterFactory() DefaultAppLogEmitterFactory {
+func NewAppLogEmitterFactory() DefaultAppLogEmitterFactory {
 	return DefaultAppLogEmitterFactory{}
 }

src/pkg/egress/syslog/app_log_emitter_test.go

@@ -11,7 +11,7 @@ var _ = Describe("Loggregator Emitter", func() {
 	Describe("DefaultAppLogEmitter", func() {
 		It("emits a log message", func() {
 			logClient := testhelper.NewSpyLogClient()
-			factory := syslog.NewDefaultAppLogEmitterFactory()
+			factory := syslog.NewAppLogEmitterFactory()
 			emitter := factory.NewAppLogEmitter(logClient, "0")
 
 			emitter.EmitLog("app-id", "some-message")
@@ -30,7 +30,7 @@ var _ = Describe("Loggregator Emitter", func() {
 
 		It("does not emit a log message if the appID is empty", func() {
 			logClient := testhelper.NewSpyLogClient()
-			factory := syslog.NewDefaultAppLogEmitterFactory()
+			factory := syslog.NewAppLogEmitterFactory()
 			emitter := factory.NewAppLogEmitter(logClient, "0")
 
 			emitter.EmitLog("", "some-message")
@@ -46,8 +46,8 @@ var _ = Describe("Loggregator Emitter", func() {
 	})
 
 	Describe("DefaultAppLogEmitterFactory", func() {
-		It("produces a DefaultAppLogEmitter", func() {
-			factory := syslog.NewDefaultAppLogEmitterFactory()
+		It("produces a AppLogEmitter", func() {
+			factory := syslog.NewAppLogEmitterFactory()
 			logClient := testhelper.NewSpyLogClient()
 			sourceIndex := "test-index"
 

src/pkg/egress/syslog/retry_writer_test.go

@@ -176,7 +176,7 @@ func buildRetryWriter(
 	maxRetries int,
 	delayMultiplier time.Duration,
 ) (egress.WriteCloser, error) {
-	factory := syslog.NewDefaultAppLogEmitterFactory()
+	factory := syslog.NewAppLogEmitterFactory()
 	emitter := factory.NewAppLogEmitter(testhelper.NewSpyLogClient(), "test-index")
 	return syslog.NewRetryWriter(
 		urlBinding,

src/pkg/egress/syslog/syslog_connector_test.go

@@ -174,7 +174,7 @@ var _ = Describe("SyslogConnector", func() {
 
 		It("emits a LGR and SYS log to the log client about logs that have been dropped", func() {
 			logClient := testhelper.NewSpyLogClient()
-			factory := syslog.NewDefaultAppLogEmitterFactory()
+			factory := syslog.NewAppLogEmitterFactory()
 			connector := syslog.NewSyslogConnector(
 				true,
 				spyWaitGroup,
@@ -217,7 +217,7 @@ var _ = Describe("SyslogConnector", func() {
 
 		It("doesn't emit LGR and SYS log to the log client about aggregate drains drops", func() {
 			logClient := testhelper.NewSpyLogClient()
-			factory := syslog.NewDefaultAppLogEmitterFactory()
+			factory := syslog.NewAppLogEmitterFactory()
 			connector := syslog.NewSyslogConnector(
 				true,
 				spyWaitGroup,

src/pkg/ingress/bindings/filtered_binding_fetcher_test.go

@@ -25,7 +25,7 @@ var _ = Describe("FilteredBindingFetcher", func() {
 
 	BeforeEach(func() {
 		metrics = metricsHelpers.NewMetricsRegistry()
-		factory := syslog.NewDefaultAppLogEmitterFactory()
+		factory := syslog.NewAppLogEmitterFactory()
 		emitter = factory.NewAppLogEmitter(testhelper.NewSpyLogClient(), "test-index")
 	})