Skip to content

Commit 1c828a6

Browse files
emutavchiemutavchi
authored
Merge branch 'sprint/25Q3' into wpe-2.46-api-changes-25Q3
2 parents a9287f6 + 8fbfbb2 commit 1c828a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+873
-3455
lines changed

‎.github/workflows/ContentProtectionTests.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: ContentProtection
2+
3+
on:
4+
push:
5+
paths:
6+
- ContentProtection/**
7+
- .github/workflows/*ContentProtection*.yml
8+
pull_request:
9+
paths:
10+
- ContentProtection/**
11+
- .github/workflows/*ContentProtection*.yml
12+
13+
jobs:
14+
tests:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
include:
19+
- src: 'ContentProtection'
20+
build: 'build/ContentProtection'
21+
steps:
22+
- uses: actions/checkout@v4
23+
with:
24+
path: ${{github.repository}}
25+
- run: |
26+
sudo apt update
27+
sudo apt install -y cmake
28+
- run: sh +x ${GITHUB_REPOSITORY}/.github/workflows/BuildThunder.sh
29+
- run: |
30+
cmake \
31+
-S ${GITHUB_REPOSITORY}/${{ matrix.src }} \
32+
-B ${{ matrix.build }} \
33+
-DCMAKE_INSTALL_PREFIX="install" \
34+
-DCMAKE_CXX_FLAGS="-Wall -Werror"
35+
cmake --build ${{ matrix.build }} --target install

‎.github/workflows/L2-ContentProtection.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.github/workflows/L2-tests-R4-4-1.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,7 @@ jobs:
280280
-DRDK_SERVICE_L2_TEST=ON
281281
-DDS_FOUND=ON
282282
-DPLUGIN_ANALYTICS=ON
283-
-DPLUGIN_ANALYTICS_SIFT_BACKEND=ON
284-
-DPLUGIN_ANALYTICS_SIFT_2_0_ENABLED="true"
285-
-DPLUGIN_ANALYTICS_SIFT_MAX_RANDOMISATION_WINDOW_TIME=15
286-
-DPLUGIN_ANALYTICS_SIFT_STORE_PATH="/tmp/AnalyticsSiftStore"
287-
-DPLUGIN_ANALYTICS_SIFT_URL="127.0.0.1:12345"
283+
-DPLUGIN_ANALYTICS_BACKEND_LIBRARY_NAME="libWPEFrameworkAnalyticsBackendMock.so"
288284
-DPLUGIN_ANALYTICS_EVENTS_MAP="/tmp/AnalyticsEventsMap.json"
289285
&&
290286
cmake --build build/rdkservices -j8

‎Analytics/Analytics.conf.in‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,8 @@ startuporder = "@PLUGIN_ANALYTICS_STARTUPORDER@"
55

66
configuration = JSON()
77

8-
configuration.add("deviceosname", "@PLUGIN_ANALYTICS_DEVICE_OS_NAME@")
98
configuration.add("eventsmap", "@PLUGIN_ANALYTICS_EVENTS_MAP@")
9+
configuration.add("loggername", "@PLUGIN_ANALYTICS_LOGGER_NAME@")
10+
configuration.add("loggerversion", "@PLUGIN_ANALYTICS_LOGGER_VERSION@")
11+
configuration.add("backendlib", "@PLUGIN_ANALYTICS_BACKEND_LIBRARY_NAME@")
1012

11-
if boolean("@PLUGIN_ANALYTICS_SIFT_BACKEND_ENABLED@"):
12-
sift = JSON()
13-
sift.add("schema2", "@PLUGIN_ANALYTICS_SIFT_2_0_ENABLED@")
14-
sift.add("commonschema", "@PLUGIN_ANALYTICS_SIFT_COMMON_SCHEMA@")
15-
sift.add("env", "@PLUGIN_ANALYTICS_SIFT_ENV@")
16-
sift.add("productname", "@PLUGIN_ANALYTICS_SIFT_PRODUCT_NAME@")
17-
sift.add("loggername", "@PLUGIN_ANALYTICS_SIFT_LOGGER_NAME@")
18-
sift.add("loggerversion", "@PLUGIN_ANALYTICS_SIFT_LOGGER_VERSION@")
19-
sift.add("platformdefault", "@PLUGIN_ANALYTICS_SIFT_PLATFORM_DEFAULT@")
20-
sift.add("maxrandomisationwindowtime", "@PLUGIN_ANALYTICS_SIFT_MAX_RANDOMISATION_WINDOW_TIME@")
21-
sift.add("maxeventsinpost", "@PLUGIN_ANALYTICS_SIFT_MAX_EVENTS_IN_POST@")
22-
sift.add("maxretries", "@PLUGIN_ANALYTICS_SIFT_MAX_RETRIES@")
23-
sift.add("minretryperiod", "@PLUGIN_ANALYTICS_SIFT_MIN_RETRY_PERIOD@")
24-
sift.add("maxretryperiod", "@PLUGIN_ANALYTICS_SIFT_MAX_RETRY_PERIOD@")
25-
sift.add("exponentialperiodicfactor", "@PLUGIN_ANALYTICS_SIFT_EXPONENTIAL_PERIODIC_FACTOR@")
26-
sift.add("storepath", "@PLUGIN_ANALYTICS_SIFT_STORE_PATH@")
27-
sift.add("eventslimit", "@PLUGIN_ANALYTICS_SIFT_STORE_EVENTS_LIMIT@")
28-
sift.add("url", "@PLUGIN_ANALYTICS_SIFT_URL@")
29-
configuration.add("sift", sift)

‎Analytics/Analytics.config‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,9 @@ set (startuporder ${PLUGIN_ANALYTICS_STARTUPORDER})
77
endif()
88

99
map()
10-
kv(deviceosname ${PLUGIN_ANALYTICS_DEVICE_OS_NAME})
1110
kv(eventsmap, ${PLUGIN_ANALYTICS_EVENTS_MAP})
11+
kv(loggername, ${PLUGIN_ANALYTICS_LOGGER_NAME})
12+
kv(loggerversion, ${PLUGIN_ANALYTICS_LOGGER_VERSION})
13+
kv(backendlib, ${PLUGIN_ANALYTICS_BACKEND_LIBRARY_NAME})
1214
end()
1315
ans(configuration)
14-
15-
16-
if(PLUGIN_ANALYTICS_SIFT_BACKEND_ENABLED)
17-
map()
18-
kv(schema2 ${PLUGIN_ANALYTICS_SIFT_2_0_ENABLED})
19-
kv(commonschema ${PLUGIN_ANALYTICS_SIFT_COMMON_SCHEMA})
20-
kv(env ${PLUGIN_ANALYTICS_SIFT_ENV})
21-
kv(productname ${PLUGIN_ANALYTICS_SIFT_PRODUCT_NAME})
22-
kv(loggername ${PLUGIN_ANALYTICS_SIFT_LOGGER_NAME})
23-
kv(loggerversion ${PLUGIN_ANALYTICS_SIFT_LOGGER_VERSION})
24-
kv(platformdefault ${PLUGIN_ANALYTICS_SIFT_PLATFORM_DEFAULT})
25-
kv(maxrandomisationwindowtime, ${PLUGIN_ANALYTICS_SIFT_MAX_RANDOMISATION_WINDOW_TIME})
26-
kv(maxeventsinpost, ${PLUGIN_ANALYTICS_SIFT_MAX_EVENTS_IN_POST})
27-
kv(maxretries, ${PLUGIN_ANALYTICS_SIFT_MAX_RETRIES})
28-
kv(minretryperiod, ${PLUGIN_ANALYTICS_SIFT_MIN_RETRY_PERIOD})
29-
kv(maxretryperiod, ${PLUGIN_ANALYTICS_SIFT_MAX_RETRY_PERIOD})
30-
kv(exponentialperiodicfactor, ${PLUGIN_ANALYTICS_SIFT_EXPONENTIAL_PERIODIC_FACTOR})
31-
kv(storepath, ${PLUGIN_ANALYTICS_SIFT_STORE_PATH})
32-
kv(eventslimit, ${PLUGIN_ANALYTICS_SIFT_STORE_EVENTS_LIMIT})
33-
kv(url, ${PLUGIN_ANALYTICS_SIFT_URL})
34-
end()
35-
ans(siftobject)
36-
map_append(${configuration} sift ${siftobject})
37-
endif()

‎Analytics/Analytics.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@
4848
"type": "integer",
4949
"example": 35000
5050
},
51+
"appId":{
52+
"summary": "Durable App ID string",
53+
"type": "string",
54+
"example": "app-id-app1"
55+
},
5156
"eventPayload":{
5257
"summary": "Custom payload of the event in JSON format. User defined colection of objects and keys. May be an empty object",
5358
"type": "object",
@@ -87,6 +92,9 @@
8792
"uptimeTimestamp":{
8893
"$ref": "#/definitions/uptimeTimestamp"
8994
},
95+
"appId":{
96+
"$ref": "#/definitions/appId"
97+
},
9098
"eventPayload":{
9199
"$ref": "#/definitions/eventPayload"
92100
}

‎Analytics/AnalyticsPlugin.json‎

Lines changed: 14 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -5,112 +5,35 @@
55
"callsign":"org.rdk.Analytics",
66
"locator":"libWPEFrameworkAnalytics.so",
77
"status":"development",
8-
"description":"The `Analytics` plugin allows to send analytics events to dedicated backends. Currently the SIFT backend is supported."
8+
"description":"The `Analytics` plugin allows to send analytics events to dedicated backends"
99
},
1010
"configuration":{
1111
"type":"object",
1212
"properties":{
1313
"configuration":{
1414
"type":"object",
1515
"properties":{
16-
"deviceosname":{
17-
"description":"Device OS name",
16+
"loggername":{
17+
"description":"Logger name used by backend",
18+
"type":"string"
19+
},
20+
"loggerversion":{
21+
"description":"Logger version used by backend",
1822
"type":"string"
1923
},
2024
"eventsmap":{
2125
"description":"Optional path to json file with array of mapped events name",
2226
"type":"string"
2327
},
24-
"sift":{
25-
"type":"object",
26-
"properties":{
27-
"schema2":{
28-
"description":"If true, enables Sift 2.0 schema, otherwise uses Sift 1.0 schema",
29-
"type":"boolean"
30-
},
31-
"commonschema":{
32-
"description":"Sift schema common schema",
33-
"type":"string"
34-
},
35-
"env":{
36-
"description":"Sift schema environment",
37-
"type":"string"
38-
},
39-
"productname":{
40-
"description":"Sift schema product name",
41-
"type":"string"
42-
},
43-
"loggername":{
44-
"description":"Sift schema logger name",
45-
"type":"string"
46-
},
47-
"loggerversion":{
48-
"description":"Sift schema logger version",
49-
"type":"string"
50-
},
51-
"platformdefault":{
52-
"description":"Sift schema platform default value",
53-
"type":"string"
54-
},
55-
"maxrandomisationwindowtime":{
56-
"description":"Sift uploader max randomisation window time of posting queued events in seconds",
57-
"type":"number"
58-
},
59-
"maxeventsinpost":{
60-
"description":"Sift uploader max events in single post",
61-
"type":"number"
62-
},
63-
"maxretries":{
64-
"description":"Sift uploader max retries posting events",
65-
"type":"number"
66-
},
67-
"minretryperiod":{
68-
"description":"Sift uploader min retry period seconds",
69-
"type":"number"
70-
},
71-
"maxretryperiod":{
72-
"description":"Sift uploader max retry period seconds",
73-
"type":"number"
74-
},
75-
"exponentialperiodicfactor":{
76-
"description":"Sift uploader exponential periodic factor for retry delay",
77-
"type":"number"
78-
},
79-
"storepath":{
80-
"description":"Sift store path to persistent queue with events",
81-
"type":"number"
82-
},
83-
"eventslimit":{
84-
"description":"Sift store events limit",
85-
"type":"number"
86-
},
87-
"url":{
88-
"description":"URL to Sift server endpoint",
89-
"type":"string"
90-
}
91-
},
92-
"required":[
93-
"schema2",
94-
"commonschema",
95-
"productname",
96-
"loggername",
97-
"loggerversion",
98-
"platformdefault",
99-
"maxrandomisationwindowtime",
100-
"maxeventsinpost",
101-
"maxretries",
102-
"minretryperiod",
103-
"maxretryperiod",
104-
"exponentialperiodicfactor",
105-
"storepath",
106-
"eventslimit",
107-
"url"
108-
]
28+
"backendlib":{
29+
"description":"Name of backend library",
30+
"type":"string"
10931
}
11032
},
11133
"required":[
112-
"deviceosname",
113-
"sift"
34+
"loggername",
35+
"loggerversion",
36+
"backendlib"
11437
]
11538
}
11639
},
@@ -121,4 +44,4 @@
12144
"interface":{
12245
"$ref":"Analytics.json#"
12346
}
124-
}
47+
}

‎Analytics/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ All notable changes to this RDK Service will be documented in this file.
1414

1515
For more details, refer to versioning section under Main README.
1616

17+
## [1.0.4] - 2025-06-12
18+
- Backend as an external dynamic library
19+
1720
## [1.0.3] - 2025-02-07
1821
### Fixed
1922
- Fix hang on call to zdump

0 commit comments

Comments
 (0)