Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get rid of goprivate #3

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Get rid of goprivate #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c5f6cc
use github.com
Jan 8, 2025
b0a580b
fix build config
Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ coverage:
which cdp-upload-test-results && cdp-upload-test-results --type html "$(COVERAGE_DIR)" || true

build: $(SOURCES)
GOPRIVATE=github.bus.zalan.do CGO_ENABLED=0 go build $(BUILD_FLAGS) -ldflags "$(LDFLAGS)" $(CMD)
CGO_ENABLED=0 go build $(BUILD_FLAGS) -ldflags "$(LDFLAGS)" $(CMD)

godoc:
go install github.com/princjef/gomarkdoc/cmd/gomarkdoc@latest
Expand Down
5 changes: 3 additions & 2 deletions config/build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dist:
# debug_compilation: true

receivers:
- gomod: github.bus.zalan.do/logging/otelcol-lightstep-receiver v1.0.0
- gomod: github.com/zalando/otelcol-lightstep-receiver v1.0.0
name: lightstepreceiver
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.113.0

Expand All @@ -27,5 +27,6 @@ extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.113.0

replaces:
- github.bus.zalan.do/logging/otelcol-lightstep-receiver => ../../../lightstepreceiver
- github.com/zalando/otelcol-lightstep-receiver => ../../../otelcol-lightstep-receiver
- go.opentelemetry.io/collector/pdata => go.opentelemetry.io/collector/pdata v1.20.0
- go.opentelemetry.io/collector/component => go.opentelemetry.io/collector/component v0.113.0
2 changes: 1 addition & 1 deletion factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"

"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/metadata"
"github.com/zalando/otelcol-lightstep-receiver/internal/metadata"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.bus.zalan.do/logging/otelcol-lightstep-receiver
module github.com/zalando/otelcol-lightstep-receiver

go 1.22.7

Expand Down
8 changes: 4 additions & 4 deletions internal/lightstep_pb/grpc/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"go.opentelemetry.io/collector/config/configgrpc"
"sync"

lightstepCommon "github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_common"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_pb"
pb "github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_pb/collectorpb"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/telemetry"
lightstepCommon "github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_common"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_pb"
pb "github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_pb/collectorpb"
"github.com/zalando/otelcol-lightstep-receiver/internal/telemetry"

"go.opentelemetry.io/collector/client"
"go.opentelemetry.io/collector/component"
Expand Down
8 changes: 4 additions & 4 deletions internal/lightstep_pb/http/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"net"
"net/http"

lightstepCommon "github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_common"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_pb"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_pb/collectorpb"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/telemetry"
lightstepCommon "github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_common"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_pb"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_pb/collectorpb"
"github.com/zalando/otelcol-lightstep-receiver/internal/telemetry"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/lightstep_pb/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"time"
"unicode/utf8"

lightstepCommon "github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_common"
pb "github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_pb/collectorpb"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/telemetry"
lightstepCommon "github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_common"
pb "github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_pb/collectorpb"
"github.com/zalando/otelcol-lightstep-receiver/internal/telemetry"
)

// Request wraps incoming Lightstep tracer ReportRequest
Expand Down
6 changes: 3 additions & 3 deletions internal/lightstep_pb/transform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"go.uber.org/zap"
"testing"

lightstepCommon "github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_common"
pb "github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_pb/collectorpb"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/telemetry"
lightstepCommon "github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_common"
pb "github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_pb/collectorpb"
"github.com/zalando/otelcol-lightstep-receiver/internal/telemetry"
)

func initTelemetry() *telemetry.Telemetry {
Expand Down
2 changes: 1 addition & 1 deletion internal/lightstep_thrift/collectorthrift/constants.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion internal/lightstep_thrift/collectorthrift/reportingservice.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion internal/lightstep_thrift/collectorthrift/ttypes.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions internal/lightstep_thrift/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"go.uber.org/zap"
"time"

"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_thrift/collectorthrift"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/telemetry"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_thrift/collectorthrift"
"github.com/zalando/otelcol-lightstep-receiver/internal/telemetry"
)

// ThriftServerReportRequest defines thrift report request with http context
Expand Down
6 changes: 3 additions & 3 deletions internal/lightstep_thrift/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"net"
"net/http"

"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_thrift/thrift_0_9_2/lib/go/thrift"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_thrift/thrift_0_9_2/lib/go/thrift"

"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_thrift/collectorthrift"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/telemetry"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_thrift/collectorthrift"
"github.com/zalando/otelcol-lightstep-receiver/internal/telemetry"
)

const transport = "thrift"
Expand Down
6 changes: 3 additions & 3 deletions internal/lightstep_thrift/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"time"

lightstepCommon "github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_common"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_thrift/collectorthrift"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/telemetry"
lightstepCommon "github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_common"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_thrift/collectorthrift"
"github.com/zalando/otelcol-lightstep-receiver/internal/telemetry"
)

type Request struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/lightstep_thrift/transform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"go.opentelemetry.io/collector/receiver"
"testing"

"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/telemetry"
"github.com/zalando/otelcol-lightstep-receiver/internal/telemetry"
)

func initTr() *Request {
Expand Down
10 changes: 5 additions & 5 deletions receiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"

"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_pb/grpc"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_pb/http"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/lightstep_thrift"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/metadata"
"github.bus.zalan.do/logging/otelcol-lightstep-receiver/internal/telemetry"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_pb/grpc"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_pb/http"
"github.com/zalando/otelcol-lightstep-receiver/internal/lightstep_thrift"
"github.com/zalando/otelcol-lightstep-receiver/internal/metadata"
"github.com/zalando/otelcol-lightstep-receiver/internal/telemetry"
)

type lightstepReceiver struct {
Expand Down