Skip to content

RUM-17613: timeseries [2/5] Using updated timeseries schema from rum_event_schema #3712

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

Open
satween wants to merge 1 commit into
base: feature/timeseries
Choose a base branch
from
Open

RUM-17613: timeseries [2/5] Using updated timeseries schema from rum_event_schema #3712

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
2 changes: 2 additions & 0 deletions detekt_custom_safe_calls_third_party.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,8 @@ datadog:
- "kotlin.collections.listOf(com.datadog.android.rum.model.ErrorEvent.Interface)"
- "kotlin.collections.listOf(com.datadog.android.rum.model.LongTaskEvent.Interface)"
- "kotlin.collections.listOf(com.datadog.android.rum.model.ResourceEvent.Interface)"
- "kotlin.collections.listOf(com.datadog.android.rum.model.TimeseriesCpuEvent.Interface)"
- "kotlin.collections.listOf(com.datadog.android.rum.model.TimeseriesMemoryEvent.Interface)"
- "kotlin.collections.listOf(com.datadog.android.rum.model.ViewEvent.Interface)"
- "kotlin.collections.listOf(com.datadog.android.rum.model.VitalAppLaunchEvent.Interface)"
- "kotlin.collections.listOf(com.datadog.android.rum.model.VitalOperationStepEvent.Interface)"
Expand Down
632 changes: 575 additions & 57 deletions features/dd-sdk-android-rum/api/apiSurface
View file
Open in desktop

Large diffs are not rendered by default.

2,263 changes: 1,949 additions & 314 deletions features/dd-sdk-android-rum/api/dd-sdk-android-rum.api
View file
Open in desktop

Large diffs are not rendered by default.

39 changes: 37 additions & 2 deletions features/dd-sdk-android-rum/src/main/json/rum/_common-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "CommonProperties",
"type": "object",
"description": "Schema of common properties of RUM events",
"required": ["date", "application", "session", "view", "_dd"],
"required": ["date", "application", "session", "_dd"],
Comment thread
satween marked this conversation as resolved.
"properties": {
"date": {
"type": "integer",
Expand Down Expand Up @@ -92,7 +92,7 @@
"unity",
"kotlin-multiplatform",
"electron",
"rum-cpp",
"cpp",
Comment thread
satween marked this conversation as resolved.
"maui"
],
"readOnly": true
Expand Down Expand Up @@ -173,6 +173,20 @@
},
"readOnly": true
},
"tab": {
"type": "object",
"description": "Tab properties",
"required": ["id"],
"properties": {
"id": {
"type": "string",
"description": "UUID of the browser tab",
"pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$",
"readOnly": true
}
},
"readOnly": true
},
"connectivity": {
"type": "object",
"description": "Device connectivity properties",
Expand Down Expand Up @@ -455,6 +469,14 @@
"minimum": 0,
"maximum": 100,
"readOnly": true
},
"session_replay_experimental_features": {
"type": "array",
"description": "Session Replay experimental features enabled in the SDK configuration",
"items": {
"type": "string"
},
"readOnly": true
}
}
},
Expand All @@ -475,6 +497,19 @@
"type": "object",
"description": "User provided context",
"additionalProperties": true
},
"stream": {
"type": "object",
"description": "Stream properties",
"required": ["id"],
"properties": {
"id": {
"type": "string",
"description": "UUID of the stream",
"pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$",
"readOnly": true
}
}
}
}
}
194 changes: 61 additions & 133 deletions features/dd-sdk-android-rum/src/main/json/rum/timeseries-cpu-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,162 +4,90 @@
"title": "RumTimeseriesCpuEvent",
"type": "object",
"description": "Schema for a CPU timeseries event.",
"required": ["_dd", "application", "date", "session", "source", "timeseries", "type"],
"properties": {
"type": {
"type": "string",
"description": "RUM event type",
"const": "timeseries",
"readOnly": true
"allOf": [
{
"$ref": "_common-schema.json"
},
"_dd": {
"type": "object",
"description": "Internal properties",
"required": ["format_version"],
{
"required": ["type", "timeseries"],
"properties": {
"format_version": {
"type": "integer",
"const": 2,
"description": "Version of the RUM event format",
"readOnly": true
}
},
"readOnly": true
},
"application": {
"type": "object",
"description": "Application properties",
"required": ["id"],
"properties": {
"id": {
"type": "string",
"description": "UUID of the application",
"pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$",
"readOnly": true
}
},
"readOnly": true
},
"session": {
"type": "object",
"description": "Session properties",
"required": ["id", "type"],
"properties": {
"id": {
"type": "string",
"description": "UUID of the session",
"pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$",
"readOnly": true
},
"type": {
"type": "string",
"description": "Type of the session",
"enum": ["user", "synthetics", "ci_test"],
"readOnly": true
}
},
"readOnly": true
},
"source": {
"type": "string",
"description": "The source of this event",
"enum": [
"android",
"ios",
"browser",
"flutter",
"react-native",
"roku",
"unity",
"kotlin-multiplatform",
"electron",
"rum-cpp"
],
"readOnly": true
},
"date": {
"type": "integer",
"description": "Start of the event in ms from epoch",
"minimum": 0,
"readOnly": true
},
"service": {
"type": "string",
"description": "The service name for this application"
},
"version": {
"type": "string",
"description": "The version for this application"
},
"timeseries": {
"type": "object",
"description": "CPU timeseries properties",
"required": ["id", "name", "schema", "start", "end", "data"],
"properties": {
"id": {
"type": "string",
"description": "UUID of the timeseries batch",
"pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$",
"description": "RUM event type",
"const": "timeseries",
"readOnly": true
},
"name": {
"type": "string",
"description": "Name identifying the timeseries metric",
"const": "cpu",
"readOnly": true
},
"schema": {
"type": "string",
"description": "Wire-shape discriminator for the data field",
"const": "object-v2",
"readOnly": true
},
"start": {
"type": "integer",
"description": "Timestamp of the first sample in nanoseconds from epoch",
"readOnly": true
},
"end": {
"type": "integer",
"description": "Timestamp of the last sample in nanoseconds from epoch",
"readOnly": true
},
"data": {
"timeseries": {
"type": "object",
"description": "Flattened CPU data points",
"required": ["timestamps", "values"],
"description": "CPU timeseries properties",
"required": ["id", "name", "schema", "start", "end", "data"],
"properties": {
"timestamps": {
"type": "array",
"description": "Sample timestamps in nanoseconds from epoch",
"items": {
"type": "integer",
"readOnly": true
},
"id": {
"type": "string",
"description": "UUID of the timeseries batch",
"pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$",
"readOnly": true
},
"values": {
"name": {
"type": "string",
"description": "Name identifying the timeseries metric",
"const": "cpu",
"readOnly": true
},
"schema": {
"type": "string",
"description": "Wire-shape discriminator for the data field",
"const": "object-v2",
"readOnly": true
},
"start": {
"type": "integer",
"description": "Timestamp of the first sample in nanoseconds from epoch",
"readOnly": true
},
"end": {
"type": "integer",
"description": "Timestamp of the last sample in nanoseconds from epoch",
"readOnly": true
},
"data": {
"type": "object",
"description": "CPU measurements, aligned index-for-index with timestamps",
"required": ["cpu_usage"],
"description": "Flattened CPU data points",
"required": ["timestamps", "values"],
"properties": {
"cpu_usage": {
"timestamps": {
"type": "array",
"description": "CPU usage as a percentage (0.0 to 100.0)",
"description": "Sample timestamps in nanoseconds from epoch",
"items": {
"type": "number",
"type": "integer",
"readOnly": true
},
"readOnly": true
},
"values": {
"type": "object",
"description": "CPU measurements, aligned index-for-index with timestamps",
"required": ["cpu_usage"],
"properties": {
"cpu_usage": {
"type": "array",
"description": "CPU usage as a percentage (0.0 to 100.0)",
"items": {
"type": "number",
"readOnly": true
},
"readOnly": true
}
},
"readOnly": true
}
},
"readOnly": true
}
},
"readOnly": true
}
},
"readOnly": true
}
}
}
]
}
Loading
Loading