Skip to content

Commit

Permalink
Expose the internal packages for use from collector-contrib (#42)
Browse files Browse the repository at this point in the history
This prepares release v0.4.0 with no changes since v0.3.0 other than
this package rename.
  • Loading branch information
jmacd authored Sep 6, 2023
1 parent 09a9308 commit d198a41
Show file tree
Hide file tree
Showing 32 changed files with 35 additions and 35 deletions.
16 changes: 8 additions & 8 deletions collector/cmd/otelarrowcol/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dist:
description: Development OTel-Arrow Collector binary, testing only.

# Note: this is replaced to match the current release using `sed`
version: 0.3.0
version: 0.4.0

# Note: This should match the version of the core collector components used below
otelcol_version: 0.83.0
Expand All @@ -15,15 +15,15 @@ exporters:
- import: go.opentelemetry.io/collector/exporter/otlphttpexporter
gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.83.0
- import: github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter
gomod: github.com/open-telemetry/otel-arrow/collector v0.3.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0
- import: github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter
gomod: github.com/open-telemetry/otel-arrow/collector v0.3.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0

receivers:
- import: github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver
gomod: github.com/open-telemetry/otel-arrow/collector v0.3.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0
- import: github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver
gomod: github.com/open-telemetry/otel-arrow/collector v0.3.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0
- import: github.com/lightstep/telemetry-generator/generatorreceiver
gomod: github.com/lightstep/telemetry-generator/generatorreceiver v0.13.0

Expand All @@ -33,13 +33,13 @@ processors:
- import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.83.0
- import: github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor
gomod: github.com/open-telemetry/otel-arrow/collector v0.3.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0
- import: github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor
gomod: github.com/open-telemetry/otel-arrow/collector v0.3.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0

connectors:
- import: github.com/open-telemetry/otel-arrow/collector/connector/validationconnector
gomod: github.com/open-telemetry/otel-arrow/collector v0.3.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0

extensions:
- import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension
Expand Down
4 changes: 2 additions & 2 deletions collector/cmd/otelarrowcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/lightstep/telemetry-generator/generatorreceiver v0.13.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.83.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.83.0
github.com/open-telemetry/otel-arrow/collector v0.3.0
github.com/open-telemetry/otel-arrow/collector v0.4.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector v0.83.0
go.opentelemetry.io/collector/component v0.83.0
Expand Down Expand Up @@ -81,7 +81,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/go-grpc-compression v1.2.0 // indirect
github.com/open-telemetry/otel-arrow v0.3.0 // indirect
github.com/open-telemetry/otel-arrow v0.4.0 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
Expand Down
2 changes: 1 addition & 1 deletion collector/cmd/otelarrowcol/main.go

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

2 changes: 1 addition & 1 deletion collector/exporter/fileexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os"

"github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter/internal/metadata"
"github.com/open-telemetry/otel-arrow/collector/internal/sharedcomponent"
"github.com/open-telemetry/otel-arrow/collector/sharedcomponent"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/exporter"
Expand Down
4 changes: 2 additions & 2 deletions collector/exporter/fileexporter/file_exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"

"github.com/klauspost/compress/zstd"
"github.com/open-telemetry/otel-arrow/collector/internal/testdata"
"github.com/open-telemetry/otel-arrow/collector/testdata"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
Expand Down Expand Up @@ -684,4 +684,4 @@ func TestFlushing(t *testing.T) {
// Compare the content.
assert.EqualValues(t, b, bbuf.Bytes())
assert.NoError(t, fe.Shutdown(ctx))
}
}
2 changes: 1 addition & 1 deletion collector/exporter/otelarrowexporter/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/open-telemetry/otel-arrow/collector/internal/testutil"
"github.com/open-telemetry/otel-arrow/collector/testutil"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configcompression"
"go.opentelemetry.io/collector/config/configgrpc"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/status"

"github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter/internal/arrow/grpcmock"
"github.com/open-telemetry/otel-arrow/collector/testdata"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter/internal/arrow/grpcmock"
"github.com/open-telemetry/otel-arrow/collector/internal/testdata"
)

var (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"

"github.com/open-telemetry/otel-arrow/collector/internal/testdata"
"github.com/open-telemetry/otel-arrow/collector/testdata"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"
Expand Down
2 changes: 1 addition & 1 deletion collector/exporter/otelarrowexporter/otlp.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"google.golang.org/grpc/status"

"github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter/internal/arrow"
"github.com/open-telemetry/otel-arrow/collector/internal/netstats"
"github.com/open-telemetry/otel-arrow/collector/netstats"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer/consumererror"
"go.opentelemetry.io/collector/exporter"
Expand Down
2 changes: 1 addition & 1 deletion collector/exporter/otelarrowexporter/otlp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"google.golang.org/protobuf/types/known/durationpb"

"github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter/internal/arrow/grpcmock"
"github.com/open-telemetry/otel-arrow/collector/internal/testdata"
"github.com/open-telemetry/otel-arrow/collector/testdata"
"go.opentelemetry.io/collector/client"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
Expand Down
2 changes: 1 addition & 1 deletion collector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0
github.com/klauspost/compress v1.16.7
github.com/open-telemetry/otel-arrow v0.3.0
github.com/open-telemetry/otel-arrow v0.4.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector v0.83.0
go.opentelemetry.io/collector/component v0.83.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package netstats // import "github.com/open-telemetry/otel-arrow/collector/internal/netstats"
package netstats // import "github.com/open-telemetry/otel-arrow/collector/netstats"

import (
"context"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package netstats // import "github.com/open-telemetry/otel-arrow/collector/internal/netstats"
package netstats // import "github.com/open-telemetry/otel-arrow/collector/netstats"

import (
"context"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion collector/receiver/otelarrowreceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package otelarrowreceiver // import "github.com/open-telemetry/otel-arrow/collec
import (
"context"

"github.com/open-telemetry/otel-arrow/collector/internal/sharedcomponent"
"github.com/open-telemetry/otel-arrow/collector/sharedcomponent"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/confighttp"
Expand Down
2 changes: 1 addition & 1 deletion collector/receiver/otelarrowreceiver/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/open-telemetry/otel-arrow/collector/internal/testutil"
"github.com/open-telemetry/otel-arrow/collector/testutil"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/confighttp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"golang.org/x/net/http2/hpack"
"google.golang.org/grpc/metadata"

"github.com/open-telemetry/otel-arrow/collector/internal/testdata"
"github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver/internal/arrow/mock"
"github.com/open-telemetry/otel-arrow/collector/testdata"
"go.opentelemetry.io/collector/client"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/open-telemetry/otel-arrow/collector/testdata"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumertest"
"github.com/open-telemetry/otel-arrow/collector/internal/testdata"
"go.opentelemetry.io/collector/obsreport"
"go.opentelemetry.io/collector/pdata/plog/plogotlp"
"go.opentelemetry.io/collector/receiver/receivertest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/open-telemetry/otel-arrow/collector/testdata"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumertest"
"github.com/open-telemetry/otel-arrow/collector/internal/testdata"
"go.opentelemetry.io/collector/obsreport"
"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
"go.opentelemetry.io/collector/receiver/receivertest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/open-telemetry/otel-arrow/collector/testdata"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumertest"
"github.com/open-telemetry/otel-arrow/collector/internal/testdata"
"go.opentelemetry.io/collector/obsreport"
"go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp"
"go.opentelemetry.io/collector/receiver/receivertest"
Expand Down
2 changes: 1 addition & 1 deletion collector/receiver/otelarrowreceiver/otlp.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"go.uber.org/zap"
"google.golang.org/grpc"

"github.com/open-telemetry/otel-arrow/collector/internal/netstats"
"github.com/open-telemetry/otel-arrow/collector/netstats"
"github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver/internal/arrow"
"github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver/internal/logs"
"github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver/internal/metrics"
Expand Down
4 changes: 2 additions & 2 deletions collector/receiver/otelarrowreceiver/otlp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"

"github.com/open-telemetry/otel-arrow/collector/internal/testdata"
"github.com/open-telemetry/otel-arrow/collector/internal/testutil"
"github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver/internal/arrow/mock"
"github.com/open-telemetry/otel-arrow/collector/testdata"
"github.com/open-telemetry/otel-arrow/collector/testutil"
"go.opentelemetry.io/collector/client"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// Package sharedcomponent exposes util functionality for receivers and exporters
// that need to share state between different signal types instances such as net.Listener or os.File.
package sharedcomponent // import "github.com/open-telemetry/otel-arrow/collector/internal/sharedcomponent"
package sharedcomponent // import "github.com/open-telemetry/otel-arrow/collector/sharedcomponent"

import (
"context"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package testutil // import "github.com/open-telemetry/otel-arrow/collector/internal/testutil"
package testutil // import "github.com/open-telemetry/otel-arrow/collector/testutil"

import (
"net"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module-sets:
beta:
version: v0.3.0
version: v0.4.0
modules:
- github.com/open-telemetry/otel-arrow
- github.com/open-telemetry/otel-arrow/collector
Expand Down

0 comments on commit d198a41

Please sign in to comment.