WIP: change to add log receiver

ymotongpoo · Nov 29, 2023 · 4b31d0f · 4b31d0f
1 parent e93317f
commit 4b31d0f
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 28 deletions.
diff --git a/receiver/discordreceiver/discord.go b/receiver/discordreceiver/discord.go
@@ -28,28 +28,54 @@ import (
 )
 
 type discordHandler struct {
-	session  *discordgo.Session
-	consumer consumer.Metrics
-	cancel   context.CancelFunc
-	config   *Config
-	obsrecv  *receiverhelper.ObsReport
-	mb       *metadata.MetricsBuilder
-	mcCh     chan messageCreateEvent
+	session         *discordgo.Session
+	metricsConsumer consumer.Metrics
+	logsConsumer    consumer.Logs
+	cancel          context.CancelFunc
+	config          *Config
+	obsrecv         *receiverhelper.ObsReport
+	mb              *metadata.MetricsBuilder
+	mcCh            chan messageCreateEvent
 }
 
-func newDiscordHandler(consumer consumer.Metrics, cfg *Config, settings receiver.CreateSettings, obsrecv *receiverhelper.ObsReport) (*discordHandler, error) {
+func newDiscordMetricsHandler(
+	consumer consumer.Metrics,
+	cfg *Config,
+	settings receiver.CreateSettings,
+	obsrecv *receiverhelper.ObsReport,
+) (*discordHandler, error) {
 	s, err := discordgo.New("Bot " + cfg.Token)
 	if err != nil {
 		return nil, err
 	}
 
 	dh := &discordHandler{
-		session:  s,
-		consumer: consumer,
-		config:   cfg,
-		obsrecv:  obsrecv,
-		mb:       metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, settings),
-		mcCh:     make(chan messageCreateEvent, 1000),
+		session:         s,
+		metricsConsumer: consumer,
+		config:          cfg,
+		obsrecv:         obsrecv,
+		mb:              metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, settings),
+		mcCh:            make(chan messageCreateEvent, 1000),
+	}
+	return dh, nil
+}
+
+func newDiscordLogsHandler(
+	consumer consumer.Logs,
+	cfg *Config,
+	settings receiver.CreateSettings,
+	obsrecv *receiverhelper.ObsReport,
+) (*discordHandler, error) {
+	s, err := discordgo.New("Bot " + cfg.Token)
+	if err != nil {
+		return nil, err
+	}
+	dh := &discordHandler{
+		session:      s,
+		logsConsumer: consumer,
+		config:       cfg,
+		obsrecv:      obsrecv,
+		mcCh:         make(chan messageCreateEvent, 1000),
 	}
 	return dh, nil
 }

diff --git a/receiver/discordreceiver/factory.go b/receiver/discordreceiver/factory.go
@@ -30,6 +30,7 @@ func NewFactory() receiver.Factory {
 		metadata.Type,
 		createDefaultConfig,
 		receiver.WithMetrics(createMetricsReceiver, metadata.MetricsStability),
+		receiver.WithLogs(createLogsReceiver, metadata.LogsStability),
 	)
 }
 
@@ -48,5 +49,22 @@ func createMetricsReceiver(
 	if err != nil {
 		return nil, err
 	}
-	return newDiscordReceiver(c, settings, consumer)
+	return newDiscordMetricsReceiver(c, settings, consumer)
+}
+
+func createLogsReceiver(
+	_ context.Context,
+	settings receiver.CreateSettings,
+	cfg component.Config,
+	consumer consumer.Logs,
+) (receiver.Logs, error) {
+	if consumer == nil {
+		return nil, component.ErrNilNextConsumer
+	}
+	c := cfg.(*Config)
+	err := c.Validate()
+	if err != nil {
+		return nil, err
+	}
+	return newDiscordLogsReceiver(c, settings, consumer)
 }
diff --git a/receiver/discordreceiver/internal/metadata/generated_status.go b/receiver/discordreceiver/internal/metadata/generated_status.go
diff --git a/receiver/discordreceiver/metadata.yaml b/receiver/discordreceiver/metadata.yaml
@@ -17,7 +17,7 @@ type: discord
 status:
   class: receiver
   stability:
-    development: [metrics]
+    development: [metrics, logs]
   codeowners:
     active: [ymotongpoo]
 

diff --git a/receiver/discordreceiver/receiver.go b/receiver/discordreceiver/receiver.go
@@ -25,15 +25,20 @@ import (
 )
 
 type discordReceiver struct {
-	consumer consumer.Metrics
-	settings receiver.CreateSettings
-	cancel   context.CancelFunc
-	config   *Config
-	dh       *discordHandler
-	obsrecv  *receiverhelper.ObsReport
+	metricsConsumer consumer.Metrics
+	logsConsumer    consumer.Logs
+	settings        receiver.CreateSettings
+	cancel          context.CancelFunc
+	config          *Config
+	dh              *discordHandler
+	obsrecv         *receiverhelper.ObsReport
 }
 
-func newDiscordReceiver(config *Config, settings receiver.CreateSettings, consumer consumer.Metrics) (*discordReceiver, error) {
+func newDiscordMetricsReceiver(
+	config *Config,
+	settings receiver.CreateSettings,
+	consumer consumer.Metrics,
+) (*discordReceiver, error) {
 	obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{
 		ReceiverID:             settings.ID,
 		Transport:              "event",
@@ -43,18 +48,39 @@ func newDiscordReceiver(config *Config, settings receiver.CreateSettings, consum
 		return nil, err
 	}
 	return &discordReceiver{
-		consumer: consumer,
-		settings: settings,
-		config:   config,
-		obsrecv:  obsrecv,
+		metricsConsumer: consumer,
+		settings:        settings,
+		config:          config,
+		obsrecv:         obsrecv,
+	}, nil
+}
+
+func newDiscordLogsReceiver(
+	config *Config,
+	settings receiver.CreateSettings,
+	consumer consumer.Logs,
+) (*discordReceiver, error) {
+	obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{
+		ReceiverID:             settings.ID,
+		Transport:              "event",
+		ReceiverCreateSettings: settings,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return &discordReceiver{
+		logsConsumer: consumer,
+		settings:     settings,
+		config:       config,
+		obsrecv:      obsrecv,
 	}, nil
 }
 
 func (r *discordReceiver) Start(ctx context.Context, _ component.Host) error {
 	ctx, r.cancel = context.WithCancel(ctx)
 
 	var err error
-	r.dh, err = newDiscordHandler(r.consumer, r.config, r.settings, r.obsrecv)
+	r.dh, err = newDiscordMetricsHandler(r.metricsConsumer, r.config, r.settings, r.obsrecv)
 	if err != nil {
 		return err
 	}