[jenson] Remove redundant disabling of new relic instrumentation

gojek · Jan 8, 2019 · e8f5a41 · e8f5a41
1 parent 0c875c8
commit e8f5a41
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 21 deletions.
diff --git a/proctord/.env.sample b/proctord/.env.sample
@@ -20,5 +20,4 @@ export PROCTOR_POSTGRES_MAX_CONNECTIONS="50"
 export PROCTOR_POSTGRES_CONNECTIONS_MAX_LIFETIME="30"
 export PROCTOR_NEW_RELIC_APP_NAME="PROCTORD"
 export PROCTOR_NEW_RELIC_LICENCE_KEY="nrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnr"
-export PROCTOR_NEW_RELIC_ENABLED=false
 export PROCTOR_MIN_CLIENT_VERSION="v0.2.0"
diff --git a/proctord/.env.test b/proctord/.env.test
@@ -22,5 +22,4 @@ export PROCTOR_POSTGRES_MAX_CONNECTIONS=50
 export PROCTOR_POSTGRES_CONNECTIONS_MAX_LIFETIME=30
 export PROCTOR_NEW_RELIC_APP_NAME="PROCTORD"
 export PROCTOR_NEW_RELIC_LICENCE_KEY="nrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnr"
-export PROCTOR_NEW_RELIC_ENABLED=false
 export PROCTOR_MIN_CLIENT_VERSION="v0.2.0"
diff --git a/proctord/README.md b/proctord/README.md
@@ -56,3 +56,5 @@
 * Create database `PROCTOR_POSTGRES_DATABASE`
 * `PROCTOR_POSTGRES_MAX_CONNECTIONS` defines maximum open and idle connections to postgres
 * `PROCTOR_POSTGRES_CONNECTIONS_MAX_LIFETIME` is the lifetime of a connection in minutes
+* `PROCTOR_NEW_RELIC_APP_NAME` and `PROCTOR_NEW_RELIC_LICENCE_KEY` are used to send profiling details to newrelic. Provide dummy values if you don't want profiling
+* `PROCTOR_MIN_CLIENT_VERSION` is minimum client version allowed to communicate with proctord
diff --git a/proctord/config/config.go b/proctord/config/config.go
@@ -101,10 +101,6 @@ func NewRelicLicenceKey() string {
 	return viper.GetString("NEW_RELIC_LICENCE_KEY")
 }
 
-func NewRelicEnabled() bool {
-	return viper.GetBool("NEW_RELIC_ENABLED")
-}
-
 func MinClientVersion() string {
 	return viper.GetString("MIN_CLIENT_VERSION")
-}
+}
diff --git a/proctord/config/config_test.go b/proctord/config/config_test.go
@@ -186,14 +186,6 @@ func TestNewRelicLicenceKey(t *testing.T) {
 	assert.Equal(t, "nrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnrnr", NewRelicLicenceKey())
 }
 
-func TestNewRelicEnabled(t *testing.T) {
-	os.Setenv("PROCTOR_NEW_RELIC_ENABLED", "true")
-
-	viper.AutomaticEnv()
-
-	assert.Equal(t, true, NewRelicEnabled())
-}
-
 func TestMinClientVersion(t *testing.T) {
 	os.Setenv("PROCTOR_MIN_CLIENT_VERSION", "0.2.0")
 

diff --git a/proctord/instrumentation/newrelic.go b/proctord/instrumentation/newrelic.go
@@ -4,18 +4,12 @@ import (
 	"net/http"
 
 	"github.com/gojektech/proctor/proctord/config"
-	"github.com/gojektech/proctor/proctord/logger"
 	"github.com/newrelic/go-agent"
 )
 
 var NewRelicApp newrelic.Application
 
 func InitNewRelic() error {
-	if !config.NewRelicEnabled() {
-		logger.Warn("New Relic is disabled")
-		NewRelicApp = &StubNewrelicApp{}
-		return nil
-	}
 	appName := config.NewRelicAppName()
 	licenceKey := config.NewRelicLicenceKey()
 	newRelicConfig := newrelic.NewConfig(appName, licenceKey)