Skip to content

Commit

Permalink
Merge branch 'main' into msg/make-components-testable
Browse files Browse the repository at this point in the history
  • Loading branch information
MovieStoreGuy committed Dec 22, 2021
2 parents c51624c + bc72335 commit 1ace367
Show file tree
Hide file tree
Showing 348 changed files with 25,899 additions and 8,127 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ extension/httpforwarder/ @open-telemetry/collector-c
extension/oauth2clientauthextension/ @open-telemetry/collector-contrib-approvers @jpkrohling @pavankrish123
extension/observer/ @open-telemetry/collector-contrib-approvers @asuresh4 @jrcamp
extension/observer/ecstaskobserver/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick
extension/observer/k8sobserver/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick @dmitryax
extension/oidcauthextension/ @open-telemetry/collector-contrib-approvers @jpkrohling

internal/aws/ @open-telemetry/collector-contrib-approvers @anuraaga @mxiamxia
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,21 @@
## 💡 Enhancements 💡

- `prometheusremotewriteexporter`: Handling Staleness flag from OTLP (#6679)
- `mysqlreceiver`: Add Integration test (#6916)
- `datadogexporter`: Add compatibility with ECS Fargate semantic conventions (#6670)
- `k8s_observer`: discover k8s.node endpoints (#6820)

## 🛑 Breaking changes 🛑

- `memcachedreceiver`: Update metric names (#6594)
- `memcachedreceiver`: Fix some metric units and value types (#6895)
- `sapm` receiver: Use Jaeger status values instead of OpenCensus (#6682)
- `jaeger` receiver/exporter: Parse/set Jaeger status with OTel spec values (#6682)

## 🚀 New components 🚀

- `ecs_task_observer`: Discover running containers in AWS ECS tasks (#6894)

## 🧰 Bug fixes 🧰

## 💡 Enhancements 💡
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ INTEGRATION_TEST_MODULES := \
receiver/kafkametricsreceiver \
receiver/nginxreceiver \
receiver/memcachedreceiver \
receiver/mysqlreceiver \
internal/common \
extension/observer/dockerobserver

Expand Down
30 changes: 18 additions & 12 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.41.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.41.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.41.1-0.20211210184707-4dcb3388a168
go.opentelemetry.io/collector/model v0.41.1-0.20211210184707-4dcb3388a168
go.opentelemetry.io/collector v0.41.1-0.20211221183212-22c010d4446c
go.opentelemetry.io/collector/model v0.41.1-0.20211220220048-babb2d26d6a9
golang.org/x/mod v0.5.1
)

Expand Down Expand Up @@ -46,7 +46,7 @@ require (
github.com/aliyun/aliyun-log-go-sdk v0.1.27 // indirect
github.com/antonmedv/expr v1.9.0 // indirect
github.com/apache/thrift v0.15.0 // indirect
github.com/armon/go-metrics v0.3.9 // indirect
github.com/armon/go-metrics v0.3.10 // indirect
github.com/avast/retry-go v3.0.0+incompatible // indirect
github.com/aws/aws-sdk-go v1.42.23 // indirect
github.com/beeker1121/goque v2.1.0+incompatible // indirect
Expand All @@ -63,7 +63,7 @@ require (
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/cilium/ebpf v0.6.2 // indirect
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
github.com/containerd/console v1.0.2 // indirect
github.com/containerd/containerd v1.5.8 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
Expand All @@ -82,13 +82,13 @@ require (
github.com/eapache/go-resiliency v1.2.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021 // indirect
github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
github.com/envoyproxy/go-control-plane v0.10.1 // indirect
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
github.com/facebookgo/muster v0.0.0-20150708232844-fd3d7953fd52 // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
Expand Down Expand Up @@ -122,7 +122,7 @@ require (
github.com/gorilla/mux v1.8.0 // indirect
github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/hashicorp/consul/api v1.10.1 // indirect
github.com/hashicorp/consul/api v1.11.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.0.0 // indirect
Expand All @@ -132,7 +132,7 @@ require (
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/serf v0.9.5 // indirect
github.com/hashicorp/serf v0.9.6 // indirect
github.com/hetznercloud/hcloud-go v1.26.2 // indirect
github.com/honeycombio/libhoney-go v1.15.6 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
Expand Down Expand Up @@ -162,7 +162,7 @@ require (
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/microsoft/ApplicationInsights-Go v0.4.4 // indirect
Expand Down Expand Up @@ -209,6 +209,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/newrelicexporter v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.41.0 // indirect
Expand All @@ -229,6 +230,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.41.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.41.0 // indirect
Expand Down Expand Up @@ -352,7 +354,7 @@ require (
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.9.0 // indirect
github.com/spf13/viper v1.10.0 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
Expand Down Expand Up @@ -412,7 +414,7 @@ require (
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.63.2 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down Expand Up @@ -513,6 +515,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokie

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter => ../../exporter/opencensusexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter => ../../exporter/parquetexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter => ../../exporter/prometheusexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter
Expand Down Expand Up @@ -553,6 +557,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/oaut

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer => ../../extension/observer

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver => ../../extension/observer/ecstaskobserver

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver => ../../extension/observer/hostobserver

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver => ../../extension/observer/k8sobserver
Expand Down
Loading

0 comments on commit 1ace367

Please sign in to comment.