addressing after review

Author: pawels-optimizely

examples/README.md

@@ -3,5 +3,7 @@
 ### Profiling
 Prerequisite: `go get github.com/pkg/profile`
 
-* CPU profile. Execute: `go build -ldflags "-X main.RunCPUProfile=true" main_profile_feature.go && ./main_profile_feature`. It will create cpu.pprof file in your current directory. Then run: `go tool pprof -http=:8080 cpu.pprof` and profile cpu usage using web browser.
-* Memory profile. Execute: `go build -ldflags "-X main.RunMemProfile=true" main_profile_feature.go.go && ./main_profile_feature`. It will create mem.pprof file in your current directory. Then run: `go tool pprof -http=:8080 mem.pprof` and profile memory using browser.
+DATAFILES_DIR env var has to be set to point to the path where 100_entities.json is located
+
+* CPU profile. Execute: `go build -ldflags "-X main.ProfileMode=cpu" main_profile_feature.go && ./main_profile_feature`. It will create cpu.pprof file in your current directory. Then run: `go tool pprof -http=:8080 cpu.pprof` and profile cpu usage using web browser.
+* Memory profile. Execute: `go build -ldflags "-X main.ProfileMode=mem" main_profile_feature.go.go && ./main_profile_feature`. It will create mem.pprof file in your current directory. Then run: `go tool pprof -http=:8080 mem.pprof` and profile memory using browser.

examples/main_profile_feature.go

@@ -1,5 +1,4 @@
-// to run the CPU profiling: go build -ldflags "-X main.RunCPUProfile=true" main.go && ./main
-// to run the Mem profiling: go build -ldflags "-X main.RunMemProfile=true" main.go && ./main
+// to run the CPU profiling: go build -ldflags "-X main.ProfileMode=mem" main_profile_feature.go && ./main_profile_feature
 
 package main
 
@@ -17,7 +16,6 @@ import (
 	"github.com/pkg/profile"
 )
 
-// stressTest has everything that test app has. it is used to run profile
 func stressTest() {
 	/*
 		For the test app, the biggest json file is used with 100 entities.
@@ -57,17 +55,18 @@ func stressTest() {
 	clientApp.IsFeatureEnabled("feature_5", user)
 }
 
-var RunMemProfile = "false"
-var RunCPUProfile = "false"
+var ProfileMode = ""
+
+const RUN_NUMBER = 50
 
 func main() {
 
-	if RunMemProfile == "true" || RunCPUProfile == "true" {
+	if ProfileMode != "" {
 
-		const RUN_NUMBER = 50
-		if RunMemProfile == "true" {
+		switch ProfileMode {
+		case "mem":
 			defer profile.Start(profile.MemProfile, profile.ProfilePath("."), profile.MemProfileRate(1)).Stop()
-		} else if RunCPUProfile == "true" {
+		case "cpu":
 			defer profile.Start(profile.CPUProfile, profile.ProfilePath(".")).Stop()
 		}
 

optimizely/config/datafileprojectconfig/json_parser_test.go

@@ -17,10 +17,8 @@
 package datafileprojectconfig
 
 import (
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"testing"
 
 	"github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/entities"
@@ -65,14 +63,9 @@ func TestParseDatafilePasses(t *testing.T) {
 
 func BenchmarkParseDatafilePasses(b *testing.B) {
 	for n := 0; n < b.N; n++ {
-		datafile, err := ioutil.ReadFile("test/100_entities.json")
-		if err != nil {
-			log.Fatal(err)
-		}
+		datafile, _ := ioutil.ReadFile("test/100_entities.json")
 
-		datafileStruct := &entities.Datafile{}
-
-		json.Unmarshal(datafile, &datafileStruct)
+		Parse(datafile)
 
 	}