Skip to content

feat: licensing changes #6474

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

Merged
merged 5 commits into from
Apr 1, 2025
Merged

feat: licensing changes #6474

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a05525
modules handling
Shivam-nagar23 Mar 25, 2025
c940489
example
Shivam-nagar23 Mar 25, 2025
b84ac07
sql files
Shivam-nagar23 Mar 25, 2025
5e89acc
main sync
Shivam-nagar23 Mar 31, 2025
fb492d3
common lib update
Shivam-nagar23 Apr 1, 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: 5 additions & 2 deletions client/telemetry/TelemetryEventClient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ type TelemetryEventClientImpl struct {
userAttributesRepository repository.UserAttributesRepository
cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService
telemetryConfig TelemetryConfig
globalEnvVariables *util.GlobalEnvVariables
}

type TelemetryEventClient interface {
Expand All @@ -96,7 +97,8 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
serverDataStore *serverDataStore.ServerDataStore, userAuditService user2.UserAuditService,
helmAppClient gRPC.HelmAppClient,
cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService, cronLogger *cron3.CronLoggerImpl,
installedAppReadService installedAppReader.InstalledAppReadServiceEA) (*TelemetryEventClientImpl, error) {
installedAppReadService installedAppReader.InstalledAppReadServiceEA,
envVariables *util.EnvironmentVariables) (*TelemetryEventClientImpl, error) {
cron := cron.New(
cron.WithChain(cron.Recover(cronLogger)))
cron.Start()
Expand All @@ -118,6 +120,7 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
installedAppReadService: installedAppReadService,
cloudProviderIdentifierService: cloudProviderIdentifierService,
telemetryConfig: TelemetryConfig{},
globalEnvVariables: envVariables.GlobalEnvVariables,
}

watcher.HeartbeatEventForTelemetry()
Expand Down Expand Up @@ -423,7 +426,7 @@ func (impl *TelemetryEventClientImpl) EnqueueGenericPostHogEvent(ucid string, ev
impl.PosthogClient.Client = client
}
}
if impl.PosthogClient.Client != nil {
if impl.PosthogClient.Client != nil && !impl.globalEnvVariables.IsAirGapEnvironment {
err := impl.PosthogClient.Client.Enqueue(posthog.Capture{
DistinctId: ucid,
Event: eventType,
Expand Down
1 change: 0 additions & 1 deletion cmd/external-app/wire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ import (
func InitializeApp() (*App, error) {
wire.Build(
user.SelfRegistrationWireSet,

sql.PgSqlWireSet,
user.UserWireSet,
sso.SsoConfigWireSet,
Expand Down
6 changes: 3 additions & 3 deletions cmd/external-app/wire_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading