Merge pull request #364 from esimov/master

Define a global environment variable instead of Sentry

Author: monstermunchkin

docker-compose.yml

@@ -64,11 +64,11 @@ services:
       - "3000:3000"
       - "3001:3001"
     environment:
+      - ENVIRONMENT=development
       - JAEGER_AGENT_HOST=jaeger
       - JAEGER_SAMPLER_TYPE=const
       - JAEGER_SAMPLER_PARAM=1
       - JAEGER_SERVICE_NAME=testserver
-      - SENTRY_ENVIRONMENT=development
       - SENTRY_RELEASE=HEAD
       - PACE_LIVETEST_INTERVAL=10s
       - LOG_FORMAT=console

maintenance/errors/README.md

@@ -9,9 +9,9 @@
 
 ## Environment based configuration
 
+* `ENVIRONMENT`
+    * Default environment of sentry reported in the dashboard
 * `SENTRY_DSN`
     * URL of the sentry DSN
-* `SENTRY_ENVIRONMENT`
-    * Environment of sentry reported in the dashboard
 * `SENTRY_RELEASE`
     * Name of the release e.g. git commit or similar

maintenance/errors/raven/client.go

@@ -376,7 +376,7 @@ func newClient(tags map[string]string) *Client {
 		log.Warnf("DSN environment was set to %q but failed: %v", dsn, err)
 	}
 	client.SetRelease(os.Getenv("SENTRY_RELEASE"))
-	client.SetEnvironment(os.Getenv("SENTRY_ENVIRONMENT"))
+	client.SetEnvironment(os.Getenv("ENVIRONMENT"))
 	return client
 }