Repository: apigee/registry (go)

Issue:
Move `log` package to `pkg/log`
The `log` package predates `pkg`, but guided by #593, I think it would be good to move it there soon, particularly if we use it from [registry-experimental](https://github.com/apigee/registry-experimental) (which currently pins to a tag, so any breaking changes wouldn't appear there until the tag is updated).

Pull request description:
Move log to pkg/log
Fixes #850.

Patch:
diff --git a/cmd/registry-server/main.go b/cmd/registry-server/main.go
index 27d3985..a06561c 100644
--- a/cmd/registry-server/main.go
+++ b/cmd/registry-server/main.go
@@ -21,8 +21,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/apigee/registry/log"
-	"github.com/apigee/registry/log/interceptor"
+	"github.com/apigee/registry/pkg/log"
+	"github.com/apigee/registry/pkg/log/interceptor"
 	"github.com/apigee/registry/server/registry"
 	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
diff --git a/cmd/registry/cmd/annotate/annotate.go b/cmd/registry/cmd/annotate/annotate.go
index 2ec491d..bcf6da4 100644
--- a/cmd/registry/cmd/annotate/annotate.go
+++ b/cmd/registry/cmd/annotate/annotate.go
@@ -22,8 +22,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/cmd/label"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/gapic"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/compute/complexity/complexity.go b/cmd/registry/cmd/compute/complexity/complexity.go
index 33ece02..dabe5a1 100644
--- a/cmd/registry/cmd/compute/complexity/complexity.go
+++ b/cmd/registry/cmd/compute/complexity/complexity.go
@@ -22,8 +22,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/compute/conformance/conformance.go b/cmd/registry/cmd/compute/conformance/conformance.go
index 12eb026..eccb652 100644
--- a/cmd/registry/cmd/compute/conformance/conformance.go
+++ b/cmd/registry/cmd/compute/conformance/conformance.go
@@ -21,8 +21,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/conformance"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/compute/lint/lint.go b/cmd/registry/cmd/compute/lint/lint.go
index 40f14f7..f4ba7eb 100644
--- a/cmd/registry/cmd/compute/lint/lint.go
+++ b/cmd/registry/cmd/compute/lint/lint.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/compute/lintstats/lintstats.go b/cmd/registry/cmd/compute/lintstats/lintstats.go
index 44d8e97..cbc7890 100644
--- a/cmd/registry/cmd/compute/lintstats/lintstats.go
+++ b/cmd/registry/cmd/compute/lintstats/lintstats.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/types"
 	"github.com/apigee/registry/gapic"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/compute/score/score.go b/cmd/registry/cmd/compute/score/score.go
index acd2be6..bd0b842 100644
--- a/cmd/registry/cmd/compute/score/score.go
+++ b/cmd/registry/cmd/compute/score/score.go
@@ -20,8 +20,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/patterns"
 	"github.com/apigee/registry/cmd/registry/scoring"
 	"github.com/apigee/registry/cmd/registry/tasks"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/proto"
diff --git a/cmd/registry/cmd/compute/scorecard/scorecard.go b/cmd/registry/cmd/compute/scorecard/scorecard.go
index 1dd8e8e..377d959 100644
--- a/cmd/registry/cmd/compute/scorecard/scorecard.go
+++ b/cmd/registry/cmd/compute/scorecard/scorecard.go
@@ -20,8 +20,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/patterns"
 	"github.com/apigee/registry/cmd/registry/scoring"
 	"github.com/apigee/registry/cmd/registry/tasks"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/proto"
diff --git a/cmd/registry/cmd/compute/vocabulary/vocabulary.go b/cmd/registry/cmd/compute/vocabulary/vocabulary.go
index d8bdfc4..7d7cdb6 100644
--- a/cmd/registry/cmd/compute/vocabulary/vocabulary.go
+++ b/cmd/registry/cmd/compute/vocabulary/vocabulary.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/delete/delete.go b/cmd/registry/cmd/delete/delete.go
index 74b4ed9..b169c97 100644
--- a/cmd/registry/cmd/delete/delete.go
+++ b/cmd/registry/cmd/delete/delete.go
@@ -19,8 +19,8 @@ import (
 	"errors"
 
 	"github.com/apigee/registry/cmd/registry/tasks"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
diff --git a/cmd/registry/cmd/diff/diff.go b/cmd/registry/cmd/diff/diff.go
index 2b0e9af..58cd6c6 100644
--- a/cmd/registry/cmd/diff/diff.go
+++ b/cmd/registry/cmd/diff/diff.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/get/get.go b/cmd/registry/cmd/get/get.go
index 6014133..cad2b16 100644
--- a/cmd/registry/cmd/get/get.go
+++ b/cmd/registry/cmd/get/get.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/patch"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/models"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/label/label.go b/cmd/registry/cmd/label/label.go
index 24fa847..2aafa27 100644
--- a/cmd/registry/cmd/label/label.go
+++ b/cmd/registry/cmd/label/label.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/gapic"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/resolve/resolve.go b/cmd/registry/cmd/resolve/resolve.go
index 4466f09..8e37c64 100644
--- a/cmd/registry/cmd/resolve/resolve.go
+++ b/cmd/registry/cmd/resolve/resolve.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/controller"
 	"github.com/apigee/registry/cmd/registry/tasks"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/rpc"
 	"github.com/google/uuid"
diff --git a/cmd/registry/cmd/upload/csv.go b/cmd/registry/cmd/upload/csv.go
index 126f218..afbf7ed 100644
--- a/cmd/registry/cmd/upload/csv.go
+++ b/cmd/registry/cmd/upload/csv.go
@@ -25,8 +25,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/cmd/upload/discovery.go b/cmd/registry/cmd/upload/discovery.go
index 9b31c2d..26eebc6 100644
--- a/cmd/registry/cmd/upload/discovery.go
+++ b/cmd/registry/cmd/upload/discovery.go
@@ -22,8 +22,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
diff --git a/cmd/registry/cmd/upload/openapi.go b/cmd/registry/cmd/upload/openapi.go
index 893640e..83558b5 100644
--- a/cmd/registry/cmd/upload/openapi.go
+++ b/cmd/registry/cmd/upload/openapi.go
@@ -26,8 +26,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
diff --git a/cmd/registry/cmd/upload/protos.go b/cmd/registry/cmd/upload/protos.go
index 38cdb8f..9361245 100644
--- a/cmd/registry/cmd/upload/protos.go
+++ b/cmd/registry/cmd/upload/protos.go
@@ -29,8 +29,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
diff --git a/cmd/registry/cmd/upload/upload.go b/cmd/registry/cmd/upload/upload.go
index 14b6497..98d4c6a 100644
--- a/cmd/registry/cmd/upload/upload.go
+++ b/cmd/registry/cmd/upload/upload.go
@@ -18,8 +18,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/registry/cmd/vocabulary/difference.go b/cmd/registry/cmd/vocabulary/difference.go
index f2641cc..83dd689 100644
--- a/cmd/registry/cmd/vocabulary/difference.go
+++ b/cmd/registry/cmd/vocabulary/difference.go
@@ -17,8 +17,8 @@ package vocabulary
 import (
 	"fmt"
 
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/google/gnostic/metrics/vocabulary"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/encoding/protojson"
diff --git a/cmd/registry/cmd/vocabulary/intersection.go b/cmd/registry/cmd/vocabulary/intersection.go
index 4a1bf65..abb03ff 100644
--- a/cmd/registry/cmd/vocabulary/intersection.go
+++ b/cmd/registry/cmd/vocabulary/intersection.go
@@ -17,8 +17,8 @@ package vocabulary
 import (
 	"fmt"
 
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/google/gnostic/metrics/vocabulary"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/encoding/protojson"
diff --git a/cmd/registry/cmd/vocabulary/union.go b/cmd/registry/cmd/vocabulary/union.go
index 9a9bde0..4537894 100644
--- a/cmd/registry/cmd/vocabulary/union.go
+++ b/cmd/registry/cmd/vocabulary/union.go
@@ -17,8 +17,8 @@ package vocabulary
 import (
 	"fmt"
 
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/google/gnostic/metrics/vocabulary"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/encoding/protojson"
diff --git a/cmd/registry/cmd/vocabulary/unique.go b/cmd/registry/cmd/vocabulary/unique.go
index fc4bc7f..5f091a4 100644
--- a/cmd/registry/cmd/vocabulary/unique.go
+++ b/cmd/registry/cmd/vocabulary/unique.go
@@ -19,8 +19,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/google/gnostic/metrics/vocabulary"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/encoding/protojson"
diff --git a/cmd/registry/cmd/vocabulary/versions.go b/cmd/registry/cmd/vocabulary/versions.go
index 85d3cd6..eaaf7b5 100644
--- a/cmd/registry/cmd/vocabulary/versions.go
+++ b/cmd/registry/cmd/vocabulary/versions.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/google/gnostic/metrics/vocabulary"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/encoding/protojson"
diff --git a/cmd/registry/cmd/vocabulary/vocabulary.go b/cmd/registry/cmd/vocabulary/vocabulary.go
index 30189a1..62319b3 100644
--- a/cmd/registry/cmd/vocabulary/vocabulary.go
+++ b/cmd/registry/cmd/vocabulary/vocabulary.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/conformance/conformance-task.go b/cmd/registry/conformance/conformance-task.go
index 2fb5c03..48dec1b 100644
--- a/cmd/registry/conformance/conformance-task.go
+++ b/cmd/registry/conformance/conformance-task.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
diff --git a/cmd/registry/controller/controller.go b/cmd/registry/controller/controller.go
index c2131e9..5f10d24 100644
--- a/cmd/registry/controller/controller.go
+++ b/cmd/registry/controller/controller.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/apigee/registry/cmd/registry/patterns"
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/rpc"
 )
 
diff --git a/cmd/registry/controller/local-tasks.go b/cmd/registry/controller/local-tasks.go
index 5770326..95f17b4 100644
--- a/cmd/registry/controller/local-tasks.go
+++ b/cmd/registry/controller/local-tasks.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
 	"google.golang.org/protobuf/proto"
diff --git a/cmd/registry/main.go b/cmd/registry/main.go
index 8aa8c41..3cd6d3c 100644
--- a/cmd/registry/main.go
+++ b/cmd/registry/main.go
@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"github.com/apigee/registry/cmd/registry/cmd"
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/google/uuid"
 )
 
diff --git a/cmd/registry/patch/api.go b/cmd/registry/patch/api.go
index 784c75f..a9f72aa 100644
--- a/cmd/registry/patch/api.go
+++ b/cmd/registry/patch/api.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 
 	"github.com/apigee/registry/gapic"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/models"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
diff --git a/cmd/registry/patch/apply.go b/cmd/registry/patch/apply.go
index 39918e9..e9942a7 100644
--- a/cmd/registry/patch/apply.go
+++ b/cmd/registry/patch/apply.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 
 	"github.com/apigee/registry/cmd/registry/tasks"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"gopkg.in/yaml.v3"
 )
 
diff --git a/cmd/registry/patch/project.go b/cmd/registry/patch/project.go
index 80c56c3..bc23784 100644
--- a/cmd/registry/patch/project.go
+++ b/cmd/registry/patch/project.go
@@ -25,8 +25,8 @@ import (
 	"github.com/apigee/registry/cmd/registry/compress"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/gapic"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/models"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
diff --git a/cmd/registry/plugins/registry-lint-api-linter/main.go b/cmd/registry/plugins/registry-lint-api-linter/main.go
index f8e64af..1a61a19 100644
--- a/cmd/registry/plugins/registry-lint-api-linter/main.go
+++ b/cmd/registry/plugins/registry-lint-api-linter/main.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	lint "github.com/apigee/registry/cmd/registry/plugins/linter"
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/rpc"
 )
 
diff --git a/cmd/registry/scoring/score.go b/cmd/registry/scoring/score.go
index c13e7c8..3b43c81 100644
--- a/cmd/registry/scoring/score.go
+++ b/cmd/registry/scoring/score.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/patterns"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/rpc"
 	"google.golang.org/grpc/codes"
diff --git a/cmd/registry/scoring/scorecard.go b/cmd/registry/scoring/scorecard.go
index 50d9d2d..9b099e8 100644
--- a/cmd/registry/scoring/scorecard.go
+++ b/cmd/registry/scoring/scorecard.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/apigee/registry/cmd/registry/patterns"
 	"github.com/apigee/registry/cmd/registry/types"
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/rpc"
 	"google.golang.org/grpc/codes"
diff --git a/cmd/registry/tasks/tasks.go b/cmd/registry/tasks/tasks.go
index c2faf7d..df6946a 100644
--- a/cmd/registry/tasks/tasks.go
+++ b/cmd/registry/tasks/tasks.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 )
 
 // Task is a generic interface for a runnable operation
diff --git a/log/README.md b/log/README.md
deleted file mode 100644
index bc8e671..0000000
--- a/log/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# log
-
-This package provides logging for the Registry project. See
-https://pkg.go.dev/github.com/apigee/registry/log for package documentation and
-examples.
diff --git a/pkg/log/README.md b/pkg/log/README.md
new file mode 100644
index 0000000..4e01701
--- /dev/null
+++ b/pkg/log/README.md
@@ -0,0 +1,5 @@
+# log
+
+This package provides logging for the Registry project. See
+https://pkg.go.dev/github.com/apigee/registry/pkg/log for package documentation and
+examples.
diff --git a/log/interceptor/interceptor.go b/pkg/log/interceptor/interceptor.go
similarity index 98%
rename from log/interceptor/interceptor.go
rename to pkg/log/interceptor/interceptor.go
index fd43c97..bfeea25 100644
--- a/log/interceptor/interceptor.go
+++ b/pkg/log/interceptor/interceptor.go
@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/google/uuid"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/log/log.go b/pkg/log/log.go
similarity index 100%
rename from log/log.go
rename to pkg/log/log.go
diff --git a/log/log_test.go b/pkg/log/log_test.go
similarity index 100%
rename from log/log_test.go
rename to pkg/log/log_test.go
diff --git a/log/option.go b/pkg/log/option.go
similarity index 100%
rename from log/option.go
rename to pkg/log/option.go
diff --git a/log/recorder.go b/pkg/log/recorder.go
similarity index 100%
rename from log/recorder.go
rename to pkg/log/recorder.go
diff --git a/pkg/wipeout/tasks.go b/pkg/wipeout/tasks.go
index 1d23c33..a07fb68 100644
--- a/pkg/wipeout/tasks.go
+++ b/pkg/wipeout/tasks.go
@@ -17,8 +17,8 @@ package wipeout
 import (
 	"context"
 
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/rpc"
 )
 
diff --git a/pkg/wipeout/wipeout.go b/pkg/wipeout/wipeout.go
index c818053..0e080b0 100644
--- a/pkg/wipeout/wipeout.go
+++ b/pkg/wipeout/wipeout.go
@@ -18,8 +18,8 @@ import (
 	"context"
 
 	"github.com/apigee/registry/cmd/registry/tasks"
-	"github.com/apigee/registry/log"
 	"github.com/apigee/registry/pkg/connection"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/rpc"
 )
 
diff --git a/server/registry/internal/storage/errors.go b/server/registry/internal/storage/errors.go
index 285bf46..e4d064c 100644
--- a/server/registry/internal/storage/errors.go
+++ b/server/registry/internal/storage/errors.go
@@ -19,7 +19,7 @@ import (
 	"net"
 	"os"
 
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/lib/pq"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
diff --git a/server/registry/internal/storage/errors_cgo_enabled.go b/server/registry/internal/storage/errors_cgo_enabled.go
index e98bf27..52d05ab 100644
--- a/server/registry/internal/storage/errors_cgo_enabled.go
+++ b/server/registry/internal/storage/errors_cgo_enabled.go
@@ -19,7 +19,7 @@ package storage
 import (
 	"context"
 
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/mattn/go-sqlite3"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/server/registry/internal/storage/logger.go b/server/registry/internal/storage/logger.go
index ba32f98..4581181 100644
--- a/server/registry/internal/storage/logger.go
+++ b/server/registry/internal/storage/logger.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 )
diff --git a/server/registry/notifications.go b/server/registry/notifications.go
index 7628aab..4eb0e7f 100644
--- a/server/registry/notifications.go
+++ b/server/registry/notifications.go
@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"cloud.google.com/go/pubsub"
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/rpc"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/timestamppb"


Test patch:
diff --git a/log/apex.go b/pkg/log/apex.go
similarity index 100%
rename from log/apex.go
rename to pkg/log/apex.go
diff --git a/log/context.go b/pkg/log/context.go
similarity index 100%
rename from log/context.go
rename to pkg/log/context.go
diff --git a/log/example_test.go b/pkg/log/example_test.go
similarity index 98%
rename from log/example_test.go
rename to pkg/log/example_test.go
index 88a2ceb..cf82028 100644
--- a/log/example_test.go
+++ b/pkg/log/example_test.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"google.golang.org/grpc/metadata"
 )
 
diff --git a/server/registry/notifications_test.go b/server/registry/notifications_test.go
index cc16a92..7f5fc37 100644
--- a/server/registry/notifications_test.go
+++ b/server/registry/notifications_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"cloud.google.com/go/pubsub/pstest"
-	"github.com/apigee/registry/log"
+	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/rpc"
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/genproto/googleapis/pubsub/v1"