driver: ensure attributes are added on defer before span.End

* Fixes adding span attributes before invoking span.End
* Passed in options for each transaction related span

Author: Emmanuel T Odeke

driver.go

@@ -393,27 +393,28 @@ func (c *ocConn) BeginTx(ctx context.Context, opts driver.TxOptions) (tx driver.
 
 	var span *trace.Span
 	attrs := append([]trace.Attribute(nil), c.options.DefaultAttributes...)
-	defer func() {
-		if len(attrs) > 0 {
-			span.AddAttributes(attrs...)
-		}
-	}()
+
 	if ctx == nil || ctx == context.TODO() {
 		ctx = context.Background()
 		_, span = trace.StartSpan(ctx, "sql:begin_transaction", trace.WithSpanKind(trace.SpanKindClient))
 		attrs = append(attrs, attrMissingContext)
 	} else {
 		_, span = trace.StartSpan(ctx, "sql:begin_transaction", trace.WithSpanKind(trace.SpanKindClient))
 	}
-	defer span.End()
+	defer func() {
+		if len(attrs) > 0 {
+			span.AddAttributes(attrs...)
+		}
+		span.End()
+	}()
 
 	if connBeginTx, ok := c.parent.(driver.ConnBeginTx); ok {
 		tx, err = connBeginTx.BeginTx(ctx, opts)
 		setSpanStatus(span, err)
 		if err != nil {
 			return nil, err
 		}
-		return ocTx{parent: tx, ctx: ctx}, nil
+		return ocTx{parent: tx, ctx: ctx, options: c.options}, nil
 	}
 
 	attrs = append(
@@ -428,7 +429,7 @@ func (c *ocConn) BeginTx(ctx context.Context, opts driver.TxOptions) (tx driver.
 	if err != nil {
 		return nil, err
 	}
-	return ocTx{parent: tx, ctx: ctx}, nil
+	return ocTx{parent: tx, ctx: ctx, options: c.options}, nil
 }
 
 // ocResult implements driver.Result