Skip to content

Analytics changes with tests. #1730

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

Closed
wants to merge 20 commits into from
Closed

Analytics changes with tests. #1730

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 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
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
7 changes: 6 additions & 1 deletion analytics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ set(ios_SRCS
set(stub_SRCS
src/analytics_stub.cc)

# Source files used by the stub implementation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we delete the stub_SRCS above? And/or, update the comment? Do we want to do stuff here to strip out src/windows for Mac/Linux, or leave it up to the file?

set(desktop_SRCS
src/analytics_desktop.cc
src/windows/analytics_dynamic.c)

if(ANDROID)
set(analytics_platform_SRCS
"${android_SRCS}")
Expand All @@ -86,7 +91,7 @@ elseif(IOS)
"${ios_SRCS}")
else()
set(analytics_platform_SRCS
"${stub_SRCS}")
"${desktop_SRCS}")
endif()

add_library(firebase_analytics STATIC
Expand Down
12 changes: 12 additions & 0 deletions analytics/integration_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,18 @@ else()
)
elseif(MSVC)
set(ADDITIONAL_LIBS advapi32 ws2_32 crypt32)
set(ANALYTICS_WINDOWS_DLL "${FIREBASE_CPP_SDK_DIR}/analytics/windows/analytics_win.dll")

# For Windows, check if the Analytics DLL exists, and copy it in if so.
if (EXISTS "${ANALYTICS_WINDOWS_DLL}")
add_custom_command(
TARGET ${integration_test_target_name} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${ANALYTICS_WINDOWS_DLL}"
$<TARGET_FILE_DIR:${integration_test_target_name}>)
else()
message(WARNING "Couldn't find ${ANALYTICS_WINDOWS_DLL}. Analytics will run in stub mode.")
endif()
else()
set(ADDITIONAL_LIBS pthread)
endif()
Expand Down
Loading
Loading