Skip to content

Commit

Permalink
Add components for supporting APM functions (#5713)
Browse files Browse the repository at this point in the history 
(cherry picked from commit f560826)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
  • Loading branch information
@lahsivjar @mergify
lahsivjar authored and mergify[bot] committed Oct 11, 2024
1 parent e151978 commit b60d317
Show file tree
Hide file tree
Showing 6 changed files with 6,323 additions and 3,816 deletions.
9,884 changes: 6,070 additions & 3,814 deletions NOTICE.txt
View file

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ require (
github.com/elastic/go-sysinfo v1.14.2
github.com/elastic/go-ucfg v0.8.8
github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015
github.com/elastic/opentelemetry-collector-components/connector/signaltometricsconnector v0.1.0
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.12.0
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.2.0
github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.2.0
github.com/fatih/color v1.17.0
github.com/fsnotify/fsnotify v1.7.0
github.com/go-viper/mapstructure/v2 v2.1.0
Expand Down Expand Up @@ -140,6 +143,7 @@ require (
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
github.com/DataDog/zstd v1.4.5 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
Expand All @@ -161,7 +165,17 @@ require (
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
<<<<<<< HEAD
github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b // indirect
=======
github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20 // indirect
github.com/cockroachdb/errors v1.11.3 // indirect
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v1.1.2 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
>>>>>>> f560826112 (Add components for supporting APM functions (#5713))
github.com/containerd/containerd v1.7.18 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
Expand All @@ -183,7 +197,11 @@ require (
github.com/elastic/go-windows v1.0.2 // indirect
github.com/elastic/gosigar v0.14.3 // indirect
github.com/elastic/lunes v0.1.0 // indirect
<<<<<<< HEAD
github.com/elastic/opentelemetry-lib v0.9.0 // indirect
=======
github.com/elastic/opentelemetry-lib v0.11.0 // indirect
>>>>>>> f560826112 (Add components for supporting APM functions (#5713))
github.com/elastic/pkcs8 v1.0.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/envoyproxy/go-control-plane v0.12.1-0.20240621013728-1eb8caab5155 // indirect
Expand All @@ -194,6 +212,7 @@ require (
github.com/expr-lang/expr v1.16.9 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/getsentry/sentry-go v0.27.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
Expand Down Expand Up @@ -265,6 +284,8 @@ require (
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/v2 v2.1.1 // indirect
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
Expand Down Expand Up @@ -303,6 +324,7 @@ require (
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/onsi/ginkgo/v2 v2.20.0 // indirect
github.com/onsi/gomega v1.34.1 // indirect
<<<<<<< HEAD
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.110.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.110.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.110.0 // indirect
Expand All @@ -319,6 +341,25 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.110.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.110.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.110.0 // indirect
=======
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.111.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.111.0 // indirect
>>>>>>> f560826112 (Add components for supporting APM functions (#5713))
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/openshift/api v3.9.0+incompatible // indirect
Expand All @@ -339,6 +380,7 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/prometheus v0.54.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/rubenv/sql-migrate v1.5.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand Down
Loading

0 comments on commit b60d317

Please sign in to comment.