Skip to content

Commit

Permalink
prepare release 1.0.0-rc_0011
Browse files Browse the repository at this point in the history
  • Loading branch information
djaglowski committed Apr 26, 2023
1 parent 9257d7f commit a0987f3
Show file tree
Hide file tree
Showing 27 changed files with 193 additions and 146 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<!-- next version -->

## v1.0.0-rc10/v0.76.0
## v1.0.0-rcv0011/v0.76.1

### 🛑 Breaking changes 🛑

Expand Down
1 change: 1 addition & 0 deletions cmd/builder/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ require (
)

retract (
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
v0.69.0 // Release failed, use v0.69.1
v0.57.1 // Release failed, use v0.57.2
v0.57.0 // Release failed, use v0.57.2
Expand Down
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.76.0"
const defaultOtelColVersion = "0.76.1"

// ErrInvalidGoMod indicates an invalid gomod
var ErrInvalidGoMod = errors.New("invalid gomod specification for module")
Expand Down
8 changes: 4 additions & 4 deletions cmd/builder/test/core.builder.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
dist:
module: go.opentelemetry.io/collector/builder/test/core
otelcol_version: 0.76.0
otelcol_version: 0.76.1

extensions:
- import: go.opentelemetry.io/collector/extension/zpagesextension
gomod: go.opentelemetry.io/collector v0.76.0
gomod: go.opentelemetry.io/collector v0.76.1
path: ${WORKSPACE_DIR}

receivers:
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
gomod: go.opentelemetry.io/collector v0.76.0
gomod: go.opentelemetry.io/collector v0.76.1
path: ${WORKSPACE_DIR}

exporters:
- import: go.opentelemetry.io/collector/exporter/loggingexporter
gomod: go.opentelemetry.io/collector v0.76.0
gomod: go.opentelemetry.io/collector v0.76.1
path: ${WORKSPACE_DIR}

replaces:
Expand Down
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.76.0-dev
otelcol_version: 0.76.0
version: 0.76.1-dev
otelcol_version: 0.76.1

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

replaces:
- go.opentelemetry.io/collector => ../../
Expand Down
36 changes: 18 additions & 18 deletions cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ go 1.19

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

Expand Down Expand Up @@ -68,11 +68,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.76.0 // indirect
go.opentelemetry.io/collector/consumer v0.76.0 // indirect
go.opentelemetry.io/collector/featuregate v0.76.0 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rc10 // indirect
go.opentelemetry.io/collector/semconv v0.76.0 // indirect
go.opentelemetry.io/collector/confmap v0.76.1 // indirect
go.opentelemetry.io/collector/consumer v0.76.1 // indirect
go.opentelemetry.io/collector/featuregate v0.76.1 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011 // indirect
go.opentelemetry.io/collector/semconv v0.76.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.15.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.

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

require (
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector v0.76.0
go.opentelemetry.io/collector/confmap v0.76.0
go.opentelemetry.io/collector v0.76.1
go.opentelemetry.io/collector/confmap v0.76.1
go.opentelemetry.io/otel/metric v0.37.0
go.opentelemetry.io/otel/trace v1.14.0
go.uber.org/multierr v1.11.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.76.0 // indirect
go.opentelemetry.io/collector/featuregate v0.76.1 // indirect
go.opentelemetry.io/otel v1.14.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand All @@ -43,4 +43,7 @@ replace go.opentelemetry.io/collector/semconv => ../semconv

replace go.opentelemetry.io/collector/extension/zpagesextension => ../extension/zpagesextension

retract v0.69.0 // Release failed, use v0.69.1
retract (
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
v0.69.0 // Release failed, use v0.69.1
)
7 changes: 5 additions & 2 deletions 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.2
go.opentelemetry.io/collector/featuregate v0.76.0
go.opentelemetry.io/collector/featuregate v0.76.1
go.uber.org/multierr v1.11.0
gopkg.in/yaml.v3 v3.0.1
)
Expand All @@ -20,4 +20,7 @@ require (

replace go.opentelemetry.io/collector/featuregate => ../featuregate

retract v0.69.0 // Release failed, use v0.69.1
retract (
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
v0.69.0 // Release failed, use v0.69.1
)
17 changes: 10 additions & 7 deletions connector/forwardconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.19

require (
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector v0.76.0
go.opentelemetry.io/collector/component v0.76.0
go.opentelemetry.io/collector/consumer v0.76.0
go.opentelemetry.io/collector/pdata v1.0.0-rc10
go.opentelemetry.io/collector v0.76.1
go.opentelemetry.io/collector/component v0.76.1
go.opentelemetry.io/collector/consumer v0.76.1
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011
)

require (
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.76.0 // indirect
go.opentelemetry.io/collector/featuregate v0.76.0 // indirect
go.opentelemetry.io/collector/confmap v0.76.1 // indirect
go.opentelemetry.io/collector/featuregate v0.76.1 // indirect
go.opentelemetry.io/otel v1.14.0 // indirect
go.opentelemetry.io/otel/metric v0.37.0 // indirect
go.opentelemetry.io/otel/trace v1.14.0 // indirect
Expand Down Expand Up @@ -59,4 +59,7 @@ replace go.opentelemetry.io/collector/consumer => ../../consumer

replace go.opentelemetry.io/collector/confmap => ../../confmap

retract v0.69.0 // Release failed, use v0.69.1
retract (
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
v0.69.0 // Release failed, use v0.69.1
)
9 changes: 6 additions & 3 deletions consumer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.19

require (
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector v0.76.0
go.opentelemetry.io/collector/pdata v1.0.0-rc10
go.opentelemetry.io/collector v0.76.1
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011
)

require (
Expand Down Expand Up @@ -44,4 +44,7 @@ replace go.opentelemetry.io/collector/featuregate => ../featuregate

replace go.opentelemetry.io/collector/confmap => ../confmap

retract v0.69.0 // Release failed, use v0.69.1
retract (
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
v0.69.0 // Release failed, use v0.69.1
)
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.76.0
image: otel/opentelemetry-collector:0.76.1
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.76.0
image: otel/opentelemetry-collector:0.76.1
name: otel-collector
resources:
limits:
Expand Down
16 changes: 9 additions & 7 deletions exporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1
github.com/stretchr/testify v1.8.2
go.opencensus.io v0.24.0
go.opentelemetry.io/collector v0.76.0
go.opentelemetry.io/collector/component v0.76.0
go.opentelemetry.io/collector/consumer v0.76.0
go.opentelemetry.io/collector/pdata v1.0.0-rc10
go.opentelemetry.io/collector v0.76.1
go.opentelemetry.io/collector/component v0.76.1
go.opentelemetry.io/collector/consumer v0.76.1
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011
go.opentelemetry.io/otel v1.14.0
go.opentelemetry.io/otel/sdk v1.14.0
go.opentelemetry.io/otel/trace v1.14.0
Expand Down Expand Up @@ -43,9 +43,9 @@ require (
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
go.opentelemetry.io/collector/confmap v0.76.0 // indirect
go.opentelemetry.io/collector/featuregate v0.76.0 // indirect
go.opentelemetry.io/collector/receiver v0.76.0 // indirect
go.opentelemetry.io/collector/confmap v0.76.1 // indirect
go.opentelemetry.io/collector/featuregate v0.76.1 // indirect
go.opentelemetry.io/collector/receiver v0.76.1 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.37.0 // indirect
go.opentelemetry.io/otel/metric v0.37.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.37.0 // indirect
Expand Down Expand Up @@ -78,3 +78,5 @@ replace go.opentelemetry.io/collector/pdata => ../pdata
replace go.opentelemetry.io/collector/receiver => ../receiver

replace go.opentelemetry.io/collector/semconv => ../semconv

retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module
21 changes: 12 additions & 9 deletions exporter/loggingexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ go 1.19

require (
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector v0.76.0
go.opentelemetry.io/collector/component v0.76.0
go.opentelemetry.io/collector/confmap v0.76.0
go.opentelemetry.io/collector/consumer v0.76.0
go.opentelemetry.io/collector/exporter v0.76.0
go.opentelemetry.io/collector/pdata v1.0.0-rc10
go.opentelemetry.io/collector v0.76.1
go.opentelemetry.io/collector/component v0.76.1
go.opentelemetry.io/collector/confmap v0.76.1
go.opentelemetry.io/collector/consumer v0.76.1
go.opentelemetry.io/collector/exporter v0.76.1
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011
go.uber.org/zap v1.24.0
golang.org/x/sys v0.7.0
)
Expand All @@ -29,8 +29,8 @@ 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.76.0 // indirect
go.opentelemetry.io/collector/receiver v0.76.0 // indirect
go.opentelemetry.io/collector/featuregate v0.76.1 // indirect
go.opentelemetry.io/collector/receiver v0.76.1 // indirect
go.opentelemetry.io/otel v1.14.0 // indirect
go.opentelemetry.io/otel/metric v0.37.0 // indirect
go.opentelemetry.io/otel/trace v1.14.0 // indirect
Expand Down Expand Up @@ -64,4 +64,7 @@ replace go.opentelemetry.io/collector/semconv => ../../semconv

replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension

retract v0.69.0 // Release failed, use v0.69.1
retract (
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
v0.69.0 // Release failed, use v0.69.1
)
21 changes: 12 additions & 9 deletions exporter/otlpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ go 1.19

require (
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector v0.76.0
go.opentelemetry.io/collector/component v0.76.0
go.opentelemetry.io/collector/confmap v0.76.0
go.opentelemetry.io/collector/consumer v0.76.0
go.opentelemetry.io/collector/exporter v0.76.0
go.opentelemetry.io/collector/pdata v1.0.0-rc10
go.opentelemetry.io/collector v0.76.1
go.opentelemetry.io/collector/component v0.76.1
go.opentelemetry.io/collector/confmap v0.76.1
go.opentelemetry.io/collector/consumer v0.76.1
go.opentelemetry.io/collector/exporter v0.76.1
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f
google.golang.org/grpc v1.54.0
google.golang.org/protobuf v1.30.0
Expand All @@ -35,8 +35,8 @@ 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.76.0 // indirect
go.opentelemetry.io/collector/receiver v0.76.0 // indirect
go.opentelemetry.io/collector/featuregate v0.76.1 // indirect
go.opentelemetry.io/collector/receiver v0.76.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
go.opentelemetry.io/otel v1.14.0 // indirect
go.opentelemetry.io/otel/metric v0.37.0 // indirect
Expand Down Expand Up @@ -70,4 +70,7 @@ replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extensi

replace go.opentelemetry.io/collector/consumer => ../../consumer

retract v0.69.0 // Release failed, use v0.69.1
retract (
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
v0.69.0 // Release failed, use v0.69.1
)
Loading

0 comments on commit a0987f3

Please sign in to comment.