Skip to content

OLED-262 - add observedTimestamp #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 17, 2023
Merged

OLED-262 - add observedTimestamp #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions enricher/ecs/ecs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ func (enr *Enricher) EnrichRecord(r map[interface{}]interface{}, t time.Time) ma
}
}
return map[interface{}]interface{}{
"resource": resource,
"body": body,
"timestamp": timestamp,
"observedTimestamp": t.UnixMilli(),
"resource": resource,
"body": body,
"timestamp": timestamp,
mappings.OBSERVED_TIMESTAMP: t.UnixMilli(),
}
}
4 changes: 2 additions & 2 deletions enricher/ecs/ecs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ func TestEnrichRecords(t *testing.T) {
"other_key_2": "other_value_2",
"other_key_3": "other_value_3",
},
"timestamp": "1234567890",
"observedTimestamp": int64(1257894425432),
"timestamp": "1234567890",
mappings.OBSERVED_TIMESTAMP: int64(1257894425432),
},
},
}
Expand Down
4 changes: 3 additions & 1 deletion enricher/eks/eks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ func NewEnricher() (*Enricher, error) {

var _ enricher.IEnricher = (*Enricher)(nil)

func (e Enricher) EnrichRecord(r map[interface{}]interface{}, _ time.Time) map[interface{}]interface{} {
func (e Enricher) EnrichRecord(r map[interface{}]interface{}, t time.Time) map[interface{}]interface{} {
// add resource attributes
r["resource"] = map[interface{}]interface{}{
mappings.RESOURCE_CLOUD_ACCOUNT_ID: e.AccountId,
mappings.RESOURCE_ACCOUNT_GROUP: e.CanvaAccountFunction,
}

r[mappings.OBSERVED_TIMESTAMP] = t.UnixMilli()

return r
}
28 changes: 17 additions & 11 deletions enricher/eks/eks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ func TestValidNewEnricher(t *testing.T) {
Name: "Gets AccountId",
Env: map[string]string{
mappings.ENV_ACCOUNT_ID: "1234567890",
mappings.ENV_ACCOUNT_GROUP: DummyAccountGroup,
mappings.ENV_ACCOUNT_GROUP: DummyAccountFunction,
},
Expected: &Enricher{
AccountId: "1234567890",
CanvaAccountFunction: DummyAccountGroup,
CanvaAccountFunction: DummyAccountFunction,
},
},
{
Expand Down Expand Up @@ -61,7 +61,7 @@ func TestInvalidNewEnricher(t *testing.T) {
assert.Error(t, err)
}

func TestEnrichRecordsWithAccountId(t *testing.T) {
func TestEnrichRecords(t *testing.T) {
var cases = []struct {
Name string
Enricher Enricher
Expand All @@ -72,21 +72,22 @@ func TestEnrichRecordsWithAccountId(t *testing.T) {
Name: "Adds Account Id",
Enricher: Enricher{
AccountId: "1234567",
CanvaAccountFunction: DummyAccountGroup,
CanvaAccountFunction: DummyAccountFunction,
},
Input: map[interface{}]interface{}{
"log": "hello world",
},
Expected: map[interface{}]interface{}{
"log": "hello world",
mappings.OBSERVED_TIMESTAMP: ExpectedTime,
"log": "hello world",
"resource": map[interface{}]interface{}{
mappings.RESOURCE_CLOUD_ACCOUNT_ID: "1234567",
mappings.RESOURCE_ACCOUNT_GROUP: DummyAccountGroup,
mappings.RESOURCE_ACCOUNT_GROUP: DummyAccountFunction,
},
},
},
{
Name: "Adds Account Group",
Name: "Adds Account Group Function",
Enricher: Enricher{
AccountId: DummyAccountId,
CanvaAccountFunction: "PII",
Expand All @@ -95,7 +96,8 @@ func TestEnrichRecordsWithAccountId(t *testing.T) {
"log": "hello world",
},
Expected: map[interface{}]interface{}{
"log": "hello world",
mappings.OBSERVED_TIMESTAMP: ExpectedTime,
"log": "hello world",
"resource": map[interface{}]interface{}{
mappings.RESOURCE_CLOUD_ACCOUNT_ID: DummyAccountId,
mappings.RESOURCE_ACCOUNT_GROUP: "PII",
Expand All @@ -113,7 +115,11 @@ func TestEnrichRecordsWithAccountId(t *testing.T) {
}

var (
DummyTime = time.Now()
DummyAccountGroup = "general"
DummyAccountId = "Account_Id"
DummyAccountFunction = "general"
DummyAccountId = "Account_Id"
DummyTime = time.Date(2009, time.November, 10, 23, 7, 5, 432000000, time.UTC)
)

var (
ExpectedTime = int64(1257894425432)
)
4 changes: 4 additions & 0 deletions enricher/mappings/mappings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package mappings

const (
OBSERVED_TIMESTAMP = "observedTimestamp"
)

const (
RESOURCE_CLOUD_ACCOUNT_ID = "cloud.account.id"
RESOURCE_ACCOUNT_GROUP = "canva.account.function"
Expand Down