Fix v2 Go module path

README.md

@@ -19,4 +19,4 @@ Blip was created by engineers at [Cash App](https://cash.app) and [Square](https
 
 :link: [Contributions welcome](https://github.com/cashapp/blip/blob/main/CONTRIBUTING.md)
 
-[![Go Reference](https://pkg.go.dev/badge/github.com/cashapp/blip.svg)](https://pkg.go.dev/github.com/cashapp/blip)
+[![Go Reference](https://pkg.go.dev/badge/github.com/cashapp/blip/v2.svg)](https://pkg.go.dev/github.com/cashapp/blip/v2)

aws/aws.go

@@ -12,7 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 
-	"github.com/cashapp/blip"
+	"github.com/cashapp/blip/v2"
 )
 
 type ConfigFactory struct {

aws/rds.go

@@ -12,7 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/rds"
 	"github.com/go-sql-driver/mysql"
 
-	"github.com/cashapp/blip"
+	"github.com/cashapp/blip/v2"
 )
 
 type RDSClient interface {

aws/rds_test.go

@@ -12,9 +12,9 @@ import (
 
 	//"github.com/stretchr/testify/assert"
 
-	"github.com/cashapp/blip"
-	blipAWS "github.com/cashapp/blip/aws"
-	"github.com/cashapp/blip/test/mock"
+	"github.com/cashapp/blip/v2"
+	blipAWS "github.com/cashapp/blip/v2/aws"
+	"github.com/cashapp/blip/v2/test/mock"
 )
 
 func TestRDSClient(t *testing.T) {

aws/secret.go

@@ -10,7 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
 
-	"github.com/cashapp/blip"
+	"github.com/cashapp/blip/v2"
 )
 
 type Secret struct {

bin/blip/main.go

@@ -5,7 +5,7 @@ package main
 import (
 	"log"
 
-	"github.com/cashapp/blip/server"
+	"github.com/cashapp/blip/v2/server"
 )
 
 func main() {

blip.go

@@ -20,7 +20,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 )
 
-const VERSION = "2.0.0"
+const VERSION = "2.0.1"
 
 var SHA = ""
 

blip_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cashapp/blip"
+	"github.com/cashapp/blip/v2"
 )
 
 func TestTimeLimit(t *testing.T) {

config_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/cashapp/blip"
+	"github.com/cashapp/blip/v2"
 )
 
 func TestMain(m *testing.M) {

dbconn/factory.go

@@ -17,8 +17,8 @@ import (
 
 	"github.com/go-sql-driver/mysql"
 
-	"github.com/cashapp/blip"
-	"github.com/cashapp/blip/aws"
+	"github.com/cashapp/blip/v2"
+	"github.com/cashapp/blip/v2/aws"
 )
 
 // rdsAddr matches Amazon RDS hostnames with optional :port suffix.

dbconn/factory_test.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/cashapp/blip"
-	"github.com/cashapp/blip/dbconn"
-	"github.com/cashapp/blip/test"
+	"github.com/cashapp/blip/v2"
+	"github.com/cashapp/blip/v2/dbconn"
+	"github.com/cashapp/blip/v2/test"
 )
 
 func sysvar(db *sql.DB, name string) (string, error) {

dbconn/mycnf.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-ini/ini"
 
-	"github.com/cashapp/blip"
+	"github.com/cashapp/blip/v2"
 )
 
 // ParseMyCnf parses a MySQL my.cnf file. It only reads the "[client]" section,

dbconn/mycnf_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/cashapp/blip"
-	"github.com/cashapp/blip/dbconn"
+	"github.com/cashapp/blip/v2"
+	"github.com/cashapp/blip/v2/dbconn"
 )
 
 func TestParseMyCnf(t *testing.T) {

dbconn/password_secret_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/credentials"
 
-	"github.com/cashapp/blip"
+	"github.com/cashapp/blip/v2"
 )
 
 type testAWSConfigFactory struct {

dbconn/reload_password.go

@@ -9,8 +9,8 @@ import (
 	dsndriver "github.com/go-mysql/hotswap-dsn-driver"
 	"github.com/go-sql-driver/mysql"
 
-	"github.com/cashapp/blip"
-	"github.com/cashapp/blip/event"
+	"github.com/cashapp/blip/v2"
+	"github.com/cashapp/blip/v2/event"
 )
 
 func init() {

docs/content/about/release-notes.md

@@ -23,20 +23,24 @@ As described in the [Blip versioning guidelines](https://github.com/block/blip/b
 
 To upgrade an integration:
 
-1. Replace `dbconn.Credentials` with `blip.DbCredentials` and update any `dbconn.CredentialFunc` implementations.
-2. Accept the new variadic options argument when storing or wrapping `dbconn.NewConnFactory`; ordinary two-argument calls continue to compile.
-3. Capture the parameter slice returned by `DataSizeQuery`, `TableSizeQuery`, and `TableIoWaitQuery`, and pass it to the database query call.
-4. Replace `aws.Secret.Password` calls with `GetSecret` for the default JSON object or `GetSecretPayload` plus a password secret parser for custom payloads.
-5. Stop comparing `heartbeat.BlipReader` values directly; compare the relevant state exposed by the reader instead.
+1. Update imports from `github.com/cashapp/blip/...` to `github.com/cashapp/blip/v2/...` and require `github.com/cashapp/blip/v2 v2.0.1` or later.
+2. Replace `dbconn.Credentials` with `blip.DbCredentials` and update any `dbconn.CredentialFunc` implementations.
+3. Accept the new variadic options argument when storing or wrapping `dbconn.NewConnFactory`; ordinary two-argument calls continue to compile.
+4. Capture the parameter slice returned by `DataSizeQuery`, `TableSizeQuery`, and `TableIoWaitQuery`, and pass it to the database query call.
+5. Replace `aws.Secret.Password` calls with `GetSecret` for the default JSON object or `GetSecretPayload` plus a password secret parser for custom payloads.
+6. Stop comparing `heartbeat.BlipReader` values directly; compare the relevant state exposed by the reader instead.
 
 ### Runtime changes
 
 AWS Secrets Manager `password-secret` authentication now uses the secret's optional string `username` value instead of always using the configured monitor username. Remove `username` from the secret to retain the v1.2 behavior.
 
 Default sink HTTP clients now have a 10-second whole-request timeout plus bounded connection and response-header timeouts. Custom HTTP client factories are unchanged.
 
-### v2.0.0 (7 Aug 2026)
+### v2.0.1 (7 Aug 2026)
 
+Version v2.0.0 was withdrawn before release completion because its module path lacked the `/v2` suffix required by Go modules. v2.0.1 is the first usable v2 release.
+
+* Added the required `/v2` module and import path for the v2 series.
 * Added the `autoinc` domain for auto-increment column utilization.
 * Added the `error.account`, `error.global`, `error.host`, `error.thread`, and `error.user` domains.
 * Added the `innodb.buffer-pool` domain.

docs/content/cloud/aws.md

@@ -37,7 +37,7 @@ config.LoadDefaultConfig(ctx, config.WithRegion("..."))
 
 Section [Region](#region) above explains how the region is auto-detected or configured.
 
-Use the [`blip.AWSConfigFactory`](https://pkg.go.dev/github.com/cashapp/blip#AWSConfigFactory) to load a custome AWS configuration (which includes the credentials).
+Use the [`blip.AWSConfigFactory`](https://pkg.go.dev/github.com/cashapp/blip/v2#AWSConfigFactory) to load a custome AWS configuration (which includes the credentials).
 See [Develop / Intergration API]({{< ref "/develop/integration-api" >}}) for more information.
 
 ## Authentication
@@ -129,7 +129,7 @@ It works with Blip, but Blip ignores the connection fields like `host` and `port
 {{< /hint >}}
 
 If you embed Blip and use a different secret payload shape, set the
-[`blip.Plugins.ParsePasswordSecret`](https://pkg.go.dev/github.com/cashapp/blip#Plugins)
+[`blip.Plugins.ParsePasswordSecret`](https://pkg.go.dev/github.com/cashapp/blip/v2#Plugins)
 callback before calling `Server.Boot`.
 The callback receives one raw payload: `SecretString` bytes when present, otherwise `SecretBinary` bytes.
 It should set the password and, if needed, username on the credentials value passed to it.

docs/content/develop/domain-translator.md

@@ -6,14 +6,14 @@ This allows Blip to collect and structure metrics one way, but report metrics in
 
 ## Sink Translator
 
-[sink/tr.Translator](https://pkg.go.dev/github.com/cashapp/blip/sink/tr#DomainTranslator)
+[sink/tr.Translator](https://pkg.go.dev/github.com/cashapp/blip/v2/sink/tr#DomainTranslator)
 
 The sink translator renames metrics.
-A sink translator must be registered by calling [`sink/tr.Register`](https://pkg.go.dev/github.com/cashapp/blip/sink/tr#Register).
+A sink translator must be registered by calling [`sink/tr.Register`](https://pkg.go.dev/github.com/cashapp/blip/v2/sink/tr#Register).
 
 ## Prometheus Translator
 
-[prom.Translator](https://pkg.go.dev/github.com/cashapp/blip/prom#DomainTranslator)
+[prom.Translator](https://pkg.go.dev/github.com/cashapp/blip/v2/prom#DomainTranslator)
 
 The Prometheus translator is used for [Prometheus emulation]({{< ref "config/prometheus" >}}).
 Currently, these translators are built-in.

docs/content/develop/events.md

@@ -1,7 +1,7 @@
 ---
 ---
 
-Blip uses [events](https://pkg.go.dev/github.com/cashapp/blip/event) instead of traditional logging.
+Blip uses [events](https://pkg.go.dev/github.com/cashapp/blip/v2/event) instead of traditional logging.
 
 Instead of,
 
@@ -20,13 +20,13 @@ By default, error events are printed to `STDERR`.
 Start `blip` with the [`--log`]({{< ref "/config/blip#--log" >}}) option to print info events to `STDOUT`, which simulates traditional logging.
 
 An event receiver handles every event.
-The default event receiver is [`event.Log`](https://pkg.go.dev/github.com/cashapp/blip/event#Log), which prints events as noted above: error events to `STDERR`, and "info" events to `STDOUT` if [`--log`]({{< ref "/config/blip#--log" >}}).
+The default event receiver is [`event.Log`](https://pkg.go.dev/github.com/cashapp/blip/v2/event#Log), which prints events as noted above: error events to `STDERR`, and "info" events to `STDOUT` if [`--log`]({{< ref "/config/blip#--log" >}}).
 
 To change (or implement different) Blip logging, implement a custom event receiver.
 
 ## Custom Receiver
 
-Implement the [`event.Receiver` interface](https://pkg.go.dev/github.com/cashapp/blip/event#Receiver), then call [`event.SetReceiver`](https://pkg.go.dev/github.com/cashapp/blip/event#SetReceiver) before booting the server.
+Implement the [`event.Receiver` interface](https://pkg.go.dev/github.com/cashapp/blip/v2/event#Receiver), then call [`event.SetReceiver`](https://pkg.go.dev/github.com/cashapp/blip/v2/event#SetReceiver) before booting the server.
 
 <p class="note">
 Registering a custom receive completely overrides the default receiver.

docs/content/develop/integration-api.md

@@ -23,7 +23,7 @@ How you integrate with Blip depends on what you're trying to customize:
 |Timeouts|Variables|
 
 {{< hint type=important >}}
-**All integrations must be set before calling [`Server.Boot`](https://pkg.go.dev/github.com/cashapp/blip/server#Server.Boot).**
+**All integrations must be set before calling [`Server.Boot`](https://pkg.go.dev/github.com/cashapp/blip/v2/server#Server.Boot).**
 {{< /hint >}}
 
 ## Registry
@@ -33,9 +33,9 @@ Blip has three registries:
 
 |Registry|Resource Name|Factory Produces|
 |:-------|:------------|:---------------|
-|[Metrics Registry](https://pkg.go.dev/github.com/cashapp/blip/metrics#Register)|metric domain|[Collector](https://pkg.go.dev/github.com/cashapp/blip#Collector)|
-|[Sink Registry](https://pkg.go.dev/github.com/cashapp/blip/sink#Register)|sink|[Sink](https://pkg.go.dev/github.com/cashapp/blip#Sink)|
-|[Domain Translator Registry](https://pkg.go.dev/github.com/cashapp/blip/sink/tr#Register)|metric domain|[DomainTranslator](https://pkg.go.dev/github.com/cashapp/blip/sink/tr#DomainTranslator)|
+|[Metrics Registry](https://pkg.go.dev/github.com/cashapp/blip/v2/metrics#Register)|metric domain|[Collector](https://pkg.go.dev/github.com/cashapp/blip/v2#Collector)|
+|[Sink Registry](https://pkg.go.dev/github.com/cashapp/blip/v2/sink#Register)|sink|[Sink](https://pkg.go.dev/github.com/cashapp/blip/v2#Sink)|
+|[Domain Translator Registry](https://pkg.go.dev/github.com/cashapp/blip/v2/sink/tr#Register)|metric domain|[DomainTranslator](https://pkg.go.dev/github.com/cashapp/blip/v2/sink/tr#DomainTranslator)|
 
 The metric and sink registries are the most important: they allow you to make Blip collect any metrics and send metrics anywhere.
 
@@ -51,18 +51,18 @@ This is also how [custom metric collectors]({{< ref "develop/collectors" >}}) wo
 
 ## Factories
 
-[Factories](https://pkg.go.dev/github.com/cashapp/blip#Factories) are interfaces that let you override certain object creation of Blip.
+[Factories](https://pkg.go.dev/github.com/cashapp/blip/v2#Factories) are interfaces that let you override certain object creation of Blip.
 Every factory is optional: if specified, it overrides the built-in factory.
 
 ## Plugins
 
-[Plugins](https://pkg.go.dev/github.com/cashapp/blip#Plugins) are function callbacks that let you override specific functionality of Blip.
+[Plugins](https://pkg.go.dev/github.com/cashapp/blip/v2#Plugins) are function callbacks that let you override specific functionality of Blip.
 Every plugin is optional: if specified, it overrides the built-in functionality.
 
 ### AWS Password Secrets
 
-Set [`Plugins.ParsePasswordSecret`](https://pkg.go.dev/github.com/cashapp/blip#Plugins) to customize how Blip maps the raw AWS Secrets Manager payload from [`config.aws.password-secret`]({{< ref "/config/config-file#password-secret" >}}) to MySQL credentials.
-If this callback is not set, Blip uses [`DefaultPasswordSecretParser`](https://pkg.go.dev/github.com/cashapp/blip#DefaultPasswordSecretParser): `password` is required, and `username` is optional.
+Set [`Plugins.ParsePasswordSecret`](https://pkg.go.dev/github.com/cashapp/blip/v2#Plugins) to customize how Blip maps the raw AWS Secrets Manager payload from [`config.aws.password-secret`]({{< ref "/config/config-file#password-secret" >}}) to MySQL credentials.
+If this callback is not set, Blip uses [`DefaultPasswordSecretParser`](https://pkg.go.dev/github.com/cashapp/blip/v2#DefaultPasswordSecretParser): `password` is required, and `username` is optional.
 Blip passes `SecretString` bytes when present; otherwise, it passes `SecretBinary` bytes.
 The `credentials` argument is initialized with the configured monitor username; custom parsers must set `credentials.Password` and can override `credentials.Username`.
 
@@ -75,10 +75,10 @@ plugins.ParsePasswordSecret = func(ctx context.Context, cfg blip.ConfigMonitor,
 
 ## Events
 
-Implement a [Receiver](https://pkg.go.dev/github.com/cashapp/blip/event#Receiver), then call [event.SetReceiver](https://pkg.go.dev/github.com/cashapp/blip/event#SetReceiver) to override the default.
-There is only one event receiver; use [Tee](https://pkg.go.dev/github.com/cashapp/blip/event#Tee) to chain receivers.
+Implement a [Receiver](https://pkg.go.dev/github.com/cashapp/blip/v2/event#Receiver), then call [event.SetReceiver](https://pkg.go.dev/github.com/cashapp/blip/v2/event#SetReceiver) to override the default.
+There is only one event receiver; use [Tee](https://pkg.go.dev/github.com/cashapp/blip/v2/event#Tee) to chain receivers.
 
 ## Variables
 
 Various packages have public variables that you can modify to fine-tune aspects of Blip.
-For example, the [heartbeat package](https://pkg.go.dev/github.com/cashapp/blip/heartbeat#pkg-variables) has several timeout and retry wait durations.
+For example, the [heartbeat package](https://pkg.go.dev/github.com/cashapp/blip/v2/heartbeat#pkg-variables) has several timeout and retry wait durations.

docs/content/develop/sinks.md

@@ -3,10 +3,10 @@
 
 Implement two interfaces:
 
-* [`blip.Sink`](https://pkg.go.dev/github.com/cashapp/blip#Sink)
-* [`blip.SinkFactory`](https://pkg.go.dev/github.com/cashapp/blip#SinkFactory)
+* [`blip.Sink`](https://pkg.go.dev/github.com/cashapp/blip/v2#Sink)
+* [`blip.SinkFactory`](https://pkg.go.dev/github.com/cashapp/blip/v2#SinkFactory)
 
-Register the custom sink by calling [`sink.Register`](https://pkg.go.dev/github.com/cashapp/blip/sink#Register) before `Server.Boot`.
+Register the custom sink by calling [`sink.Register`](https://pkg.go.dev/github.com/cashapp/blip/v2/sink#Register) before `Server.Boot`.
 
 Reference the custom sink in the [`sinks`]({{< ref "/config/config-file#sinks" >}}) config section:
 

docs/content/intro/quick-start.md

@@ -190,9 +190,9 @@ import (
 
     "gopkg.in/yaml.v2"
 
-    "github.com/cashapp/blip"
-    "github.com/cashapp/blip/server"
-    "github.com/cashapp/blip/sink"
+    "github.com/cashapp/blip/v2"
+    "github.com/cashapp/blip/v2/server"
+    "github.com/cashapp/blip/v2/sink"
 )
 
 type YAML struct{}

docs/content/intro/sinks.md

@@ -66,7 +66,7 @@ Here's a _mock_ (incomplete and nonfunctional) implementation of a sink (called
 ```go
 import (
     "context"
-    "github.com/cashapp/blip"
+    "github.com/cashapp/blip/v2"
 )
 
 type Kim struct {

docs/content/metrics/domains/autoinc/_index.md

@@ -68,4 +68,4 @@ None.
 
 |Blip Version|Change|
 |------------|------|
-|v2.0.0|Domain added|
+|v2.0.1|Domain added|

docs/content/metrics/quick-ref.md

@@ -12,18 +12,18 @@ The rest are reserved for future use.
 |access.index|Index access statistics (`sys.schema_index_statistics`)||
 |access.table|Table access statistics (`sys.schema_table_statistics`)||
 |aria|MariaDB Aria storage engine||
-|[`autoinc`](domains#autoinc)|Auto-increment column utilization|v2.0.0|
+|[`autoinc`](domains#autoinc)|Auto-increment column utilization|v2.0.1|
 |aws|Amazon Web Services||
 |[`aws.rds`](domains#awsrds)|[Amazon RDS metrics](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/monitoring-cloudwatch.html#rds-metrics)|v1.0.0|
 |aws.aurora|Amazon Aurora||
 |azure|Microsoft Azure||
 |error|MySQL, client, and query errors||
 |error.client|Client errors||
-|[error.account](domains#error.account)|Error counts and rates by account [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.0|
-|[error.global](domains#error.global)|Global error counts and rates [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.0|
-|[error.host](domains#error.host)|Error counts and rates by host [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.0|
-|[error.thread](domains#error.thread)|Error counts and rates by thread [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.0|
-|[error.user](domains#error.user)|Error counts and rates by user [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.0|
+|[error.account](domains#error.account)|Error counts and rates by account [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.1|
+|[error.global](domains#error.global)|Global error counts and rates [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.1|
+|[error.host](domains#error.host)|Error counts and rates by host [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.1|
+|[error.thread](domains#error.thread)|Error counts and rates by thread [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.1|
+|[error.user](domains#error.user)|Error counts and rates by user [`Error Summary Tables`](https://dev.mysql.com/doc/refman/8.4/en/performance-schema-error-summary-tables.html)|v2.0.1|
 |error.query|Query errors||
 |error.repl|Replication errors||
 |event|[MySQL Event Scheduler](https://dev.mysql.com/doc/refman/8.0/en/event-scheduler.html)||
@@ -33,7 +33,7 @@ The rest are reserved for future use.
 |gr|MySQL Group Replication||
 |host|Host (client)||
 |[`innodb`](domains#innodb)|InnoDB metrics [`INFORMATION_SCHEMA.INNODB_METRICS`](https://dev.mysql.com/doc/refman/en/information-schema-innodb-metrics-table.html)|v1.0.0|
-|[`innodb.buffer-pool`](domains#innodbbuffer-pool)|InnoDB buffer pool metrics [`INFORMATION_SCHEMA.INNODB_BUFFER_POOL_STATS`](https://dev.mysql.com/doc/refman/8.4/en/information-schema-innodb-buffer-pool-stats-table.html)|v2.0.0|
+|[`innodb.buffer-pool`](domains#innodbbuffer-pool)|InnoDB buffer pool metrics [`INFORMATION_SCHEMA.INNODB_BUFFER_POOL_STATS`](https://dev.mysql.com/doc/refman/8.4/en/information-schema-innodb-buffer-pool-stats-table.html)|v2.0.1|
 |innodb.mutex|InnoDB mutexes `SHOW ENGINE INNODB MUTEX`||
 |mariadb|MariaDB enhancements||
 |ndb|MySQL NDB Cluster||