Skip to content

[pkg/otlp] Bump to Collector version 0.37 #9398

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

Merged
mx-psi merged 5 commits into from
Oct 15, 2021
Merged

[pkg/otlp] Bump to Collector version 0.37 #9398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19ab28f
Bump to collector v0.37
mx-psi Oct 6, 2021
4cfbd5d
Rename `config_parser.go` to `map_provider.go`
mx-psi Oct 6, 2021
29d4d0e
Bump go.opentelemetry.io/otel/internal/metric module to fix issue
mx-psi Oct 6, 2021
f6b3f7d
Add unit test to check that previous hack is unnecessary
mx-psi Oct 8, 2021
ae1392c
Merge remote-tracking branch 'origin/main' into mx-psi/bump-otel-v0.37
mx-psi Oct 15, 2021
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
30 changes: 24 additions & 6 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,11 @@ core,github.com/shirou/gopsutil/load,BSD-3-Clause,The Go Authors | WAKAYAMA Shir
core,github.com/shirou/gopsutil/mem,BSD-3-Clause,The Go Authors | WAKAYAMA Shirou
core,github.com/shirou/gopsutil/net,BSD-3-Clause,The Go Authors | WAKAYAMA Shirou
core,github.com/shirou/gopsutil/process,BSD-3-Clause,The Go Authors | WAKAYAMA Shirou
core,github.com/shirou/gopsutil/v3/cpu,BSD-3-Clause,The Go Authors | WAKAYAMA Shirou
core,github.com/shirou/gopsutil/v3/internal/common,BSD-3-Clause,The Go Authors | WAKAYAMA Shirou
core,github.com/shirou/gopsutil/v3/mem,BSD-3-Clause,The Go Authors | WAKAYAMA Shirou
core,github.com/shirou/gopsutil/v3/net,BSD-3-Clause,The Go Authors | WAKAYAMA Shirou
core,github.com/shirou/gopsutil/v3/process,BSD-3-Clause,The Go Authors | WAKAYAMA Shirou
core,github.com/shirou/w32,BSD-3-Clause,The w32 Authors
core,github.com/shuLhan/go-bindata,CC0-1.0,The go-bindata authors
core,github.com/shuLhan/go-bindata/cmd/go-bindata,CC0-1.0,The go-bindata authors
Expand Down Expand Up @@ -746,11 +751,9 @@ core,go.opentelemetry.io/collector/component/componenterror,Apache-2.0,Open Tele
core,go.opentelemetry.io/collector/component/componenthelper,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config/configauth,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config/configcheck,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config/configgrpc,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config/confighttp,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config/confignet,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config/configparser,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config/configtelemetry,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config/configtest,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/config/configtls,Apache-2.0,Open Telemetry Maintainers
Expand All @@ -764,10 +767,9 @@ core,go.opentelemetry.io/collector/exporter/exporterhelper,Apache-2.0,Open Telem
core,go.opentelemetry.io/collector/exporter/exporterhelper/internal,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/exporter/otlpexporter,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/extension/ballastextension,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/extension/experimental/storage,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/extension/extensionhelper,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/extension/storage,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/internal/cgroups,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/internal/collector/telemetry,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/internal/iruntime,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/internal/middleware,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/internal/obsreportconfig,Apache-2.0,Open Telemetry Maintainers
Expand Down Expand Up @@ -801,13 +803,14 @@ core,go.opentelemetry.io/collector/receiver/scrapererror,Apache-2.0,Open Telemet
core,go.opentelemetry.io/collector/service,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/internal,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/internal/builder,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/internal/components,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/internal/extensions,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/internal/fanoutconsumer,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/internal/telemetry,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/internal/telemetrylogs,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/internal/zpages,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/internal/zpages/tmplgen,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/parserprovider,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/contrib,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp,Apache-2.0,Open Telemetry Maintainers
Expand All @@ -817,19 +820,34 @@ core,go.opentelemetry.io/otel,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/attribute,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/baggage,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/codes,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/exporters/prometheus,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/internal,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/internal/baggage,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/internal/global,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/internal/metric,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/internal/metric/global,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/internal/metric/registry,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/metric,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/metric/global,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/metric/number,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/metric/registry,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/metric/sdkapi,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/metric/unit,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/propagation,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/export/metric,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/export/metric/aggregation,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/instrumentation,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/internal,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/aggregator,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/aggregator/exact,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/aggregator/histogram,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/aggregator/minmaxsumcount,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/aggregator/sum,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/controller/basic,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/controller/time,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/processor/basic,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/selector/simple,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/resource,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/trace,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/semconv/v1.4.0,Apache-2.0,Open Telemetry Maintainers
Expand Down
10 changes: 6 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ require (
github.com/prometheus/client_golang v1.11.0
github.com/richardartoul/molecule v0.0.0-20210914193524-25d8911bb85b
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
github.com/shirou/gopsutil v3.21.8+incompatible
github.com/shirou/gopsutil v3.21.9+incompatible
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4
github.com/shuLhan/go-bindata v4.0.0+incompatible
github.com/spf13/afero v1.6.0
Expand All @@ -183,8 +183,10 @@ require (
github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f
go.etcd.io/bbolt v1.3.6
go.etcd.io/etcd/client/v2 v2.305.0
go.opentelemetry.io/collector v0.36.0
go.opentelemetry.io/collector/model v0.36.0
go.opentelemetry.io/collector v0.37.0
go.opentelemetry.io/collector/model v0.37.0
// Fix vanity import issue
go.opentelemetry.io/otel/internal/metric v0.24.1-0.20211006140346-3d4ae8d0b75f // indirect
go.uber.org/automaxprocs v1.4.0
go.uber.org/multierr v1.7.0
go.uber.org/zap v1.19.1
Expand All @@ -198,7 +200,7 @@ require (
golang.org/x/tools v0.1.5
gomodules.xyz/jsonpatch/v3 v3.0.1
google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08
google.golang.org/grpc v1.40.0
google.golang.org/grpc v1.41.0
gopkg.in/DataDog/dd-trace-go.v1 v1.33.0
gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0
Expand Down
Loading