Skip to content

Commit

Permalink
Merge branch 'main' into inject-proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
michel-laterman authored Jul 3, 2024
2 parents 38f9463 + a1fc480 commit be43fdf
Show file tree
Hide file tree
Showing 19 changed files with 684 additions and 505 deletions.
308 changes: 201 additions & 107 deletions NOTICE.txt

Large diffs are not rendered by default.

70 changes: 36 additions & 34 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/elastic/go-sysinfo v1.14.0
github.com/elastic/go-ucfg v0.8.8
github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.3.0
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.4.0
github.com/fatih/color v1.16.0
github.com/fsnotify/fsnotify v1.7.0
github.com/gofrs/flock v0.8.1
Expand Down Expand Up @@ -86,21 +86,21 @@ require (
require (
github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.103.1-0.20240701121317-74244e46a6b6
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.104.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.104.0
go.opentelemetry.io/collector/component v0.104.0
go.opentelemetry.io/collector/confmap v0.104.0
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.104.0
Expand All @@ -126,7 +126,7 @@ require (

require (
cloud.google.com/go/compute/metadata v0.3.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 // indirect
github.com/Jeffail/gabs/v2 v2.6.0 // indirect
github.com/Showmax/go-fqdn v1.0.0 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
Expand All @@ -148,22 +148,25 @@ require (
github.com/elastic/go-structform v0.0.10 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elastic/gosigar v0.14.3 // indirect
github.com/elastic/opentelemetry-lib v0.4.0 // indirect
github.com/elastic/opentelemetry-lib v0.5.0 // indirect
github.com/elastic/pkcs8 v1.0.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/expr-lang/expr v1.16.9 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
github.com/gobuffalo/here v0.6.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
Expand Down Expand Up @@ -196,7 +199,6 @@ require (
github.com/knadh/koanf/v2 v2.1.1 // indirect
github.com/leodido/go-syslog/v4 v4.1.0 // indirect
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
github.com/leoluk/perflib_exporter v0.2.1 // indirect
github.com/lestrrat-go/strftime v1.0.6 // indirect
github.com/lightstep/go-expohisto v1.0.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
Expand All @@ -217,25 +219,26 @@ require (
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.104.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.104.0 // indirect
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
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus-community/windows_exporter v0.25.1 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.54.0 // indirect
Expand Down Expand Up @@ -273,7 +276,6 @@ require (
go.opentelemetry.io/collector/consumer v0.104.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect
go.opentelemetry.io/collector/filter v0.104.0 // indirect
go.opentelemetry.io/collector/otelcol/otelcoltest v0.104.0 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/collector/semconv v0.104.0 // indirect
go.opentelemetry.io/collector/service v0.104.0 // indirect
Expand Down
Loading

0 comments on commit be43fdf

Please sign in to comment.