Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Handle invalid argument, unavailable ErrorCodes (and refactor OTLP+Arrow receiver tests) #15

Merged
merged 8 commits into from
Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ require (
require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
github.com/apache/arrow/go/v10 v10.0.0 // indirect
github.com/apache/arrow/go/v11 v11.0.0-20221108144011-89a65b06a199 // indirect
github.com/apache/arrow/go/v11 v11.0.0-20221116153901-e38141421d43 // indirect
github.com/apache/thrift v0.16.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/f5/otel-arrow-adapter v0.0.0-20221111033209-0140de5d0a01 // indirect
github.com/f5/otel-arrow-adapter v0.0.0-20221116234146-d8ecadf9751b // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
Expand Down
60 changes: 56 additions & 4 deletions cmd/otelcorecol/go.sum

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions exporter/otlpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/apache/arrow/go/v10 v10.0.0
github.com/f5/otel-arrow-adapter v0.0.0-20221111033209-0140de5d0a01
github.com/f5/otel-arrow-adapter v0.0.0-20221116234146-d8ecadf9751b
github.com/golang/mock v1.6.0
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.1
Expand All @@ -19,7 +19,8 @@ require (

require (
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/apache/arrow/go/v11 v11.0.0-20221108144011-89a65b06a199 // indirect
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
github.com/apache/arrow/go/v11 v11.0.0-20221116153901-e38141421d43 // indirect
github.com/apache/thrift v0.16.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
Expand Down
71 changes: 67 additions & 4 deletions exporter/otlpexporter/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion exporter/otlpexporter/internal/arrow/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package arrow
package arrow // import "go.opentelemetry.io/collector/exporter/otlpexporter/internal/arrow"

import "fmt"

Expand Down
2 changes: 1 addition & 1 deletion exporter/otlpexporter/internal/arrow/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package arrow
package arrow // import "go.opentelemetry.io/collector/exporter/otlpexporter/internal/arrow"

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion exporter/otlpexporter/internal/arrow/prioritizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package arrow
package arrow // import "go.opentelemetry.io/collector/exporter/otlpexporter/internal/arrow"

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion exporter/otlpexporter/internal/arrow/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package arrow
package arrow // import "go.opentelemetry.io/collector/exporter/otlpexporter/internal/arrow"

import (
"context"
Expand Down
5 changes: 3 additions & 2 deletions exporter/otlphttpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ require (

require (
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/apache/arrow/go/v11 v11.0.0-20221108144011-89a65b06a199 // indirect
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
github.com/apache/arrow/go/v11 v11.0.0-20221116153901-e38141421d43 // indirect
github.com/apache/thrift v0.16.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/f5/otel-arrow-adapter v0.0.0-20221111033209-0140de5d0a01 // indirect
github.com/f5/otel-arrow-adapter v0.0.0-20221116234146-d8ecadf9751b // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand Down
71 changes: 67 additions & 4 deletions exporter/otlphttpexporter/go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ go 1.18
require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2
github.com/cenkalti/backoff/v4 v4.1.3
github.com/f5/otel-arrow-adapter v0.0.0-20221111033209-0140de5d0a01
github.com/f5/otel-arrow-adapter v0.0.0-20221116234146-d8ecadf9751b
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0
github.com/golang/snappy v0.0.4
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/klauspost/compress v1.15.11
github.com/knadh/koanf v1.4.4
Expand Down Expand Up @@ -49,7 +48,8 @@ require (

require (
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/apache/arrow/go/v11 v11.0.0-20221108144011-89a65b06a199 // indirect
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
github.com/apache/arrow/go/v11 v11.0.0-20221116153901-e38141421d43 // indirect
github.com/apache/thrift v0.16.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand Down
Loading