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

Jump to bottom

Update package path to /opentelemetry.proto.experimental.arrow.v1 #152

Merged
merged 1 commit into from
May 18, 2023
Merged

Update package path to /opentelemetry.proto.experimental.arrow.v1 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
810 changes: 0 additions & 810 deletions api/collector/arrow/v1/arrow_service.pb.go
View file
Open in desktop

This file was deleted.

813 changes: 813 additions & 0 deletions api/experimental/arrow/v1/arrow_service.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ...llector/arrow/v1/arrow_service_grpc.pb.go → ...imental/arrow/v1/arrow_service_grpc.pb.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 ...ector/arrow/v1/mock/arrow_service_mock.go → ...ental/arrow/v1/mock/arrow_service_mock.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 collector/gen/exporter/otlpexporter/internal/arrow/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"io"
"testing"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowCollectorMock "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1/mock"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowCollectorMock "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1/mock"
"github.com/golang/mock/gomock"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
Expand Down
2 changes: 1 addition & 1 deletion collector/gen/exporter/otlpexporter/internal/arrow/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"sync"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowRecord "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record"
"go.uber.org/zap"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion collector/gen/exporter/otlpexporter/internal/arrow/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowRecord "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record"
arrowRecordMock "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record/mock"
otelAssert "github.com/f5/otel-arrow-adapter/pkg/otel/assert"
Expand Down
2 changes: 1 addition & 1 deletion collector/gen/exporter/otlpexporter/internal/arrow/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/status"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowRecord "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record"

"go.opentelemetry.io/collector/component"
Expand Down
2 changes: 1 addition & 1 deletion collector/gen/exporter/otlpexporter/internal/arrow/stream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
"time"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowRecordMock "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record/mock"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion collector/gen/exporter/otlpexporter/otlp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

arrowPkg "github.com/apache/arrow/go/v12/arrow"
arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowRecord "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record"
"go.uber.org/multierr"
"google.golang.org/genproto/googleapis/rpc/errdetails"
Expand Down
4 changes: 2 additions & 2 deletions collector/gen/exporter/otlpexporter/otlp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"testing"
"time"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpbMock "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1/mock"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowpbMock "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1/mock"
arrowRecord "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion collector/gen/receiver/otlpreceiver/internal/arrow/arrow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"io"
"strings"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowRecord "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record"
"go.uber.org/multierr"
"go.uber.org/zap"
Expand Down
4 changes: 2 additions & 2 deletions collector/gen/receiver/otlpreceiver/internal/arrow/arrow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"sync"
"testing"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowCollectorMock "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1/mock"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowCollectorMock "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1/mock"
arrowRecord "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record"
arrowRecordMock "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record/mock"
otelAssert "github.com/f5/otel-arrow-adapter/pkg/otel/assert"
Expand Down
2 changes: 1 addition & 1 deletion collector/gen/receiver/otlpreceiver/otlp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"net/http"
"sync"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowRecord "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record"
"go.uber.org/zap"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion collector/gen/receiver/otlpreceiver/otlp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"testing"
"time"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowRecord "github.com/f5/otel-arrow-adapter/pkg/otel/arrow_record"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/benchmark/profileable/arrow/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"go.opentelemetry.io/collector/pdata/plog"

v1 "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
v1 "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
"github.com/f5/otel-arrow-adapter/pkg/benchmark"
"github.com/f5/otel-arrow-adapter/pkg/benchmark/dataset"
cfg "github.com/f5/otel-arrow-adapter/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/benchmark/profileable/arrow/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"go.opentelemetry.io/collector/pdata/pmetric"

colarspb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
colarspb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
"github.com/f5/otel-arrow-adapter/pkg/benchmark"
"github.com/f5/otel-arrow-adapter/pkg/benchmark/dataset"
cfg "github.com/f5/otel-arrow-adapter/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/benchmark/profileable/arrow/traces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"go.opentelemetry.io/collector/pdata/ptrace"

v1 "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
v1 "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
"github.com/f5/otel-arrow-adapter/pkg/benchmark"
"github.com/f5/otel-arrow-adapter/pkg/benchmark/dataset"
cfg "github.com/f5/otel-arrow-adapter/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel/arrow_record/consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"

colarspb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
colarspb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
common "github.com/f5/otel-arrow-adapter/pkg/otel/common/arrow"
logsotlp "github.com/f5/otel-arrow-adapter/pkg/otel/logs/otlp"
metricsotlp "github.com/f5/otel-arrow-adapter/pkg/otel/metrics/otlp"
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel/arrow_record/mock/mock.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 pkg/otel/arrow_record/producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"

colarspb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
colarspb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
carrow "github.com/f5/otel-arrow-adapter/pkg/arrow"
config2 "github.com/f5/otel-arrow-adapter/pkg/config"
acommon "github.com/f5/otel-arrow-adapter/pkg/otel/common/arrow"
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel/arrow_record/producer_consumer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp"
"google.golang.org/protobuf/proto"

arrowpb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
"github.com/f5/otel-arrow-adapter/pkg/config"
"github.com/f5/otel-arrow-adapter/pkg/datagen"
"github.com/f5/otel-arrow-adapter/pkg/otel/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel/common/arrow/related_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package arrow
import (
"github.com/apache/arrow/go/v12/arrow"

colarspb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
colarspb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
cfg "github.com/f5/otel-arrow-adapter/pkg/config"
"github.com/f5/otel-arrow-adapter/pkg/otel/common/schema/builder"
config "github.com/f5/otel-arrow-adapter/pkg/otel/common/schema/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel/logs/arrow/all_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/plog"

v1 "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
v1 "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
"github.com/f5/otel-arrow-adapter/pkg/config"
jsonassert "github.com/f5/otel-arrow-adapter/pkg/otel/assert"
acommon "github.com/f5/otel-arrow-adapter/pkg/otel/common/schema"
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel/logs/otlp/related_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package otlp

import (
colarspb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
colarspb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
"github.com/f5/otel-arrow-adapter/pkg/otel"
"github.com/f5/otel-arrow-adapter/pkg/otel/common/otlp"
"github.com/f5/otel-arrow-adapter/pkg/record_message"
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel/metrics/otlp/related_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package otlp

import (
colarspb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
colarspb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
"github.com/f5/otel-arrow-adapter/pkg/otel"
"github.com/f5/otel-arrow-adapter/pkg/otel/common/otlp"
"github.com/f5/otel-arrow-adapter/pkg/record_message"
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel/traces/arrow/all_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"

v1 "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
v1 "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
"github.com/f5/otel-arrow-adapter/pkg/config"
jsonassert "github.com/f5/otel-arrow-adapter/pkg/otel/assert"
"github.com/f5/otel-arrow-adapter/pkg/otel/common"
Expand Down
2 changes: 1 addition & 1 deletion pkg/otel/traces/otlp/related_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package otlp
// Infrastructure used to process related records.

import (
colarspb "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
colarspb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
"github.com/f5/otel-arrow-adapter/pkg/otel"
"github.com/f5/otel-arrow-adapter/pkg/otel/common/otlp"
"github.com/f5/otel-arrow-adapter/pkg/record_message"
Expand Down
2 changes: 1 addition & 1 deletion pkg/record_message/arrow_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/apache/arrow/go/v12/arrow"
"github.com/apache/arrow/go/v12/arrow/array"

v1 "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1"
v1 "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
)

type PayloadType = v1.OtlpArrowPayloadType
Expand Down
6 changes: 3 additions & 3 deletions proto/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ for dir in $(find ${DIR}/opentelemetry -name '*.proto' -print0 | xargs -0 -n1 di
protoc -I ${DIR} --go_out=api --go-grpc_out=api ${files}
done

mv api/github.com/f5/otel-arrow-adapter/api/collector api
mv api/github.com/f5/otel-arrow-adapter/api/experimental api
rm -rf api/github.com

# Generate the mock files
go get github.com/golang/mock
go install github.com/golang/mock
mkdir -p api/collector/arrow/v1/mock
mockgen -package mock github.com/f5/otel-arrow-adapter/api/collector/arrow/v1 ArrowStreamServiceClient,ArrowStreamService_ArrowStreamClient,ArrowStreamServiceServer,ArrowStreamService_ArrowStreamServer > api/collector/arrow/v1/mock/arrow_service_mock.go
mkdir -p api/experimental/arrow/v1/mock
mockgen -package mock github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1 ArrowStreamServiceClient,ArrowStreamService_ArrowStreamClient,ArrowStreamServiceServer,ArrowStreamService_ArrowStreamServer > api/experimental/arrow/v1/mock/arrow_service_mock.go
go mod tidy
6 changes: 3 additions & 3 deletions ...to/collector/arrow/v1/arrow_service.proto → ...experimental/arrow/v1/arrow_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

syntax = "proto3";

package opentelemetry.proto.collector.arrow.v1;
package opentelemetry.proto.experimental.arrow.v1;

option java_multiple_files = true;
option java_package = "io.opentelemetry.proto.collector.arrow.v1";
option java_package = "io.opentelemetry.proto.experimental.arrow.v1";
option java_outer_classname = "ArrowServiceProto";

// Note the following is temporary
option go_package = "github.com/f5/otel-arrow-adapter/api/collector/arrow/v1";
option go_package = "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1";

// Service that can be used to send `BatchArrowRecords` between one Application instrumented with OpenTelemetry and a
// collector, or between collectors.
Expand Down