Skip to content

Commit

Permalink
Upgrade collector to v0.96.0 (#155)
Browse files Browse the repository at this point in the history 
Updates the collector and resolves breaking changes, so we can unblock
collector upgrade in downstream repos.

Confirmed `make test` passes
  • Loading branch information
@moh-osman3
moh-osman3 authored Mar 6, 2024
1 parent 8f484f7 commit 3e555cd
Show file tree
Hide file tree
Showing 42 changed files with 1,246 additions and 1,212 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ endif
BUILDER = builder
.PHONY: $(BUILDER)
builder:
$(GOCMD) install go.opentelemetry.io/collector/cmd/builder@v0.94.0
$(GOCMD) install go.opentelemetry.io/collector/cmd/builder@v0.96.0

.PHONY: genotelarrowcol
genotelarrowcol: builder
Expand Down
146 changes: 70 additions & 76 deletions collector/cmd/otelarrowcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

module github.com/open-telemetry/otel-arrow/collector/cmd/otelarrowcol

go 1.20
go 1.21

require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.94.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.94.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.94.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.96.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.96.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.96.0
github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.17.0
github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.17.0
github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.17.0
Expand All @@ -17,17 +17,17 @@ require (
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.17.0
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.17.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.94.1
go.opentelemetry.io/collector/connector v0.94.1
go.opentelemetry.io/collector/exporter v0.94.1
go.opentelemetry.io/collector/exporter/debugexporter v0.94.1
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.94.1
go.opentelemetry.io/collector/extension v0.94.1
go.opentelemetry.io/collector/otelcol v0.94.1
go.opentelemetry.io/collector/processor v0.94.1
go.opentelemetry.io/collector/receiver v0.94.1
go.opentelemetry.io/collector/receiver/otlpreceiver v0.94.1
golang.org/x/sys v0.16.0
go.opentelemetry.io/collector/component v0.96.0
go.opentelemetry.io/collector/connector v0.96.0
go.opentelemetry.io/collector/exporter v0.96.0
go.opentelemetry.io/collector/exporter/debugexporter v0.96.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.96.0
go.opentelemetry.io/collector/extension v0.96.0
go.opentelemetry.io/collector/otelcol v0.96.0
go.opentelemetry.io/collector/processor v0.96.0
go.opentelemetry.io/collector/receiver v0.96.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.0
golang.org/x/sys v0.17.0
)

require (
Expand Down Expand Up @@ -68,16 +68,15 @@ require (
github.com/holiman/uint256 v1.2.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.5 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/v2 v2.0.2 // indirect
github.com/knadh/koanf/v2 v2.1.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
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
Expand All @@ -87,9 +86,9 @@ require (
github.com/pierrec/lz4/v4 v4.1.18 // 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.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/shirou/gopsutil/v3 v3.24.1 // indirect
Expand All @@ -106,68 +105,63 @@ 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.94.1 // indirect
go.opentelemetry.io/collector/config/configauth v0.94.1 // indirect
go.opentelemetry.io/collector/config/configcompression v0.94.1 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.94.1 // indirect
go.opentelemetry.io/collector/config/confighttp v0.94.1 // indirect
go.opentelemetry.io/collector/config/confignet v0.94.1 // indirect
go.opentelemetry.io/collector/config/configopaque v0.94.1 // indirect
go.opentelemetry.io/collector/config/configretry v0.94.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
go.opentelemetry.io/collector/config/configtls v0.94.1 // indirect
go.opentelemetry.io/collector/config/internal v0.94.1 // indirect
go.opentelemetry.io/collector/confmap v0.94.1 // indirect
go.opentelemetry.io/collector/consumer v0.94.1 // indirect
go.opentelemetry.io/collector/extension/auth v0.94.1 // indirect
go.opentelemetry.io/collector/featuregate v1.1.0 // indirect
go.opentelemetry.io/collector/pdata v1.1.0 // indirect
go.opentelemetry.io/collector/semconv v0.94.1 // indirect
go.opentelemetry.io/collector/service v0.94.1 // indirect
go.opentelemetry.io/contrib/config v0.3.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect
go.opentelemetry.io/otel v1.23.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v0.45.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.45.1 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.23.0 // indirect
go.opentelemetry.io/otel/metric v1.23.0 // indirect
go.opentelemetry.io/otel/sdk v1.23.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.23.0 // indirect
go.opentelemetry.io/otel/trace v1.23.0 // indirect
go.opentelemetry.io/collector v0.96.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.96.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.96.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.96.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.96.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.96.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.3.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.96.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.96.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.96.0 // indirect
go.opentelemetry.io/collector/config/internal v0.96.0 // indirect
go.opentelemetry.io/collector/confmap v0.96.0 // indirect
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.0 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.0 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.0 // indirect
go.opentelemetry.io/collector/consumer v0.96.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.96.0 // indirect
go.opentelemetry.io/collector/featuregate v1.3.0 // indirect
go.opentelemetry.io/collector/pdata v1.3.0 // indirect
go.opentelemetry.io/collector/semconv v0.96.0 // indirect
go.opentelemetry.io/collector/service v0.96.0 // indirect
go.opentelemetry.io/contrib/config v0.4.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.18.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
gonum.org/v1/gonum v0.14.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
google.golang.org/grpc v1.62.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)











Loading

0 comments on commit 3e555cd

Please sign in to comment.