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.

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

feat(backend): added utm data to PG #2152

Merged
merged 3 commits into from
May 24, 2024
Merged

feat(backend): added utm data to PG #2152

merged 3 commits into from
May 24, 2024

Conversation

zavorotynskiy
Copy link
Contributor

No description provided.

Copy link

coderabbitai bot commented Apr 30, 2024

Walkthrough

The recent updates enhance session tracking by implementing UTM parameter updates across various components. A new method extracts UTM data from URLs, updates session records, and integrates these changes into the session management infrastructure. This ensures accurate tracking of marketing efforts, enhancing data-driven decision-making.

Changes

Files Change Summary
.../db/datasaver/saver.go Added functionality to update UTM parameters in sessions based on incoming messages.
.../pkg/sessions/sessions.go Introduced a new method to extract and update UTM parameters from URLs.
.../pkg/sessions/updates.go Enhanced session updates with UTM parameters, including new methods and struct fields.
.../pkg/url/url.go Added a function to extract query parameters from URLs, aiding in UTM data extraction.
.../pkg/sessions/model.go Updated the Session struct with UtmSource, UtmMedium, and UtmCampaign fields.
.../pkg/sessions/storage.go Additional fields utm_source, utm_medium, and utm_campaign added to storageImpl.Get.
.../db/clickhouse/connector.go Added fields for UTM parameters to the sessions table insertion query in connectorImpl.

🐇✨
In the warren, beneath the moon's soft glow,
New trails we've carved, where data streams flow.
UTM paths in code we weave,
Tracking journeys that browsers leave.
Hop and skip in fields anew,
With every line, our garden grew.
🌱📊

Tip

New Features and Improvements

Review Settings

Introduced new personality profiles for code reviews. Users can now select between "Chill" and "Assertive" review tones to tailor feedback styles according to their preferences. The "Assertive" profile posts more comments and nitpicks the code more aggressively, while the "Chill" profile is more relaxed and posts fewer comments.

AST-based Instructions

CodeRabbit offers customizing reviews based on the Abstract Syntax Tree (AST) pattern matching. Read more about AST-based instructions in the documentation.

Community-driven AST-based Rules

We are kicking off a community-driven initiative to create and share AST-based rules. Users can now contribute their AST-based rules to detect security vulnerabilities, code smells, and anti-patterns. Please see the ast-grep-essentials repository for more information.

New Static Analysis Tools

We are continually expanding our support for static analysis tools. We have added support for biome, hadolint, and ast-grep. Update the settings in your .coderabbit.yaml file or head over to the settings page to enable or disable the tools you want to use.

Tone Settings

Users can now customize CodeRabbit to review code in the style of their favorite characters or personalities. Here are some of our favorite examples:

  • Mr. T: "You must talk like Mr. T in all your code reviews. I pity the fool who doesn't!"
  • Pirate: "Arr, matey! Ye must talk like a pirate in all yer code reviews. Yarrr!"
  • Snarky: "You must be snarky in all your code reviews. Snark, snark, snark!"

Revamped Settings Page

We have redesigned the settings page for a more intuitive layout, enabling users to find and adjust settings quickly. This change was long overdue; it not only improves the user experience but also allows our development team to add more settings in the future with ease. Going forward, the changes to .coderabbit.yaml will be reflected in the settings page, and vice versa.

Miscellaneous

  • Turn off free summarization: You can switch off free summarization of PRs opened by users not on a paid plan using the enable_free_tier setting.
  • Knowledge-base scope: You can now set the scope of the knowledge base to either the repository (local) or the organization (global) level using the knowledge_base setting. In addition, you can specify Jira project keys and Linear team keys to limit the knowledge base scope for those integrations.
  • High-level summary placement: You can now customize the location of the high-level summary in the PR description using the high_level_summary_placeholder setting (default @coderabbitai summary).
  • Revamped request changes workflow: You can now configure CodeRabbit to auto-approve or request changes on PRs based on the review feedback using the request_changes_workflow setting.

Warning

Review ran into problems

Problems (1)
  • Git: Failed to clone repository. Please contact CodeRabbit support.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 3

Comment on lines +26 to +37
func GetURLQueryParams(rawURL string) (map[string]string, error) {
rawURL = strings.Replace(rawURL, "\t", "", -1)
u, err := url.Parse(rawURL)
if err != nil {
return nil, err
}
params := make(map[string]string)
for key, values := range u.Query() {
params[key] = values[0]
}
return params, nil
}
Copy link

Choose a reason for hiding this comment

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

Consider supporting multiple values for the same query parameter.

-		params[key] = values[0]
+		params[key] = strings.Join(values, ",")

This change will concatenate all values for a parameter separated by commas, which might be useful if multiple values are expected.


Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
func GetURLQueryParams(rawURL string) (map[string]string, error) {
rawURL = strings.Replace(rawURL, "\t", "", -1)
u, err := url.Parse(rawURL)
if err != nil {
return nil, err
}
params := make(map[string]string)
for key, values := range u.Query() {
params[key] = values[0]
}
return params, nil
}
func GetURLQueryParams(rawURL string) (map[string]string, error) {
rawURL = strings.Replace(rawURL, "\t", "", -1)
u, err := url.Parse(rawURL)
if err != nil {
return nil, err
}
params := make(map[string]string)
for key, values := range u.Query() {
params[key] = strings.Join(values, ",")
}
return params, nil
}

@@ -180,6 +180,7 @@ func (s *saverImpl) handleMessage(msg Message) error {
return err
}
s.sessions.UpdateReferrer(session.SessionID, m.Referrer)
s.sessions.UpdateUTM(session.SessionID, m.URL)
Copy link

Choose a reason for hiding this comment

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

Add error handling for the UpdateUTM method call.

-		s.sessions.UpdateUTM(session.SessionID, m.URL)
+		if err := s.sessions.UpdateUTM(session.SessionID, m.URL); err != nil {
+			s.log.Error(sessCtx, "UTM update failed for session %d, error: %s", session.SessionID, err)
+			return err
+		}

This ensures that any errors during UTM updates are logged and handled appropriately.


Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
s.sessions.UpdateUTM(session.SessionID, m.URL)
if err := s.sessions.UpdateUTM(session.SessionID, m.URL); err != nil {
s.log.Error(sessCtx, "UTM update failed for session %d, error: %s", session.SessionID, err)
return err
}

Comment on lines +215 to +228
func (s *sessionsImpl) UpdateUTM(sessionID uint64, pageUrl string) error {
params, err := url.GetURLQueryParams(pageUrl)
if err != nil {
return err
}
utmSource := params["utm_source"]
utmMedium := params["utm_medium"]
utmCampaign := params["utm_campaign"]
if utmSource == "" && utmMedium == "" && utmCampaign == "" {
return nil
}
s.updates.SetUTM(sessionID, utmSource, utmMedium, utmCampaign)
return nil
}
Copy link

Choose a reason for hiding this comment

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

Handle cases where only some UTM parameters are present.

-	if utmSource == "" && utmMedium == "" && utmCampaign == "" {
+	if utmSource != "" || utmMedium != "" || utmCampaign != "" {
+		s.updates.SetUTM(sessionID, utmSource, utmMedium, utmCampaign)
+	}

This change ensures that UTM parameters are updated even if only some of them are present, rather than requiring all to be non-empty.


Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
func (s *sessionsImpl) UpdateUTM(sessionID uint64, pageUrl string) error {
params, err := url.GetURLQueryParams(pageUrl)
if err != nil {
return err
}
utmSource := params["utm_source"]
utmMedium := params["utm_medium"]
utmCampaign := params["utm_campaign"]
if utmSource == "" && utmMedium == "" && utmCampaign == "" {
return nil
}
s.updates.SetUTM(sessionID, utmSource, utmMedium, utmCampaign)
return nil
}
func (s *sessionsImpl) UpdateUTM(sessionID uint64, pageUrl string) error {
params, err := url.GetURLQueryParams(pageUrl)
if err != nil {
return err
}
utmSource := params["utm_source"]
utmMedium := params["utm_medium"]
utmCampaign := params["utm_campaign"]
if utmSource != "" || utmMedium != "" || utmCampaign != "" {
s.updates.SetUTM(sessionID, utmSource, utmMedium, utmCampaign)
}
return nil
}

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between 45b74cb and d2e1d37.
Files selected for processing (1)
  • ee/backend/pkg/db/clickhouse/connector.go (2 hunks)
Additional comments not posted (2)
ee/backend/pkg/db/clickhouse/connector.go (2)

118-118: Ensure the new UTM fields are correctly integrated into the SQL query.

The addition of utm_source, utm_medium, and utm_campaign to the sessions table's INSERT statement aligns with the PR's objectives to track UTM parameters. Ensure that these fields are properly indexed if performance becomes a concern.


318-320: UTM parameters correctly appended to session data.

#!/bin/bash
# Description: Verify that UTM parameters are being stored correctly in the database.

# Test: Query the database to check if UTM parameters are present and correctly associated with sessions.
echo "SELECT session_id, utm_source, utm_medium, utm_campaign FROM experimental.sessions WHERE session_id = <some_session_id>;"

The UTM parameters are correctly appended to the session data. It's recommended to verify that these parameters are being stored correctly in the database.

@zavorotynskiy zavorotynskiy merged commit 993b6b5 into dev May 24, 2024
5 of 6 checks passed
@zavorotynskiy zavorotynskiy deleted the utm_data branch May 24, 2024 06:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant