Skip to content

Commit

Permalink
Merge branch 'main' into chore/replicated-merge-tree
Browse files Browse the repository at this point in the history
  • Loading branch information
prashant-shahi committed Mar 13, 2024
2 parents 2358078 + 125f938 commit e34a78b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 2 additions & 0 deletions components/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver"
Expand Down Expand Up @@ -161,6 +162,7 @@ func Components() (otelcol.Factories, error) {
carbonreceiver.NewFactory(),
collectdreceiver.NewFactory(),
couchdbreceiver.NewFactory(),
datadogreceiver.NewFactory(),
dockerstatsreceiver.NewFactory(),
dotnetdiagnosticsreceiver.NewFactory(),
elasticsearchreceiver.NewFactory(),
Expand Down
8 changes: 5 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ require (
github.com/gorilla/websocket v1.5.0
github.com/hashicorp/golang-lru v1.0.2
github.com/knadh/koanf v1.5.0
github.com/lightstep/go-expohisto v1.0.0
github.com/oklog/ulid v1.3.1
github.com/open-telemetry/opamp-go v0.5.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter v0.88.0
Expand Down Expand Up @@ -48,6 +49,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.88.0
Expand Down Expand Up @@ -85,6 +87,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.88.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.76.3
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.88.0
Expand Down Expand Up @@ -200,6 +203,7 @@ require (
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.48.0 // indirect
github.com/DataDog/zstd v1.5.0 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.20.0 // indirect
Expand Down Expand Up @@ -305,7 +309,6 @@ require (
github.com/knadh/koanf/v2 v2.0.1 // indirect
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lightstep/go-expohisto v1.0.0 // indirect
github.com/linkedin/goavro/v2 v2.9.8 // indirect
github.com/linode/linodego v1.19.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand Down Expand Up @@ -342,7 +345,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.88.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.88.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.88.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.88.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.88.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.88.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.88.0 // indirect
Expand Down Expand Up @@ -431,7 +433,7 @@ require (
require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/andybalholm/brotli v1.0.6 // indirect
github.com/antonmedv/expr v1.15.3 // indirect
github.com/antonmedv/expr v1.15.3
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand Down
8 changes: 8 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0=
github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
github.com/DataDog/datadog-agent/pkg/proto v0.48.0 h1:Ga1doqJG07YG3uA/tcEy13m6OHvfcKaCkMQjafWsAxI=
github.com/DataDog/datadog-agent/pkg/proto v0.48.0/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo=
github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
Expand Down Expand Up @@ -1164,6 +1166,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdrecei
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.88.0/go.mod h1:60Bk4I2BzQc3t/8MRsp5mNljrXaVDesitNxtu8qGMjg=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.88.0 h1:YLHDRVYdAxKkIO4odgEQzdGedKwVFkgLwi7mkQeuN3Q=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.88.0/go.mod h1:uqXweGZrRt4OOoCryUpZmBhp2s1VvxaceWH+53UmIa4=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.88.0 h1:ZhnqUPOnp7BMFdfaOEc504XKTKP4RbVlnsD62DSBf4U=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.88.0/go.mod h1:++zCfUMqGaftwBybkunbJwi5k0m1A/mlSGTxfmZHDj4=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.88.0 h1:nZ6htzzlFFMnq0y0COHPNJIVdvbo4FxlR+OxxgYzQUE=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.88.0/go.mod h1:D9KcaUxtdtwj/hvnDD64jfILiB20iplYDkDIG+zbOvs=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.76.3 h1:JYTKZjJUAFYUT9quw3ANNMZz5c8LXvJ+AxHFZPv2RWU=
Expand Down Expand Up @@ -1495,6 +1499,10 @@ github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:tw
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns=
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U=
github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs=
github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI=
github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
Expand Down

0 comments on commit e34a78b

Please sign in to comment.