Skip to content

Commit 5d4d625

Browse files
michalpristasmergify[bot]
authored andcommitted
Added k8s components to otel distribution (#4908)
(cherry picked from commit 6b78791) # Conflicts: # NOTICE.txt # go.mod # go.sum # internal/pkg/agent/cmd/common.go # internal/pkg/otel/README.md # internal/pkg/otel/components.go # internal/pkg/otel/run_test.go # internal/pkg/otel/testdata/all-components.yml
1 parent 14936f5 commit 5d4d625

20 files changed

+11686
-5036
lines changed

NOTICE.txt

+10,978-5,021
Large diffs are not rendered by default.

go.mod

+107-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.21.0
55
toolchain go1.21.10
66

77
require (
8-
github.com/Microsoft/go-winio v0.6.1
8+
github.com/Microsoft/go-winio v0.6.2
99
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1
1010
github.com/billgraziano/dpapi v0.4.0
1111
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
@@ -43,13 +43,33 @@ require (
4343
github.com/mitchellh/hashstructure v1.1.0
4444
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
4545
github.com/oklog/ulid v1.3.1
46+
<<<<<<< HEAD
47+
=======
48+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.103.0
49+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.103.0
50+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.103.0
51+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.103.0
52+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.103.0
53+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.103.0
54+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.103.0
55+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.103.0
56+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.103.0
57+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.103.0
58+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.103.0
59+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.103.0
60+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.103.0
61+
>>>>>>> 6b7879127d (Added k8s components to otel distribution (#4908))
4662
github.com/otiai10/copy v1.14.0
4763
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0
4864
github.com/pkg/errors v0.9.1
4965
github.com/rs/zerolog v1.27.0
5066
github.com/sajari/regression v1.0.1
5167
github.com/schollz/progressbar/v3 v3.13.1
68+
<<<<<<< HEAD
5269
github.com/shirou/gopsutil/v3 v3.24.3
70+
=======
71+
github.com/shirou/gopsutil/v3 v3.24.5
72+
>>>>>>> 6b7879127d (Added k8s components to otel distribution (#4908))
5373
github.com/sirupsen/logrus v1.9.3
5474
github.com/spf13/cobra v1.8.0
5575
github.com/spf13/pflag v1.0.5
@@ -154,11 +174,16 @@ require (
154174
github.com/google/gofuzz v1.2.0 // indirect
155175
github.com/google/licenseclassifier v0.0.0-20221004142553-c1ed8fcf4bab // indirect
156176
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
177+
<<<<<<< HEAD
157178
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
179+
=======
180+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
181+
github.com/hashicorp/consul/api v1.29.1 // indirect
182+
>>>>>>> 6b7879127d (Added k8s components to otel distribution (#4908))
158183
github.com/hashicorp/errwrap v1.1.0 // indirect
159184
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
160185
github.com/iancoleman/strcase v0.3.0 // indirect
161-
github.com/imdario/mergo v0.3.13 // indirect
186+
github.com/imdario/mergo v0.3.15 // indirect
162187
github.com/inconshreveable/mousetrap v1.1.0 // indirect
163188
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect
164189
github.com/jaypipes/pcidb v1.0.0 // indirect
@@ -170,6 +195,7 @@ require (
170195
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
171196
github.com/knadh/koanf/v2 v2.1.1 // indirect
172197
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
198+
github.com/leoluk/perflib_exporter v0.2.1 // indirect
173199
github.com/lestrrat-go/strftime v1.0.6 // indirect
174200
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
175201
github.com/mailru/easyjson v0.7.7 // indirect
@@ -187,6 +213,7 @@ require (
187213
github.com/modern-go/reflect2 v1.0.2 // indirect
188214
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
189215
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
216+
<<<<<<< HEAD
190217
github.com/onsi/ginkgo/v2 v2.9.0 // indirect
191218
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.97.0 // indirect
192219
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 // indirect
@@ -195,14 +222,35 @@ require (
195222
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.97.0 // indirect
196223
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.97.0 // indirect
197224
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.97.0 // indirect
225+
=======
226+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
227+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.103.0 // indirect
228+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0 // indirect
229+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0 // indirect
230+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.103.0 // indirect
231+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.103.0 // indirect
232+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.103.0 // indirect
233+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.103.0 // indirect
234+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.103.0 // indirect
235+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.103.0 // indirect
236+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.103.0 // indirect
237+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.103.0 // indirect
238+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.103.0 // indirect
239+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.103.0 // indirect
240+
>>>>>>> 6b7879127d (Added k8s components to otel distribution (#4908))
198241
github.com/opencontainers/go-digest v1.0.0 // indirect
199242
github.com/opencontainers/image-spec v1.1.0 // indirect
200243
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
201244
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
202245
github.com/prometheus/client_golang v1.19.0 // indirect
203246
github.com/prometheus/client_model v0.6.1 // indirect
247+
<<<<<<< HEAD
204248
github.com/prometheus/common v0.48.0 // indirect
205249
github.com/prometheus/procfs v0.12.0 // indirect
250+
=======
251+
github.com/prometheus/common v0.54.0 // indirect
252+
github.com/prometheus/procfs v0.15.1 // indirect
253+
>>>>>>> 6b7879127d (Added k8s components to otel distribution (#4908))
206254
github.com/rivo/uniseg v0.4.4 // indirect
207255
github.com/rs/cors v1.10.1 // indirect
208256
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
@@ -216,6 +264,7 @@ require (
216264
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
217265
github.com/yusufpapurcu/wmi v1.2.4 // indirect
218266
go.elastic.co/apm/module/apmhttp v1.15.0 // indirect
267+
<<<<<<< HEAD
219268
go.elastic.co/apm/module/apmhttp/v2 v2.0.0 // indirect
220269
go.elastic.co/apm/v2 v2.0.0 // indirect
221270
go.elastic.co/fastjson v1.1.0 // indirect
@@ -257,6 +306,51 @@ require (
257306
go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect
258307
go.opentelemetry.io/otel/trace v1.25.0 // indirect
259308
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
309+
=======
310+
go.elastic.co/apm/module/apmhttp/v2 v2.6.0 // indirect
311+
go.elastic.co/apm/module/apmzap/v2 v2.6.0 // indirect
312+
go.elastic.co/apm/v2 v2.6.0 // indirect
313+
go.elastic.co/fastjson v1.3.0 // indirect
314+
go.etcd.io/bbolt v1.3.10 // indirect
315+
go.opencensus.io v0.24.0 // indirect
316+
go.opentelemetry.io/collector v0.103.0 // indirect
317+
go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect
318+
go.opentelemetry.io/collector/config/configcompression v1.10.0 // indirect
319+
go.opentelemetry.io/collector/config/configgrpc v0.103.0 // indirect
320+
go.opentelemetry.io/collector/config/confighttp v0.103.0 // indirect
321+
go.opentelemetry.io/collector/config/confignet v0.103.0 // indirect
322+
go.opentelemetry.io/collector/config/configopaque v1.10.0 // indirect
323+
go.opentelemetry.io/collector/config/configretry v0.103.0 // indirect
324+
go.opentelemetry.io/collector/config/configtelemetry v0.103.0 // indirect
325+
go.opentelemetry.io/collector/config/configtls v0.103.0 // indirect
326+
go.opentelemetry.io/collector/config/internal v0.103.0 // indirect
327+
go.opentelemetry.io/collector/connector v0.103.0 // indirect
328+
go.opentelemetry.io/collector/consumer v0.103.0 // indirect
329+
go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect
330+
go.opentelemetry.io/collector/filter v0.103.0 // indirect
331+
go.opentelemetry.io/collector/pdata v1.10.0 // indirect
332+
go.opentelemetry.io/collector/semconv v0.103.0 // indirect
333+
go.opentelemetry.io/collector/service v0.103.0 // indirect
334+
go.opentelemetry.io/contrib/config v0.7.0 // indirect
335+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
336+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
337+
go.opentelemetry.io/contrib/propagators/b3 v1.27.0 // indirect
338+
go.opentelemetry.io/otel v1.27.0 // indirect
339+
go.opentelemetry.io/otel/bridge/opencensus v1.27.0 // indirect
340+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
341+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect
342+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
343+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
344+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
345+
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
346+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect
347+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect
348+
go.opentelemetry.io/otel/metric v1.27.0 // indirect
349+
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
350+
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
351+
go.opentelemetry.io/otel/trace v1.27.0 // indirect
352+
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
353+
>>>>>>> 6b7879127d (Added k8s components to otel distribution (#4908))
260354
go.uber.org/multierr v1.11.0 // indirect
261355
golang.org/x/mod v0.17.0 // indirect
262356
golang.org/x/net v0.24.0 // indirect
@@ -268,17 +362,28 @@ require (
268362
google.golang.org/grpc/examples v0.0.0-20220304170021-431ea809a767 // indirect
269363
gopkg.in/inf.v0 v0.9.1 // indirect
270364
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
365+
<<<<<<< HEAD
271366
howett.net/plist v1.0.0 // indirect
272367
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
368+
=======
369+
howett.net/plist v1.0.1 // indirect
370+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
371+
k8s.io/kubelet v0.29.3 // indirect
372+
>>>>>>> 6b7879127d (Added k8s components to otel distribution (#4908))
273373
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
274374
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
275375
sigs.k8s.io/yaml v1.3.0 // indirect
276376
)
277377

278378
require (
379+
<<<<<<< HEAD
279380
github.com/hashicorp/go-version v1.6.0 // indirect
280381
github.com/json-iterator/go v1.1.12 // indirect
281382
github.com/onsi/gomega v1.27.3 // indirect
383+
=======
384+
github.com/hashicorp/go-version v1.7.0 // indirect
385+
github.com/json-iterator/go v1.1.12 // indirect; indirecthttps://github.com/elastic/ingest-dev/issues/3253
386+
>>>>>>> 6b7879127d (Added k8s components to otel distribution (#4908))
282387
go.elastic.co/apm v1.15.0
283388
go.elastic.co/apm/module/apmgrpc v1.15.0
284389
k8s.io/klog/v2 v2.80.1 // indirect

0 commit comments

Comments
 (0)