This is an automated email from the ASF dual-hosted git repository.
zeroshade pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 224df196f fix(go/adbc/driver/internal/driverbase): Ensure to propagate
the traceParent from the driver/database to connection (#2951)
224df196f is described below
commit 224df196f3e7cfe529693f58e8f56b308b7e1423
Author: Bruce Irschick <[email protected]>
AuthorDate: Wed Jun 11 10:24:26 2025 -0700
fix(go/adbc/driver/internal/driverbase): Ensure to propagate the
traceParent from the driver/database to connection (#2951)
This fix ensures the traceParent option is propagated from the
Driver.Open to Database.Connect.
---
go/adbc/driver/internal/driverbase/connection.go | 1 +
go/adbc/driver/snowflake/driver_test.go | 28 +++++++++++++++++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/go/adbc/driver/internal/driverbase/connection.go
b/go/adbc/driver/internal/driverbase/connection.go
index 475581a85..2e1277852 100644
--- a/go/adbc/driver/internal/driverbase/connection.go
+++ b/go/adbc/driver/internal/driverbase/connection.go
@@ -136,6 +136,7 @@ func NewConnectionImplBase(database *DatabaseImplBase)
ConnectionImplBase {
Tracer: database.Tracer,
Autocommit: true,
Closed: false,
+ traceParent: database.traceParent,
}
}
diff --git a/go/adbc/driver/snowflake/driver_test.go
b/go/adbc/driver/snowflake/driver_test.go
index c5bc650b4..4a899d082 100644
--- a/go/adbc/driver/snowflake/driver_test.go
+++ b/go/adbc/driver/snowflake/driver_test.go
@@ -26,6 +26,7 @@ import (
"database/sql"
sqldriver "database/sql/driver"
"encoding/base64"
+ "encoding/hex"
"encoding/json"
"encoding/pem"
"errors"
@@ -318,6 +319,16 @@ func withQuirks(t *testing.T, fn func(*SnowflakeQuirks)) {
fn(q)
}
+func generateTraceparent() string {
+ traceID := make([]byte, 16)
+ _, _ = rand.Read(traceID)
+
+ spanID := make([]byte, 8)
+ _, _ = rand.Read(spanID)
+
+ return fmt.Sprintf("00-%s-%s-01", hex.EncodeToString(traceID),
hex.EncodeToString(spanID))
+}
+
func TestValidation(t *testing.T) {
withQuirks(t, func(q *SnowflakeQuirks) {
suite.Run(t, &validation.DatabaseTests{Quirks: q})
@@ -385,12 +396,27 @@ func (suite *SnowflakeTests) TestNewDatabaseWithOptions()
{
t.Run("WithTransporter", func(t *testing.T) {
transport := &customTransport{base:
gosnowflake.SnowflakeTransport}
- db, err :=
drv.NewDatabaseWithOptions(suite.Quirks.DatabaseOptions(),
+ dbOptions := suite.Quirks.DatabaseOptions()
+ // Add trace parent to the options.
+ dbOptions[adbc.OptionKeyTelemetryTraceParent] =
generateTraceparent()
+ db, err := drv.NewDatabaseWithOptions(dbOptions,
driver.WithTransporter(transport))
suite.NoError(err)
suite.NotNil(db)
cnxn, err := db.Open(suite.ctx)
suite.NoError(err)
+
+ // Confirm database trace parent is non-empty and propagated to
the connection trace parent
+ dbImpl, ok := db.(driverbase.DatabaseImpl)
+ suite.True(ok, "expecting db to implement interface
'driverbase.DatabaseImpl'")
+ dTp := dbImpl.Base().GetTraceParent()
+ cnxnImpl, ok := cnxn.(driverbase.ConnectionImpl)
+ suite.True(ok, "expecting cnxn to implement interface
'driverbase.ConnectionImpl'")
+ cTp := cnxnImpl.Base().GetTraceParent()
+ suite.NotEmpty(t, dTp)
+ suite.NotEmpty(t, cTp)
+ suite.Equal(dTp, cTp, "expecting database and connection trace
parent to be equal")
+
suite.NoError(db.Close())
suite.NoError(cnxn.Close())
suite.True(transport.called)
