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.

Sign up for GitHub

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

Get latest from main #21679

Merged
merged 12 commits into from
May 9, 2023
Merged

Get latest from main #21679

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
67ffaf5
[pkg/stanza] Add 'unquote' operator (#21657)
djaglowski May 9, 2023
4c6059e
changelog update 0.77.0
opentelemetrybot May 9, 2023
cf4cdb8
update version.yaml 0.77.0
opentelemetrybot May 9, 2023
d2378ca
builder config changes 0.77.0
opentelemetrybot May 9, 2023
f7b9bb5
Prepare contrib-base for version v0.77.0
opentelemetrybot May 9, 2023
4da3958
make multimod-prerelease changes 0.77.0
opentelemetrybot May 9, 2023
fbc937b
make multimod-sync changes 0.77.0
opentelemetrybot May 9, 2023
f475220
Update builder configs (#21676)
TylerHelmuth May 9, 2023
3b70291
Prepare release prs/0.77.0 (#21677)
TylerHelmuth May 9, 2023
a522051
Fix pdata dep
TylerHelmuth May 9, 2023
4a610bc
Update changelog
TylerHelmuth May 9, 2023
5b0bfdf
Merge branch 'prepare-release-prs/0.77.0' into prepare-release-prs/0.…
May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
make multimod-sync changes 0.77.0
  • Loading branch information
@opentelemetrybot @TylerHelmuth
opentelemetrybot authored and TylerHelmuth committed May 9, 2023
commit fbc937b3348ac1f0edb06082cc1ab4770bf02966
34 changes: 17 additions & 17 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.77.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.77.0
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/component v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/receiver/otlpreceiver v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector v0.77.0
go.opentelemetry.io/collector/component v0.77.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.77.0
golang.org/x/mod v0.10.0
golang.org/x/text v0.9.0
gopkg.in/yaml.v2 v2.4.0
Expand Down Expand Up @@ -201,8 +201,8 @@ require (
github.com/samber/lo v1.37.0 // indirect
github.com/shoenig/go-m1cpu v0.1.5 // indirect
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 // indirect
go.opentelemetry.io/collector/exporter v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/receiver v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/exporter v0.77.0 // indirect
go.opentelemetry.io/collector/receiver v0.77.0 // indirect
)

require (
Expand Down Expand Up @@ -590,18 +590,18 @@ require (
go.mongodb.org/atlas v0.25.0 // indirect
go.mongodb.org/mongo-driver v1.11.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/confmap v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/consumer v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/featuregate v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011.0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/semconv v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/confmap v0.77.0 // indirect
go.opentelemetry.io/collector/consumer v0.77.0 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.77.0 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.77.0 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.77.0 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.77.0 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.77.0 // indirect
go.opentelemetry.io/collector/featuregate v0.77.0 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.77.0 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.77.0 // indirect
go.opentelemetry.io/collector/semconv v0.77.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.15.0 // indirect
Expand Down
85 changes: 33 additions & 52 deletions cmd/configschema/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions cmd/mdatagen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ go 1.19
require (
github.com/google/go-cmp v0.5.9
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector/component v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/confmap v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011.0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/receiver v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/semconv v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/component v0.77.0
go.opentelemetry.io/collector/confmap v0.77.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011
go.opentelemetry.io/collector/receiver v0.77.0
go.opentelemetry.io/collector/semconv v0.77.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.24.0
golang.org/x/text v0.9.0
Expand All @@ -27,9 +27,9 @@ 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 v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/consumer v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/featuregate v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector v0.77.0 // indirect
go.opentelemetry.io/collector/consumer v0.77.0 // indirect
go.opentelemetry.io/collector/featuregate v0.77.0 // indirect
go.opentelemetry.io/otel v1.15.1 // indirect
go.opentelemetry.io/otel/metric v0.38.1 // indirect
go.opentelemetry.io/otel/trace v1.15.1 // indirect
Expand Down
32 changes: 16 additions & 16 deletions cmd/mdatagen/go.sum
View file
Open in desktop

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

26 changes: 13 additions & 13 deletions cmd/otelcontribcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,20 +174,20 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.77.0
github.com/prometheus/prometheus v0.43.0
github.com/stretchr/testify v1.8.2
go.opentelemetry.io/collector v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/component v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector v0.77.0
go.opentelemetry.io/collector/component v0.77.0
go.opentelemetry.io/collector/connector/forwardconnector v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/consumer v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/exporter v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/consumer v0.77.0
go.opentelemetry.io/collector/exporter v0.77.0
go.opentelemetry.io/collector/exporter/loggingexporter v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/exporter/otlpexporter v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/exporter/otlpexporter v0.77.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.77.0
go.opentelemetry.io/collector/extension/ballastextension v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/extension/zpagesextension v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/processor/batchprocessor v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/extension/zpagesextension v0.77.0
go.opentelemetry.io/collector/processor/batchprocessor v0.77.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/receiver v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/receiver/otlpreceiver v0.76.2-0.20230508160606-833cbdaf75cc
go.opentelemetry.io/collector/receiver v0.77.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.77.0
golang.org/x/sys v0.7.0
)

Expand Down Expand Up @@ -604,10 +604,10 @@ require (
go.mongodb.org/atlas v0.25.0 // indirect
go.mongodb.org/mongo-driver v1.11.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/confmap v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/featuregate v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/confmap v0.77.0 // indirect
go.opentelemetry.io/collector/featuregate v0.77.0 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0011.0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/semconv v0.76.2-0.20230508160606-833cbdaf75cc // indirect
go.opentelemetry.io/collector/semconv v0.77.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.15.0 // indirect
Expand Down
Loading