Add end of trial notification #319

Sa1to · 2024-01-19T15:18:47Z

Fixes #244 and #245.

Test plan

use testing accounts
change scheduler e.g. to 30 seconds

src/main/kotlin/com/sourcegraph/cody/api/SourcegraphApiRequests.kt

src/main/kotlin/com/sourcegraph/common/EndOfTrialNotification.kt

mkondratek · 2024-01-26T15:17:20Z

ENDING SOON

ENDED

kalanchan · 2024-01-29T22:01:15Z

thanks @mkondratek!

in both notifications can you add a bit of bottom padding to space out the title and the body of the notification?

in the first notification, are you able to add a line break after Setup your payment information... to make it easier to read?

mkondratek · 2024-01-29T23:45:04Z

in both notifications can you add a bit of bottom padding to space out the title and the body of the notification?

That would not be idiomatic - our notification will look very strange compared to the other notifications. I suggest keeping the present padding.

src/main/kotlin/com/sourcegraph/cody/agent/protocol/CurrentUserCodySubscription.kt

pkukielka · 2024-01-30T14:13:50Z

src/main/kotlin/com/sourcegraph/cody/initialization/EndOfTrialNotificationScheduler.kt

+          CodyAgentService.applyAgentOnBackgroundThread(project) { agent ->
+            agent.server
+                .getCurrentUserCodySubscription()
+                .thenApply { currentUserCodySubscription ->


DO NOT run thenApply on server responses.
Or, run it if you want, but first answer me this:
on which thread/threadpool this will be running, and how big that thread pool is? :)
I do not consider it to be safe, maybe we should so some automagical wrapping just to be able to use it without thinking about it.

I do completeOnTimeout in the same block in line 63. I think it will be running on the very same thread (started by applyAgentOnBackgroundThread in line 39).

I do not understand your concerns in this case but likely I miss something. Let's discuss it via f2f.

How it can be running in the same thread, if the current thread can even finish in the meantime? :) This is not a blocking operation. It's tricky, I agree, let's discuss on the standup tomorrow.

I refactored the code so it's easier to read and understand.

Agree, it's much more readable now, thank you!

pkukielka · 2024-01-30T14:14:50Z

src/main/kotlin/com/sourcegraph/cody/initialization/EndOfTrialNotificationScheduler.kt

+
+                  agent.server
+                      .evaluateFeatureFlag(GetFeatureFlag.CodyProTrialEnded)
+                      .completeOnTimeout(false, 4, TimeUnit.SECONDS)


Just to be safe, cannot we wait longer if that is a method run once every 2h?
Or is it simply always expected to return in xx ms?

we can but 4 seconds seems to be much more than needed for a feature flag check + it is consistent with other timeouts

src/main/kotlin/com/sourcegraph/cody/initialization/EndOfTrialNotificationScheduler.kt

src/main/resources/CodyBundle.properties

pkukielka · 2024-01-30T14:29:11Z

src/main/kotlin/com/sourcegraph/cody/initialization/EndOfTrialNotificationScheduler.kt

+      codyProTrialEnded: Boolean,
+      useSscForCodySubscription: Boolean
+  ) {
+    if (currentUserCodySubscription.plan == Plan.PRO &&


I verified logic with the specification and to my eyes it look good.

…ip agent call on enterprise account; improve logging

pkukielka

LGTM

Sa1to commented Jan 19, 2024

View reviewed changes

src/main/kotlin/com/sourcegraph/cody/api/SourcegraphApiRequests.kt Outdated Show resolved Hide resolved

mkondratek reviewed Jan 20, 2024

View reviewed changes

src/main/kotlin/com/sourcegraph/common/EndOfTrialNotification.kt Outdated Show resolved Hide resolved

mkondratek reviewed Jan 20, 2024

View reviewed changes

src/main/kotlin/com/sourcegraph/common/EndOfTrialNotification.kt Outdated Show resolved Hide resolved

mkondratek reviewed Jan 20, 2024

View reviewed changes

src/main/kotlin/com/sourcegraph/common/EndOfTrialNotification.kt Outdated Show resolved Hide resolved

mkondratek reviewed Jan 22, 2024

View reviewed changes

src/main/kotlin/com/sourcegraph/common/EndOfTrialNotification.kt Outdated Show resolved Hide resolved

mkondratek force-pushed the sa1to/end-of-trial-notification branch from f65f8d6 to 6c5f52c Compare January 24, 2024 22:01

mkondratek mentioned this pull request Jan 24, 2024

Update org.jetbrains.intellij 1.15.0 -> 1.17.0 #343

Merged

mkondratek force-pushed the sa1to/end-of-trial-notification branch from 6c5f52c to 0e620b4 Compare January 25, 2024 00:09

mkondratek changed the title ~~WIP: Add end of trial notifcation~~ Add end of trial notification Jan 25, 2024

mkondratek force-pushed the sa1to/end-of-trial-notification branch 4 times, most recently from 74d1875 to 2da2322 Compare January 25, 2024 12:09

mkondratek force-pushed the sa1to/end-of-trial-notification branch from 8a3759a to e5b7e2f Compare January 27, 2024 20:15

mkondratek marked this pull request as ready for review January 28, 2024 00:12

mkondratek linked an issue Jan 29, 2024 that may be closed by this pull request

PRD: [JB] *On Feb 15* Notify users that Cody Pro trial has ended #245

Closed

mkondratek force-pushed the sa1to/end-of-trial-notification branch 4 times, most recently from 2dbb7d0 to dbf5e8d Compare January 29, 2024 20:20

pkukielka reviewed Jan 30, 2024

View reviewed changes

src/main/kotlin/com/sourcegraph/cody/agent/protocol/CurrentUserCodySubscription.kt Show resolved Hide resolved

pkukielka reviewed Jan 30, 2024

View reviewed changes

src/main/kotlin/com/sourcegraph/cody/initialization/EndOfTrialNotificationScheduler.kt Show resolved Hide resolved

danielmarquespt reviewed Jan 30, 2024

View reviewed changes

src/main/resources/CodyBundle.properties Outdated Show resolved Hide resolved

pkukielka reviewed Jan 30, 2024

View reviewed changes

Add end of trial notification

01ba4ec

mkondratek added 13 commits January 30, 2024 16:21

Ask graphql/getCurrentUserCodySubscription endpoint

c3cba21

Fixes

c231186

Fixes

cbb7736

Drop GraphQL approach

f600a50

Fixes

a0267cb

Extract the notifications

e21a5b3

Convert status and plan to enums

8e50adc

Fixes

5af7a28

Dispose scheduler on the ended-notification "don't show it again"; sk…

913e2a1

…ip agent call on enterprise account; improve logging

Update codyCommit

36a9f09

Update messages

45698c6

Fixes

506ac3f

Fixes

f20090b

mkondratek force-pushed the sa1to/end-of-trial-notification branch from 30f6620 to f20090b Compare January 30, 2024 15:32

Fixes

b87d483

pkukielka approved these changes Jan 31, 2024

View reviewed changes

mkondratek merged commit 09229c5 into main Jan 31, 2024
1 of 2 checks passed

mkondratek deleted the sa1to/end-of-trial-notification branch January 31, 2024 15:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add end of trial notification #319

Add end of trial notification #319

Sa1to commented Jan 19, 2024 •

edited by mkondratek

Loading

mkondratek commented Jan 26, 2024 •

edited

Loading

kalanchan commented Jan 29, 2024 •

edited

Loading

mkondratek commented Jan 29, 2024

pkukielka Jan 30, 2024

mkondratek Jan 30, 2024

pkukielka Jan 30, 2024

mkondratek Jan 31, 2024

pkukielka Jan 31, 2024

pkukielka Jan 30, 2024

mkondratek Jan 30, 2024 •

edited

Loading

pkukielka Jan 30, 2024

pkukielka left a comment

Add end of trial notification #319

Add end of trial notification #319

Conversation

Sa1to commented Jan 19, 2024 • edited by mkondratek Loading

Test plan

mkondratek commented Jan 26, 2024 • edited Loading

ENDING SOON

ENDED

kalanchan commented Jan 29, 2024 • edited Loading

mkondratek commented Jan 29, 2024

pkukielka Jan 30, 2024

Choose a reason for hiding this comment

mkondratek Jan 30, 2024

Choose a reason for hiding this comment

pkukielka Jan 30, 2024

Choose a reason for hiding this comment

mkondratek Jan 31, 2024

Choose a reason for hiding this comment

pkukielka Jan 31, 2024

Choose a reason for hiding this comment

pkukielka Jan 30, 2024

Choose a reason for hiding this comment

mkondratek Jan 30, 2024 • edited Loading

Choose a reason for hiding this comment

pkukielka Jan 30, 2024

Choose a reason for hiding this comment

pkukielka left a comment

Choose a reason for hiding this comment

Sa1to commented Jan 19, 2024 •

edited by mkondratek

Loading

mkondratek commented Jan 26, 2024 •

edited

Loading

kalanchan commented Jan 29, 2024 •

edited

Loading

mkondratek Jan 30, 2024 •

edited

Loading