Skip to content

Commit

Permalink
[receiver/k8sclusterreceiver] update scope name for consistency (open…
Browse files Browse the repository at this point in the history
…-telemetry#34536)

Update the scope name for telemetry produced by the
k8sclusterreceiverreceiver from otelcol/k8sclusterreceiver to
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiverreceiver

Part of
open-telemetry/opentelemetry-collector#9494

---------

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
codeboten authored and f7o committed Sep 12, 2024
1 parent 5a382fe commit 1cacc04
Show file tree
Hide file tree
Showing 20 changed files with 80 additions and 54 deletions.
27 changes: 27 additions & 0 deletions .chloggen/codeboten_update-scope-k8sclusterreceiver.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: k8sclusterreceiver

# 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 k8sclusterreceiver from `otelcol/k8sclusterreceiver` to `github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver`"

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

# (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: []
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@ resourceMetrics:
name: openshift.appliedclusterquota.used
unit: "{resource}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ resourceMetrics:
name: k8s.cronjob.active_jobs
unit: "{job}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ resourceMetrics:
name: k8s.daemonset.ready_nodes
unit: "{node}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ resourceMetrics:
name: k8s.deployment.desired
unit: "{pod}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ resourceMetrics:
name: k8s.job.max_parallel_pods
unit: "{pod}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest

Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ resourceMetrics:
name: k8s.job.successful_pods
unit: "{pod}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
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
Expand Up @@ -17,5 +17,5 @@ resourceMetrics:
name: k8s.namespace.phase
unit: ""
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
2 changes: 1 addition & 1 deletion receiver/k8sclusterreceiver/internal/node/nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func CustomMetrics(set receiver.Settings, rb *metadata.ResourceBuilder, node *co

// TODO: Generate a schema URL for the node metrics in the metadata package and use them here.
rm.SetSchemaUrl(conventions.SchemaURL)
sm.Scope().SetName("otelcol/k8sclusterreceiver")
sm.Scope().SetName("github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver")
sm.Scope().SetVersion(set.BuildInfo.Version)

rb.SetK8sNodeUID(string(node.UID))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ resourceMetrics:
name: k8s.node.allocatable_hugepages_2_mi
unit: "{hugepages-2Mi}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ resourceMetrics:
unit: "{condition}"

scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ resourceMetrics:
name: k8s.node.allocatable_memory
unit: By
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resourceMetrics:
name: k8s.pod.phase
unit: ""
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
- resource:
attributes:
Expand Down Expand Up @@ -79,5 +79,5 @@ resourceMetrics:
name: k8s.container.cpu_limit
unit: "{cpu}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ resourceMetrics:
name: k8s.pod.status_reason
unit: ""
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
- resource:
attributes:
Expand Down Expand Up @@ -91,5 +91,5 @@ resourceMetrics:
name: k8s.container.cpu_limit
unit: "{cpu}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ resourceMetrics:
unit: "{pod}"

scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest

Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ resourceMetrics:
name: k8s.replication_controller.desired
unit: "{pod}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ resourceMetrics:
name: k8s.resource_quota.used
unit: "{resource}"
scope:
name: otelcol/k8sclusterreceiver
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver
version: latest
1 change: 0 additions & 1 deletion receiver/k8sclusterreceiver/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
type: k8s_cluster
scope_name: otelcol/k8sclusterreceiver

status:
class: receiver
Expand Down
Loading

0 comments on commit 1cacc04

Please sign in to comment.