Skip to content

Commit

Permalink
[chore] Prepare release 0.70.0 (#6999)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitryax authored Jan 23, 2023
1 parent ed1f913 commit 2b96397
Show file tree
Hide file tree
Showing 20 changed files with 99 additions and 98 deletions.
2 changes: 1 addition & 1 deletion cmd/builder/internal/builder/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"go.uber.org/zap"
)

const defaultOtelColVersion = "0.69.1"
const defaultOtelColVersion = "0.70.0"

// ErrInvalidGoMod indicates an invalid gomod
var ErrInvalidGoMod = errors.New("invalid gomod specification for module")
Expand Down
23 changes: 12 additions & 11 deletions cmd/builder/internal/config/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.69.1-dev
otelcol_version: 0.69.1
version: 0.70.0-dev
otelcol_version: 0.70.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.69.1
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.0
exporters:
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.69.1
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.69.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.69.1
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.70.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.70.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.70.0
extensions:
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.69.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.69.1
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.70.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.70.0
processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.69.1
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.69.1
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.70.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.70.0
connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.69.1
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.70.0

22 changes: 11 additions & 11 deletions cmd/otelcorecol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.69.1-dev
otelcol_version: 0.69.1
version: 0.70.0-dev
otelcol_version: 0.70.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.69.1
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.0
exporters:
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.69.1
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.69.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.69.1
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.70.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.70.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.70.0
extensions:
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.69.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.69.1
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.70.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.70.0
processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.69.1
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.69.1
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.70.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.70.0
connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.69.1
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.70.0

replaces:
- go.opentelemetry.io/collector => ../../
Expand Down
30 changes: 15 additions & 15 deletions cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/connector/forwardconnector v0.69.1
go.opentelemetry.io/collector/exporter/loggingexporter v0.69.1
go.opentelemetry.io/collector/exporter/otlpexporter v0.69.1
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.69.1
go.opentelemetry.io/collector/extension/ballastextension v0.69.1
go.opentelemetry.io/collector/extension/zpagesextension v0.69.1
go.opentelemetry.io/collector/processor/batchprocessor v0.69.1
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.69.1
go.opentelemetry.io/collector/receiver/otlpreceiver v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/connector/forwardconnector v0.70.0
go.opentelemetry.io/collector/exporter/loggingexporter v0.70.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.70.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.70.0
go.opentelemetry.io/collector/extension/ballastextension v0.70.0
go.opentelemetry.io/collector/extension/zpagesextension v0.70.0
go.opentelemetry.io/collector/processor/batchprocessor v0.70.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.70.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.0
golang.org/x/sys v0.4.0
)

Expand Down Expand Up @@ -64,11 +64,11 @@ require (
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/confmap v0.69.1 // indirect
go.opentelemetry.io/collector/consumer v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/confmap v0.70.0 // indirect
go.opentelemetry.io/collector/consumer v0.70.0 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rc4 // indirect
go.opentelemetry.io/collector/semconv v0.69.1 // indirect
go.opentelemetry.io/collector/semconv v0.70.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.12.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcorecol/main.go

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

6 changes: 3 additions & 3 deletions component/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/confmap v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/confmap v0.70.0
go.opentelemetry.io/otel/metric v0.34.0
go.opentelemetry.io/otel/trace v1.11.2
go.uber.org/multierr v1.9.0
Expand All @@ -19,7 +19,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
go.uber.org/atomic v1.10.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion confmap/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/knadh/koanf v1.5.0
github.com/mitchellh/mapstructure v1.5.0
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector/featuregate v0.69.1
go.opentelemetry.io/collector/featuregate v0.70.0
go.uber.org/multierr v1.9.0
gopkg.in/yaml.v3 v3.0.1
)
Expand Down
10 changes: 5 additions & 5 deletions connector/forwardconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/consumer v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/consumer v0.70.0
go.opentelemetry.io/collector/pdata v1.0.0-rc4
)

Expand All @@ -22,8 +22,8 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/confmap v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/confmap v0.70.0 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
go.opentelemetry.io/otel/metric v0.34.0 // indirect
go.opentelemetry.io/otel/trace v1.11.2 // indirect
Expand Down
2 changes: 1 addition & 1 deletion consumer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/pdata v1.0.0-rc4
)

Expand Down
4 changes: 2 additions & 2 deletions examples/k8s/otel-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ spec:
- command:
- "/otelcol"
- "--config=/conf/otel-agent-config.yaml"
image: otel/opentelemetry-collector:0.69.1
image: otel/opentelemetry-collector:0.70.0
name: otel-agent
resources:
limits:
Expand Down Expand Up @@ -177,7 +177,7 @@ spec:
- command:
- "/otelcol"
- "--config=/conf/otel-collector-config.yaml"
image: otel/opentelemetry-collector:0.69.1
image: otel/opentelemetry-collector:0.70.0
name: otel-collector
resources:
limits:
Expand Down
10 changes: 5 additions & 5 deletions exporter/loggingexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/confmap v0.69.1
go.opentelemetry.io/collector/consumer v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/confmap v0.70.0
go.opentelemetry.io/collector/consumer v0.70.0
go.opentelemetry.io/collector/pdata v1.0.0-rc4
go.uber.org/zap v1.24.0
golang.org/x/sys v0.4.0
Expand All @@ -28,7 +28,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
go.opentelemetry.io/otel/metric v0.34.0 // indirect
go.opentelemetry.io/otel/trace v1.11.2 // indirect
Expand Down
10 changes: 5 additions & 5 deletions exporter/otlpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/confmap v0.69.1
go.opentelemetry.io/collector/consumer v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/confmap v0.70.0
go.opentelemetry.io/collector/consumer v0.70.0
go.opentelemetry.io/collector/pdata v1.0.0-rc4
go.uber.org/atomic v1.10.0
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6
Expand All @@ -34,7 +34,7 @@ require (
github.com/mostynb/go-grpc-compression v1.1.17 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
go.opentelemetry.io/otel/metric v0.34.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions exporter/otlphttpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/confmap v0.69.1
go.opentelemetry.io/collector/consumer v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/confmap v0.70.0
go.opentelemetry.io/collector/consumer v0.70.0
go.opentelemetry.io/collector/pdata v1.0.0-rc4
go.opentelemetry.io/collector/receiver/otlpreceiver v0.69.1
go.opentelemetry.io/collector/receiver/otlpreceiver v0.70.0
go.uber.org/zap v1.24.0
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6
google.golang.org/grpc v1.52.0
Expand Down Expand Up @@ -37,7 +37,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rs/cors v1.8.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
Expand Down
8 changes: 4 additions & 4 deletions extension/ballastextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/confmap v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/confmap v0.70.0
go.uber.org/zap v1.24.0
)

Expand All @@ -24,7 +24,7 @@ require (
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
go.opentelemetry.io/otel/metric v0.34.0 // indirect
go.opentelemetry.io/otel/trace v1.11.2 // indirect
Expand Down
8 changes: 4 additions & 4 deletions extension/zpagesextension/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/confmap v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/confmap v0.70.0
go.opentelemetry.io/contrib/zpages v0.37.0
go.opentelemetry.io/otel/sdk v1.11.2
go.opentelemetry.io/otel/trace v1.11.2
Expand All @@ -22,7 +22,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
go.opentelemetry.io/otel/metric v0.34.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ require (
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.1
go.opencensus.io v0.24.0
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/confmap v0.69.1
go.opentelemetry.io/collector/consumer v0.69.1
go.opentelemetry.io/collector/extension/zpagesextension v0.69.1
go.opentelemetry.io/collector/featuregate v0.69.1
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/confmap v0.70.0
go.opentelemetry.io/collector/consumer v0.70.0
go.opentelemetry.io/collector/extension/zpagesextension v0.70.0
go.opentelemetry.io/collector/featuregate v0.70.0
go.opentelemetry.io/collector/pdata v1.0.0-rc4
go.opentelemetry.io/collector/semconv v0.69.1
go.opentelemetry.io/collector/semconv v0.70.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0
go.opentelemetry.io/contrib/propagators/b3 v1.12.0
Expand Down
10 changes: 5 additions & 5 deletions processor/batchprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ require (
github.com/prometheus/common v0.39.0
github.com/stretchr/testify v1.8.1
go.opencensus.io v0.24.0
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/confmap v0.69.1
go.opentelemetry.io/collector/consumer v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/confmap v0.70.0
go.opentelemetry.io/collector/consumer v0.70.0
go.opentelemetry.io/collector/pdata v1.0.0-rc4
go.opentelemetry.io/otel v1.11.2
go.opentelemetry.io/otel/exporters/prometheus v0.34.0
Expand Down Expand Up @@ -44,7 +44,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/otel/trace v1.11.2 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
Expand Down
10 changes: 5 additions & 5 deletions processor/memorylimiterprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.18

require (
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.69.1
go.opentelemetry.io/collector/component v0.69.1
go.opentelemetry.io/collector/confmap v0.69.1
go.opentelemetry.io/collector/consumer v0.69.1
go.opentelemetry.io/collector v0.70.0
go.opentelemetry.io/collector/component v0.70.0
go.opentelemetry.io/collector/confmap v0.70.0
go.opentelemetry.io/collector/consumer v0.70.0
go.opentelemetry.io/collector/pdata v1.0.0-rc4
go.uber.org/atomic v1.10.0
go.uber.org/zap v1.24.0
Expand All @@ -33,7 +33,7 @@ require (
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/featuregate v0.69.1 // indirect
go.opentelemetry.io/collector/featuregate v0.70.0 // indirect
go.opentelemetry.io/otel v1.11.2 // indirect
go.opentelemetry.io/otel/metric v0.34.0 // indirect
go.opentelemetry.io/otel/trace v1.11.2 // indirect
Expand Down
Loading

0 comments on commit 2b96397

Please sign in to comment.