Skip to content

Conversation

@YashodhanJoshi1
Copy link
Contributor

cherry-pick of #9348 for release branch

Signed-off-by: Yashodhan Joshi <[email protected]>
@github-actions github-actions bot added the ☢️ Bug Something isn't working label Nov 27, 2025
@YashodhanJoshi1 YashodhanJoshi1 changed the base branch from main to branch-v0.20.0 November 27, 2025 05:26
@github-actions
Copy link
Contributor

Failed to generate code suggestions for PR

@YashodhanJoshi1 YashodhanJoshi1 modified the milestones: v0.20.1, v0.20.0 Nov 27, 2025
@greptile-apps
Copy link
Contributor

greptile-apps bot commented Nov 27, 2025

Greptile Overview

Greptile Summary

Cherry-picked multiple bug fixes and improvements from the development branch to the release branch, addressing self-org-trigger functionality, Docker build consistency, and various UI issues.

Key Changes

Self-Reporting Trigger Fixes (Rust)

  • Fixed variable reference bug in ingestion.rs where error handling incorrectly referenced cfg.common.usage_reporting_mode instead of local usage_reporting_mode variable
  • Reorganized trigger ingestion logic in queues.rs to support per-org reporting with cloud-specific trial period checks
  • Added conditional compilation for cloud feature to check if organizations are in free trial before ingesting trigger data

Docker Build Improvements

  • Standardized Docker build stage naming from webBuilder to webbuilder across all 10 Dockerfile variants
  • Added missing libbz2.so.1.0 library dependency to 6 production Dockerfiles to prevent runtime library loading issues

UI/UX Improvements

  • Fixed custom logo display logic to properly handle light/dark mode with correct fallbacks
  • Corrected shell escaping in Kubernetes helm commands (double quotes to single quotes)
  • Improved error messages for datetime validation to be more user-friendly
  • Fixed alert validation by expanding all accordion sections before validation
  • Fixed license expiry timestamp conversion from microseconds to milliseconds
  • Hide license tab in cloud deployments
  • Removed 20KB file size limit on logo uploads

Confidence Score: 5/5

  • This PR is safe to merge with minimal risk as it cherry-picks well-tested fixes from the development branch
  • Score reflects that this is a cherry-pick of previously reviewed changes, all fixes address specific bugs with clear intent, changes are isolated and well-scoped, and the modifications improve system stability without introducing breaking changes
  • No files require special attention - all changes are straightforward bug fixes and improvements

Important Files Changed

File Analysis

Filename Score Overview
src/service/self_reporting/ingestion.rs 5/5 Fixed variable reference bug in error handling path by using local usage_reporting_mode variable instead of cfg.common.usage_reporting_mode
src/service/self_reporting/queues.rs 4/5 Fixed self-org-trigger issues: added cloud-specific trial period check, corrected usage_reporting_mode references, and reorganized trigger ingestion logic to support per-org reporting
web/src/components/Header.vue 5/5 Fixed custom logo display logic to properly show light/dark mode logos with correct fallback behavior
web/src/components/alerts/AddAlert.vue 5/5 Fixed validation issues by ensuring all accordion sections are expanded before validation and adjusted preview panel height from fixed 320px to 100%
web/src/components/ingestion/recommended/KubernetesConfig.vue 5/5 Fixed shell escaping issues by changing double quotes to single quotes around exporter paths and header values in helm commands
web/src/enterprise/components/billings/LicensePeriod.vue 5/5 Fixed license expiry timestamp conversion from microseconds to milliseconds, removed "Update License Key" button, and added cloud deployment check

Sequence Diagram

sequenceDiagram
    participant Client
    participant ReportingQueue
    participant Worker as Worker Thread
    participant Ingestion as Ingestion Module
    participant OrgCheck as Organization Service
    participant DB as Database/Stream

    Client->>ReportingQueue: Enqueue Trigger Data
    ReportingQueue->>Worker: Message via Channel
    Worker->>Worker: Buffer until batch size/timeout
    Worker->>Worker: Separate triggers, usages, errors
    
    alt usage_reporting_mode != "remote"
        Worker->>Ingestion: ingest_usages(usages)
        Ingestion->>DB: Store in META_ORG
    end
    
    alt Additional Reporting Orgs Configured
        loop For each additional org
            Worker->>Ingestion: ingest_reporting_data(triggers)
            Ingestion->>DB: Store triggers in org stream
        end
    end
    
    alt usage_report_to_own_org enabled
        Worker->>Worker: Group triggers by org
        loop For each trigger org
            alt Cloud feature enabled
                Worker->>OrgCheck: is_org_in_free_trial_period(org_id)
                OrgCheck-->>Worker: trial status
                alt Not in trial
                    Worker->>Worker: Skip this org
                end
            end
            Worker->>Ingestion: ingest_reporting_data(org triggers)
            Ingestion->>DB: Store in own org stream
        end
    end
Loading

Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

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

14 files reviewed, no comments

Edit Code Review Agent Settings | Greptile

@YashodhanJoshi1 YashodhanJoshi1 merged commit 2cf141c into branch-v0.20.0 Nov 27, 2025
34 checks passed
@YashodhanJoshi1 YashodhanJoshi1 deleted the fix/trigger_b20 branch November 27, 2025 08:52
@YashodhanJoshi1 YashodhanJoshi1 added the Needs-Testing Needs-Testing label Nov 27, 2025
@priyabrata-stack priyabrata-stack added Testing-Completed Testing-Completed and removed Needs-Testing Needs-Testing labels Dec 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

☢️ Bug Something isn't working Testing-Completed Testing-Completed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants