Skip to content

Commit 6249ae8

Browse files
authored
resourcedetectionprocessor: use opentelemetry-go for host id detection (open-telemetry#18740)
* resourcedetectionprocessor: use gopsutil for host id detection Signed-off-by: Dominik Rosiek <[email protected]> * feat: use opentelemetry sdk Signed-off-by: Dominik Rosiek <[email protected]> --------- Signed-off-by: Dominik Rosiek <[email protected]>
1 parent 820510e commit 6249ae8

File tree

16 files changed

+71
-30
lines changed

16 files changed

+71
-30
lines changed

.chloggen/drosiek-host-id-2.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
5+
component: resourcedetectionprocessor
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: "use opentelemetry-go library for `host.id` detection in the `system` detector"
9+
10+
# One or more tracking issues related to the change
11+
issues: [18533]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

cmd/configschema/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ require (
199199
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.79.0 // indirect
200200
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.79.0 // indirect
201201
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.79.0 // indirect
202-
github.com/panta/machineid v1.0.2 // indirect
203202
github.com/samber/lo v1.37.0 // indirect
204203
github.com/shoenig/go-m1cpu v0.1.6 // indirect
205204
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 // indirect

cmd/configschema/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,6 @@ require (
539539
github.com/openzipkin/zipkin-go v0.4.1 // indirect
540540
github.com/outcaste-io/ristretto v0.2.1 // indirect
541541
github.com/ovh/go-ovh v1.3.0 // indirect
542-
github.com/panta/machineid v1.0.2 // indirect
543542
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
544543
github.com/paulmach/orb v0.9.0 // indirect
545544
github.com/pelletier/go-toml v1.9.5 // indirect

cmd/otelcontribcol/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/datadogexporter/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ require (
139139
github.com/openshift/api v3.9.0+incompatible // indirect
140140
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
141141
github.com/outcaste-io/ristretto v0.2.1 // indirect
142-
github.com/panta/machineid v1.0.2 // indirect
143142
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
144143
github.com/philhofer/fwd v1.1.2 // indirect
145144
github.com/pkg/errors v0.9.1 // indirect

exporter/datadogexporter/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,6 @@ require (
523523
github.com/openzipkin/zipkin-go v0.4.1 // indirect
524524
github.com/outcaste-io/ristretto v0.2.1 // indirect
525525
github.com/ovh/go-ovh v1.3.0 // indirect
526-
github.com/panta/machineid v1.0.2 // indirect
527526
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
528527
github.com/paulmach/orb v0.9.0 // indirect
529528
github.com/philhofer/fwd v1.1.2 // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/metadataproviders/go.mod

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ require (
77
github.com/aws/aws-sdk-go v1.44.277
88
github.com/docker/docker v24.0.2+incompatible
99
github.com/hashicorp/consul/api v1.21.0
10-
github.com/panta/machineid v1.0.2
1110
github.com/stretchr/testify v1.8.4
11+
go.opentelemetry.io/collector/semconv v0.79.0
12+
go.opentelemetry.io/otel/sdk v1.16.0
1213
)
1314

1415
require (
@@ -19,6 +20,8 @@ require (
1920
github.com/docker/go-connections v0.4.0 // indirect
2021
github.com/docker/go-units v0.4.0 // indirect
2122
github.com/fatih/color v1.13.0 // indirect
23+
github.com/go-logr/logr v1.2.4 // indirect
24+
github.com/go-logr/stdr v1.2.2 // indirect
2225
github.com/gogo/protobuf v1.3.2 // indirect
2326
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
2427
github.com/hashicorp/go-hclog v1.5.0 // indirect
@@ -38,6 +41,9 @@ require (
3841
github.com/pkg/errors v0.9.1 // indirect
3942
github.com/pmezard/go-difflib v1.0.0 // indirect
4043
github.com/stretchr/objx v0.5.0 // indirect
44+
go.opentelemetry.io/otel v1.16.0 // indirect
45+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
46+
go.opentelemetry.io/otel/trace v1.16.0 // indirect
4147
golang.org/x/net v0.10.0 // indirect
4248
golang.org/x/sys v0.8.0 // indirect
4349
golang.org/x/time v0.3.0 // indirect

0 commit comments

Comments
 (0)