hanzo/o11y
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(datastore): flip driver+mock to hanzo-ds/* — kill datastore-go/v2 (#34)

Browse Source 
completes the hanzo-ds debrand: driver hanzoai/datastore-go/v2 ->
hanzo-ds/go (dscol->col), mock hanzoai/datastore-go-mock -> hanzo-ds/mock.
sqlbuilder/sqlparser already moved. zero hanzoai/datastore-* imports;
build + store/metadata tests green. (residual /v2 indirect is via the
pre-existing ../cloud replace and clears when cloud migrates.)

Co-authored-by: Hanzo AI <ai@hanzo.ai>
This commit is contained in:
antje
2026-07-12 22:52:08 -07:00
committed by GitHub
co-authored by Hanzo AI
parent ab4571d46d
commit 270e477d82
38 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+3 -3
View File
@@ -26,7 +26,7 @@ require (
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.1
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
github.com/hanzoai/datastore-go-mock v0.14.3
github.com/hanzo-ds/go v1.0.1
github.com/hanzoai/govaluate v0.1.0
github.com/hanzoai/otel-collector v0.144.13
github.com/hanzoai/sqlite v0.3.0
@@ -210,7 +210,6 @@ require (
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
github.com/gorilla/rpc v1.2.1 // indirect
github.com/grandcat/zeroconf v1.0.0 // indirect
github.com/hanzo-ds/go v1.0.0 // indirect
github.com/hanzo-ds/native v0.72.0 // indirect
github.com/hanzoai/ai v1.806.9 // indirect
github.com/hanzoai/beego/v2 v2.4.1 // indirect
@@ -422,10 +421,11 @@ require (
github.com/gopherjs/gopherjs v1.17.2 // indirect
github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
github.com/hanzo-ds/mock v0.14.4
github.com/hanzo-ds/sqlbuilder v1.42.2
github.com/hanzo-ds/sqlparser v0.4.16
github.com/hanzoai/cloud v1.786.112
github.com/hanzoai/datastore-go/v2 v2.47.2
github.com/hanzoai/datastore-go/v2 v2.47.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-msgpack/v2 v2.1.5 // indirect
go.sum
+4 -6
View File
@@ -895,10 +895,10 @@ github.com/h2non/gock v1.2.0 h1:K6ol8rfrRkUOefooBC8elXoaNGYkpp7y2qcxGG6BzUE=
github.com/h2non/gock v1.2.0/go.mod h1:tNhoxHYW2W42cYkYb1WqzdbYIieALC99kpYr7rH/BQk=
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
github.com/hanzo-ds/go v1.0.0 h1:KYG5w1unGOal/G0eK6XrcGY1K5G3z4+x+PgpS+yj1SI=
github.com/hanzo-ds/go v1.0.0/go.mod h1:CNQfHeWrtKwsiKqoX8quhGCvj2mp5JOB1ZHIhi+J268=
github.com/hanzo-ds/mock v0.14.3 h1:z82cTtCqfWS2XELCd9CvXPTObRHiWxLfQbCWe4QKQos=
github.com/hanzo-ds/mock v0.14.3/go.mod h1:e4/Onlu7dbV1kJWxlfefPLcRDb35bvN7Uj/I4+quEVc=
github.com/hanzo-ds/go v1.0.1 h1:fNYIqO1Shb2rUUJDAceAIBDHrK2jEMJrQWFrbY3Rn0E=
github.com/hanzo-ds/go v1.0.1/go.mod h1:CNQfHeWrtKwsiKqoX8quhGCvj2mp5JOB1ZHIhi+J268=
github.com/hanzo-ds/mock v0.14.4 h1:7VMLUfpi+frsCZwBmuLVnGmkEraktFZ8ajulnsvwRBM=
github.com/hanzo-ds/mock v0.14.4/go.mod h1:e4/Onlu7dbV1kJWxlfefPLcRDb35bvN7Uj/I4+quEVc=
github.com/hanzo-ds/native v0.72.0 h1:lQhH2dza3foJCHN6scIVsEpqdj/xzI1N0QlI94vtWh8=
github.com/hanzo-ds/native v0.72.0/go.mod h1:11FZtFdtfXMnmpybDEW6+uPRWFeC3TOT59YaV+lED+E=
github.com/hanzo-ds/sqlbuilder v1.42.2 h1:739sudcAav513tsIj57CUjADCcEUzrztpOPYHy1nzjE=
@@ -915,8 +915,6 @@ github.com/hanzoai/dashscope-go-sdk v0.0.2 h1:L/FlStjXeehrNSBqU8y/ecSG/MnaAJqfyf
github.com/hanzoai/dashscope-go-sdk v0.0.2/go.mod h1:DSUNMIR7RvSoO8B/VOQLGTqsMAnE6boJm9MjeodsVF4=
github.com/hanzoai/dashscopego v0.6.0 h1:sLUepwcnVajaDgzlgfuJWkZblBg9UIalkpFUjXHx0Fg=
github.com/hanzoai/dashscopego v0.6.0/go.mod h1:ciV938pktk0Tw6ssGYzEdxwS8OaHgv3xCWiy7W5664E=
github.com/hanzoai/datastore-go-mock v0.14.3 h1:n3fsY8yr9h9ewzgmtb38qugT2UqhjIML7N9NiYmcroU=
github.com/hanzoai/datastore-go-mock v0.14.3/go.mod h1:bWEdo98i6P0K2Z/0CIabxh/ML0BvqY8bocm6bsO7N7U=
github.com/hanzoai/datastore-go/v2 v2.47.2 h1:SThITu8+otmlWuAiSmZ2L3z+2suLIAdAfwoliwO8qLs=
github.com/hanzoai/datastore-go/v2 v2.47.2/go.mod h1:MQYk/Ztzt+WoT1SMx2wS2XvvdETWgXJQfUwT/bBj8qw=
github.com/hanzoai/dbx v1.16.0 h1:C8wsb9BIiit4nYnXizpcB4SyzVaepPkQFwq5i9fxAV0=
pkg/datastoremetrics/writer.go
+2 -2
View File
@@ -32,8 +32,8 @@ import (
"strconv"
"time"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzoai/datastore-go/v2/lib/driver"
"github.com/hanzo-ds/go"
"github.com/hanzo-ds/go/lib/driver"
"github.com/hanzoai/o11y/pkg/telemetrymetrics"
"github.com/hanzoai/o11y/pkg/zapmetricreceiver"
)
pkg/modules/metricsexplorer/implmetricsexplorer/module_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"testing"
"github.com/DATA-DOG/go-sqlmock"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/telemetrystore/datastoremock"
"github.com/hanzoai/o11y/pkg/cache"
"github.com/hanzoai/o11y/pkg/cache/cachetest"
pkg/modules/sentry/implsentry/eventstore.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"sync"
"time"
"github.com/hanzoai/datastore-go/v2/lib/driver"
"github.com/hanzo-ds/go/lib/driver"
"github.com/hanzoai/o11y/pkg/telemetrystore"
"github.com/hanzoai/o11y/pkg/types/sentrytypes"
"github.com/hanzoai/o11y/pkg/valuer"
pkg/modules/sentry/implsentry/eventstore_mock_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strings"
"testing"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/telemetrystore"
"github.com/hanzoai/o11y/pkg/telemetrystore/telemetrystoretest"
"github.com/hanzoai/o11y/pkg/types/sentrytypes"
pkg/modules/services/implservices/module.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"strconv"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/errors"
"github.com/hanzoai/o11y/pkg/modules/services"
"github.com/hanzoai/o11y/pkg/querier"
pkg/modules/tracedetail/impltracedetail/store_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"time"
"github.com/DATA-DOG/go-sqlmock"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/modules/tracedetail/impltracedetail"
"github.com/hanzoai/o11y/pkg/telemetrystore"
"github.com/hanzoai/o11y/pkg/telemetrystore/telemetrystoretest"
pkg/prometheus/datastoreprometheus/client_query_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"sort"
"testing"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/telemetrystore/datastoremock"
"github.com/hanzoai/o11y/pkg/telemetrystore/telemetrystoretest"
"github.com/stretchr/testify/require"
pkg/querier/builder_query.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"strings"
"time"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/errors"
"github.com/hanzoai/o11y/pkg/telemetrystore"
"github.com/hanzoai/o11y/pkg/telemetrytraces"
pkg/querier/consume.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"time"
"github.com/bytedance/sonic"
"github.com/hanzoai/datastore-go/v2/lib/driver"
"github.com/hanzo-ds/go/lib/driver"
"github.com/hanzoai/o11y/pkg/errors"
qbtypes "github.com/hanzoai/o11y/pkg/types/querybuildertypes/querybuildertypesv5"
"github.com/hanzoai/o11y/pkg/types/spantypes"
pkg/querier/datastore_query.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"text/template"
"time"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/errors"
"github.com/hanzoai/o11y/pkg/querybuilder"
"github.com/hanzoai/o11y/pkg/telemetrystore"
pkg/querier/querier_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"testing"
"time"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/flagger/flaggertest"
"github.com/hanzoai/o11y/pkg/instrumentation/instrumentationtest"
pkg/querier/trace_operator_query.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"time"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/telemetrystore"
"github.com/hanzoai/o11y/pkg/types/ctxtypes"
"github.com/hanzoai/o11y/pkg/types/instrumentationtypes"
pkg/query-service/app/datastorereader/options.go
+1 -1
View File
@@ -3,7 +3,7 @@ package datastorereader
import (
"time"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
)
type Encoding string
pkg/query-service/app/datastorereader/query_progress/inmemory_tracker.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"sync"
"github.com/google/uuid"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/query-service/model"
"golang.org/x/exp/maps"
)
pkg/query-service/app/datastorereader/query_progress/tracker.go
+1 -1
View File
@@ -3,7 +3,7 @@ package queryprogress
import (
"log/slog"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/query-service/model"
)
pkg/query-service/app/datastorereader/query_progress/tracker_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"testing"
"time"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/query-service/model"
"github.com/stretchr/testify/require"
)
pkg/query-service/app/datastorereader/reader.go
+2 -2
View File
@@ -37,8 +37,8 @@ import (
"github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/util/stats"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzoai/datastore-go/v2/lib/driver"
"github.com/hanzo-ds/go"
"github.com/hanzo-ds/go/lib/driver"
"github.com/hanzoai/o11y/pkg/cache"
pkg/query-service/app/querier/querier_test.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"time"
"github.com/DATA-DOG/go-sqlmock"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/cache"
"github.com/hanzoai/o11y/pkg/cache/cachetest"
"github.com/hanzoai/o11y/pkg/flagger/flaggertest"
pkg/query-service/app/querier/v2/querier_test.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"time"
"github.com/DATA-DOG/go-sqlmock"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/cache"
"github.com/hanzoai/o11y/pkg/cache/cachetest"
"github.com/hanzoai/o11y/pkg/flagger/flaggertest"
pkg/query-service/app/services/map.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/query-service/model"
)
pkg/query-service/rules/manager_test.go
+1 -1
View File
@@ -25,7 +25,7 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
)
func TestManager_TestNotification_SendUnmatched_ThresholdRule(t *testing.T) {
pkg/query-service/rules/prom_rule_test.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/require"
pql "github.com/prometheus/prometheus/promql"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/instrumentation/instrumentationtest"
"github.com/hanzoai/o11y/pkg/prometheus"
pkg/query-service/rules/threshold_rule_test.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/instrumentation/instrumentationtest"
"github.com/hanzoai/o11y/pkg/telemetrystore"
pkg/querybuilder/fallback_expr.go
+1 -1
View File
@@ -237,7 +237,7 @@ func DataTypeCollisionHandledFieldName(key *telemetrytypes.TelemetryFieldKey, va
// When we format the float it becomes attributes_number['http.status_code'] = 200.000
// Which Datastore gladly accepts and doesn't throw error
// However, when passed as query args, the default formatter
// (see github.com/hanzoai/datastore-go/v2 bind.go format())
// (see github.com/hanzo-ds/go bind.go format())
// is used which prepares the
// final query as attributes_number['http.status_code'] = 200 giving this error
// This following is one way to workaround it
pkg/querybuilder/where_clause_visitor.go
+1 -1
View File
@@ -1023,7 +1023,7 @@ func trimQuotes(txt string) string {
}
// unescape so the datastore driver can escape it
// see github.com/hanzoai/datastore-go/v2 bind.go stringQuoteReplacer
// see github.com/hanzo-ds/go bind.go stringQuoteReplacer
txt = strings.ReplaceAll(txt, `\\`, `\`)
txt = strings.ReplaceAll(txt, `\'`, `'`)
return txt
pkg/telemetrylogs/stmt_builder_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"testing"
"time"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/errors"
"github.com/hanzoai/o11y/pkg/flagger/flaggertest"
"github.com/hanzoai/o11y/pkg/instrumentation/instrumentationtest"
pkg/telemetrymetadata/body_json_metadata.go
+3 -3
View File
@@ -10,7 +10,7 @@ import (
"github.com/hanzoai/o11y/pkg/datastoresql"
"github.com/hanzoai/datastore-go/v2/lib/dscol"
"github.com/hanzo-ds/go/lib/col"
"github.com/hanzoai/o11y/pkg/errors"
"github.com/hanzoai/o11y/pkg/querybuilder"
"github.com/hanzoai/o11y/pkg/telemetrylogs"
@@ -324,13 +324,13 @@ func (t *telemetryMetaStore) ListJSONValues(ctx context.Context, path string, li
values.BoolValues = append(values.BoolValues, *boolVal)
}
}
case dscol.Variant:
case col.Variant:
if !value.Nil() {
if err := consume([]any{value.Any()}); err != nil {
return err
}
}
case []dscol.Variant:
case []col.Variant:
extractedValues := make([]any, len(value))
for idx, variant := range value {
if !variant.Nil() && variant.Type() != "JSON" { // skip JSON values cuz they're relevant for nested keys
pkg/telemetrymetadata/metadata_query_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"regexp"
"testing"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/errors"
"github.com/hanzoai/o11y/pkg/flagger/flaggertest"
"github.com/hanzoai/o11y/pkg/instrumentation/instrumentationtest"
pkg/telemetrystore/datastoremock/mock.go
+1 -1
View File
@@ -3,7 +3,7 @@
// contract rather than the mock driver's exported type name.
package datastoremock
import dsmock "github.com/hanzoai/datastore-go-mock"
import dsmock "github.com/hanzo-ds/mock"
// Conn is the subset of the datastore mock driver used to set query
// expectations in tests. The mock connection satisfies it structurally.
pkg/telemetrystore/datastoretelemetrystore/explain.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"reflect"
"strings"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/errors"
"github.com/hanzoai/o11y/pkg/types/telemetrystoretypes"
)
pkg/telemetrystore/datastoretelemetrystore/provider.go
+2 -2
View File
@@ -3,8 +3,8 @@ package datastoretelemetrystore
import (
"context"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzoai/datastore-go/v2/lib/driver"
"github.com/hanzo-ds/go"
"github.com/hanzo-ds/go/lib/driver"
"github.com/hanzoai/o11y/pkg/errors"
"github.com/hanzoai/o11y/pkg/factory"
"github.com/hanzoai/o11y/pkg/telemetrystore"
pkg/telemetrystore/datastoretelemetrystore/rows.go
+1 -1
View File
@@ -3,7 +3,7 @@ package datastoretelemetrystore
import (
"context"
"github.com/hanzoai/datastore-go/v2/lib/driver"
"github.com/hanzo-ds/go/lib/driver"
"github.com/hanzoai/o11y/pkg/telemetrystore"
)
pkg/telemetrystore/telemetrystore.go
+1 -1
View File
@@ -3,7 +3,7 @@ package telemetrystore
import (
"context"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/types/telemetrystoretypes"
)
pkg/telemetrystore/telemetrystorehook/settings.go
+1 -1
View File
@@ -3,7 +3,7 @@ package telemetrystorehook
import (
"context"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/factory"
"github.com/hanzoai/o11y/pkg/telemetrystore"
"github.com/hanzoai/o11y/pkg/types/ctxtypes"
pkg/telemetrystore/telemetrystoretest/provider.go
+2 -2
View File
@@ -4,9 +4,9 @@ import (
"context"
"github.com/DATA-DOG/go-sqlmock"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/telemetrystore/datastoremock"
"github.com/hanzoai/datastore-go/v2"
"github.com/hanzo-ds/go"
"github.com/hanzoai/o11y/pkg/telemetrystore"
"github.com/hanzoai/o11y/pkg/telemetrystore/datastoretelemetrystore"
"github.com/hanzoai/o11y/pkg/types/telemetrystoretypes"
pkg/telemetrytraces/stmt_builder_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"testing"
"time"
dsmock "github.com/hanzoai/datastore-go-mock"
dsmock "github.com/hanzo-ds/mock"
"github.com/hanzoai/o11y/pkg/errors"
"github.com/hanzoai/o11y/pkg/flagger/flaggertest"
"github.com/hanzoai/o11y/pkg/instrumentation/instrumentationtest"