Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update release script, release v0.9.0 #103

Merged
merged 8 commits into from
Nov 15, 2023
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## Unreleased

## [0.9.0](https://github.com/open-telemetry/otel-arrow/releases/tag/v0.9.0) - 2023-11-15

- No changes, testing release process.

## [0.8.0](https://github.com/open-telemetry/otel-arrow/releases/tag/v0.8.0) - 2023-11-15

- No changes, testing release process.

## [0.7.0](https://github.com/open-telemetry/otel-arrow/releases/tag/v0.7.0) - 2023-11-10

- New "concurrentbatchprocessor" component under development (#71, #79, #90)
Expand Down
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,24 @@ endif
# update files with new version
sed -i.bak 's/$(PREVIOUS_VERSION)/$(RELEASE_CANDIDATE)/g' versions.yaml
sed -i.bak 's/$(PREVIOUS_VERSION)/$(RELEASE_CANDIDATE)/g' collector/otelarrowcol-build.yaml
sed -i.bak 's/$(PREVIOUS_VERSION)/$(RELEASE_CANDIDATE)/g' collector/cmd/otelarrowcol/main.go
find . -name "*.bak" -type f -delete
$(GOCMD) run ./tools/replacer fix
# commit changes before running multimod
git add .
git commit -m "prepare release $(RELEASE_CANDIDATE)"
$(MAKE) multimod-prerelease
git add .
git commit -m "multimode changes $(RELEASE_CANDIDATE)"
# regenerate files
$(MAKE) gotidy
$(GOCMD) run ./tools/replacer unfix
git add .
git commit -m "go mod tidy $(RELEASE_CANDIDATE)"
# ensure a clean branch (that was a test--gotidy should be idempotent and should not change the working dir again)
git diff -s --exit-code || (echo "local repository not clean"; exit 1)
$(GOCMD) run ./tools/replacer unfix
git add .
git commit -m "add multimod changes $(RELEASE_CANDIDATE)" || (echo "no multimod changes to commit")
git commit -m "remove replace statements $(RELEASE_CANDIDATE)" || (echo "no multimod changes to commit")

# Install OTC's builder at the version WHICH MUST MATCH collector/otelarrowcol-build.yaml
BUILDER = builder
Expand All @@ -117,6 +122,7 @@ genotelarrowcol: builder
GOWORK="off" $(GOCMD) run ./tools/replacer fix
$(GOCMD) work sync
$(MAKE) gotidy
GOWORK="off" $(GOCMD) run ./tools/replacer unfix

.PHONY: otelarrowcol
otelarrowcol:
Expand Down
20 changes: 10 additions & 10 deletions collector/cmd/otelarrowcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.88.0
github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.8.0
github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.8.0
github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.8.0
github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.8.0
github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor v0.8.0
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.8.0
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.8.0
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.8.0
github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.9.0
github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.9.0
github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.9.0
github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.9.0
github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor v0.9.0
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.9.0
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.9.0
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.9.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.89.0
go.opentelemetry.io/collector/connector v0.89.0
Expand Down Expand Up @@ -92,8 +92,8 @@ require (
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/open-telemetry/otel-arrow v0.8.0 // indirect
github.com/open-telemetry/otel-arrow/collector v0.8.0 // indirect
github.com/open-telemetry/otel-arrow v0.9.0 // indirect
github.com/open-telemetry/otel-arrow/collector v0.9.0 // indirect
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
Expand Down
2 changes: 1 addition & 1 deletion collector/connector/validationconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/open-telemetry/otel-arrow/collector/connector/validationconnec
go 1.21

require (
github.com/open-telemetry/otel-arrow v0.8.0
github.com/open-telemetry/otel-arrow v0.9.0
go.opentelemetry.io/collector v0.89.0
go.opentelemetry.io/collector/component v0.89.0
go.opentelemetry.io/collector/connector v0.89.0
Expand Down
2 changes: 1 addition & 1 deletion collector/exporter/fileexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

require (
github.com/klauspost/compress v1.17.2
github.com/open-telemetry/otel-arrow/collector v0.8.0
github.com/open-telemetry/otel-arrow/collector v0.9.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.89.0
go.opentelemetry.io/collector/confmap v0.89.0
Expand Down
4 changes: 2 additions & 2 deletions collector/exporter/otelarrowexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.21
require (
github.com/apache/arrow/go/v12 v12.0.1
github.com/golang/mock v1.6.0
github.com/open-telemetry/otel-arrow v0.8.0
github.com/open-telemetry/otel-arrow/collector v0.8.0
github.com/open-telemetry/otel-arrow v0.9.0
github.com/open-telemetry/otel-arrow/collector v0.9.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector v0.89.0
go.opentelemetry.io/collector/component v0.89.0
Expand Down
16 changes: 8 additions & 8 deletions collector/otelarrowcol-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,31 @@ dist:
exporters:
# This is the core OpenTelemetry Protocol with Apache Arrow exporter
- import: github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter
gomod: github.com/open-telemetry/otel-arrow/collector v0.8.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.9.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.89.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.89.0
- import: github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter
gomod: github.com/open-telemetry/otel-arrow/collector v0.8.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.9.0

receivers:
# This is the core OpenTelemetry Protocol with Apache Arrow receiver
- import: github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver
gomod: github.com/open-telemetry/otel-arrow/collector v0.8.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.9.0
- import: github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver
gomod: github.com/open-telemetry/otel-arrow/collector v0.8.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.9.0
- gomod: github.com/lightstep/telemetry-generator/generatorreceiver v0.15.0

processors:
- import: github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor
gomod: github.com/open-telemetry/otel-arrow/collector v0.8.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.9.0
- import: github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor
gomod: github.com/open-telemetry/otel-arrow/collector v0.8.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.9.0
- import: github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor
gomod: github.com/open-telemetry/otel-arrow/collector v0.8.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.9.0

connectors:
- import: github.com/open-telemetry/otel-arrow/collector/connector/validationconnector
gomod: github.com/open-telemetry/otel-arrow/collector v0.8.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.9.0

extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.88.0
Expand Down
4 changes: 2 additions & 2 deletions collector/receiver/otelarrowreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0
github.com/klauspost/compress v1.17.2
github.com/open-telemetry/otel-arrow v0.8.0
github.com/open-telemetry/otel-arrow/collector v0.8.0
github.com/open-telemetry/otel-arrow v0.9.0
github.com/open-telemetry/otel-arrow/collector v0.9.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector v0.89.0
go.opentelemetry.io/collector/component v0.89.0
Expand Down
11 changes: 10 additions & 1 deletion go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -739,16 +739,26 @@ github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssette
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.88.0/go.mod h1:qygQpMj8Xk4J9YQMgsvC5raRRfNqkkPJRFZ6ZFPL7MI=
github.com/open-telemetry/otel-arrow v0.6.0/go.mod h1:NHvm+Wk07EYIsXV9rqOmMRpifm1JHsd7nNrAs3JkikY=
github.com/open-telemetry/otel-arrow v0.7.0/go.mod h1:8oImVClIzZKIkupdEKkeaNy+TG7+OdBkJSsAvCz4pmA=
github.com/open-telemetry/otel-arrow v0.8.0/go.mod h1:sIlf7+788Lo7T+EGNPVYFfdUrLHSirkM2PeAnyRUAvg=
github.com/open-telemetry/otel-arrow/collector v0.6.0/go.mod h1:0JW97NNFS7631/Xzn3Gw8VrPiujuiiajXQdj18tvb+c=
github.com/open-telemetry/otel-arrow/collector v0.7.0/go.mod h1:jBeGTXpyJYW+QTGQ4Cvp0ucb0ACzQFIVVDRAXm8uOfY=
github.com/open-telemetry/otel-arrow/collector v0.8.0/go.mod h1:myobGe42YNoTHWa3N1QNQla8B/fm26YdsKtFnRByVBc=
github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.7.0/go.mod h1:P7/cu7qaCst5foAi6aNU9bbqjW10tx2QjM7DFFEmLnY=
github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.8.0/go.mod h1:6T3FuXRLWvcUXF2He5rx93p2txAwJBM/9HVl77OmKSM=
github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.7.0/go.mod h1:u9w+k/55jxZda+4GLJtRRH2FOqxRU15O3+t07NAXqDE=
github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.8.0/go.mod h1:4/GO3S7y9awvBS3pbs0QMiuoGmjsIOhD6Um5ZFes0Vo=
github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.7.0/go.mod h1:acGTof9oflP6jxMzFmktdQmyl1Cm3ALzyQ1PL0U4s8A=
github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.8.0/go.mod h1:IaEuw/OxEOTW+Pp8tQmg8f/qT9jBdqgNfPckOqLELzI=
github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.7.0/go.mod h1:tRtFIprDGkSbZBoYMehD1olk+HoqtvJrLIRSdnNPM7o=
github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.8.0/go.mod h1:lfHgrHftFXF0qaMnKGqKy9J0KiFgYcKqqBEhuB75NKg=
github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor v0.7.0/go.mod h1:Rz4rO6dVMAuczSGyAXJUIjf88EyAhRJu9SEIoqaS6vU=
github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor v0.8.0/go.mod h1:suOi9A9TnsMU32yGJXaVAiX9IcPoiNfkVEvWe2gJCe8=
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.7.0/go.mod h1:an0oOIXmeJ2dcMlKBN3585nrbQmV3oZqSFVAjou9/fo=
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.8.0/go.mod h1:YYqQtw5XLZr2/uKKogBE0AoO5Y8XXjK+qcky4d9a3Ak=
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.7.0/go.mod h1:oRRqdy6HKpbbaCShBPg4km9s9Xbj9WfpfOy7sDx1Esk=
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.8.0/go.mod h1:bfJ52oQuGcdvKged3twCDKQLzWuerwrU08irJynUXTk=
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.7.0/go.mod h1:ZdLfmqPB88OjdsWeBDwireNzK2D8oKvjwtBuLJIyhBw=
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.8.0/go.mod h1:2d9RyJGnMcN/67zi3r5b85rl6t9lHnXkJemS/E4XhTo=
github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
Expand Down Expand Up @@ -1002,7 +1012,6 @@ google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:RdyHbowztCGQySiCvQPgWQWgWhGnouTdCflKoDBt32U=
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA=
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc=
Expand Down
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module-sets:
beta:
version: v0.8.0
version: v0.9.0
modules:
- github.com/open-telemetry/otel-arrow
- github.com/open-telemetry/otel-arrow/collector
Expand Down
Loading