Skip to content

Commit

Permalink
change import path to reflect new org
Browse files Browse the repository at this point in the history
  • Loading branch information
muir committed Oct 3, 2022
1 parent 21d70e0 commit 40cd7af
Show file tree
Hide file tree
Showing 56 changed files with 177 additions and 177 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ ${GOBIN}/enumer:;
calculate_coverage:
echo "mode: atomic" > coverage.txt
for d in $$(go list ./...); do \
go test -race -covermode=atomic -coverprofile=profile.out -coverpkg=github.com/muir/xop-go/... $$d; \
go test -race -covermode=atomic -coverprofile=profile.out -coverpkg=github.com/xoplog/xop-go/... $$d; \
if [ -f profile.out ]; then \
grep -v ^mode profile.out >> coverage.txt; \
rm profile.out; \
fi; \
done
XOPLEVEL_xoptestutil=debug go test -covermode=atomic -tags xoptesting -coverprofile=profile.out -coverpkg=github.com/muir/xop-go/... ./xoptest/xoptestutil -run TestAdjustedLevelLogger -count 1
XOPLEVEL_xoptestutil=debug go test -covermode=atomic -tags xoptesting -coverprofile=profile.out -coverpkg=github.com/xoplog/xop-go/... ./xoptest/xoptestutil -run TestAdjustedLevelLogger -count 1
if [ -f profile.out ]; then \
grep -v ^mode profile.out >> coverage.txt; \
rm profile.out; \
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Development status

In development, almost ready for use.
Ready to use, not yet stable.

Expect the following changes at some point

Expand All @@ -23,10 +23,11 @@ Expect the following changes at some point

- main xop top-level
- utility/support functions like xopat
- bundled base loggers and xopbase
- indiviual base loggers that have imports
- xopbase (because it needs to be versioned separately)
- split out packages that have external dependencies

- xopotel
- xopresty

- Additional gateway base loggers will be written

Expand Down
2 changes: 1 addition & 1 deletion base.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package xop

import (
"github.com/muir/xop-go/xopbase"
"github.com/xoplog/xop-go/xopbase"
)

type loggers struct {
Expand Down
8 changes: 4 additions & 4 deletions basegroup.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions basegroup.zzzgo
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"sync"
"time"

"github.com/muir/xop-go/trace"
"github.com/muir/xop-go/xopat"
"github.com/muir/xop-go/xopbase"
"github.com/muir/xop-go/xopnum"
"github.com/xoplog/xop-go/trace"
"github.com/xoplog/xop-go/xopat"
"github.com/xoplog/xop-go/xopbase"
"github.com/xoplog/xop-go/xopnum"
)

type baseLoggers []xopbase.Logger
Expand Down
8 changes: 4 additions & 4 deletions context.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"strings"

"github.com/muir/xop-go/xopnum"
"github.com/xoplog/xop-go/xopnum"
)

type contextKeyType struct{}
Expand Down Expand Up @@ -167,9 +167,9 @@ func adjustConfig(opts []AdjusterOption) xopnum.Level {
frames := runtime.CallersFrames(pc)
frame, _ := frames.Next()
if frame.Function != "" {
// Example: github.com/muir/xop-go/xoptest/xoptestutil.foo.Context
// Example: github.com/muir/xop-go/xoptest/xoptestutil.TestAdjusterContext
// Example: github.com/muir/xop-go/xoptest/xoptestutil.init
// Example: github.com/xoplog/xop-go/xoptest/xoptestutil.foo.Context
// Example: github.com/xoplog/xop-go/xoptest/xoptestutil.TestAdjusterContext
// Example: github.com/xoplog/xop-go/xoptest/xoptestutil.init
base := filepath.Base(frame.Function)
parts := strings.SplitN(base, ".", 2)
if len(parts) == 2 {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/muir/xop-go
module github.com/xoplog/xop-go

go 1.16

Expand Down
8 changes: 4 additions & 4 deletions internal/enumer_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/enumer_test.zzzgo
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"
"testing"

"github.com/muir/xop-go/xopbase"
"github.com/xoplog/xop-go/xopbase"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
6 changes: 3 additions & 3 deletions line.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions line.zzzgo
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package xop

import (
"github.com/muir/xop-go/xopat"
"github.com/muir/xop-go/xopbase"
"github.com/xoplog/xop-go/xopat"
"github.com/xoplog/xop-go/xopbase"

"github.com/mohae/deepcopy"
)
Expand Down
6 changes: 3 additions & 3 deletions logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"sync/atomic"
"time"

"github.com/muir/xop-go/xopbase"
"github.com/muir/xop-go/xopnum"
"github.com/muir/xop-go/xoputil"
"github.com/xoplog/xop-go/xopbase"
"github.com/xoplog/xop-go/xopnum"
"github.com/xoplog/xop-go/xoputil"
)

type Log struct {
Expand Down
2 changes: 1 addition & 1 deletion seed.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion seed.zzzgo
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/muir/xop-go/trace"
"github.com/xoplog/xop-go/trace"
)

// Seed is used to create a Log.
Expand Down
4 changes: 2 additions & 2 deletions span.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions span.zzzgo
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package xop

import (
"github.com/muir/xop-go/trace"
"github.com/muir/xop-go/xopat"
"github.com/xoplog/xop-go/trace"
"github.com/xoplog/xop-go/xopat"

"github.com/mohae/deepcopy"
)
Expand Down
10 changes: 5 additions & 5 deletions sub.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions sub.zzzgo
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"strconv"
"sync/atomic"

"github.com/muir/xop-go/xopat"
"github.com/muir/xop-go/xopbase"
"github.com/muir/xop-go/xopconst"
"github.com/muir/xop-go/xopnum"
"github.com/xoplog/xop-go/xopat"
"github.com/xoplog/xop-go/xopbase"
"github.com/xoplog/xop-go/xopconst"
"github.com/xoplog/xop-go/xopnum"
)

// Sub holds an ephermal state of a log being tranformed to a new log.
Expand Down
2 changes: 1 addition & 1 deletion sub_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package xop

import (
"errors"
"github.com/muir/xop-go/xopnum"
"github.com/stretchr/testify/assert"
"github.com/xoplog/xop-go/xopnum"
"testing"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion trace/trace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package trace_test
import (
"testing"

"github.com/muir/xop-go/trace"
"github.com/xoplog/xop-go/trace"

"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions xopat/attributes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions xopat/attributes.zzzgo
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"time"

"github.com/muir/xop-go/trace"
"github.com/xoplog/xop-go/trace"
)

// Attribute is the base type for the keys that are used to add
Expand Down Expand Up @@ -39,7 +39,7 @@ type Attribute struct {
var DefaultNamespace = os.Args[0]

// Make is used to construct attributes.
// Some keys are reserved. See https://github.com/muir/xop-go/blob/main/xopconst/reserved.go
// Some keys are reserved. See https://github.com/xoplog/xop-go/blob/main/xopconst/reserved.go
// for the list of reserved keys. Some keys are already registered.
type Make struct {
Key string // the attribute name
Expand Down
6 changes: 3 additions & 3 deletions xopbase/base.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions xopbase/base.zzzgo
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"context"
"time"

"github.com/muir/xop-go/trace"
"github.com/muir/xop-go/xopat"
"github.com/muir/xop-go/xopnum"
"github.com/xoplog/xop-go/trace"
"github.com/xoplog/xop-go/xopat"
"github.com/xoplog/xop-go/xopnum"
)

// Logger is the bottom half of a logger -- the part that actually
Expand Down
2 changes: 1 addition & 1 deletion xopbytes/bytelogger.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package xopbytes

import (
"github.com/muir/xop-go/trace"
"github.com/xoplog/xop-go/trace"
)

type BytesWriter interface {
Expand Down
2 changes: 1 addition & 1 deletion xopbytes/iowriter.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package xopbytes
import (
"io"

"github.com/muir/xop-go/trace"
"github.com/xoplog/xop-go/trace"
)

var _ BytesWriter = IOWriter{}
Expand Down
2 changes: 1 addition & 1 deletion xopconst/otel.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package xopconst

import (
"github.com/muir/xop-go/xopat"
"github.com/xoplog/xop-go/xopat"
)

// The descriptions are lifted from https://opentelemetry.io/ and are thus Copyright(c)
Expand Down
2 changes: 1 addition & 1 deletion xopconst/standard.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package xopconst

import (
"github.com/muir/xop-go/xopat"
"github.com/xoplog/xop-go/xopat"
)

// ParentLink is added automatically by xop in all situations where the information is present
Expand Down
8 changes: 4 additions & 4 deletions xopjson/attributes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions xopjson/attributes.zzzgo
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"encoding/json"
"sync"

"github.com/muir/xop-go/xopat"
"github.com/muir/xop-go/xopbase"
"github.com/muir/xop-go/xoputil"
"github.com/xoplog/xop-go/xopat"
"github.com/xoplog/xop-go/xopbase"
"github.com/xoplog/xop-go/xoputil"
)

const numSinglePrealloc = 20
Expand Down
Loading

0 comments on commit 40cd7af

Please sign in to comment.