Skip to content

Commit e63611c

Browse files
authored
[8.14](backport #4811) Add Resource Detection processor to OTel mode (#4979)
1 parent c7a9d27 commit e63611c

File tree

9 files changed

+9806
-3764
lines changed

9 files changed

+9806
-3764
lines changed

NOTICE.txt

+9,587-3,733
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: feature
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Makes the `resourcedetection` processor available to users running Elastic Agent in `otel` mode.
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
#pr: https://github.com/owner/repo/1234
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

dev-tools/notice/overrides.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@
1616
{"name": "kernel.org/pub/linux/libs/security/libcap/cap", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
1717
{"name": "kernel.org/pub/linux/libs/security/libcap/psx", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
1818
{"name": "github.com/awslabs/kinesis-aggregation/go", "licenceType": "Apache-2.0", "url": "https://github.com/awslabs/kinesis-aggregation/blob/master/LICENSE.txt"}
19+
{"name": "github.com/pascaldekloe/goe", "licenceFile": "LICENSE", "licenceType": "CC0-1.0"}

dev-tools/notice/rules.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"BSD-2-Clause",
66
"BSD-2-Clause-FreeBSD",
77
"BSD-3-Clause",
8+
"CC0-1.0",
89
"Elastic",
910
"ISC",
1011
"MIT",

go.mod

+34-19
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/elastic/go-licenser v0.4.1
2424
github.com/elastic/go-sysinfo v1.14.0
2525
github.com/elastic/go-ucfg v0.8.8
26-
github.com/fatih/color v1.15.0
26+
github.com/fatih/color v1.16.0
2727
github.com/fsnotify/fsnotify v1.7.0
2828
github.com/gofrs/flock v0.8.1
2929
github.com/gofrs/uuid v4.4.0+incompatible
@@ -43,7 +43,15 @@ 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-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.100.0
46+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.102.0
47+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.102.0
48+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.102.0
49+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.102.0
50+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.102.0
51+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.102.0
52+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.102.0
53+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0
54+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.102.0
4755
github.com/otiai10/copy v1.14.0
4856
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0
4957
github.com/pkg/errors v0.9.1
@@ -60,6 +68,11 @@ require (
6068
go.elastic.co/apm/module/apmgorilla v1.15.0
6169
go.elastic.co/ecszap v1.0.1
6270
go.elastic.co/go-licence-detector v0.5.0
71+
go.opentelemetry.io/collector/exporter/debugexporter v0.102.1
72+
go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1
73+
go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1
74+
go.opentelemetry.io/collector/processor/batchprocessor v0.102.1
75+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1
6376
go.uber.org/zap v1.27.0
6477
golang.org/x/crypto v0.23.0
6578
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
@@ -85,14 +98,8 @@ require (
8598
)
8699

87100
require (
88-
// open telemetry dependencies
89-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.102.0
90-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.102.0
91-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.102.0
92-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.102.0
93-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.102.0
94-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0
95-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.102.0
101+
github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect
102+
github.com/distribution/reference v0.5.0 // indirect
96103
go.opentelemetry.io/collector/component v0.102.1
97104
go.opentelemetry.io/collector/confmap v0.102.1
98105
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1
@@ -102,31 +109,29 @@ require (
102109
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1
103110
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1
104111
go.opentelemetry.io/collector/exporter v0.102.1
105-
go.opentelemetry.io/collector/exporter/debugexporter v0.102.1
106-
go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1
107112
go.opentelemetry.io/collector/extension v0.102.1
108-
go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1
109113
go.opentelemetry.io/collector/featuregate v1.9.0
110114
go.opentelemetry.io/collector/otelcol v0.102.1
111115
go.opentelemetry.io/collector/processor v0.102.1
112-
go.opentelemetry.io/collector/processor/batchprocessor v0.102.1
113116
go.opentelemetry.io/collector/receiver v0.102.1
114-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1
115117
)
116118

117119
require (
120+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
121+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.23.0 // indirect
118122
github.com/Jeffail/gabs/v2 v2.6.0 // indirect
123+
github.com/Showmax/go-fqdn v1.0.0 // indirect
119124
github.com/StackExchange/wmi v1.2.1 // indirect
120125
github.com/akavel/rsrc v0.8.0 // indirect
121126
github.com/alecthomas/participle/v2 v2.1.1 // indirect
127+
github.com/armon/go-metrics v0.4.1 // indirect
122128
github.com/armon/go-radix v1.0.0 // indirect
129+
github.com/aws/aws-sdk-go v1.53.11 // indirect
123130
github.com/beorn7/perks v1.0.1 // indirect
124131
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
125-
github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect
126132
github.com/cespare/xxhash/v2 v2.3.0 // indirect
127133
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
128134
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
129-
github.com/distribution/reference v0.5.0 // indirect
130135
github.com/dnephin/pflag v1.0.7 // indirect
131136
github.com/docker/docker v25.0.5+incompatible // indirect
132137
github.com/docker/go-connections v0.5.0 // indirect
@@ -159,13 +164,21 @@ require (
159164
github.com/google/licenseclassifier v0.0.0-20221004142553-c1ed8fcf4bab // indirect
160165
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
161166
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
167+
github.com/hashicorp/consul/api v1.28.3 // indirect
162168
github.com/hashicorp/errwrap v1.1.0 // indirect
169+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
170+
github.com/hashicorp/go-hclog v1.5.0 // indirect
171+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
172+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
173+
github.com/hashicorp/golang-lru v1.0.2 // indirect
163174
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
175+
github.com/hashicorp/serf v0.10.1 // indirect
164176
github.com/iancoleman/strcase v0.3.0 // indirect
165177
github.com/imdario/mergo v0.3.13 // indirect
166178
github.com/inconshreveable/mousetrap v1.1.0 // indirect
167179
github.com/jaypipes/pcidb v1.0.0 // indirect
168180
github.com/jcchavezs/porto v0.1.0 // indirect
181+
github.com/jmespath/go-jmespath v0.4.0 // indirect
169182
github.com/josharian/intern v1.0.0 // indirect
170183
github.com/karrick/godirwalk v1.16.1 // indirect
171184
github.com/klauspost/compress v1.17.8 // indirect
@@ -179,7 +192,7 @@ require (
179192
github.com/mailru/easyjson v0.7.7 // indirect
180193
github.com/markbates/pkger v0.17.0 // indirect
181194
github.com/mattn/go-colorable v0.1.13 // indirect
182-
github.com/mattn/go-isatty v0.0.17 // indirect
195+
github.com/mattn/go-isatty v0.0.20 // indirect
183196
github.com/mattn/go-runewidth v0.0.15 // indirect
184197
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
185198
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -192,10 +205,12 @@ require (
192205
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
193206
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
194207
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
208+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.102.0 // indirect
195209
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.102.0 // indirect
196210
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.102.0 // indirect
197211
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.102.0 // indirect
198-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.100.0 // indirect
212+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.102.0 // indirect
213+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.102.0 // indirect
199214
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.102.0 // indirect
200215
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.102.0 // indirect
201216
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.102.0 // indirect

0 commit comments

Comments
 (0)