From 30d3925119e498b4ae37571328c2c18c31c079cf Mon Sep 17 00:00:00 2001
From: Gavi Hirsch <gavriel.hirsch@clever.com>
Date: Tue, 11 Aug 2020 16:42:59 -0700
Subject: [PATCH] glue log group format

---
 splitter/splitter.go      | 4 ++--
 splitter/splitter_test.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/splitter/splitter.go b/splitter/splitter.go
index c332253..be32f7c 100644
--- a/splitter/splitter.go
+++ b/splitter/splitter.go
@@ -116,9 +116,9 @@ var awsFargateLogStreamRegex = regexp.MustCompile(`^fargate/([a-z0-9-]+)--([a-z0
 // RDS slowquery log groups are in the form of /aws/rds/cluster/<database name>/slowquery
 var awsRDSLogGroupRegex = regexp.MustCompile(`^/aws/rds/cluster/([a-z0-9-]+)/slowquery$`)
 
-// glue log groups are of the form /aws-glue/jobs/<env>/<app>
+// glue log groups are of the form /aws-glue/jobs/<env>/<app>/<pod-id>
 // glue log streams are of the form <job id>-<"driver" | "1" | "progress-bar">
-var awsGlueLogGroupRegex = regexp.MustCompile(`^/aws-glue/jobs/([a-z0-9-]+)/([a-z0-9-]+)$`)
+var awsGlueLogGroupRegex = regexp.MustCompile(`^/aws-glue/jobs/([a-z0-9-]+)/([a-z0-9-]+)/([a-z0-9-]+)$`)
 var awsGlueLogStreamRegex = regexp.MustCompile(`^(jr_[a-z0-9-]+)-.*$`)
 
 // arn and task cruft to satisfy parsing later on: https://github.com/Clever/amazon-kinesis-client-go/blob/94aacdf8339bd2cc8400d3bcb323dc1bce2c8422/decode/decode.go#L421-L425
diff --git a/splitter/splitter_test.go b/splitter/splitter_test.go
index 5ce1f46..170a1f1 100644
--- a/splitter/splitter_test.go
+++ b/splitter/splitter_test.go
@@ -258,7 +258,7 @@ func TestSplitGlue(t *testing.T) {
 	input := LogEventBatch{
 		MessageType:         "DATA_MESSAGE",
 		Owner:               "123456789012",
-		LogGroup:            "/aws-glue/jobs/clever-dev/analytics-district-participation",
+		LogGroup:            "/aws-glue/jobs/clever-dev/analytics-district-participation/aae75f00",
 		LogStream:           "jr_8927660fecacbe026ccab656cb80befea8102ac2023df531b92889b112aada28-1",
 		SubscriptionFilters: []string{"ForwardLogsToKinesis"},
 		LogEvents: []LogEvent{