Skip to content

Commit

Permalink
Update to OTel Collector v0.102.x (#219)
Browse files Browse the repository at this point in the history 
The steps for this update are documented in CONTRIBUTING.md.
Version 0.102.x was released this week.

This exposed breakage in the release process, not fully investigated. I
observed that when the `go.work` file was involved, `go mod` could not
resolve dependencies (which is somehow related to the lack of replace
statements). I have removed the `go.work` file.

To repair the release process, I've run the OTel collector build-tools
`crosslink` tool, which inserts replace statements. The consequence is
that `go run`, `go install`, and so on can no longer be used on the
`otelarrowcol` target. This is unfortunate, but our release process was
already shaky because of the unconventional use of go.work.

Removes the experiment processor (and all examples that refer to it)
because it used a deprecated API in the collector. This could be
replaced by a connector, but we haven't been using it, so it's removed.
  • Loading branch information
@jmacd
jmacd authored Jun 5, 2024
1 parent 7ee4c3c commit ff9801d
Show file tree
Hide file tree
Showing 47 changed files with 1,238 additions and 2,208 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: "1.21"
go-version: "1.22"

- name: Build all modules
run: make build
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Avoid work for already-canceled requests. [#213](https://github.com/open-telemetry/otel-arrow/pull/213)
- Call IPCReader.Err() after reader loop. [#215](https://github.com/open-telemetry/otel-arrow/pull/215)
- Update to Arrow-Go v16.1.0. [#218](https://github.com/open-telemetry/otel-arrow/pull/218)
- Update to OpenTelemetry Collector v0.102.x. [#219](https://github.com/open-telemetry/otel-arrow/pull/219)

## [0.23.0](https://github.com/open-telemetry/otel-arrow/releases/tag/v0.23.0) - 2024-05-09

Expand Down
4 changes: 1 addition & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ multimod-prerelease: $(MULTIMOD)
$(MULTIMOD) prerelease -s=true -b=false -v ./versions.yaml -m ${MODSET}
# this is a hack to sync the otelarrowreceiver during this process
# to avoid gomod ambigious imports.
(cd collector/receiver/otelarrowreceiver/ && $(GOCMD) work sync)
$(MAKE) gotidy

COMMIT?=HEAD
Expand Down Expand Up @@ -115,15 +114,14 @@ endif
BUILDER = builder
.PHONY: $(BUILDER)
builder:
$(GOCMD) install go.opentelemetry.io/collector/cmd/builder@v0.98.0
$(GOCMD) install go.opentelemetry.io/collector/cmd/builder@v0.102.1

.PHONY: genotelarrowcol
genotelarrowcol: builder
rm -f collector/cmd/otelarrowcol/*
GOWORK="off" $(GOCMD) run ./tools/replacer fix
GOWORK="off" $(BUILDER) --skip-compilation --config collector/otelarrowcol-build.yaml
GOWORK="off" $(GOCMD) run ./tools/replacer fix
$(GOCMD) work sync
$(MAKE) gotidy
GOWORK="off" $(GOCMD) run ./tools/replacer unfix
$(MAKE) gotidy
Expand Down
4 changes: 0 additions & 4 deletions collector/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ maintainers. These components are:
- [`processor/obfuscationprocessor`][OBFUSCATIONPROCESSOR]: Supports
obfuscation of OpenTelemetry data using a [Feistel
cipher](https://en.wikipedia.org/wiki/Feistel_cipher).
- [`processor/experimentprocessor`][EXPERIMENTPROCESSOR]: A
probabilistic routing component for conducting experiments between
exporters.
- [`connector/validationconnector`][VALIDATIONCONNECTOR]: A component
for on-the-fly validation of a local pipeline.

Expand Down Expand Up @@ -90,7 +87,6 @@ Also, the build includes a synthetic telemetry data generator:
[UPSTREAMFILEEXPORTER]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/fileexporter/README.md
[UPSTREAMFILERECEIVER]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/filereceiver/README.md
[OBFUSCATIONPROCESSOR]: ./processor/obfuscationprocessor/README.md
[EXPERIMENTPROCESSOR]: ./processor/experimentprocessor/README.md
[VALIDATIONCONNECTOR]: ./connector/validationconnector/README.md
[BASICAUTHEXT]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/basicauthextension/README.md
[HEADERSETTEREXT]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/headerssetterextension/README.md
Expand Down
2 changes: 0 additions & 2 deletions collector/cmd/otelarrowcol/components.go
View file

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

39 changes: 0 additions & 39 deletions collector/cmd/otelarrowcol/components_test.go
View file

This file was deleted.

157 changes: 79 additions & 78 deletions collector/cmd/otelarrowcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,39 @@

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

go 1.21
go 1.21.0

toolchain go1.22.2

require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.98.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.102.0
github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.23.0
github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.23.0
github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.23.0
github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.23.0
github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor v0.23.0
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.23.0
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.23.0
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.23.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.98.0
go.opentelemetry.io/collector/connector v0.98.0
go.opentelemetry.io/collector/exporter v0.98.0
go.opentelemetry.io/collector/exporter/debugexporter v0.98.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.98.0
go.opentelemetry.io/collector/extension v0.98.0
go.opentelemetry.io/collector/otelcol v0.98.0
go.opentelemetry.io/collector/processor v0.98.0
go.opentelemetry.io/collector/receiver v0.98.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.98.0
golang.org/x/sys v0.19.0
go.opentelemetry.io/collector/component v0.102.1
go.opentelemetry.io/collector/confmap v0.102.1
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/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/otelcol v0.102.1
go.opentelemetry.io/collector/processor v0.102.1
go.opentelemetry.io/collector/receiver v0.102.1
go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1
golang.org/x/sys v0.20.0
)

require (
Expand All @@ -40,7 +47,7 @@ require (
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cyrildever/feistel v1.5.5 // indirect
github.com/cyrildever/go-utls v1.9.7 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand All @@ -63,8 +70,8 @@ require (
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.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/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/go-version v1.7.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
Expand All @@ -87,15 +94,16 @@ 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.19.0 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/common v0.53.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.3 // indirect
github.com/shirou/gopsutil/v3 v3.24.4 // 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
github.com/stretchr/testify v1.9.0 // indirect
github.com/tg123/go-htpasswd v1.2.2 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
Expand All @@ -107,64 +115,57 @@ 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.98.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.98.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.5.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.98.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.98.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.98.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.5.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.98.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.98.0 // indirect
go.opentelemetry.io/collector/config/internal v0.98.0 // indirect
go.opentelemetry.io/collector/confmap v0.98.0 // indirect
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.98.0 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.0 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.0 // indirect
go.opentelemetry.io/collector/consumer v0.98.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.98.0 // indirect
go.opentelemetry.io/collector/featuregate v1.5.0 // indirect
go.opentelemetry.io/collector/pdata v1.5.0 // indirect
go.opentelemetry.io/collector/semconv v0.98.0 // indirect
go.opentelemetry.io/collector/service v0.98.0 // indirect
go.opentelemetry.io/contrib/config v0.4.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.25.0 // indirect
go.opentelemetry.io/otel v1.25.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.25.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.25.0 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.25.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.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/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/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/featuregate v1.9.0 // indirect
go.opentelemetry.io/collector/pdata v1.9.0 // 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
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.15.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/tools v0.21.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.33.0 // indirect
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
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit ff9801d

Please sign in to comment.