Skip to content

Commit

Permalink
[receiver/hostmetrics] update scope name for consistency (#34526)
Browse files Browse the repository at this point in the history
Update the scope name for telemetry produced by the hostmetrics
receiver's scrapers from `otelcol/hostmetricsreceiver/*` to
`github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/*`

Part of
open-telemetry/opentelemetry-collector#9494

---------

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
codeboten authored Aug 8, 2024
1 parent 56080d5 commit a809974
Show file tree
Hide file tree
Showing 25 changed files with 47 additions and 29 deletions.
27 changes: 27 additions & 0 deletions .chloggen/codeboten_update-scope-hostmetrics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: hostmetricsreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Update the scope name for telemetry produced by the hostmetrics receiver's scrapers from `otelcol/hostmetricsreceiver/*` to `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/*`"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [34526]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
2 changes: 1 addition & 1 deletion exporter/elasticsearchexporter/testdata/metrics-cpu.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"scopeMetrics": [
{
"scope": {
"name": "otelcol/hostmetricsreceiver/cpu",
"name": "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper",
"version": "0.102.0-dev"
},
"metrics": [
Expand Down
10 changes: 5 additions & 5 deletions exporter/signalfxexporter/testdata/hostmetrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ resourceMetrics:
name: system.cpu.load_average.5m
unit: "1"
scope:
name: otelcol/hostmetricsreceiver/load
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/loadscraper
version: v0.55.0-341-gf787ff695
- resource: {}
schemaUrl: https://opentelemetry.io/schemas/1.9.0
Expand Down Expand Up @@ -62,7 +62,7 @@ resourceMetrics:
timeUnixNano: "1660943983792184000"
unit: By
scope:
name: otelcol/hostmetricsreceiver/memory
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/memoryscraper
version: v0.55.0-341-gf787ff695
- resource: {}
schemaUrl: https://opentelemetry.io/schemas/1.9.0
Expand Down Expand Up @@ -1583,7 +1583,7 @@ resourceMetrics:
isMonotonic: true
unit: '{packets}'
scope:
name: otelcol/hostmetricsreceiver/network
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/networkscraper
version: v0.55.0-341-gf787ff695
- resource: {}
schemaUrl: https://opentelemetry.io/schemas/1.9.0
Expand Down Expand Up @@ -1694,7 +1694,7 @@ resourceMetrics:
timeUnixNano: "1660943984119168000"
unit: By
scope:
name: otelcol/hostmetricsreceiver/paging
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/pagingscraper
version: v0.55.0-341-gf787ff695
- resource: {}
schemaUrl: https://opentelemetry.io/schemas/1.9.0
Expand Down Expand Up @@ -2378,5 +2378,5 @@ resourceMetrics:
timeUnixNano: "1660943984125836000"
unit: By
scope:
name: otelcol/hostmetricsreceiver/filesystem
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper
version: v0.55.0-341-gf787ff695
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ resourceMetrics:
isMonotonic: true
unit: s
scope:
name: otelcol/hostmetricsreceiver/cpu
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ resourceMetrics:
isMonotonic: true
unit: s
scope:
name: otelcol/hostmetricsreceiver/cpu
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper
version: latest

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: hostmetricsreceiver/cpu
scope_name: otelcol/hostmetricsreceiver/cpu

parent: hostmetrics

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: hostmetricsreceiver/disk
scope_name: otelcol/hostmetricsreceiver/disk

parent: hostmetrics

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: hostmetricsreceiver/filesystem
scope_name: otelcol/hostmetricsreceiver/filesystem

parent: hostmetrics

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: hostmetricsreceiver/load
scope_name: otelcol/hostmetricsreceiver/load

parent: hostmetrics

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: hostmetricsreceiver/memory
scope_name: otelcol/hostmetricsreceiver/memory

parent: hostmetrics

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: hostmetricsreceiver/network
scope_name: otelcol/hostmetricsreceiver/network

parent: hostmetrics

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: hostmetricsreceiver/paging
scope_name: otelcol/hostmetricsreceiver/paging

parent: hostmetrics

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: hostmetricsreceiver/processes
scope_name: otelcol/hostmetricsreceiver/processes

parent: hostmetrics

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: hostmetricsreceiver/process
scope_name: otelcol/hostmetricsreceiver/process

parent: hostmetrics

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ resourceMetrics:
timeUnixNano: "2000000"
unit: By
scope:
name: otelcol/hostmetricsreceiver/process
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper
version: latest
- resource:
attributes:
Expand Down Expand Up @@ -147,5 +147,5 @@ resourceMetrics:
timeUnixNano: "2000000"
unit: By
scope:
name: otelcol/hostmetricsreceiver/process
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,5 @@ resourceMetrics:
timeUnixNano: "2000000"
unit: By
scope:
name: otelcol/hostmetricsreceiver/process
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper
version: latest

0 comments on commit a809974

Please sign in to comment.