Skip to content
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

fix: changing eventNames longer than configured max length to ":max-length-exceeded:" before sending to reporting #4244

Merged
merged 6 commits into from
Jan 3, 2024
Merged

fix: changing eventNames longer than configured max length to ":max-length-exceeded:" before sending to reporting #4244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f3675a
fix: changing eventName longer than 100 characters to INVALID_EVENT_NAME
vamsikrishnakandi Dec 18, 2023
6558222
Merge branch 'master' into fix.largeEventName
vamsikrishnakandi Dec 18, 2023
dca8f0d
fix: introduce constant for invalid event name
vamsikrishnakandi Dec 18, 2023
245052b
fix: made eventNameMaxLength configurable
vamsikrishnakandi Dec 18, 2023
162a411
fix: updated checking logic and default value
vamsikrishnakandi Dec 27, 2023
4bab9bf
Merge branch 'master' into fix.largeEventName
vamsikrishnakandi Dec 27, 2023
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
4 changes: 3 additions & 1 deletion config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,4 +254,6 @@ PgNotifier:
retriggerInterval: 2s
retriggerCount: 500
trackBatchInterval: 2s
maxAttempt: 3
maxAttempt: 3
Reporting:
eventNameMaxLength: 0
5 changes: 5 additions & 0 deletions enterprise/reporting/reporting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@
}
defer func() { _ = stmt.Close() }()

eventNameMaxLength := config.GetInt("Reporting.eventNameMaxLength", 0)
reportedAt := time.Now().UTC().Unix() / 60
for _, metric := range metrics {
workspaceID := r.configSubscriber.WorkspaceIDFromSource(metric.ConnectionDetails.SourceID)
Expand All @@ -589,6 +590,10 @@
metric = transformMetricForPII(metric, getPIIColumnsToExclude())
}

if eventNameMaxLength > 0 && len(metric.StatusDetail.EventName) > eventNameMaxLength {
metric.StatusDetail.EventName = types.MaxLengthExceeded
}

Check warning on line 595 in enterprise/reporting/reporting.go

View check run for this annotation

Codecov / codecov/patch

enterprise/reporting/reporting.go#L594-L595 

Added lines #L594 - L595 were not covered by tests

_, err = stmt.Exec(
workspaceID, r.namespace, r.instanceID,
metric.ConnectionDetails.SourceDefinitionId,
Expand Down
2 changes: 2 additions & 0 deletions utils/types/reporting_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ const (
DefaultReplayEnabled = false
)

const MaxLengthExceeded = ":max-length-exceeded:"

var (
DiffStatus = "diff"

Expand Down
Loading