add query and batch objects to ObservedQuery and ObservedBatch

Author: joao-r-reis

query_executor.go

@@ -386,6 +386,7 @@ func (q *internalQuery) attempt(keyspace string, end, start time.Time, iter *Ite
 			Metrics:   metricsForHost,
 			Err:       iter.err,
 			Attempt:   attempt,
+			Query:     q.originalQuery,
 		})
 	}
 }
@@ -597,6 +598,7 @@ func (b *internalBatch) attempt(keyspace string, end, start time.Time, iter *Ite
 		Metrics: metricsForHost,
 		Err:     iter.err,
 		Attempt: attempt,
+		Batch:   b.originalBatch,
 	})
 }
 

session.go

@@ -2160,6 +2160,9 @@ type ObservedQuery struct {
 	// Attempt is the index of attempt at executing this query.
 	// The first attempt is number zero and any retries have non-zero attempt number.
 	Attempt int
+
+	// Query object associated with this request. Should be used as read only.
+	Query *Query
 }
 
 // QueryObserver is the interface implemented by query observers / stat collectors.
@@ -2197,6 +2200,9 @@ type ObservedBatch struct {
 	// Attempt is the index of attempt at executing this query.
 	// The first attempt is number zero and any retries have non-zero attempt number.
 	Attempt int
+
+	// Batch object associated with this request. Should be used as read only.
+	Batch *Batch
 }
 
 // BatchObserver is the interface implemented by batch observers / stat collectors.