Report DataDog internal Event ID (#6)

cirruslabs · Sep 20, 2023 · 272a534 · 272a534
1 parent dd249d7
commit 272a534
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/internal/command/datadog/datadog.go b/internal/command/datadog/datadog.go
@@ -156,7 +156,7 @@ func processWebhookEvent(
 		logger.Debugf("skipping event of type %q because we only process events of types %s",
 			presentedEventType, strings.Join(eventTypesSet.ToSlice(), ", "))
 
-		return nil
+		return ctx.String(http.StatusOK, fmt.Sprintf("skipping event of type %q", presentedEventType))
 	}
 
 	body, err := io.ReadAll(ctx.Request().Body)
@@ -183,11 +183,12 @@ func processWebhookEvent(
 	// Enrich the event with tags
 	enrichEventWithTags(body, evt, logger)
 
-	if err := sender.SendEvent(ctx.Request().Context(), evt); err != nil {
+	message, err := sender.SendEvent(ctx.Request().Context(), evt)
+	if err != nil {
 		return fmt.Errorf("%w: %v", ErrDatadogFailed, err)
 	}
 
-	return nil
+	return ctx.String(http.StatusCreated, message)
 }
 
 func verifyEvent(ctx echo.Context, body []byte) error {

diff --git a/internal/datadogsender/api.go b/internal/datadogsender/api.go
@@ -30,7 +30,7 @@ func NewAPISender(apiKey string, apiSite string) (*APISender, error) {
 	}, nil
 }
 
-func (sender *APISender) SendEvent(ctx context.Context, event *Event) error {
+func (sender *APISender) SendEvent(ctx context.Context, event *Event) (string, error) {
 	ctx = context.WithValue(
 		ctx,
 		datadog.ContextAPIKeys,
@@ -47,14 +47,18 @@ func (sender *APISender) SendEvent(ctx context.Context, event *Event) error {
 			"site": sender.apiSite,
 		})
 
-	_, _, err := sender.eventsAPI.CreateEvent(ctx, datadogV1.EventCreateRequest{
+	response, _, err := sender.eventsAPI.CreateEvent(ctx, datadogV1.EventCreateRequest{
 		Title: event.Title,
 		Text:  event.Text,
 		Tags:  event.Tags,
 	})
 	if err != nil {
-		return fmt.Errorf("%w: %v", ErrAPISenderFailed, err)
+		return "", fmt.Errorf("%w: %v", ErrAPISenderFailed, err)
 	}
 
-	return nil
+	if response.Event == nil {
+		return "", fmt.Errorf("%w: %v", ErrAPISenderFailed, "response.Event is nil")
+	}
+
+	return fmt.Sprintf("DataDog event id: %v", response.Event.Id), nil
 }
diff --git a/internal/datadogsender/datadogsender.go b/internal/datadogsender/datadogsender.go
@@ -9,5 +9,5 @@ type Event struct {
 }
 
 type Sender interface {
-	SendEvent(context.Context, *Event) error
+	SendEvent(context.Context, *Event) (string, error)
 }
diff --git a/internal/datadogsender/dogstatsd.go b/internal/datadogsender/dogstatsd.go
@@ -25,14 +25,14 @@ func NewDogstatsdSender(addr string) (*DogstatsdSender, error) {
 	}, nil
 }
 
-func (sender *DogstatsdSender) SendEvent(ctx context.Context, event *Event) error {
+func (sender *DogstatsdSender) SendEvent(ctx context.Context, event *Event) (string, error) {
 	if err := sender.client.Event(&statsd.Event{
 		Title: event.Title,
 		Text:  event.Text,
 		Tags:  event.Tags,
 	}); err != nil {
-		return fmt.Errorf("%w: %v", ErrDogstatsdSenderFailed, err)
+		return "", fmt.Errorf("%w: %v", ErrDogstatsdSenderFailed, err)
 	}
 
-	return nil
+	return "", nil
 }