github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2928 from overleaf/jpa-sentry-unified-release-and-env-annotation

Browse source 
[misc] expose release and environment to frontend

GitOrigin-RevId: 2adab7cfb2c63f6d5bc34c367393449c84ef2690
This commit is contained in:
Jakob Ackermann 2020-06-23 15:15:49 +02:00 committed by Copybot
parent 130ea42a79
commit 991c4f9876
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/Dockerfile
View file

@ -44,3 +44,6 @@ RUN mkdir -p /app/data/dumpFolder && \
USER node USER node
CMD ["node", "--expose-gc", "app.js"] CMD ["node", "--expose-gc", "app.js"]
ARG SENTRY_RELEASE
ENV SENTRY_RELEASE=$SENTRY_RELEASE

7
services/web/app/src/infrastructure/ExpressLocals.js
View file

@ -366,9 +366,10 @@ module.exports = function(webRouter, privateApiRouter, publicApiRouter) {
recaptchaDisabled: recaptchaDisabled:
Settings.recaptcha != null ? Settings.recaptcha.disabled : undefined, Settings.recaptcha != null ? Settings.recaptcha.disabled : undefined,
validRootDocExtensions: Settings.validRootDocExtensions, validRootDocExtensions: Settings.validRootDocExtensions,
sentryAllowedOriginRegex: sentryAllowedOriginRegex: Settings.sentry.allowedOriginRegex,
Settings.sentry && Settings.sentry.allowedOriginRegex, sentryDsn: Settings.sentry.publicDSN,
sentryDsn: Settings.sentry != null ? Settings.sentry.publicDSN : undefined sentryEnvironment: Settings.sentry.environment,
sentryRelease: Settings.sentry.release
} }
next() next()
}) })

9
services/web/config/settings.defaults.coffee
View file

@ -385,13 +385,10 @@ module.exports = settings =
# tenderUrl: "" # tenderUrl: ""
# #
# Client-side error logging is provided by getsentry.com # Client-side error logging is provided by getsentry.com
# sentry: sentry:
# src: "" environment: process.env['SENTRY_ENVIRONMENT']
release: process.env['SENTRY_RELEASE']
# publicDSN: "" # publicDSN: ""
#
# src should be either a remote url like
# //cdn.ravenjs.com/1.1.22/jquery,native/raven.min.js
# or a local file in the js/libs directory.
# The publicDSN is the token for the client-side getSentry service. # The publicDSN is the token for the client-side getSentry service.
# Production Settings # Production Settings

2
services/web/frontend/js/utils/sentry.js
View file

@ -6,6 +6,8 @@ if (window.ExposedSettings.sentryDsn) {
Sentry.init({ Sentry.init({
dsn: window.ExposedSettings.sentryDsn, dsn: window.ExposedSettings.sentryDsn,
release: window.ExposedSettings.sentryRelease,
environment: window.ExposedSettings.sentryEnvironment,
// Ignore errors unless they come from our origins // Ignore errors unless they come from our origins
// Adapted from: https://docs.sentry.io/platforms/javascript/#decluttering-sentry // Adapted from: https://docs.sentry.io/platforms/javascript/#decluttering-sentry