Skip to content

Commit

Permalink
[pkg/otlp] Bump OpenTelemetry Collector to v0.47.0 (#11154)
Browse files Browse the repository at this point in the history 
* Bump OpenTelemetry Collector to v0.45.0

* Bump OpenTelemetry Collector to v0.46.0

* Add release note

* Set compression to 'none' on the otlp exporter

* Update licenses

* Bump to version v0.47.0

* Bump pkg/resourcetotelemetry to v0.47.0

* `inv -e generate-licenses`
  • Loading branch information
@mx-psi
mx-psi authored Mar 21, 2022
1 parent 5aa7301 commit 4b834d0
Show file tree
Hide file tree
Showing 14 changed files with 114 additions and 86 deletions.
12 changes: 4 additions & 8 deletions LICENSE-3rdparty.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,6 @@ core,go.opencensus.io/trace/tracestate,Apache-2.0,OpenCensus Authors
core,go.opentelemetry.io/collector/client,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/component,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/component/componenterror,Apache-2.0,Open Telemetry Maintainers
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/configcompression,Apache-2.0,Open Telemetry Maintainers
Expand All @@ -781,16 +780,13 @@ core,go.opentelemetry.io/collector/config/configunmarshaler,Apache-2.0,Open Tele
core,go.opentelemetry.io/collector/config/experimental/configsource,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/consumer,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/consumer/consumererror,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/consumer/consumerhelper,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/consumer/consumertest,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/exporter/exporterhelper,Apache-2.0,Open Telemetry Maintainers
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/internal/cgroups,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/internal/internalinterface,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 All @@ -808,19 +804,18 @@ core,go.opentelemetry.io/collector/model/internal/data/protogen/logs/v1,Apache-2
core,go.opentelemetry.io/collector/model/internal/data/protogen/metrics/v1,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/model/internal/data/protogen/resource/v1,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/model/internal/data/protogen/trace/v1,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/model/internal/pdata,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/model/otlp,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/model/otlpgrpc,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/model/pdata,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/model/semconv/v1.5.0,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/model/semconv/v1.6.1,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/obsreport,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/processor/batchprocessor,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/processor/processorhelper,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/receiver/otlpreceiver,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/receiver/otlpreceiver/internal/logs,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/receiver/otlpreceiver/internal/metrics,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/receiver/otlpreceiver/internal/trace,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/receiver/receiverhelper,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/receiver/scrapererror,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/collector/service/featuregate,Apache-2.0,Open Telemetry Maintainers
Expand Down Expand Up @@ -854,17 +849,18 @@ core,go.opentelemetry.io/otel/metric/number,Apache-2.0,Open Telemetry Maintainer
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/internal/env,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/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/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/export,Apache-2.0,Open Telemetry Maintainers
core,go.opentelemetry.io/otel/sdk/metric/export/aggregation,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
Expand Down
54 changes: 29 additions & 25 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.6
github.com/google/go-cmp v0.5.7
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/gopacket v1.1.19
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1
Expand Down Expand Up @@ -153,7 +153,7 @@ require (
github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb
github.com/olekukonko/tablewriter v0.0.5
github.com/open-policy-agent/opa v0.37.2
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.44.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
github.com/openshift/api v0.0.0-20190924102528-32369d4db2ad
github.com/patrickmn/go-cache v2.1.0+incompatible
Expand All @@ -166,7 +166,7 @@ require (
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4
github.com/skydive-project/go-debouncer v1.0.0
github.com/spf13/afero v1.6.0
github.com/spf13/cobra v1.3.0
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
Expand All @@ -180,11 +180,11 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0
go.etcd.io/bbolt v1.3.6
go.etcd.io/etcd/client/v2 v2.305.1
go.opentelemetry.io/collector v0.44.0
go.opentelemetry.io/collector/model v0.44.0
go.opentelemetry.io/collector v0.47.0
go.opentelemetry.io/collector/model v0.47.0
go.uber.org/automaxprocs v1.4.0
go.uber.org/multierr v1.7.0
go.uber.org/zap v1.20.0
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.21.0
go4.org/intern v0.0.0-20210108033219-3eb7198706b2
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f
Expand All @@ -196,7 +196,7 @@ require (
golang.org/x/tools v0.1.10
gomodules.xyz/jsonpatch/v3 v3.0.1
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
google.golang.org/grpc v1.44.0
google.golang.org/grpc v1.45.0
gopkg.in/DataDog/dd-trace-go.v1 v1.34.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
Expand Down Expand Up @@ -276,7 +276,7 @@ require (
github.com/go-kit/log v0.1.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/go-logr/logr v1.2.2 // indirect
github.com/go-logr/stdr v1.2.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.6 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
Expand Down Expand Up @@ -308,12 +308,12 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/kjk/lzma v0.0.0-20161016003348-3fd93898850d // indirect
github.com/klauspost/compress v1.14.2 // indirect
github.com/klauspost/compress v1.15.1 // indirect
github.com/klauspost/pgzip v1.2.5 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/lib/pq v1.10.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
Expand Down Expand Up @@ -354,7 +354,7 @@ require (
github.com/rs/cors v1.8.2 // indirect
github.com/sassoftware/go-rpmutils v0.2.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.3.0 // indirect
github.com/shirou/gopsutil/v3 v3.21.12 // indirect
github.com/shirou/gopsutil/v3 v3.22.2 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/smira/go-ftp-protocol v0.0.0-20140829150050-066b75c2b70d // indirect
github.com/smira/go-xz v0.0.0-20150414201226-0c531f070014 // indirect
Expand All @@ -380,17 +380,16 @@ require (
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0 // indirect
go.opentelemetry.io/contrib/zpages v0.28.0 // indirect
go.opentelemetry.io/otel v1.3.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.26.0 // indirect
go.opentelemetry.io/otel/internal/metric v0.26.0 // indirect
go.opentelemetry.io/otel/metric v0.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.26.0 // indirect
go.opentelemetry.io/otel/trace v1.3.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
go.opentelemetry.io/contrib/zpages v0.29.0 // indirect
go.opentelemetry.io/otel v1.4.1 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.27.0 // indirect
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
go.opentelemetry.io/otel/metric v0.27.0 // indirect
go.opentelemetry.io/otel/sdk v1.4.1 // indirect
go.opentelemetry.io/otel/sdk/metric v0.27.0 // indirect
go.opentelemetry.io/otel/trace v1.4.1 // indirect
go.uber.org/atomic v1.9.0 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222175341-b30ae309168e // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
Expand All @@ -400,8 +399,6 @@ require (
gomodules.xyz/orderedmap v0.1.0 // indirect
google.golang.org/api v0.62.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
// See internal/patch/grpc-go-insecure/README.md for more details.
google.golang.org/grpc/credentials/insecure v0.0.0 // indirect
google.golang.org/protobuf v1.27.1
gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand All @@ -414,6 +411,13 @@ require (
sigs.k8s.io/yaml v1.2.0 // indirect
)

require (
// See internal/patch/logr/funcr/README.md for more details.
github.com/go-logr/logr/funcr v0.0.0 // indirect
// See internal/patch/grpc-go-insecure/README.md for more details.
google.golang.org/grpc/credentials/insecure v0.0.0 // indirect
)

// Fixing a CVE on a transitive dep of k8s/etcd, should be cleaned-up once k8s.io/apiserver dep is removed (but double-check with `go mod why` that no other dep pulls it)
replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt v3.2.1+incompatible

Expand Down
Loading

0 comments on commit 4b834d0

Please sign in to comment.