diff --git a/Makefile b/Makefile index e45daa0..8eae322 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/config/build_config.yaml b/config/build_config.yaml index d306a1a..dae3a87 100644 --- a/config/build_config.yaml +++ b/config/build_config.yaml @@ -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 @@ -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 \ No newline at end of file diff --git a/factory.go b/factory.go index 11dec58..5ef0583 100644 --- a/factory.go +++ b/factory.go @@ -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 ( diff --git a/go.mod b/go.mod index 9406cf0..872e4ce 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.bus.zalan.do/logging/otelcol-lightstep-receiver +module github.com/zalando/otelcol-lightstep-receiver go 1.22.7 diff --git a/internal/lightstep_pb/grpc/server.go b/internal/lightstep_pb/grpc/server.go index b167790..2bfeb77 100644 --- a/internal/lightstep_pb/grpc/server.go +++ b/internal/lightstep_pb/grpc/server.go @@ -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" diff --git a/internal/lightstep_pb/http/server.go b/internal/lightstep_pb/http/server.go index 279e8af..2117204 100644 --- a/internal/lightstep_pb/http/server.go +++ b/internal/lightstep_pb/http/server.go @@ -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 ( diff --git a/internal/lightstep_pb/transform.go b/internal/lightstep_pb/transform.go index cc81164..431a4c4 100644 --- a/internal/lightstep_pb/transform.go +++ b/internal/lightstep_pb/transform.go @@ -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 diff --git a/internal/lightstep_pb/transform_test.go b/internal/lightstep_pb/transform_test.go index edde459..9a26ae4 100644 --- a/internal/lightstep_pb/transform_test.go +++ b/internal/lightstep_pb/transform_test.go @@ -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 { diff --git a/internal/lightstep_thrift/collectorthrift/constants.go b/internal/lightstep_thrift/collectorthrift/constants.go index b58a264..4526889 100644 --- a/internal/lightstep_thrift/collectorthrift/constants.go +++ b/internal/lightstep_thrift/collectorthrift/constants.go @@ -7,7 +7,7 @@ import ( "bytes" "fmt" - "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" ) // (needed to ensure safety because of naive import list construction.) diff --git a/internal/lightstep_thrift/collectorthrift/reportingservice.go b/internal/lightstep_thrift/collectorthrift/reportingservice.go index f7fffd9..d527ca2 100644 --- a/internal/lightstep_thrift/collectorthrift/reportingservice.go +++ b/internal/lightstep_thrift/collectorthrift/reportingservice.go @@ -7,7 +7,7 @@ import ( "bytes" "fmt" - "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" ) // (needed to ensure safety because of naive import list construction.) diff --git a/internal/lightstep_thrift/collectorthrift/ttypes.go b/internal/lightstep_thrift/collectorthrift/ttypes.go index d4e3cbd..7272a74 100644 --- a/internal/lightstep_thrift/collectorthrift/ttypes.go +++ b/internal/lightstep_thrift/collectorthrift/ttypes.go @@ -7,7 +7,7 @@ import ( "bytes" "fmt" - "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" ) // (needed to ensure safety because of naive import list construction.) diff --git a/internal/lightstep_thrift/reporter.go b/internal/lightstep_thrift/reporter.go index 64f4bfd..977f00a 100644 --- a/internal/lightstep_thrift/reporter.go +++ b/internal/lightstep_thrift/reporter.go @@ -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 diff --git a/internal/lightstep_thrift/server.go b/internal/lightstep_thrift/server.go index bee63be..05d8143 100644 --- a/internal/lightstep_thrift/server.go +++ b/internal/lightstep_thrift/server.go @@ -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" diff --git a/internal/lightstep_thrift/transform.go b/internal/lightstep_thrift/transform.go index ceecd60..2b0a5bf 100644 --- a/internal/lightstep_thrift/transform.go +++ b/internal/lightstep_thrift/transform.go @@ -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 { diff --git a/internal/lightstep_thrift/transform_test.go b/internal/lightstep_thrift/transform_test.go index 9cd0211..3f64ff1 100644 --- a/internal/lightstep_thrift/transform_test.go +++ b/internal/lightstep_thrift/transform_test.go @@ -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 { diff --git a/receiver.go b/receiver.go index d113fae..bcfb26b 100644 --- a/receiver.go +++ b/receiver.go @@ -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 {