Merge pull request #86 from percona/PMM-2214

PMM-2214 Fixed default value for ExampleQuery conf

Author: rnovikovP

agent/agent_test.go

@@ -281,11 +281,12 @@ func (s *AgentTestSuite) TestStatusAfterConnFail(t *C) {
 }
 
 func (s *AgentTestSuite) TestStartStopService(t *C) {
+	exampleQueries := true
 	// To start a service, first we make a config for the service:
 	qanConfig := &pc.QAN{
 		Interval:       60,         // seconds
 		MaxSlowLogSize: 1073741824, // 1 GiB
-		ExampleQueries: true,
+		ExampleQueries: &exampleQueries,
 		WorkerRunTime:  120, // seconds
 	}
 
@@ -379,10 +380,11 @@ func (s *AgentTestSuite) TestStartStopService(t *C) {
 func (s *AgentTestSuite) TestStartServiceSlow(t *C) {
 	// This test is like TestStartService but simulates a slow starting service.
 
+	exampleQueries := true
 	qanConfig := &pc.QAN{
 		Interval:       60,         // seconds
 		MaxSlowLogSize: 1073741824, // 1 GiB
-		ExampleQueries: true,
+		ExampleQueries: &exampleQueries,
 		WorkerRunTime:  120, // seconds
 	}
 	qanConfigData, _ := json.Marshal(qanConfig)

bin/percona-qan-agent-installer/installer/installer.go

@@ -44,9 +44,9 @@ type Installer struct {
 	hostname     string
 	flags        Flags
 	// --
-	os       *proto.Instance
-	agent    *proto.Instance
-	debug    bool
+	os    *proto.Instance
+	agent *proto.Instance
+	debug bool
 }
 
 func newUUID() string {

docker-compose.yml

@@ -12,7 +12,7 @@ services:
     volumes:
       - ./test/schema/:/docker-entrypoint-initdb.d/:rw
   mongo:
-    image: ${MONGODB_IMAGE:-percona/percona-server-mongodb:3.4}
+    image: ${MONGODB_IMAGE:-mongo:3.6}
     ports:
       - ${MONGODB_HOST:-127.0.0.1}:${MONGODB_PORT:-27017}:27017
     # MongoDB doesn't enable profiling by default

glide.lock

@@ -76,10 +76,11 @@ func TestRealStartTool(t *testing.T) {
 	require.NoError(t, err)
 
 	// Create the qan config.
+	exampleQueries := true
 	config := &pc.QAN{
 		UUID:           protoInstance.UUID,
 		Interval:       1, // 1 second
-		ExampleQueries: true,
+		ExampleQueries: &exampleQueries,
 	}
 
 	// Send a StartTool cmd with the qan config to start an analyzer.

qan/analyzer/mongo/manager_test.go

@@ -133,10 +133,11 @@ func (m *MongoAnalyzer) Stop() error {
 }
 
 func (m *MongoAnalyzer) GetDefaults(uuid string) map[string]interface{} {
+	defaultExampleQueries := aggregator.DefaultExampleQueries
 	// verify config
 	if m.config.Interval == 0 {
 		m.config.Interval = aggregator.DefaultInterval
-		m.config.ExampleQueries = aggregator.DefaultExampleQueries
+		m.config.ExampleQueries = &defaultExampleQueries
 	}
 
 	return map[string]interface{}{

qan/analyzer/mongo/mongo.go

@@ -24,10 +24,11 @@ const (
 
 // New returns configured *Aggregator
 func New(timeStart time.Time, config pc.QAN) *Aggregator {
+	defaultExampleQueries := DefaultExampleQueries
 	// verify config
 	if config.Interval == 0 {
 		config.Interval = DefaultInterval
-		config.ExampleQueries = DefaultExampleQueries
+		config.ExampleQueries = &defaultExampleQueries
 	}
 
 	aggregator := &Aggregator{
@@ -251,9 +252,10 @@ func (self *Aggregator) createResult() *report.Result {
 	global := event.NewClass("", "", false)
 	queryStats := queries.CalcQueriesStats(int64(self.config.Interval))
 	classes := []*event.Class{}
+	exampleQueries := boolValue(self.config.ExampleQueries)
 	for _, queryInfo := range queryStats {
-		class := event.NewClass(queryInfo.ID, queryInfo.Fingerprint, self.config.ExampleQueries)
-		if self.config.ExampleQueries {
+		class := event.NewClass(queryInfo.ID, queryInfo.Fingerprint, exampleQueries)
+		if exampleQueries {
 			db := ""
 			s := strings.SplitN(queryInfo.Namespace, ".", 2)
 			if len(s) == 2 {
@@ -313,3 +315,12 @@ func newEventTimeStatsInMilliseconds(s mongostats.Statistics) *event.TimeStats {
 		Max: event.Float64(s.Max / 1000),
 	}
 }
+
+// boolValue returns the value of the bool pointer passed in or
+// false if the pointer is nil.
+func boolValue(v *bool) bool {
+	if v != nil {
+		return *v
+	}
+	return false
+}

qan/analyzer/mongo/profiler/aggregator/aggregator.go

@@ -31,10 +31,10 @@ func TestAggregator_Add(t *testing.T) {
 
 	{
 		doc := proto.SystemProfile{
-			Ts: timeStart,
-			Millis: 1000,
+			Ts:           timeStart,
+			Millis:       1000,
 			DocsExamined: 13,
-			Nreturned: 42,
+			Nreturned:    42,
 		}
 		err := aggregator.Add(doc)
 		require.NoError(t, err)
@@ -68,7 +68,7 @@ func TestAggregator_Add(t *testing.T) {
 						},
 					},
 					NumberMetrics: map[string]*event.NumberStats{
-						"Bytes_sent":    {
+						"Bytes_sent": {
 							Sum: 0,
 							Min: event.Uint64(0),
 							Avg: event.Uint64(0),
@@ -84,7 +84,7 @@ func TestAggregator_Add(t *testing.T) {
 							Avg: event.Uint64(13),
 							Max: event.Uint64(13),
 						},
-						"Rows_sent":     {
+						"Rows_sent": {
 							Sum: 42,
 							Med: event.Uint64(42),
 							P95: event.Uint64(42),
@@ -113,7 +113,7 @@ func TestAggregator_Add(t *testing.T) {
 							},
 						},
 						NumberMetrics: map[string]*event.NumberStats{
-							"Bytes_sent":    {
+							"Bytes_sent": {
 								Sum: 0,
 								Min: event.Uint64(0),
 								Avg: event.Uint64(0),
@@ -129,7 +129,7 @@ func TestAggregator_Add(t *testing.T) {
 								P95: event.Uint64(13),
 								Max: event.Uint64(13),
 							},
-							"Rows_sent":     {
+							"Rows_sent": {
 								Sum: 42,
 								Min: event.Uint64(42),
 								Avg: event.Uint64(42),

qan/analyzer/mongo/profiler/aggregator/aggregator_test.go

@@ -32,10 +32,11 @@ func TestCollectingAndSendingData(t *testing.T) {
 	dataChan := make(chan interface{})
 	spool := mock.NewSpooler(dataChan)
 	// Create the QAN config.
+	exampleQueries := true
 	qanConfig := config.QAN{
 		UUID:           "12345678",
 		Interval:       5, // seconds
-		ExampleQueries: true,
+		ExampleQueries: &exampleQueries,
 	}
 	plugin := New(dialInfo, dialer, logger, spool, qanConfig)
 

qan/analyzer/mongo/profiler/profiler_test.go

@@ -123,6 +123,7 @@ func (s *AnalyzerTestSuite) SetUpTest(t *C) {
 	}
 	s.worker = qan_worker.NewQanWorker()
 	// Config needs to be recreated on every test since it can be modified by the test analyzers
+	exampleQueries := true
 	s.config = pc.QAN{
 		UUID:           s.mysqlUUID,
 		CollectFrom:    "slowlog",
@@ -135,6 +136,7 @@ func (s *AnalyzerTestSuite) SetUpTest(t *C) {
 		Stop: []string{
 			"-- stop",
 		},
+		ExampleQueries: &exampleQueries,
 	}
 }