Skip to content

Commit 6d9bb0d

Browse files
authored
Fix: summary events (#1487)
* Summary events[1436] * Summary events[1436] * temporary changes[1436] * temporary changes[1436] * adding logs[1436] * adding logs[1436] * adding logs[1436] * adding logs[1436] * removing logs, refactoring[1436] * removing logs, refactoring[1436] * removing logs, refactoring[1436] * removing logs, refactoring[1436] * removing logs, refactoring[1436] * updating installation-script [1436]
1 parent 9216c92 commit 6d9bb0d

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

Wire.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,8 @@ func InitializeApp() (*App, error) {
597597
wire.Bind(new(restHandler.TelemetryRestHandler), new(*restHandler.TelemetryRestHandlerImpl)),
598598
telemetry.NewPosthogClient,
599599

600-
telemetry.NewTelemetryEventClientImpl,
601-
wire.Bind(new(telemetry.TelemetryEventClient), new(*telemetry.TelemetryEventClientImpl)),
600+
telemetry.NewTelemetryEventClientImplExtended,
601+
wire.Bind(new(telemetry.TelemetryEventClient), new(*telemetry.TelemetryEventClientImplExtended)),
602602

603603
router.NewBulkUpdateRouterImpl,
604604
wire.Bind(new(router.BulkUpdateRouter), new(*router.BulkUpdateRouterImpl)),

client/telemetry/TelemetryEventClient.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
5757
}
5858

5959
watcher.HeartbeatEventForTelemetry()
60-
_, err := cron.AddFunc(SummaryCronExpr, watcher.SummaryEventForTelemetry)
60+
_, err := cron.AddFunc(SummaryCronExpr, watcher.SummaryEventForTelemetryEA)
6161
if err != nil {
6262
logger.Errorw("error in starting summery event", "err", err)
6363
return nil, err
@@ -142,7 +142,7 @@ func (impl *TelemetryEventClientImpl) SummaryDetailsForTelemetry() (cluster []cl
142142
return clusters, users, k8sServerVersion
143143
}
144144

145-
func (impl *TelemetryEventClientImpl) SummaryEventForTelemetry() {
145+
func (impl *TelemetryEventClientImpl) SummaryEventForTelemetryEA() {
146146
ucid, err := impl.getUCID()
147147
if err != nil {
148148
impl.logger.Errorw("exception caught inside telemetry summary event", "err", err)
@@ -222,6 +222,7 @@ func (impl *TelemetryEventClientImpl) HeartbeatEventForTelemetry() {
222222
impl.logger.Errorw("exception caught inside telemetry heartbeat event", "err", err)
223223
return
224224
}
225+
225226
k8sServerVersion, err := discoveryClient.ServerVersion()
226227
if err != nil {
227228
impl.logger.Errorw("exception caught inside telemetry heartbeat event", "err", err)
@@ -244,13 +245,12 @@ func (impl *TelemetryEventClientImpl) HeartbeatEventForTelemetry() {
244245
}
245246

246247
err = impl.EnqueuePostHog(ucid, Heartbeat, prop)
247-
if err == nil {
248-
if err != nil {
249-
impl.logger.Warnw("HeartbeatEventForTelemetry, failed to push event", "error", err)
250-
} else {
251-
impl.logger.Debugw("HeartbeatEventForTelemetry success")
252-
}
248+
if err != nil {
249+
impl.logger.Warnw("HeartbeatEventForTelemetry, failed to push event", "error", err)
250+
return
253251
}
252+
impl.logger.Debugw("HeartbeatEventForTelemetry success")
253+
return
254254
}
255255

256256
func (impl *TelemetryEventClientImpl) GetTelemetryMetaInfo() (*TelemetryMetaInfo, error) {

client/telemetry/TelemetryEventClientExtended.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type TelemetryEventClientImplExtended struct {
2424
*TelemetryEventClientImpl
2525
}
2626

27-
func (impl *TelemetryEventClientImplExtended) NewTelemetryEventClientImplExtended(logger *zap.SugaredLogger, client *http.Client, clusterService cluster.ClusterService,
27+
func NewTelemetryEventClientImplExtended(logger *zap.SugaredLogger, client *http.Client, clusterService cluster.ClusterService,
2828
K8sUtil *util2.K8sUtil, aCDAuthConfig *util3.ACDAuthConfig,
2929
environmentService cluster.EnvironmentService, userService user.UserService,
3030
appListingRepository repository.AppListingRepository, PosthogClient *PosthogClient,
@@ -101,7 +101,6 @@ func (impl *TelemetryEventClientImplExtended) SummaryEventForTelemetry() {
101101
}
102102

103103
clusters, users, k8sServerVersion := impl.SummaryDetailsForTelemetry()
104-
105104
payload := &TelemetryEventDto{UCID: ucid, Timestamp: time.Now(), EventType: Summary, DevtronVersion: "v1"}
106105
payload.ServerVersion = k8sServerVersion.String()
107106

cmd/external-app/wire_gen.go

Lines changed: 22 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wire_gen.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)