fix build errors

Author: joao-r-reis

example_structured_logging_test.go

@@ -20,16 +20,16 @@ package gocql_test
 
 import (
 	"context"
-	"fmt"
 	"log"
 	"os"
 
-	gocql "github.com/apache/cassandra-gocql-driver/v2"
-	"github.com/apache/cassandra-gocql-driver/v2/gocqlzap"
-	"github.com/apache/cassandra-gocql-driver/v2/gocqlzerolog"
 	"github.com/rs/zerolog"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+
+	gocql "github.com/apache/cassandra-gocql-driver/v2"
+	"github.com/apache/cassandra-gocql-driver/v2/gocqlzap"
+	"github.com/apache/cassandra-gocql-driver/v2/gocqlzerolog"
 )
 
 // Example_structuredLogging demonstrates the new structured logging features
@@ -51,7 +51,7 @@ func Example_structuredLogging() {
 	config := zap.NewProductionConfig()
 	config.EncoderConfig.TimeKey = "timestamp"
 	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder // Human-readable timestamp format
-	
+
 	zapLogger, err := config.Build()
 	if err != nil {
 		log.Fatal(err)
@@ -60,7 +60,7 @@ func Example_structuredLogging() {
 
 	// Create base logger with service identifier
 	baseLogger := zapLogger.With(zap.String("service", "gocql-app"))
-	
+
 	// Create application and driver loggers with component identifiers
 	appLogger := baseLogger.With(zap.String("component", "app"))
 	driverLogger := baseLogger.With(zap.String("component", "gocql-driver"))
@@ -75,7 +75,7 @@ func Example_structuredLogging() {
 	zapCluster := gocql.NewCluster("localhost:9042")
 	zapCluster.Keyspace = "example"
 	zapCluster.Logger = gocqlZapLogger
-	
+
 	zapSession, err := zapCluster.CreateSession()
 	if err != nil {
 		appLogger.Fatal("Failed to create session", zap.Error(err))
@@ -104,7 +104,7 @@ func Example_structuredLogging() {
 	iter := zapSession.Query("SELECT id, value FROM example.log_demo WHERE id = ?").
 		Bind(1).
 		IterContext(ctx)
-	
+
 	if iter.Scan(&id, &value) {
 		// Successfully scanned the row
 	}
@@ -122,20 +122,20 @@ func Example_structuredLogging() {
 	// Example 2: Using Zerolog integration
 	// Create a production Zerolog logger with structured JSON output
 	// Production config includes timestamps, service info, and appropriate log level
-	baseLogger := zerolog.New(os.Stdout).
+	baseZerologLogger := zerolog.New(os.Stdout).
 		Level(zerolog.InfoLevel).
 		With().
 		Timestamp().
 		Str("service", "gocql-app").
 		Logger()
 
 	// Create application logger with component identifier
-	appZerologLogger := baseLogger.With().
+	appZerologLogger := baseZerologLogger.With().
 		Str("component", "app").
 		Logger()
 
 	// Create driver logger with component identifier
-	driverZerologLogger := baseLogger.With().
+	driverZerologLogger := baseZerologLogger.With().
 		Str("component", "gocql-driver").
 		Logger()
 
@@ -145,12 +145,12 @@ func Example_structuredLogging() {
 		Msg("Starting Zerolog structured logging example")
 
 	// Create gocql logger from driver logger
-	gocqlZerologLogger := gocqlzerolog.Wrap(&driverZerologLogger)
+	gocqlZerologLogger := gocqlzerolog.NewUnnamedZerologLogger(driverZerologLogger)
 
 	zerologCluster := gocql.NewCluster("localhost:9042")
 	zerologCluster.Keyspace = "example"
 	zerologCluster.Logger = gocqlZerologLogger
-	
+
 	zerologSession, err := zerologCluster.CreateSession()
 	if err != nil {
 		appZerologLogger.Fatal().Err(err).Msg("Failed to create session")
@@ -179,7 +179,7 @@ func Example_structuredLogging() {
 	iter = zerologSession.Query("SELECT id, value FROM example.log_demo WHERE id = ?").
 		Bind(2).
 		IterContext(ctx)
-	
+
 	if iter.Scan(&id, &value) {
 		// Successfully scanned the row
 	}
@@ -195,8 +195,6 @@ func Example_structuredLogging() {
 		Str("record_value", value).
 		Msg("Database operation completed successfully")
 
-
-
 	// Example 1 - Zap structured logging output (JSON format):
 	// {"level":"info","timestamp":"2021-12-31T12:00:00.000Z","service":"gocql-app","component":"app","msg":"Starting Zap structured logging example","example":"structured_logging","logger_type":"zap"}
 	// {"level":"info","timestamp":"2021-12-31T12:00:00.100Z","service":"gocql-app","component":"gocql-driver","msg":"Discovered protocol version.","protocol_version":4}
@@ -219,4 +217,3 @@ func Example_structuredLogging() {
 	// {"level":"info","service":"gocql-app","component":"app","time":"2021-12-31T12:00:12Z","operation":"select","record_id":2,"message":"Querying data from database"}
 	// {"level":"info","service":"gocql-app","component":"app","time":"2021-12-31T12:00:13Z","operation":"select","record_id":2,"record_value":"zerolog logging demo","message":"Database operation completed successfully"}
 }
- 

example_vector_test.go

@@ -34,9 +34,9 @@ func Example_vector() {
 	/* The example assumes the following CQL was used to setup the keyspace:
 	create keyspace example with replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
 	create table example.vectors(
-		id int, 
-		item_name text, 
-		embedding vector<float, 5>, 
+		id int,
+		item_name text,
+		embedding vector<float, 5>,
 		PRIMARY KEY(id)
 	);
 	-- Create SAI index for vector search (required for ANN)
@@ -75,9 +75,9 @@ func Example_vector() {
 	// Insert sample vectors representing different items
 	// These could be embeddings from ML models for products, documents, etc.
 	vectorData := []struct {
-		id      int
-		name    string
-		vector  []float32
+		id     int
+		name   string
+		vector []float32
 	}{
 		{1, "apple", []float32{0.8, 0.2, 0.1, 0.9, 0.3}},
 		{2, "orange", []float32{0.7, 0.3, 0.2, 0.8, 0.4}},
@@ -118,7 +118,7 @@ func Example_vector() {
 		var id int
 		var itemName string
 		var embedding []float32
-		
+
 		if !iter.Scan(&id, &itemName, &embedding) {
 			break
 		}
@@ -147,7 +147,7 @@ func Example_vector() {
 		var id int
 		var itemName string
 		var embedding []float32
-		
+
 		err = scanner.Scan(&id, &itemName, &embedding)
 		if err != nil {
 			log.Fatal(err)
@@ -165,10 +165,10 @@ func Example_vector() {
 	var id int
 	var itemName string
 	var embedding []float32
-	err = session.Query("SELECT id, item_name, embedding FROM example.vectors WHERE id = ?", 1).
-		ScanContext(ctx, &id, &itemName, &embedding)
-	if err != nil {
-		log.Fatal(err)
+	iter = session.Query("SELECT id, item_name, embedding FROM example.vectors WHERE id = ?", 1).
+		IterContext(ctx)
+	if !iter.Scan(&id, &itemName, &embedding) {
+		log.Fatal(iter.Close())
 	}
 	fmt.Printf("  %s (ID: %d) - Vector: %v\n", itemName, id, embedding)
 
@@ -181,7 +181,7 @@ func Example_vector() {
 		var id int
 		var itemName string
 		var embedding []float32
-		
+
 		if !allVectors.Scan(&id, &itemName, &embedding) {
 			break
 		}
@@ -195,9 +195,9 @@ func Example_vector() {
 	// Creating SAI index for vector search...
 	// Inserting sample vectors...
 	// Searching for vectors similar to: [0.8 0.2 0.1 0.9 0.3]
-	// 
+	//
 	// Top 3 most similar items (using ANN search):
 	//   apple (ID: 1) - Vector: [0.8 0.2 0.1 0.9 0.3]
 	//   strawberry (ID: 6) - Vector: [0.8 0.3 0.2 0.9 0.4]
 	//   orange (ID: 2) - Vector: [0.7 0.3 0.2 0.8 0.4]
-} 
+}