Skip to content

Commit

Permalink
Build fixes for v0.102.2-0.20240612162315-964e3a95872e (#223)
Browse files Browse the repository at this point in the history 
The current collector-contrib Arrow modules have diverged from this
repo, and here we bring them back into sync by manually applying the
changes that have been applied in that repo.
  • Loading branch information
@jmacd
jmacd authored Jun 12, 2024
1 parent 21add9a commit 7bc16c7
Show file tree
Hide file tree
Showing 57 changed files with 496 additions and 500 deletions.
46 changes: 23 additions & 23 deletions collector/cmd/otelarrowcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ require (
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.24.0
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.24.0
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.24.0
go.opentelemetry.io/collector/component v0.102.1
go.opentelemetry.io/collector/confmap v0.102.1
go.opentelemetry.io/collector/component v0.102.2-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/collector/confmap v0.102.2-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1
go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1
go.opentelemetry.io/collector/connector v0.102.1
go.opentelemetry.io/collector/exporter v0.102.1
go.opentelemetry.io/collector/connector v0.102.2-0.20240612162315-964e3a95872e
go.opentelemetry.io/collector/exporter v0.102.2-0.20240612162315-964e3a95872e
go.opentelemetry.io/collector/exporter/debugexporter v0.102.1
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.102.1
go.opentelemetry.io/collector/extension v0.102.1
go.opentelemetry.io/collector/extension v0.102.2-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/collector/otelcol v0.102.1
go.opentelemetry.io/collector/processor v0.102.1
go.opentelemetry.io/collector/receiver v0.102.1
go.opentelemetry.io/collector/processor v0.102.2-0.20240612162315-964e3a95872e
go.opentelemetry.io/collector/receiver v0.102.2-0.20240612162315-964e3a95872e
go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1
golang.org/x/sys v0.20.0
golang.org/x/sys v0.21.0
)

require (
Expand Down Expand Up @@ -88,15 +88,15 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
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.2 // indirect
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
github.com/open-telemetry/otel-arrow v0.24.0 // indirect
github.com/open-telemetry/otel-arrow/collector v0.24.0 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.53.0 // indirect
github.com/prometheus/common v0.54.0 // indirect
github.com/prometheus/procfs v0.15.0 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/shirou/gopsutil/v3 v3.24.4 // indirect
Expand All @@ -115,21 +115,21 @@ require (
github.com/zeebo/xxh3 v1.0.2 // indirect
go.mongodb.org/mongo-driver v1.12.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.102.1 // indirect
go.opentelemetry.io/collector/config/configauth v0.102.1 // indirect
go.opentelemetry.io/collector/config/configcompression v1.9.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.102.1 // indirect
go.opentelemetry.io/collector v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/config/configauth v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/config/configcompression v1.9.1-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/config/configgrpc v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/config/confighttp v0.102.1 // indirect
go.opentelemetry.io/collector/config/confignet v0.102.1 // indirect
go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.102.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect
go.opentelemetry.io/collector/config/configtls v0.102.1 // indirect
go.opentelemetry.io/collector/config/confignet v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/config/configopaque v1.9.1-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/config/configretry v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/config/configtls v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/config/internal v0.102.1 // indirect
go.opentelemetry.io/collector/consumer v0.102.1 // indirect
go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect
go.opentelemetry.io/collector/consumer v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/extension/auth v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/featuregate v1.9.0 // indirect
go.opentelemetry.io/collector/pdata v1.9.0 // indirect
go.opentelemetry.io/collector/pdata v1.9.1-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/collector/semconv v0.102.1 // indirect
go.opentelemetry.io/collector/service v0.102.1 // indirect
go.opentelemetry.io/contrib/config v0.7.0 // indirect
Expand Down Expand Up @@ -165,7 +165,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
Loading

0 comments on commit 7bc16c7

Please sign in to comment.