Skip to content

Commit

Permalink
upgrade Otel Collector to v0.94.1 (#153)
Browse files Browse the repository at this point in the history 
This PR upgrades the collector to `v0.94.1` and resolves breaking
changes. I also moved the `sharedcomponent` package to resolve a bug
when running `make genotelarrowcol`

```
go: github.com/open-telemetry/otel-arrow/collector/cmd/otelarrowcol imports
        github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter imports
        github.com/open-telemetry/otel-arrow/collector/sharedcomponent: module github.com/open-telemetry/otel-arrow/collector@latest found (v0.16.0, replaced by ../../../collector), but does not contain package github.com/open-telemetry/otel-arrow/collector/sharedcomponent
```

Confirmed `make test` passes.
  • Loading branch information
@moh-osman3
moh-osman3 authored Feb 13, 2024
1 parent ec0d595 commit 4956a49
Show file tree
Hide file tree
Showing 39 changed files with 1,042 additions and 1,489 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ endif
BUILDER = builder
.PHONY: $(BUILDER)
builder:
$(GOCMD) install go.opentelemetry.io/collector/cmd/builder@v0.92.0
$(GOCMD) install go.opentelemetry.io/collector/cmd/builder@v0.94.0

.PHONY: genotelarrowcol
genotelarrowcol: builder
Expand Down
125 changes: 60 additions & 65 deletions collector/cmd/otelarrowcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ module github.com/open-telemetry/otel-arrow/collector/cmd/otelarrowcol
go 1.20

require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.92.0
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/otel-arrow/collector/connector/validationconnector v0.16.0
github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.16.0
github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.16.0
Expand All @@ -17,22 +17,21 @@ require (
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.16.0
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.16.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.92.0
go.opentelemetry.io/collector/connector v0.92.0
go.opentelemetry.io/collector/exporter v0.92.0
go.opentelemetry.io/collector/exporter/debugexporter v0.92.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.92.0
go.opentelemetry.io/collector/extension v0.92.0
go.opentelemetry.io/collector/otelcol v0.92.0
go.opentelemetry.io/collector/processor v0.92.0
go.opentelemetry.io/collector/receiver v0.92.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.92.0
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
)

require (
cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/apache/arrow/go/v14 v14.0.2 // indirect
Expand All @@ -51,36 +50,34 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/flatbuffers v23.5.26+incompatible // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
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.4 // indirect
github.com/klauspost/compress v1.17.5 // 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.1 // indirect
github.com/knadh/koanf/v2 v2.0.2 // 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/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // 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 @@ -92,11 +89,10 @@ require (
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.45.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
github.com/shirou/gopsutil/v3 v3.24.1 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -110,43 +106,43 @@ 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.92.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.92.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.92.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.92.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.92.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.92.0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.92.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.92.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.92.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.92.0 // indirect
go.opentelemetry.io/collector/config/internal v0.92.0 // indirect
go.opentelemetry.io/collector/confmap v0.92.0 // indirect
go.opentelemetry.io/collector/consumer v0.92.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.92.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.1 // indirect
go.opentelemetry.io/collector/pdata v1.0.1 // indirect
go.opentelemetry.io/collector/semconv v0.92.0 // indirect
go.opentelemetry.io/collector/service v0.92.0 // indirect
go.opentelemetry.io/contrib/config v0.1.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.21.1 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v0.44.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.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/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
Expand All @@ -159,9 +155,8 @@ require (
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.60.1 // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 4956a49

Please sign in to comment.