Skip to content

Modify Analytics on desktop to use a verified DLL on Windows (although it is currently still a stub). #1731

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.

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
wants to merge 56 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
6d3d353
Here's the updated commit message:
google-labs-jules[bot] Jun 11, 2025
94abdb3
feat: Integrate Firebase logging for Windows Analytics
google-labs-jules[bot] Jun 12, 2025
b829441
refactor: Update event parameter handling for map and vector types
google-labs-jules[bot] Jun 12, 2025
fa9363e
refactor: Align Windows Analytics stubs with SDK patterns
google-labs-jules[bot] Jun 12, 2025
9b377ac
Here's the plan:
google-labs-jules[bot] Jun 12, 2025
e29cce5
refactor: Address final review comments for Windows Analytics
google-labs-jules[bot] Jun 12, 2025
a75e482
chore: Relocate analytics_desktop.cc to analytics/src/
google-labs-jules[bot] Jun 12, 2025
5c40559
Merge branch 'main' into feat/test_analytics_changes
jonsimantov Jun 12, 2025
e66c912
Clean up generated code.
jonsimantov Jun 12, 2025
3916cb5
Update desktop code to fix issues.
jonsimantov Jun 12, 2025
4fcf299
Copy Analytics DLL from SDK directory.
jonsimantov Jun 12, 2025
4fe2647
Add wide string version of SetAnalyticsLibraryPath and export
jonsimantov Jun 12, 2025
3354a59
Update log messages.
jonsimantov Jun 12, 2025
c57844c
Format code.
jonsimantov Jun 12, 2025
4620f05
Update paths and remove old stub.
jonsimantov Jun 12, 2025
3bfefbd
Update some nomenclature.
jonsimantov Jun 13, 2025
c67ac66
Add a SHA256 hash to verify on load.
jonsimantov Jun 13, 2025
d3271d4
Fix build error.
jonsimantov Jun 13, 2025
c274e7c
Add hash constant.
jonsimantov Jun 13, 2025
96abef7
Update layout.
jonsimantov Jun 13, 2025
df2278d
refactor: Rename library_path to library_filename for clarity
google-labs-jules[bot] Jun 13, 2025
2a90735
Tweak errors and format code.
jonsimantov Jun 13, 2025
5fa50c1
Revert to stubs on load fail.
jonsimantov Jun 13, 2025
0026cde
Remove big comment.
jonsimantov Jun 13, 2025
08ad239
Don't include analytics_windows.h except on Windows.
jonsimantov Jun 13, 2025
3ad6ec6
Add copyright notice.
jonsimantov Jun 13, 2025
a2f6681
Fixed log include.
jonsimantov Jun 13, 2025
619224f
Fix comment.
jonsimantov Jun 13, 2025
4a6b397
refactor: Extract GetExecutablePath helper in analytics_windows.cc
google-labs-jules[bot] Jun 13, 2025
903d0ef
refactor: Update log.h include path and extract GetExecutablePath helper
google-labs-jules[bot] Jun 13, 2025
24398f9
Merge remote-tracking branch 'origin/rename-libraryPath-param' into a…
jonsimantov Jun 13, 2025
9e09b5e
Updated formatting and errors.
jonsimantov Jun 13, 2025
0fa5cfe
Factor out log tag.
jonsimantov Jun 13, 2025
5d814c8
Format code.
jonsimantov Jun 13, 2025
f56b1bd
Fix syntax error.
jonsimantov Jun 13, 2025
8de56bb
Refactor GetExecutablePath with two-tier buffer strategy
google-labs-jules[bot] Jun 13, 2025
6780953
Clean up logic for getting executable path.
jonsimantov Jun 13, 2025
6208c96
Format code.
jonsimantov Jun 13, 2025
d70c338
Fix nesting.
jonsimantov Jun 13, 2025
7caa354
Fix nesting again.
jonsimantov Jun 13, 2025
6255b43
Use LoadLibraryW because LoadLibraryExW is failing.
jonsimantov Jun 13, 2025
b58c2ec
Fix build error.
jonsimantov Jun 13, 2025
828189e
Add a warning.
jonsimantov Jun 13, 2025
a10b866
Add an info message.
jonsimantov Jun 13, 2025
f0894e9
Fix error.
jonsimantov Jun 13, 2025
0ba79ee
Change message to debug.
jonsimantov Jun 13, 2025
aa1a9c1
Move functions.
jonsimantov Jun 13, 2025
7bfd4e3
Delete DLL file with stubs.
jonsimantov Jun 13, 2025
5ec8e5d
Silence an unneeded error.
jonsimantov Jun 13, 2025
57f2062
Revert "Delete DLL file with stubs."
jonsimantov Jun 13, 2025
016f569
Change file format and move the hash out of non-Windows platforms.
jonsimantov Jun 13, 2025
d4a1ab7
Fix: Use sizeof for Analytics DLL hash array
google-labs-jules[bot] Jun 14, 2025
c6cf8f6
Refactor: Adjust log level for hash mismatch in analytics_windows
google-labs-jules[bot] Jun 14, 2025
56de502
Format code.
jonsimantov Jun 14, 2025
57f303d
Updated Analytics Windows to allow multiple DLL hashes, and add usage…
jonsimantov Jun 25, 2025
ba7b04a
Merge branch 'main' into analytics-dll-secure
jonsimantov Jun 25, 2025
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
Prev Previous commit
Next Next commit
Change message to debug.
  • Loading branch information
jonsimantov committed Jun 13, 2025
commit 0ba79ee6a7818c114c53769a64652bb4e01640a2
2 changes: 1 addition & 1 deletion analytics/src/analytics_windows.cc
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ HMODULE VerifyAndLoadAnalyticsLibrary(
expected_hash_size) != 0) {
LogError(LOG_TAG "Hash mismatch for Analytics DLL.");
} else {
LogInfo(LOG_TAG "Successfully verified Analytics DLL.");
LogDebug(LOG_TAG "Successfully verified Analytics DLL.");
// Load the library. When loading with a full path string, other
// directories are not searched.
hModule = LoadLibraryW(full_dll_path_str.c_str());
Expand Down
Loading