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.

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

Add default analytics uri #5607

Merged
merged 4 commits into from
Jul 12, 2021
Merged

Add default analytics uri #5607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e91d986
[WIP] add default analytics uri
fm3 Jul 7, 2021
565ee9a
Enter relayer URI to default config
fm3 Jul 8, 2021
a674a13
Changelog
fm3 Jul 8, 2021
4a9d018
Merge branch 'master' into analytics-default
fm3 Jul 12, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- one for the skeleton mode (similar to the existing move tool).
- one for erasing volume data (similar to right-dragging with the previous brush/trace tool)
- Added colored icons to the status entries in the job list. [#5572](https://github.com/scalableminds/webknossos/pull/5594)
- Back-end side analytics are now sent to events-relay.webknossos.org by default. You can opt out by setting `backendAnalytics.uri` to empty in your config. [5607](https://github.com/scalableminds/webknossos/pull/5607)

### Changed
- Improve error logging for unhandled rejections. [#5575](https://github.com/scalableminds/webknossos/pull/5575)
Expand Down
4 changes: 2 additions & 2 deletions app/models/analytics/AnalyticsService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ class AnalyticsService @Inject()(rpc: RPC,
}

private def send(analyticsEventJson: JsObject): Fox[Unit] = {
if (wkConf.BackendAnalytics.uri == "" || wkConf.BackendAnalytics.key == "") {
if (wkConf.BackendAnalytics.uri == "") {
if (wkConf.BackendAnalytics.verboseLoggingEnabled) {
logger.info(s"Not sending analytics event, since uri/key is not configured. Event was: $analyticsEventJson")
logger.info(s"Not sending analytics event, since uri is not configured. Event was: $analyticsEventJson")
}
} else {
if (wkConf.BackendAnalytics.verboseLoggingEnabled) {
Expand Down
3 changes: 2 additions & 1 deletion conf/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ slackNotifications {

# Back-end analytics
backendAnalytics {
uri = ""
uri = "https://events-relay.webknossos.org/events"
uri = ${?DEV_WK_ANALYTICS_URI}
key = ""
sessionPause = 30 minutes
verboseLoggingEnabled = false
Expand Down