story(brand): rename to bedrock (#33)

* refactor(issue-32): rename everything to bedrock

README.md

@@ -1,18 +1,20 @@
-# app
+# bedrock
 
-This a modular and composable framework for quickly developing services in Go.
+bedrock provides a minimal, modular and composable foundation for
+quickly developing services and more use case specific frameworks in Go.
 
 # Runtime
 
-At the core of the app module is the Runtime interface. The top-level
-app package consumes this interface and wraps in a CLI implementation
+At the core of the bedrock module is the Runtime interface. The top-level
+bedrock package consumes this interface and wraps in a CLI implementation
 which handles low level things like signal interrupts. This brings the
 development bar up from CLI to the "Runtime" level which helps remove
 some cognitive load for developers.
 
 The Runtime interface also allows the top-level package to support running
-multiple "apps" at once. An example use case for this would be, writing a
-gRPC service but for its health checks you implement HTTP based endpoints.
+multiple runtimes at once. An example use case for this would be, writing a
+gRPC service but for its health checks you implement HTTP based endpoints
+instead of doing health checks via gRPC.
 
 ## gRPC
 
@@ -24,4 +26,4 @@ Provides a runtime implementation for HTTP.
 
 ## Queue
 
-Provides a runtime implementation for applications which consume events from a queue.
+Provides a runtime implementation for services which consume events from a queue.

app.go

@@ -3,7 +3,8 @@
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
-package app
+// Package bedrock provides a minimal foundation for building more complex frameworks on top of.
+package bedrock
 
 import (
 	"bytes"
@@ -14,8 +15,8 @@ import (
 	"os/signal"
 	"strings"
 
-	"github.com/z5labs/app/pkg/config"
-	"github.com/z5labs/app/pkg/otelconfig"
+	"github.com/z5labs/bedrock/pkg/config"
+	"github.com/z5labs/bedrock/pkg/otelconfig"
 	"go.opentelemetry.io/otel"
 
 	"github.com/spf13/cobra"

app_test.go

@@ -3,4 +3,4 @@
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 
-package app
+package bedrock

example/otlp/main.go

@@ -15,24 +15,24 @@ import (
 	"os"
 	"time"
 
-	"github.com/z5labs/app"
-	apphttp "github.com/z5labs/app/http"
-	"github.com/z5labs/app/pkg/otelconfig"
-	"github.com/z5labs/app/pkg/otelslog"
-	"github.com/z5labs/app/pkg/slogfield"
-	"github.com/z5labs/app/queue"
+	"github.com/z5labs/bedrock"
+	brhttp "github.com/z5labs/bedrock/http"
+	"github.com/z5labs/bedrock/pkg/otelconfig"
+	"github.com/z5labs/bedrock/pkg/otelslog"
+	"github.com/z5labs/bedrock/pkg/slogfield"
+	"github.com/z5labs/bedrock/queue"
 
 	"go.opentelemetry.io/otel"
 )
 
-func initHttpRuntime(bc app.BuildContext) (app.Runtime, error) {
+func initHttpRuntime(bc bedrock.BuildContext) (bedrock.Runtime, error) {
 	logHandler := slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{AddSource: true})
 	logger := otelslog.New(logHandler)
 
-	rt := apphttp.NewRuntime(
-		apphttp.ListenOnPort(8080),
-		apphttp.LogHandler(logHandler),
-		apphttp.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	rt := brhttp.NewRuntime(
+		brhttp.ListenOnPort(8080),
+		brhttp.LogHandler(logHandler),
+		brhttp.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 			spanCtx, span := otel.Tracer("main").Start(r.Context(), "handler")
 			defer span.End()
 
@@ -61,7 +61,7 @@ func (f processorFunc[T]) Process(ctx context.Context, t T) error {
 	return f(ctx, t)
 }
 
-func initQueueRuntime(bc app.BuildContext) (app.Runtime, error) {
+func initQueueRuntime(bc bedrock.BuildContext) (bedrock.Runtime, error) {
 	logHandler := slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{AddSource: true})
 	logger := otelslog.New(logHandler)
 
@@ -118,16 +118,16 @@ func initQueueRuntime(bc app.BuildContext) (app.Runtime, error) {
 }
 
 func main() {
-	app.New(
-		app.InitTracerProvider(func(_ app.BuildContext) (otelconfig.Initializer, error) {
+	bedrock.New(
+		bedrock.InitTracerProvider(func(_ bedrock.BuildContext) (otelconfig.Initializer, error) {
 			// TODO: move target address to config
 			return otelconfig.OTLP(
 				otelconfig.OTLPTarget("otlp-opentelemetry-collector:4317"),
 				otelconfig.ServiceName("otlp"),
 			), nil
 		}),
-		app.WithRuntimeBuilderFunc(initHttpRuntime),
-		app.WithRuntimeBuilderFunc(initQueueRuntime),
+		bedrock.WithRuntimeBuilderFunc(initHttpRuntime),
+		bedrock.WithRuntimeBuilderFunc(initQueueRuntime),
 	).Run()
 }
 

example/simple_http/main.go

@@ -11,31 +11,31 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/z5labs/app"
-	apphttp "github.com/z5labs/app/http"
-	"github.com/z5labs/app/pkg/otelconfig"
+	"github.com/z5labs/bedrock"
+	brhttp "github.com/z5labs/bedrock/http"
+	"github.com/z5labs/bedrock/pkg/otelconfig"
 )
 
-func initRuntime(bc app.BuildContext) (app.Runtime, error) {
+func initRuntime(bc bedrock.BuildContext) (bedrock.Runtime, error) {
 	logHandler := slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{AddSource: true})
 
-	rt := apphttp.NewRuntime(
-		apphttp.ListenOnPort(8080),
-		apphttp.LogHandler(logHandler),
-		apphttp.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	rt := brhttp.NewRuntime(
+		brhttp.ListenOnPort(8080),
+		brhttp.LogHandler(logHandler),
+		brhttp.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 			fmt.Fprint(w, "Hello, world")
 		}),
 	)
 	return rt, nil
 }
 
 func main() {
-	app.New(
-		app.InitTracerProvider(func(_ app.BuildContext) (otelconfig.Initializer, error) {
+	bedrock.New(
+		bedrock.InitTracerProvider(func(_ bedrock.BuildContext) (otelconfig.Initializer, error) {
 			return otelconfig.Local(
 				otelconfig.ServiceName("simple_http"),
 			), nil
 		}),
-		app.WithRuntimeBuilderFunc(initRuntime),
+		bedrock.WithRuntimeBuilderFunc(initRuntime),
 	).Run()
 }

example/simple_queue/main.go

@@ -11,9 +11,9 @@ import (
 	"log/slog"
 	"os"
 
-	"github.com/z5labs/app"
-	"github.com/z5labs/app/pkg/otelconfig"
-	"github.com/z5labs/app/queue"
+	"github.com/z5labs/bedrock"
+	"github.com/z5labs/bedrock/pkg/otelconfig"
+	"github.com/z5labs/bedrock/queue"
 )
 
 type intGenerator struct {
@@ -36,7 +36,7 @@ func (p evenOrOdd) Process(ctx context.Context, n int) error {
 	return nil
 }
 
-func initRuntime(bc app.BuildContext) (app.Runtime, error) {
+func initRuntime(bc bedrock.BuildContext) (bedrock.Runtime, error) {
 	logHandler := slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{AddSource: true})
 
 	consumer := &intGenerator{n: 0}
@@ -52,12 +52,12 @@ func initRuntime(bc app.BuildContext) (app.Runtime, error) {
 }
 
 func main() {
-	app.New(
-		app.InitTracerProvider(func(_ app.BuildContext) (otelconfig.Initializer, error) {
+	bedrock.New(
+		bedrock.InitTracerProvider(func(_ bedrock.BuildContext) (otelconfig.Initializer, error) {
 			return otelconfig.Local(
 				otelconfig.ServiceName("simple_queue"),
 			), nil
 		}),
-		app.WithRuntimeBuilderFunc(initRuntime),
+		bedrock.WithRuntimeBuilderFunc(initRuntime),
 	).Run()
 }

go.mod

@@ -1,6 +1,6 @@
-module github.com/z5labs/app
+module github.com/z5labs/bedrock
 
-go 1.20
+go 1.21
 
 require (
 	cloud.google.com/go/pubsub v1.33.0

go.sum

@@ -1,14 +1,18 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y=
+cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic=
 cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
 cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI=
 cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
 cloud.google.com/go/logging v1.8.1 h1:26skQWPeYhvIasWKm48+Eq7oUqdcdbwsCVwz5Ys0FvU=
+cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI=
 cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=
+cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
 cloud.google.com/go/monitoring v1.16.3 h1:mf2SN9qSoBtIgiMA4R/y4VADPWZA7VCNJA079qLaZQ8=
+cloud.google.com/go/monitoring v1.16.3/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw=
 cloud.google.com/go/pubsub v1.33.0 h1:6SPCPvWav64tj0sVX/+npCBKhUi/UjJehy9op/V3p2g=
 cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc=
 cloud.google.com/go/trace v1.10.4 h1:2qOAuAzNezwW3QN+t41BtkDJOG42HywL73q8x/f6fnM=
@@ -19,6 +23,7 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.21.0
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.21.0 h1:OEgjQy1rH4Fbn5IpuI9d0uhLl+j6DkDvh9Q2Ucd6GK8=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.21.0/go.mod h1:EUfJ8lb3pjD8VasPPwqIvG2XVCE6DOT8tY5tcwbWA+A=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.45.0 h1:/BF7rO6PYcmFoyJrq6HA3LqQpFSQei9aNuO1fvV3OqU=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.45.0/go.mod h1:WntFIMzxcU+PMBuekFc34UOsEZ9sP+vsnBYTyaNBkOs=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.45.0 h1:o/Nf55GfyLwGDaHkVAkRGgBXeExce73L6N9w2PZTB3k=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.45.0/go.mod h1:qkFPtMouQjW5ugdHIOthiTbweVHUTqbS0Qsu55KqXks=
 github.com/aws/aws-sdk-go-v2 v1.24.0 h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk=
@@ -46,9 +51,11 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
+github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -58,6 +65,7 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
+github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -83,6 +91,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
 github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -96,18 +105,23 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
+github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M=
 github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
@@ -117,6 +131,7 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
@@ -172,6 +187,7 @@ go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -274,6 +290,7 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

grpc/grpc.go

@@ -13,9 +13,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/z5labs/app/pkg/health"
-	"github.com/z5labs/app/pkg/noop"
-	"github.com/z5labs/app/pkg/slogfield"
+	"github.com/z5labs/bedrock/pkg/health"
+	"github.com/z5labs/bedrock/pkg/noop"
+	"github.com/z5labs/bedrock/pkg/slogfield"
 
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"

grpc/grpc_test.go

@@ -13,8 +13,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/z5labs/app/pkg/health"
-	"github.com/z5labs/app/pkg/noop"
+	"github.com/z5labs/bedrock/pkg/health"
+	"github.com/z5labs/bedrock/pkg/noop"
 
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/sync/errgroup"

http/http.go

@@ -13,10 +13,10 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/z5labs/app/http/httpvalidate"
-	"github.com/z5labs/app/pkg/health"
-	"github.com/z5labs/app/pkg/noop"
-	"github.com/z5labs/app/pkg/slogfield"
+	"github.com/z5labs/bedrock/http/httpvalidate"
+	"github.com/z5labs/bedrock/pkg/health"
+	"github.com/z5labs/bedrock/pkg/noop"
+	"github.com/z5labs/bedrock/pkg/slogfield"
 
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"golang.org/x/sync/errgroup"

http/http_test.go

@@ -15,7 +15,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/z5labs/app/pkg/health"
+	"github.com/z5labs/bedrock/pkg/health"
 
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/sync/errgroup"

queue/common_options.go

@@ -8,7 +8,7 @@ package queue
 import (
 	"log/slog"
 
-	"github.com/z5labs/app/pkg/otelslog"
+	"github.com/z5labs/bedrock/pkg/otelslog"
 )
 
 type commonOptions struct {

queue/pubsub/pubsub.go

@@ -10,10 +10,10 @@ import (
 	"context"
 	"log/slog"
 
-	"github.com/z5labs/app/pkg/noop"
-	"github.com/z5labs/app/pkg/otelslog"
-	"github.com/z5labs/app/pkg/slogfield"
-	"github.com/z5labs/app/queue"
+	"github.com/z5labs/bedrock/pkg/noop"
+	"github.com/z5labs/bedrock/pkg/otelslog"
+	"github.com/z5labs/bedrock/pkg/slogfield"
+	"github.com/z5labs/bedrock/queue"
 	"golang.org/x/sync/errgroup"
 
 	pubsubpb "cloud.google.com/go/pubsub/apiv1/pubsubpb"