fix operation and namespace for older MongoDB versions

2025-09-17 00:47:44 +00:00 · 2017-10-14 20:10:21 +02:00
parent 32827eb4b5
commit 981faf53ad
94 changed files with 716 additions and 917 deletions
--- a/src/go/mongolib/fingerprinter/fingerprinter.go
+++ b/src/go/mongolib/fingerprinter/fingerprinter.go
@@ -17,29 +17,34 @@ var (
 	DEFAULT_KEY_FILTERS = []string{"^shardVersion$"}
 )

-type Fingerprinter interface {
-	Fingerprint(doc proto.SystemProfile) (string, error)
+type Fingerprint struct {
+	Namespace   string
+	Operation   string
+	Collection  string
+	Database    string
+	Keys        string
+	Fingerprint string
 }

-type Fingerprint struct {
+type Fingerprinter struct {
 	keyFilters []string
 }

-func NewFingerprinter(keyFilters []string) *Fingerprint {
-	return &Fingerprint{
+func NewFingerprinter(keyFilters []string) *Fingerprinter {
+	return &Fingerprinter{
 		keyFilters: keyFilters,
 	}
 }

-func (f *Fingerprint) Fingerprint(doc proto.SystemProfile) (string, error) {
+func (f *Fingerprinter) Fingerprint(doc proto.SystemProfile) (Fingerprint, error) {
 	realQuery, err := util.GetQueryField(doc)
 	if err != nil {
 		// Try to encode doc.Query as json for prettiness
 		if buf, err := json.Marshal(realQuery); err == nil {
-			return "", fmt.Errorf("%v for query %s", err, string(buf))
+			return Fingerprint{}, fmt.Errorf("%v for query %s", err, string(buf))
 		}
 		// If we cannot encode as json, return just the error message without the query
-		return "", err
+		return Fingerprint{}, err
 	}
 	retKeys := keys(realQuery, f.keyFilters)

@@ -61,22 +66,22 @@ func (f *Fingerprint) Fingerprint(doc proto.SystemProfile) (string, error) {
 		}
 	}

-	// Extract collection name and operation
+	// Extract operation, collection, database and namespace
 	op := ""
 	collection := ""
+	database := ""
+	ns := strings.SplitN(doc.Ns, ".", 2)
+	if len(ns) > 0 {
+		database = ns[0]
+	}
+	if len(ns) == 2 {
+		collection = ns[1]
+	}
 	switch doc.Op {
 	case "remove", "update":
 		op = doc.Op
-		ns := strings.SplitN(doc.Ns, ".", 2)
-		if len(ns) == 2 {
-			collection = ns[1]
-		}
 	case "insert":
 		op = doc.Op
-		ns := strings.SplitN(doc.Ns, ".", 2)
-		if len(ns) == 2 {
-			collection = ns[1]
-		}
 		retKeys = []string{}
 	case "query":
 		// EXPLAIN MongoDB 2.6:
@@ -88,13 +93,11 @@ func (f *Fingerprint) Fingerprint(doc proto.SystemProfile) (string, error) {
 		// },
 		if _, ok := doc.Query.Map()["$explain"]; ok {
 			op = "explain"
+			database = ""
+			collection = ""
 			break
 		}
 		op = "find"
-		ns := strings.SplitN(doc.Ns, ".", 2)
-		if len(ns) == 2 {
-			collection = ns[1]
-		}
 	default:
 		if query.Len() == 0 {
 			break
@@ -138,6 +141,8 @@ func (f *Fingerprint) Fingerprint(doc proto.SystemProfile) (string, error) {
 		case "geoNear":
 			retKeys = []string{}
 		case "explain":
+			database = ""
+			collection = ""
 			retKeys = []string{}
 		case "$eval":
 			op = "eval"
@@ -162,7 +167,23 @@ func (f *Fingerprint) Fingerprint(doc proto.SystemProfile) (string, error) {
 		parts = append(parts, keys)
 	}

-	return strings.Join(parts, " "), nil
+	ns = []string{}
+	if database != "" {
+		ns = append(ns, database)
+	}
+	if collection != "" {
+		ns = append(ns, collection)
+	}
+	fp := Fingerprint{
+		Operation:   op,
+		Namespace:   strings.Join(ns, "."),
+		Database:    database,
+		Collection:  collection,
+		Keys:        keys,
+		Fingerprint: strings.Join(parts, " "),
+	}
+
+	return fp, nil
 }

 func keys(query interface{}, keyFilters []string) []string {
--- a/src/go/mongolib/fingerprinter/fingerprinter_test.go
+++ b/src/go/mongolib/fingerprinter/fingerprinter_test.go
@@ -44,7 +44,7 @@ func ExampleFingerprint() {
 	if err != nil {
 		panic(err)
 	}
-	fmt.Println(got)
+	fmt.Println(got.Fingerprint)
 	// Output: FIND sbtest3 c,k,pad
 }

@@ -68,7 +68,7 @@ func TestFingerprint(t *testing.T) {
 		t.Error("Error in fingerprint")
 	}

-	if got != want {
+	if got.Fingerprint != want {
 		t.Errorf("Invalid fingerprint. Got: %q, want %q", got, want)
 	}
 }
@@ -183,8 +183,8 @@ func TestFingerprints(t *testing.T) {
 				t.Errorf("cannot create fingerprint: %s", err)
 			}
 			expect := expects[file.Name()]
-			if !reflect.DeepEqual(got, expect) {
-				t.Errorf("fp.Fingerprint(doc) = %s, want %s", got, expect)
+			if !reflect.DeepEqual(got.Fingerprint, expect) {
+				t.Errorf("fp.Fingerprint(doc) = %s, want %s", got.Fingerprint, expect)
 			}
 		})
 	}
--- a/src/go/mongolib/profiler/profiler_test.go
+++ b/src/go/mongolib/profiler/profiler_test.go
@@ -70,9 +70,9 @@ func TestRegularIterator(t *testing.T) {
 	lastSeen, _ := time.Parse(time.RFC3339Nano, "2017-04-01T23:01:20.214+00:00")
 	want := stats.Queries{
 		{
-			ID:             "16196765fb4c14edb91efdbe4f5c5973",
+			ID:             "95575e896c2830043dc333cb8ee61339",
 			Namespace:      "samples.col1",
-			Operation:      "query",
+			Operation:      "FIND",
 			Query:          "{\"ns\":\"samples.col1\",\"op\":\"query\",\"query\":{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}}\n",
 			Fingerprint:    "FIND col1 find",
 			FirstSeen:      firstSeen,
@@ -128,9 +128,9 @@ func TestIteratorTimeout(t *testing.T) {
 	lastSeen, _ := time.Parse(time.RFC3339Nano, "2017-04-01T23:01:19.914+00:00")
 	want := stats.Queries{
 		{
-			ID:             "16196765fb4c14edb91efdbe4f5c5973",
+			ID:             "95575e896c2830043dc333cb8ee61339",
 			Namespace:      "samples.col1",
-			Operation:      "query",
+			Operation:      "FIND",
 			Query:          "{\"ns\":\"samples.col1\",\"op\":\"query\",\"query\":{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}}\n",
 			Fingerprint:    "FIND col1 find",
 			FirstSeen:      firstSeen,
@@ -208,9 +208,9 @@ func TestTailIterator(t *testing.T) {

 	want := stats.Queries{
 		{
-			ID:             "16196765fb4c14edb91efdbe4f5c5973",
+			ID:             "95575e896c2830043dc333cb8ee61339",
 			Namespace:      "samples.col1",
-			Operation:      "query",
+			Operation:      "FIND",
 			Query:          "{\"ns\":\"samples.col1\",\"op\":\"query\",\"query\":{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}}\n",
 			Fingerprint:    "FIND col1 find",
 			FirstSeen:      parseDate("2017-04-01T23:01:20.214+00:00"),
@@ -223,9 +223,9 @@ func TestTailIterator(t *testing.T) {
 			ResponseLength: []float64{1.06123e+06},
 		},
 		{
-			ID:             "16196765fb4c14edb91efdbe4f5c5973",
+			ID:             "95575e896c2830043dc333cb8ee61339",
 			Namespace:      "samples.col1",
-			Operation:      "query",
+			Operation:      "FIND",
 			Query:          "{\"ns\":\"samples.col1\",\"op\":\"query\",\"query\":{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}}\n",
 			Fingerprint:    "FIND col1 find",
 			FirstSeen:      parseDate("2017-04-01T23:01:19.914+00:00"),
--- a/src/go/mongolib/stats/fingerprinter.go
+++ b/src/go/mongolib/stats/fingerprinter.go
@@ -0,0 +1,10 @@
+package stats
+
+import (
+	"github.com/percona/percona-toolkit/src/go/mongolib/fingerprinter"
+	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
+)
+
+type Fingerprinter interface {
+	Fingerprint(doc proto.SystemProfile) (fingerprinter.Fingerprint, error)
+}
--- a/src/go/mongolib/stats/stats.go
+++ b/src/go/mongolib/stats/stats.go
@@ -8,7 +8,6 @@ import (
 	"time"

 	"github.com/montanaflynn/stats"
-	"github.com/percona/percona-toolkit/src/go/mongolib/fingerprinter"
 	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
 	"gopkg.in/mgo.v2/bson"
 )
@@ -31,8 +30,8 @@ func (e *StatsError) Parent() error {

 type StatsFingerprintError StatsError

-// New creates new instance of stats with given fingerprinter
-func New(fingerprinter fingerprinter.Fingerprinter) *Stats {
+// New creates new instance of stats with given Fingerprinter
+func New(fingerprinter Fingerprinter) *Stats {
 	s := &Stats{
 		fingerprinter: fingerprinter,
 	}
@@ -44,7 +43,7 @@ func New(fingerprinter fingerprinter.Fingerprinter) *Stats {
 // Stats is a collection of MongoDB statistics
 type Stats struct {
 	// dependencies
-	fingerprinter fingerprinter.Fingerprinter
+	fingerprinter Fingerprinter

 	// internal
 	queryInfoAndCounters map[GroupKey]*QueryInfoAndCounters
@@ -69,9 +68,9 @@ func (s *Stats) Add(doc proto.SystemProfile) error {
 	var ok bool

 	key := GroupKey{
-		Operation:   doc.Op,
-		Fingerprint: fp,
-		Namespace:   doc.Ns,
+		Operation:   fp.Operation,
+		Fingerprint: fp.Fingerprint,
+		Namespace:   fp.Namespace,
 	}
 	if qiac, ok = s.getQueryInfoAndCounters(key); !ok {
 		query := proto.NewExampleQuery(doc)
@@ -81,9 +80,9 @@ func (s *Stats) Add(doc proto.SystemProfile) error {
 		}
 		qiac = &QueryInfoAndCounters{
 			ID:          fmt.Sprintf("%x", md5.Sum([]byte(fmt.Sprintf("%s", key)))),
-			Operation:   doc.Op,
-			Fingerprint: fp,
-			Namespace:   doc.Ns,
+			Operation:   fp.Operation,
+			Fingerprint: fp.Fingerprint,
+			Namespace:   fp.Namespace,
 			TableScan:   false,
 			Query:       string(queryBson),
 		}
--- a/src/go/mongolib/stats/stats_test.go
+++ b/src/go/mongolib/stats/stats_test.go
@@ -145,9 +145,9 @@ func TestStats(t *testing.T) {
 		t.Errorf("Error processing doc: %s\n", err.Error())
 	}
 	statsVal := QueryInfoAndCounters{
-		ID:             "4e4774ad26f934a193757002a991ebb8",
+		ID:             "d7088d6b50551d1f2f5f34b006c0140d",
 		Namespace:      "samples.col1",
-		Operation:      "query",
+		Operation:      "FIND",
 		Query:          "{\"ns\":\"samples.col1\",\"op\":\"query\",\"query\":{\"find\":\"col1\",\"filter\":{\"s2\":{\"$gte\":\"41991\",\"$lt\":\"33754\"}},\"shardVersion\":[0,\"000000000000000000000000\"]}}\n",
 		Fingerprint:    "FIND col1 s2",
 		FirstSeen:      parseDate("2017-04-10T13:15:53.532-03:00"),
--- a/src/go/pt-mongodb-query-digest/main_test.go
+++ b/src/go/pt-mongodb-query-digest/main_test.go
@@ -301,107 +301,107 @@ Skipping profiled queries on these collections: \[system\.profile\]

 	queries := []stats.QueryStats{
 		{
-			ID:          "a7ce8dee16beadb767484112e6b29af3",
+			ID:          "e357abe482dcc0cd03ab742741bf1c86",
 			Namespace:   "test.coll",
-			Operation:   "insert",
+			Operation:   "INSERT",
 			Fingerprint: "INSERT coll",
 			Query:       `{"ns":"test.coll","op":"insert","query":{"insert":"coll","documents":\[{"_id":{"\$oid":".*"},"a":9}\],"ordered":true}}`,
 		},
 		{
-			ID:          "7e6e9af8a1754a065b323acdddbee4b5",
+			ID:          "c9b40ce564762834d12b0390a292645c",
 			Namespace:   "test.coll",
-			Operation:   "command",
+			Operation:   "DROP",
 			Fingerprint: "DROP coll drop",
 			Query:       `{"ns":"test.coll","op":"command","command":{"drop":"coll"}}`,
 		},
 		{
-			ID:          "bab52c8aa977c96ecd148c015ae07c42",
+			ID:          "e72ad41302045bd6c2bcad76511f915a",
 			Namespace:   "test.coll",
-			Operation:   "remove",
+			Operation:   "REMOVE",
 			Fingerprint: "REMOVE coll a,b",
 			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"remove","query":{"a":{"$gte":2},"b":{"$gte":2}}}`),
 		},
 		{
-			ID:          "11e1b6f695d43b1b5a2f7e6de2ad8305",
+			ID:          "30dbfbc89efd8cfd40774dff0266a28f",
 			Namespace:   "test.coll",
-			Operation:   "command",
+			Operation:   "AGGREGATE",
 			Fingerprint: "AGGREGATE coll a",
 			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"aggregate":"coll","pipeline":[{"$match":{"a":{"$gte":2}}}],"cursor":{}}}`),
 		},
 		{
-			ID:          "a4be6ed97c946182af7e30cf818afdac",
+			ID:          "e4122a58c99ab0a4020ce7d195c5a8cb",
 			Namespace:   "test.coll",
-			Operation:   "command",
+			Operation:   "DISTINCT",
 			Fingerprint: "DISTINCT coll a,b",
 			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"distinct":"coll","key":"a","query":{"b":{"$gte":5}}}}`),
 		},
 		{
-			ID:          "e2f53c6824c5cbe454e33e128b350d1e",
-			Namespace:   "test.coll",
-			Operation:   "command",
-			Fingerprint: "EXPLAIN",
-			Query:       `{"ns":"test.coll","op":"command","command":{"explain":{"find":"coll","filter":{}},"verbosity":"queryPlanner"}}`,
-		},
-		{
-			ID:          "9423eaa90c222686d092c04f001fb369",
-			Namespace:   "test.coll",
-			Operation:   "command",
-			Fingerprint: "FINDANDMODIFY coll a",
-			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"findandmodify":"coll","query":{"a":2},"update":{"$inc":{"b":1}}},"updateobj":{"$inc":{"b":1}}}`),
-		},
-		{
-			ID:          "dd20c739baef5a3fd9352c350c7e69f1",
-			Namespace:   "test.coll",
-			Operation:   "command",
-			Fingerprint: "GEONEAR coll",
-			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"geoNear":"coll","near":{"type":"Point","coordinates":[1,1]},"spherical":true}}`),
-		},
-		{
-			ID:          "018a055f724d418b80e66b98bfdb25a5",
-			Namespace:   "test.coll",
-			Operation:   "command",
-			Fingerprint: "GROUP coll a,b",
-			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"group":{"key":{"a":1,"b":1},"cond":{"b":3},"initial":{},"ns":"coll","$reduce":{"Code":"function () {}","Scope":null}}}}`),
-		},
-		{
-			ID:          "130827f5b7afe1369f619ccd5cd61ec4",
-			Namespace:   "test.coll",
-			Operation:   "command",
-			Fingerprint: "MAPREDUCE coll a",
-			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"mapreduce":"coll","map":{"Code":"function () {\n    emit(this.a, this.b);\n}","Scope":null},"reduce":{"Code":"function (a, b) {\n    return Array.sum(b);\n}","Scope":null},"query":{"a":{"$gte":0}},"out":{"inline":1}}}`),
-		},
-		{
-			ID:          "71b3d6aa44d34aaa02cd65bad3e25f49",
+			ID:          "a6782ae38ef891d5506341a4b0ab2747",
 			Namespace:   "test",
-			Operation:   "command",
+			Operation:   "EVAL",
 			Fingerprint: "EVAL",
 			Query:       regexp.QuoteMeta(`{"ns":"test","op":"command","command":{"$eval":"db"}}`),
 		},
 		{
-			ID:          "2300d7f2d372205544f249b010e9b8ad",
-			Namespace:   "test.coll",
-			Operation:   "command",
-			Fingerprint: "COUNT coll a",
-			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"count":"coll","query":{"a":{"$gt":5}},"fields":{}}}`),
+			ID:          "76d7662df07b44135ac3e07e44a6eb39",
+			Namespace:   "",
+			Operation:   "EXPLAIN",
+			Fingerprint: "EXPLAIN",
+			Query:       `{"ns":"test.coll","op":"command","command":{"explain":{"find":"coll","filter":{}},"verbosity":"queryPlanner"}}`,
 		},
 		{
-			ID:          "ffd83008fd6affc7c07053f583dea3e0",
+			ID:          "e8a3f05a4bd3f0bfa7d38eb2372258b1",
+			Namespace:   "test.coll",
+			Operation:   "FINDANDMODIFY",
+			Fingerprint: "FINDANDMODIFY coll a",
+			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"findandmodify":"coll","query":{"a":2},"update":{"$inc":{"b":1}}},"updateobj":{"$inc":{"b":1}}}`),
+		},
+		{
+			ID:          "67c5f1bafcb8cd4b3af9f008f496f74b",
 			Namespace:   "test.system.js",
-			Operation:   "query",
+			Operation:   "FIND",
 			Fingerprint: "FIND system.js find",
 			Query:       `{"ns":"test.system.js","op":"query","query":{"find":"system.js"}}`,
 		},
 		{
-			ID:          "29701e3d37e0adb35ebd70b7ef2b3f3d",
+			ID:          "c70403cbd55ffbb07f08c0cb77a24b19",
 			Namespace:   "test.coll",
-			Operation:   "command",
+			Operation:   "GEONEAR",
+			Fingerprint: "GEONEAR coll",
+			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"geoNear":"coll","near":{"type":"Point","coordinates":[1,1]},"spherical":true}}`),
+		},
+		{
+			ID:          "ca8bb19386488570447f5753741fb494",
+			Namespace:   "test.coll",
+			Operation:   "GROUP",
+			Fingerprint: "GROUP coll a,b",
+			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"group":{"key":{"a":1,"b":1},"cond":{"b":3},"initial":{},"ns":"coll","$reduce":{"Code":"function () {}","Scope":null}}}}`),
+		},
+		{
+			ID:          "10b8f47b366fbfd1fb01f8d17d75b1a2",
+			Namespace:   "test.coll",
+			Operation:   "COUNT",
+			Fingerprint: "COUNT coll a",
+			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"count":"coll","query":{"a":{"$gt":5}},"fields":{}}}`),
+		},
+		{
+			ID:          "cc3cb3824eea4094eb042f5ca76bd385",
+			Namespace:   "test.coll",
+			Operation:   "MAPREDUCE",
+			Fingerprint: "MAPREDUCE coll a",
+			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"command","command":{"mapreduce":"coll","map":{"Code":"function () {\n    emit(this.a, this.b);\n}","Scope":null},"reduce":{"Code":"function (a, b) {\n    return Array.sum(b);\n}","Scope":null},"query":{"a":{"$gte":0}},"out":{"inline":1}}}`),
+		},
+		{
+			ID:          "cba2dff0740762c6e5769f0e300df676",
+			Namespace:   "test.coll",
+			Operation:   "COUNT",
 			Fingerprint: "COUNT coll",
 			Query:       `{"ns":"test.coll","op":"command","command":{"count":"coll","query":{},"fields":{}}}`,
 		},
 		{
-			ID:          "27cb39e62745b1ff4121b4bf6f21fb12",
+			ID:          "f74a5120ac22d02120ccbf6d478b0dbc",
 			Namespace:   "test.coll",
-			Operation:   "update",
+			Operation:   "UPDATE",
 			Fingerprint: "UPDATE coll a",
 			Query:       regexp.QuoteMeta(`{"ns":"test.coll","op":"update","query":{"a":{"$gte":2}},"updateobj":{"$set":{"c":1},"$inc":{"a":-10}}}`),
 		},
--- a/src/go/tests/expect/stats_all/sum.json
+++ b/src/go/tests/expect/stats_all/sum.json
--- a/src/go/tests/expect/stats_single/aggregate_2.6.12
+++ b/src/go/tests/expect/stats_single/aggregate_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "59899eb380b4e48c345fb6f997d06bfa",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "30dbfbc89efd8cfd40774dff0266a28f",
+    "Namespace": "test.coll",
+    "Operation": "AGGREGATE",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{}}}\n",
    "Fingerprint": "AGGREGATE coll a",
    "FirstSeen": "2017-08-20T15:39:14.658Z",
--- a/src/go/tests/expect/stats_single/aggregate_3.0.15
+++ b/src/go/tests/expect/stats_single/aggregate_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "59899eb380b4e48c345fb6f997d06bfa",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "30dbfbc89efd8cfd40774dff0266a28f",
+    "Namespace": "test.coll",
+    "Operation": "AGGREGATE",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{}}}\n",
    "Fingerprint": "AGGREGATE coll a",
    "FirstSeen": "2017-08-20T15:39:20.858Z",
--- a/src/go/tests/expect/stats_single/aggregate_3.2.16
+++ b/src/go/tests/expect/stats_single/aggregate_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "11e1b6f695d43b1b5a2f7e6de2ad8305",
+    "ID": "30dbfbc89efd8cfd40774dff0266a28f",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "AGGREGATE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{}}}\n",
    "Fingerprint": "AGGREGATE coll a",
    "FirstSeen": "2017-08-20T15:39:29.915Z",
--- a/src/go/tests/expect/stats_single/aggregate_3.4.7
+++ b/src/go/tests/expect/stats_single/aggregate_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "11e1b6f695d43b1b5a2f7e6de2ad8305",
+    "ID": "30dbfbc89efd8cfd40774dff0266a28f",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "AGGREGATE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{}}}\n",
    "Fingerprint": "AGGREGATE coll a",
    "FirstSeen": "2017-08-20T15:39:36.711Z",
--- a/src/go/tests/expect/stats_single/aggregate_3.5.11
+++ b/src/go/tests/expect/stats_single/aggregate_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "11e1b6f695d43b1b5a2f7e6de2ad8305",
+    "ID": "30dbfbc89efd8cfd40774dff0266a28f",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "AGGREGATE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{},\"$db\":\"test\"}}\n",
    "Fingerprint": "AGGREGATE coll a",
    "FirstSeen": "2017-08-20T15:39:47.203Z",
--- a/src/go/tests/expect/stats_single/count_2.6.12
+++ b/src/go/tests/expect/stats_single/count_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "020d9f1058f3bf08e3b1afb1ef883d44",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "cba2dff0740762c6e5769f0e300df676",
+    "Namespace": "test.coll",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{}}}\n",
    "Fingerprint": "COUNT coll",
    "FirstSeen": "2017-08-20T15:39:14.823Z",
--- a/src/go/tests/expect/stats_single/count_3.0.15
+++ b/src/go/tests/expect/stats_single/count_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "020d9f1058f3bf08e3b1afb1ef883d44",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "cba2dff0740762c6e5769f0e300df676",
+    "Namespace": "test.coll",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{}}}\n",
    "Fingerprint": "COUNT coll",
    "FirstSeen": "2017-08-20T15:39:20.982Z",
--- a/src/go/tests/expect/stats_single/count_3.2.16
+++ b/src/go/tests/expect/stats_single/count_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "29701e3d37e0adb35ebd70b7ef2b3f3d",
+    "ID": "cba2dff0740762c6e5769f0e300df676",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{}}}\n",
    "Fingerprint": "COUNT coll",
    "FirstSeen": "2017-08-20T15:39:30.094Z",
--- a/src/go/tests/expect/stats_single/count_3.4.7
+++ b/src/go/tests/expect/stats_single/count_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "29701e3d37e0adb35ebd70b7ef2b3f3d",
+    "ID": "cba2dff0740762c6e5769f0e300df676",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{}}}\n",
    "Fingerprint": "COUNT coll",
    "FirstSeen": "2017-08-20T15:39:36.897Z",
--- a/src/go/tests/expect/stats_single/count_3.5.11
+++ b/src/go/tests/expect/stats_single/count_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "29701e3d37e0adb35ebd70b7ef2b3f3d",
+    "ID": "cba2dff0740762c6e5769f0e300df676",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{},\"$db\":\"test\"}}\n",
    "Fingerprint": "COUNT coll",
    "FirstSeen": "2017-08-20T15:39:47.396Z",
--- a/src/go/tests/expect/stats_single/count_with_query_2.6.12
+++ b/src/go/tests/expect/stats_single/count_with_query_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "5eee3fe927f2234d7655f4fcc7fead0a",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "10b8f47b366fbfd1fb01f8d17d75b1a2",
+    "Namespace": "test.coll",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{}}}\n",
    "Fingerprint": "COUNT coll a",
    "FirstSeen": "2017-08-20T15:39:14.971Z",
--- a/src/go/tests/expect/stats_single/count_with_query_3.0.15
+++ b/src/go/tests/expect/stats_single/count_with_query_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "5eee3fe927f2234d7655f4fcc7fead0a",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "10b8f47b366fbfd1fb01f8d17d75b1a2",
+    "Namespace": "test.coll",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{}}}\n",
    "Fingerprint": "COUNT coll a",
    "FirstSeen": "2017-08-20T15:39:21.124Z",
--- a/src/go/tests/expect/stats_single/count_with_query_3.2.16
+++ b/src/go/tests/expect/stats_single/count_with_query_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "2300d7f2d372205544f249b010e9b8ad",
+    "ID": "10b8f47b366fbfd1fb01f8d17d75b1a2",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{}}}\n",
    "Fingerprint": "COUNT coll a",
    "FirstSeen": "2017-08-20T15:39:30.251Z",
--- a/src/go/tests/expect/stats_single/count_with_query_3.4.7
+++ b/src/go/tests/expect/stats_single/count_with_query_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "2300d7f2d372205544f249b010e9b8ad",
+    "ID": "10b8f47b366fbfd1fb01f8d17d75b1a2",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{}}}\n",
    "Fingerprint": "COUNT coll a",
    "FirstSeen": "2017-08-20T15:39:37.077Z",
--- a/src/go/tests/expect/stats_single/count_with_query_3.5.11
+++ b/src/go/tests/expect/stats_single/count_with_query_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "2300d7f2d372205544f249b010e9b8ad",
+    "ID": "10b8f47b366fbfd1fb01f8d17d75b1a2",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "COUNT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{},\"$db\":\"test\"}}\n",
    "Fingerprint": "COUNT coll a",
    "FirstSeen": "2017-08-20T15:39:47.573Z",
--- a/src/go/tests/expect/stats_single/delete_2.6.12
+++ b/src/go/tests/expect/stats_single/delete_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-20T15:39:15.126Z",
--- a/src/go/tests/expect/stats_single/delete_3.0.15
+++ b/src/go/tests/expect/stats_single/delete_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-20T15:39:21.265Z",
--- a/src/go/tests/expect/stats_single/delete_3.2.16
+++ b/src/go/tests/expect/stats_single/delete_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-20T15:39:30.543Z",
--- a/src/go/tests/expect/stats_single/delete_3.4.7
+++ b/src/go/tests/expect/stats_single/delete_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-20T15:39:37.279Z",
--- a/src/go/tests/expect/stats_single/delete_3.5.11
+++ b/src/go/tests/expect/stats_single/delete_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"command\":{\"q\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}},\"limit\":1}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-20T15:39:47.745Z",
--- a/src/go/tests/expect/stats_single/delete_all_2.6.12
+++ b/src/go/tests/expect/stats_single/delete_all_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-30T10:54:45.348Z",
--- a/src/go/tests/expect/stats_single/delete_all_3.0.15
+++ b/src/go/tests/expect/stats_single/delete_all_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-30T10:54:52.821Z",
--- a/src/go/tests/expect/stats_single/delete_all_3.2.16
+++ b/src/go/tests/expect/stats_single/delete_all_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-30T10:55:02.238Z",
--- a/src/go/tests/expect/stats_single/delete_all_3.4.7
+++ b/src/go/tests/expect/stats_single/delete_all_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-30T10:55:09.833Z",
--- a/src/go/tests/expect/stats_single/delete_all_3.5.11
+++ b/src/go/tests/expect/stats_single/delete_all_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "bab52c8aa977c96ecd148c015ae07c42",
+    "ID": "e72ad41302045bd6c2bcad76511f915a",
    "Namespace": "test.coll",
-    "Operation": "remove",
+    "Operation": "REMOVE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"command\":{\"q\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}},\"limit\":0}}\n",
    "Fingerprint": "REMOVE coll a,b",
    "FirstSeen": "2017-08-30T10:55:19.142Z",
--- a/src/go/tests/expect/stats_single/distinct_2.6.12
+++ b/src/go/tests/expect/stats_single/distinct_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "24acf4277fabf2a382f266bb4e6e8e3e",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "e4122a58c99ab0a4020ce7d195c5a8cb",
+    "Namespace": "test.coll",
+    "Operation": "DISTINCT",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}}}}\n",
    "Fingerprint": "DISTINCT coll a,b",
    "FirstSeen": "2017-08-20T15:39:15.323Z",
--- a/src/go/tests/expect/stats_single/distinct_3.0.15
+++ b/src/go/tests/expect/stats_single/distinct_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "24acf4277fabf2a382f266bb4e6e8e3e",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "e4122a58c99ab0a4020ce7d195c5a8cb",
+    "Namespace": "test.coll",
+    "Operation": "DISTINCT",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}}}}\n",
    "Fingerprint": "DISTINCT coll a,b",
    "FirstSeen": "2017-08-20T15:39:21.392Z",
--- a/src/go/tests/expect/stats_single/distinct_3.2.16
+++ b/src/go/tests/expect/stats_single/distinct_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "a4be6ed97c946182af7e30cf818afdac",
+    "ID": "e4122a58c99ab0a4020ce7d195c5a8cb",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "DISTINCT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}}}}\n",
    "Fingerprint": "DISTINCT coll a,b",
    "FirstSeen": "2017-08-20T15:39:30.748Z",
--- a/src/go/tests/expect/stats_single/distinct_3.4.7
+++ b/src/go/tests/expect/stats_single/distinct_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "a4be6ed97c946182af7e30cf818afdac",
+    "ID": "e4122a58c99ab0a4020ce7d195c5a8cb",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "DISTINCT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}}}}\n",
    "Fingerprint": "DISTINCT coll a,b",
    "FirstSeen": "2017-08-20T15:39:37.511Z",
--- a/src/go/tests/expect/stats_single/distinct_3.5.11
+++ b/src/go/tests/expect/stats_single/distinct_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "a4be6ed97c946182af7e30cf818afdac",
+    "ID": "e4122a58c99ab0a4020ce7d195c5a8cb",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "DISTINCT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}},\"$db\":\"test\"}}\n",
    "Fingerprint": "DISTINCT coll a,b",
    "FirstSeen": "2017-08-20T15:39:47.927Z",
--- a/src/go/tests/expect/stats_single/eval_2.6.12
+++ b/src/go/tests/expect/stats_single/eval_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "3335908aa111fe5eedf75479d9b1eb72",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "a6782ae38ef891d5506341a4b0ab2747",
+    "Namespace": "test",
+    "Operation": "EVAL",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"$eval\":\"db\"}}\n",
    "Fingerprint": "EVAL",
    "FirstSeen": "2017-09-05T19:39:24.522Z",
--- a/src/go/tests/expect/stats_single/eval_3.0.15
+++ b/src/go/tests/expect/stats_single/eval_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "3335908aa111fe5eedf75479d9b1eb72",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "a6782ae38ef891d5506341a4b0ab2747",
+    "Namespace": "test",
+    "Operation": "EVAL",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"$eval\":\"db\"}}\n",
    "Fingerprint": "EVAL",
    "FirstSeen": "2017-09-05T19:39:32.054Z",
--- a/src/go/tests/expect/stats_single/eval_3.2.16
+++ b/src/go/tests/expect/stats_single/eval_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "71b3d6aa44d34aaa02cd65bad3e25f49",
+    "ID": "a6782ae38ef891d5506341a4b0ab2747",
    "Namespace": "test",
-    "Operation": "command",
+    "Operation": "EVAL",
    "Query": "{\"ns\":\"test\",\"op\":\"command\",\"command\":{\"$eval\":\"db\"}}\n",
    "Fingerprint": "EVAL",
    "FirstSeen": "2017-09-05T19:39:41.581Z",
--- a/src/go/tests/expect/stats_single/eval_3.4.7
+++ b/src/go/tests/expect/stats_single/eval_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "71b3d6aa44d34aaa02cd65bad3e25f49",
+    "ID": "a6782ae38ef891d5506341a4b0ab2747",
    "Namespace": "test",
-    "Operation": "command",
+    "Operation": "EVAL",
    "Query": "{\"ns\":\"test\",\"op\":\"command\",\"command\":{\"$eval\":\"db\"}}\n",
    "Fingerprint": "EVAL",
    "FirstSeen": "2017-09-05T19:39:48.888Z",
--- a/src/go/tests/expect/stats_single/eval_3.5.11
+++ b/src/go/tests/expect/stats_single/eval_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "71b3d6aa44d34aaa02cd65bad3e25f49",
+    "ID": "a6782ae38ef891d5506341a4b0ab2747",
    "Namespace": "test",
-    "Operation": "command",
+    "Operation": "EVAL",
    "Query": "{\"ns\":\"test\",\"op\":\"command\",\"command\":{\"$eval\":\"db\",\"$db\":\"test\"}}\n",
    "Fingerprint": "EVAL",
    "FirstSeen": "2017-09-05T19:40:00.171Z",
--- a/src/go/tests/expect/stats_single/explain_2.6.12
+++ b/src/go/tests/expect/stats_single/explain_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "4c06ec043313864d76669ddc2a1be353",
-    "Namespace": "test.coll",
-    "Operation": "query",
+    "ID": "76d7662df07b44135ac3e07e44a6eb39",
+    "Namespace": "",
+    "Operation": "EXPLAIN",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{},\"$explain\":true}}\n",
    "Fingerprint": "EXPLAIN",
    "FirstSeen": "2017-09-05T19:39:24.666Z",
--- a/src/go/tests/expect/stats_single/explain_3.0.15
+++ b/src/go/tests/expect/stats_single/explain_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "ada85b4f1473b9a1fb37158a8481e20e",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "76d7662df07b44135ac3e07e44a6eb39",
+    "Namespace": "",
+    "Operation": "EXPLAIN",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"explain\":{\"find\":\"coll\",\"filter\":{},\"options\":{}},\"verbosity\":\"queryPlanner\"}}\n",
    "Fingerprint": "EXPLAIN",
    "FirstSeen": "2017-09-05T19:39:32.21Z",
--- a/src/go/tests/expect/stats_single/explain_3.2.16
+++ b/src/go/tests/expect/stats_single/explain_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "e2f53c6824c5cbe454e33e128b350d1e",
-    "Namespace": "test.coll",
-    "Operation": "command",
+    "ID": "76d7662df07b44135ac3e07e44a6eb39",
+    "Namespace": "",
+    "Operation": "EXPLAIN",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"explain\":{\"find\":\"coll\",\"filter\":{}},\"verbosity\":\"queryPlanner\"}}\n",
    "Fingerprint": "EXPLAIN",
    "FirstSeen": "2017-09-05T19:39:41.753Z",
--- a/src/go/tests/expect/stats_single/explain_3.4.7
+++ b/src/go/tests/expect/stats_single/explain_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "e2f53c6824c5cbe454e33e128b350d1e",
-    "Namespace": "test.coll",
-    "Operation": "command",
+    "ID": "76d7662df07b44135ac3e07e44a6eb39",
+    "Namespace": "",
+    "Operation": "EXPLAIN",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"explain\":{\"find\":\"coll\",\"filter\":{}},\"verbosity\":\"queryPlanner\"}}\n",
    "Fingerprint": "EXPLAIN",
    "FirstSeen": "2017-09-05T19:39:49.065Z",
--- a/src/go/tests/expect/stats_single/explain_3.5.11
+++ b/src/go/tests/expect/stats_single/explain_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "e2f53c6824c5cbe454e33e128b350d1e",
-    "Namespace": "test.coll",
-    "Operation": "command",
+    "ID": "76d7662df07b44135ac3e07e44a6eb39",
+    "Namespace": "",
+    "Operation": "EXPLAIN",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"explain\":{\"find\":\"coll\",\"filter\":{}},\"verbosity\":\"queryPlanner\",\"$db\":\"test\"}}\n",
    "Fingerprint": "EXPLAIN",
    "FirstSeen": "2017-09-05T19:40:00.433Z",
--- a/src/go/tests/expect/stats_single/find_2.6.12
+++ b/src/go/tests/expect/stats_single/find_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "4e9241090af6f4a49545baf7c015fb5c",
+    "ID": "fe0bf975a044fe47fd32b835ceba612d",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"a\":1}}\n",
    "Fingerprint": "FIND coll a",
    "FirstSeen": "2017-08-20T15:39:15.457Z",
--- a/src/go/tests/expect/stats_single/find_3.0.15
+++ b/src/go/tests/expect/stats_single/find_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "4e9241090af6f4a49545baf7c015fb5c",
+    "ID": "fe0bf975a044fe47fd32b835ceba612d",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"a\":1}}\n",
    "Fingerprint": "FIND coll a",
    "FirstSeen": "2017-08-20T15:39:21.515Z",
--- a/src/go/tests/expect/stats_single/find_3.2.16
+++ b/src/go/tests/expect/stats_single/find_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "4e9241090af6f4a49545baf7c015fb5c",
+    "ID": "fe0bf975a044fe47fd32b835ceba612d",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"a\":1}}}\n",
    "Fingerprint": "FIND coll a",
    "FirstSeen": "2017-08-20T15:39:30.913Z",
--- a/src/go/tests/expect/stats_single/find_3.4.7
+++ b/src/go/tests/expect/stats_single/find_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "4e9241090af6f4a49545baf7c015fb5c",
+    "ID": "fe0bf975a044fe47fd32b835ceba612d",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"a\":1}}}\n",
    "Fingerprint": "FIND coll a",
    "FirstSeen": "2017-08-20T15:39:37.66Z",
--- a/src/go/tests/expect/stats_single/find_3.5.11
+++ b/src/go/tests/expect/stats_single/find_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "4e9241090af6f4a49545baf7c015fb5c",
+    "ID": "fe0bf975a044fe47fd32b835ceba612d",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"command\":{\"find\":\"coll\",\"filter\":{\"a\":1},\"$db\":\"test\"}}\n",
    "Fingerprint": "FIND coll a",
    "FirstSeen": "2017-08-20T15:39:48.107Z",
--- a/src/go/tests/expect/stats_single/find_andrii_2.6.12
+++ b/src/go/tests/expect/stats_single/find_andrii_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "dddda7545e797b073966c514f9b6fe49",
+    "ID": "02104210d67fe680273784d833f86831",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"orderby\":{\"k\":-1}}}\n",
    "Fingerprint": "FIND coll c,k,pad",
    "FirstSeen": "2017-08-20T15:39:15.616Z",
--- a/src/go/tests/expect/stats_single/find_andrii_3.0.15
+++ b/src/go/tests/expect/stats_single/find_andrii_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "dddda7545e797b073966c514f9b6fe49",
+    "ID": "02104210d67fe680273784d833f86831",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"orderby\":{\"k\":-1}}}\n",
    "Fingerprint": "FIND coll c,k,pad",
    "FirstSeen": "2017-08-20T15:39:21.656Z",
--- a/src/go/tests/expect/stats_single/find_andrii_3.2.16
+++ b/src/go/tests/expect/stats_single/find_andrii_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "dddda7545e797b073966c514f9b6fe49",
+    "ID": "02104210d67fe680273784d833f86831",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"limit\":100,\"singleBatch\":false,\"sort\":{\"k\":-1}}}\n",
    "Fingerprint": "FIND coll c,k,pad",
    "FirstSeen": "2017-08-20T15:39:31.085Z",
--- a/src/go/tests/expect/stats_single/find_andrii_3.4.7
+++ b/src/go/tests/expect/stats_single/find_andrii_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "dddda7545e797b073966c514f9b6fe49",
+    "ID": "02104210d67fe680273784d833f86831",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"limit\":100,\"singleBatch\":false,\"sort\":{\"k\":-1}}}\n",
    "Fingerprint": "FIND coll c,k,pad",
    "FirstSeen": "2017-08-20T15:39:37.823Z",
--- a/src/go/tests/expect/stats_single/find_andrii_3.5.11
+++ b/src/go/tests/expect/stats_single/find_andrii_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "dddda7545e797b073966c514f9b6fe49",
+    "ID": "02104210d67fe680273784d833f86831",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"command\":{\"find\":\"coll\",\"filter\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"limit\":100,\"singleBatch\":false,\"sort\":{\"k\":-1},\"$db\":\"test\"}}\n",
    "Fingerprint": "FIND coll c,k,pad",
    "FirstSeen": "2017-08-20T15:39:48.277Z",
--- a/src/go/tests/expect/stats_single/find_empty_2.6.12
+++ b/src/go/tests/expect/stats_single/find_empty_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "b9a4b74ac8b3747f44951490e6279b96",
+    "ID": "2a639e77efe3e68399ef9482575b3421",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\"}\n",
    "Fingerprint": "FIND coll",
    "FirstSeen": "2017-08-20T15:39:15.75Z",
--- a/src/go/tests/expect/stats_single/find_empty_3.0.15
+++ b/src/go/tests/expect/stats_single/find_empty_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "b9a4b74ac8b3747f44951490e6279b96",
+    "ID": "2a639e77efe3e68399ef9482575b3421",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\"}\n",
    "Fingerprint": "FIND coll",
    "FirstSeen": "2017-08-20T15:39:21.769Z",
--- a/src/go/tests/expect/stats_single/find_empty_3.2.16
+++ b/src/go/tests/expect/stats_single/find_empty_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "b9a4b74ac8b3747f44951490e6279b96",
+    "ID": "2a639e77efe3e68399ef9482575b3421",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{}}}\n",
    "Fingerprint": "FIND coll",
    "FirstSeen": "2017-08-20T15:39:31.294Z",
--- a/src/go/tests/expect/stats_single/find_empty_3.4.7
+++ b/src/go/tests/expect/stats_single/find_empty_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "b9a4b74ac8b3747f44951490e6279b96",
+    "ID": "2a639e77efe3e68399ef9482575b3421",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{}}}\n",
    "Fingerprint": "FIND coll",
    "FirstSeen": "2017-08-20T15:39:37.964Z",
--- a/src/go/tests/expect/stats_single/find_empty_3.5.11
+++ b/src/go/tests/expect/stats_single/find_empty_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "b9a4b74ac8b3747f44951490e6279b96",
+    "ID": "2a639e77efe3e68399ef9482575b3421",
    "Namespace": "test.coll",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"command\":{\"find\":\"coll\",\"filter\":{},\"$db\":\"test\"}}\n",
    "Fingerprint": "FIND coll",
    "FirstSeen": "2017-08-20T15:39:48.429Z",
--- a/src/go/tests/expect/stats_single/findandmodify_2.6.12
+++ b/src/go/tests/expect/stats_single/findandmodify_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "3d52ee232b8c4e1068dd90741632614a",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "e8a3f05a4bd3f0bfa7d38eb2372258b1",
+    "Namespace": "test.coll",
+    "Operation": "FINDANDMODIFY",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}}},\"updateobj\":{\"$inc\":{\"b\":1}}}\n",
    "Fingerprint": "FINDANDMODIFY coll a",
    "FirstSeen": "2017-08-20T15:39:15.903Z",
--- a/src/go/tests/expect/stats_single/findandmodify_3.0.15
+++ b/src/go/tests/expect/stats_single/findandmodify_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "3d52ee232b8c4e1068dd90741632614a",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "e8a3f05a4bd3f0bfa7d38eb2372258b1",
+    "Namespace": "test.coll",
+    "Operation": "FINDANDMODIFY",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}}},\"updateobj\":{\"$inc\":{\"b\":1}}}\n",
    "Fingerprint": "FINDANDMODIFY coll a",
    "FirstSeen": "2017-08-20T15:39:21.902Z",
--- a/src/go/tests/expect/stats_single/findandmodify_3.2.16
+++ b/src/go/tests/expect/stats_single/findandmodify_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "9423eaa90c222686d092c04f001fb369",
+    "ID": "e8a3f05a4bd3f0bfa7d38eb2372258b1",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "FINDANDMODIFY",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}}},\"updateobj\":{\"$inc\":{\"b\":1}}}\n",
    "Fingerprint": "FINDANDMODIFY coll a",
    "FirstSeen": "2017-08-20T15:39:31.548Z",
--- a/src/go/tests/expect/stats_single/findandmodify_3.4.7
+++ b/src/go/tests/expect/stats_single/findandmodify_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "9423eaa90c222686d092c04f001fb369",
+    "ID": "e8a3f05a4bd3f0bfa7d38eb2372258b1",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "FINDANDMODIFY",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}}},\"updateobj\":{\"$inc\":{\"b\":1}}}\n",
    "Fingerprint": "FINDANDMODIFY coll a",
    "FirstSeen": "2017-08-20T15:39:38.196Z",
--- a/src/go/tests/expect/stats_single/findandmodify_3.5.11
+++ b/src/go/tests/expect/stats_single/findandmodify_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "9423eaa90c222686d092c04f001fb369",
+    "ID": "e8a3f05a4bd3f0bfa7d38eb2372258b1",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "FINDANDMODIFY",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}},\"$db\":\"test\"}}\n",
    "Fingerprint": "FINDANDMODIFY coll a",
    "FirstSeen": "2017-08-20T15:39:48.636Z",
--- a/src/go/tests/expect/stats_single/geonear_2.6.12
+++ b/src/go/tests/expect/stats_single/geonear_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "eb3d8174e05f442cc5c3269eb50667d6",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "c70403cbd55ffbb07f08c0cb77a24b19",
+    "Namespace": "test.coll",
+    "Operation": "GEONEAR",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true}}\n",
    "Fingerprint": "GEONEAR coll",
    "FirstSeen": "2017-08-20T15:39:16.061Z",
--- a/src/go/tests/expect/stats_single/geonear_3.0.15
+++ b/src/go/tests/expect/stats_single/geonear_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "eb3d8174e05f442cc5c3269eb50667d6",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "c70403cbd55ffbb07f08c0cb77a24b19",
+    "Namespace": "test.coll",
+    "Operation": "GEONEAR",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true}}\n",
    "Fingerprint": "GEONEAR coll",
    "FirstSeen": "2017-08-20T15:39:22.055Z",
--- a/src/go/tests/expect/stats_single/geonear_3.2.16
+++ b/src/go/tests/expect/stats_single/geonear_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "dd20c739baef5a3fd9352c350c7e69f1",
+    "ID": "c70403cbd55ffbb07f08c0cb77a24b19",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "GEONEAR",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true}}\n",
    "Fingerprint": "GEONEAR coll",
    "FirstSeen": "2017-08-20T15:39:31.797Z",
--- a/src/go/tests/expect/stats_single/geonear_3.4.7
+++ b/src/go/tests/expect/stats_single/geonear_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "dd20c739baef5a3fd9352c350c7e69f1",
+    "ID": "c70403cbd55ffbb07f08c0cb77a24b19",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "GEONEAR",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true}}\n",
    "Fingerprint": "GEONEAR coll",
    "FirstSeen": "2017-08-20T15:39:38.432Z",
--- a/src/go/tests/expect/stats_single/geonear_3.5.11
+++ b/src/go/tests/expect/stats_single/geonear_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "dd20c739baef5a3fd9352c350c7e69f1",
+    "ID": "c70403cbd55ffbb07f08c0cb77a24b19",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "GEONEAR",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true,\"$db\":\"test\"}}\n",
    "Fingerprint": "GEONEAR coll",
    "FirstSeen": "2017-08-20T15:39:48.842Z",
--- a/src/go/tests/expect/stats_single/group_2.6.12
+++ b/src/go/tests/expect/stats_single/group_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "225e5819de843c1779f1118f2f01b77e",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "ca8bb19386488570447f5753741fb494",
+    "Namespace": "test.coll",
+    "Operation": "GROUP",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":\"\"}}}\n",
    "Fingerprint": "GROUP coll a,b",
    "FirstSeen": "2017-08-20T15:39:16.325Z",
--- a/src/go/tests/expect/stats_single/group_3.0.15
+++ b/src/go/tests/expect/stats_single/group_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "225e5819de843c1779f1118f2f01b77e",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "ca8bb19386488570447f5753741fb494",
+    "Namespace": "test.coll",
+    "Operation": "GROUP",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":\"\"}}}\n",
    "Fingerprint": "GROUP coll a,b",
    "FirstSeen": "2017-08-20T15:39:22.271Z",
--- a/src/go/tests/expect/stats_single/group_3.2.16
+++ b/src/go/tests/expect/stats_single/group_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "018a055f724d418b80e66b98bfdb25a5",
+    "ID": "ca8bb19386488570447f5753741fb494",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "GROUP",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":\"\"}}}\n",
    "Fingerprint": "GROUP coll a,b",
    "FirstSeen": "2017-08-20T15:39:32.101Z",
--- a/src/go/tests/expect/stats_single/group_3.4.7
+++ b/src/go/tests/expect/stats_single/group_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "018a055f724d418b80e66b98bfdb25a5",
+    "ID": "ca8bb19386488570447f5753741fb494",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "GROUP",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":{\"code\":\"function () {}\"}}}}\n",
    "Fingerprint": "GROUP coll a,b",
    "FirstSeen": "2017-08-20T15:39:38.886Z",
--- a/src/go/tests/expect/stats_single/group_3.5.11
+++ b/src/go/tests/expect/stats_single/group_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "018a055f724d418b80e66b98bfdb25a5",
+    "ID": "ca8bb19386488570447f5753741fb494",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "GROUP",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":{\"code\":\"function () {}\"}},\"$db\":\"test\"}}\n",
    "Fingerprint": "GROUP coll a,b",
    "FirstSeen": "2017-08-20T15:39:49.276Z",
--- a/src/go/tests/expect/stats_single/insert_2.6.12
+++ b/src/go/tests/expect/stats_single/insert_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "a7ce8dee16beadb767484112e6b29af3",
+    "ID": "e357abe482dcc0cd03ab742741bf1c86",
    "Namespace": "test.coll",
-    "Operation": "insert",
+    "Operation": "INSERT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"query\":{\"_id\":1}}\n",
    "Fingerprint": "INSERT coll",
    "FirstSeen": "2017-08-20T15:39:16.473Z",
--- a/src/go/tests/expect/stats_single/insert_3.0.15
+++ b/src/go/tests/expect/stats_single/insert_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "a7ce8dee16beadb767484112e6b29af3",
+    "ID": "e357abe482dcc0cd03ab742741bf1c86",
    "Namespace": "test.coll",
-    "Operation": "insert",
+    "Operation": "INSERT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"query\":{\"_id\":1}}\n",
    "Fingerprint": "INSERT coll",
    "FirstSeen": "2017-08-20T15:39:22.409Z",
--- a/src/go/tests/expect/stats_single/insert_3.2.16
+++ b/src/go/tests/expect/stats_single/insert_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "a7ce8dee16beadb767484112e6b29af3",
+    "ID": "e357abe482dcc0cd03ab742741bf1c86",
    "Namespace": "test.coll",
-    "Operation": "insert",
+    "Operation": "INSERT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"query\":{\"insert\":\"coll\",\"documents\":[{\"_id\":1}],\"ordered\":true}}\n",
    "Fingerprint": "INSERT coll",
    "FirstSeen": "2017-08-20T15:39:32.303Z",
--- a/src/go/tests/expect/stats_single/insert_3.4.7
+++ b/src/go/tests/expect/stats_single/insert_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "a7ce8dee16beadb767484112e6b29af3",
+    "ID": "e357abe482dcc0cd03ab742741bf1c86",
    "Namespace": "test.coll",
-    "Operation": "insert",
+    "Operation": "INSERT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"query\":{\"insert\":\"coll\",\"documents\":[{\"_id\":1}],\"ordered\":true}}\n",
    "Fingerprint": "INSERT coll",
    "FirstSeen": "2017-08-20T15:39:39.023Z",
--- a/src/go/tests/expect/stats_single/insert_3.5.11
+++ b/src/go/tests/expect/stats_single/insert_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "a7ce8dee16beadb767484112e6b29af3",
+    "ID": "e357abe482dcc0cd03ab742741bf1c86",
    "Namespace": "test.coll",
-    "Operation": "insert",
+    "Operation": "INSERT",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"command\":{\"insert\":\"coll\",\"ordered\":true,\"$db\":\"test\"}}\n",
    "Fingerprint": "INSERT coll",
    "FirstSeen": "2017-08-20T15:39:49.44Z",
--- a/src/go/tests/expect/stats_single/mapreduce_2.6.12
+++ b/src/go/tests/expect/stats_single/mapreduce_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "23ca094f285d0cd9538fb1b1f6ef0f4f",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "cc3cb3824eea4094eb042f5ca76bd385",
+    "Namespace": "test.coll",
+    "Operation": "MAPREDUCE",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":\"\",\"reduce\":\"\",\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1}}}\n",
    "Fingerprint": "MAPREDUCE coll a",
    "FirstSeen": "2017-08-20T15:39:16.701Z",
--- a/src/go/tests/expect/stats_single/mapreduce_3.0.15
+++ b/src/go/tests/expect/stats_single/mapreduce_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "23ca094f285d0cd9538fb1b1f6ef0f4f",
-    "Namespace": "test.$cmd",
-    "Operation": "command",
+    "ID": "cc3cb3824eea4094eb042f5ca76bd385",
+    "Namespace": "test.coll",
+    "Operation": "MAPREDUCE",
    "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":\"\",\"reduce\":\"\",\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1}}}\n",
    "Fingerprint": "MAPREDUCE coll a",
    "FirstSeen": "2017-08-20T15:39:22.582Z",
--- a/src/go/tests/expect/stats_single/mapreduce_3.2.16
+++ b/src/go/tests/expect/stats_single/mapreduce_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "130827f5b7afe1369f619ccd5cd61ec4",
+    "ID": "cc3cb3824eea4094eb042f5ca76bd385",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "MAPREDUCE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":\"\",\"reduce\":\"\",\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1}}}\n",
    "Fingerprint": "MAPREDUCE coll a",
    "FirstSeen": "2017-08-20T15:39:32.572Z",
--- a/src/go/tests/expect/stats_single/mapreduce_3.4.7
+++ b/src/go/tests/expect/stats_single/mapreduce_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "130827f5b7afe1369f619ccd5cd61ec4",
+    "ID": "cc3cb3824eea4094eb042f5ca76bd385",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "MAPREDUCE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":{\"code\":\"function () {\\n    emit(this.a, this.b);\\n}\"},\"reduce\":{\"code\":\"function (a, b) {\\n    return Array.sum(b);\\n}\"},\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1}}}\n",
    "Fingerprint": "MAPREDUCE coll a",
    "FirstSeen": "2017-08-20T15:39:39.249Z",
--- a/src/go/tests/expect/stats_single/mapreduce_3.5.11
+++ b/src/go/tests/expect/stats_single/mapreduce_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "130827f5b7afe1369f619ccd5cd61ec4",
+    "ID": "cc3cb3824eea4094eb042f5ca76bd385",
    "Namespace": "test.coll",
-    "Operation": "command",
+    "Operation": "MAPREDUCE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":{\"code\":\"function () {\\n    emit(this.a, this.b);\\n}\"},\"reduce\":{\"code\":\"function (a, b) {\\n    return Array.sum(b);\\n}\"},\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1},\"$db\":\"test\"}}\n",
    "Fingerprint": "MAPREDUCE coll a",
    "FirstSeen": "2017-08-20T15:39:49.68Z",
--- a/src/go/tests/expect/stats_single/update_2.6.12
+++ b/src/go/tests/expect/stats_single/update_2.6.12
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "27cb39e62745b1ff4121b4bf6f21fb12",
+    "ID": "f74a5120ac22d02120ccbf6d478b0dbc",
    "Namespace": "test.coll",
-    "Operation": "update",
+    "Operation": "UPDATE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"query\":{\"a\":{\"$gte\":2}},\"updateobj\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}}}\n",
    "Fingerprint": "UPDATE coll a",
    "FirstSeen": "2017-08-20T15:39:16.921Z",
--- a/src/go/tests/expect/stats_single/update_3.0.15
+++ b/src/go/tests/expect/stats_single/update_3.0.15
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "27cb39e62745b1ff4121b4bf6f21fb12",
+    "ID": "f74a5120ac22d02120ccbf6d478b0dbc",
    "Namespace": "test.coll",
-    "Operation": "update",
+    "Operation": "UPDATE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"query\":{\"a\":{\"$gte\":2}},\"updateobj\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}}}\n",
    "Fingerprint": "UPDATE coll a",
    "FirstSeen": "2017-08-20T15:39:22.788Z",
--- a/src/go/tests/expect/stats_single/update_3.2.16
+++ b/src/go/tests/expect/stats_single/update_3.2.16
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "27cb39e62745b1ff4121b4bf6f21fb12",
+    "ID": "f74a5120ac22d02120ccbf6d478b0dbc",
    "Namespace": "test.coll",
-    "Operation": "update",
+    "Operation": "UPDATE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"query\":{\"a\":{\"$gte\":2}},\"updateobj\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}}}\n",
    "Fingerprint": "UPDATE coll a",
    "FirstSeen": "2017-08-20T15:39:32.737Z",
--- a/src/go/tests/expect/stats_single/update_3.4.7
+++ b/src/go/tests/expect/stats_single/update_3.4.7
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "27cb39e62745b1ff4121b4bf6f21fb12",
+    "ID": "f74a5120ac22d02120ccbf6d478b0dbc",
    "Namespace": "test.coll",
-    "Operation": "update",
+    "Operation": "UPDATE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"query\":{\"a\":{\"$gte\":2}},\"updateobj\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}}}\n",
    "Fingerprint": "UPDATE coll a",
    "FirstSeen": "2017-08-20T15:39:39.434Z",
--- a/src/go/tests/expect/stats_single/update_3.5.11
+++ b/src/go/tests/expect/stats_single/update_3.5.11
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "27cb39e62745b1ff4121b4bf6f21fb12",
+    "ID": "f74a5120ac22d02120ccbf6d478b0dbc",
    "Namespace": "test.coll",
-    "Operation": "update",
+    "Operation": "UPDATE",
    "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"command\":{\"q\":{\"a\":{\"$gte\":2}},\"u\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}},\"multi\":false,\"upsert\":false}}\n",
    "Fingerprint": "UPDATE coll a",
    "FirstSeen": "2017-08-20T15:39:49.855Z",
--- a/src/go/tests/profiler_docs_stats.want.json
+++ b/src/go/tests/profiler_docs_stats.want.json
@@ -1,8 +1,8 @@
 [
  {
-    "ID": "16196765fb4c14edb91efdbe4f5c5973",
+    "ID": "95575e896c2830043dc333cb8ee61339",
    "Namespace": "samples.col1",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"samples.col1\",\"op\":\"query\",\"query\":{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}}\n",
    "Fingerprint": "FIND col1 find",
    "FirstSeen": "2017-04-10T13:16:23.29-03:00",
@@ -53,9 +53,9 @@
    }
  },
  {
-    "ID": "4e4774ad26f934a193757002a991ebb8",
+    "ID": "d7088d6b50551d1f2f5f34b006c0140d",
    "Namespace": "samples.col1",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"samples.col1\",\"op\":\"query\",\"query\":{\"find\":\"col1\",\"filter\":{\"s2\":{\"$gte\":\"41991\",\"$lt\":\"33754\"}},\"shardVersion\":[0,\"000000000000000000000000\"]}}\n",
    "Fingerprint": "FIND col1 s2",
    "FirstSeen": "2017-04-10T13:15:53.532-03:00",
@@ -106,9 +106,9 @@
    }
  },
  {
-    "ID": "8cb8666ace7e54767b4d3c4f61860cf9",
+    "ID": "b4b7a063b3afbcbdf042a0f0f9e48a9d",
    "Namespace": "samples.col1",
-    "Operation": "query",
+    "Operation": "FIND",
    "Query": "{\"ns\":\"samples.col1\",\"op\":\"query\",\"query\":{\"find\":\"col1\",\"filter\":{\"user_id\":{\"$gte\":3.384024924e+09,\"$lt\":1.95092007e+08}},\"projection\":{\"$sortKey\":{\"$meta\":\"sortKey\"}},\"shardVersion\":[0,\"000000000000000000000000\"],\"sort\":{\"user_id\":1}}}\n",
    "Fingerprint": "FIND col1 user_id",
    "FirstSeen": "2017-04-10T13:15:53.524-03:00",