Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

k8sclusterreceiver: migrate to latest semconv version #35238

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ resourceMetrics:
- key: openshift.clusterquota.uid
value:
stringValue: test-clusterquota-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: The configured upper limit for a particular resource.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package container // import "github.com/open-telemetry/opentelemetry-collector-c

import (
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.27.0"
"go.uber.org/zap"
corev1 "k8s.io/api/core/v1"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resourceMetrics:
- key: k8s.cronjob.uid
value:
stringValue: test-cronjob-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: The number of actively running jobs for a cronjob
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resourceMetrics:
- key: k8s.daemonset.uid
value:
stringValue: test-daemonset-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: Number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package deployment // import "github.com/open-telemetry/opentelemetry-collector-

import (
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.27.0"
appsv1 "k8s.io/api/apps/v1"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resourceMetrics:
- key: k8s.namespace.name
value:
stringValue: test-namespace
schemaUrl: "https://opentelemetry.io/schemas/1.18.0"
schemaUrl: "https://opentelemetry.io/schemas/1.27.0"
scopeMetrics:
- metrics:
- description: Total number of available pods (ready for at least minReadySeconds) targeted by this deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resourceMetrics:
- key: k8s.job.uid
value:
stringValue: test-job-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: The number of actively running pods for a job
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resourceMetrics:
- key: k8s.job.uid
value:
stringValue: test-job-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: The number of actively running pods for a job
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
Expand Up @@ -7,7 +7,7 @@ resourceMetrics:
- key: k8s.namespace.uid
value:
stringValue: test-namespace-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: The current phase of namespaces (1 for active and 0 for terminating)
Expand Down
2 changes: 1 addition & 1 deletion receiver/k8sclusterreceiver/internal/node/nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/receiver"
conventions "go.opentelemetry.io/collector/semconv/v1.18.0"
conventions "go.opentelemetry.io/collector/semconv/v1.27.0"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ resourceMetrics:
- key: k8s.node.uid
value:
stringValue: test-node-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: Amount of cpu allocatable on the node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ resourceMetrics:
- key: k8s.node.uid
value:
stringValue: test-node-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: The condition of a particular Node.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resourceMetrics:
value:
stringValue: "linux"

schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: Amount of cpu allocatable on the node
Expand Down
2 changes: 1 addition & 1 deletion receiver/k8sclusterreceiver/internal/pod/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"time"

"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.27.0"
"go.uber.org/zap"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resourceMetrics:
- key: k8s.pod.uid
value:
stringValue: test-pod-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: Current phase of the pod (1 - Pending, 2 - Running, 3 - Succeeded, 4 - Failed, 5 - Unknown)
Expand Down Expand Up @@ -51,7 +51,7 @@ resourceMetrics:
- key: k8s.pod.uid
value:
stringValue: test-pod-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: How many times the container has restarted in the recent past. This value is pulled directly from the K8s API and the value can go indefinitely high and be reset to 0 at any time depending on how your kubelet is configured to prune dead containers. It is best to not depend too much on the exact value but rather look at it as either == 0, in which case you can conclude there were no restarts in the recent past, or > 0, in which case you can conclude there were restarts in the recent past, and not try and analyze the value beyond that.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ resourceMetrics:
- key: k8s.pod.uid
value:
stringValue: test-pod-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: Current phase of the pod (1 - Pending, 2 - Running, 3 - Succeeded, 4 - Failed, 5 - Unknown)
Expand Down Expand Up @@ -63,7 +63,7 @@ resourceMetrics:
- key: k8s.pod.uid
value:
stringValue: test-pod-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: How many times the container has restarted in the recent past. This value is pulled directly from the K8s API and the value can go indefinitely high and be reset to 0 at any time depending on how your kubelet is configured to prune dead containers. It is best to not depend too much on the exact value but rather look at it as either == 0, in which case you can conclude there were no restarts in the recent past, or > 0, in which case you can conclude there were restarts in the recent past, and not try and analyze the value beyond that.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resourceMetrics:
- key: k8s.replicaset.uid
value:
stringValue: test-replicaset-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: Number of desired pods in this replicaset
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resourceMetrics:
- key: k8s.replicationcontroller.uid
value:
stringValue: test-replicationcontroller-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: Total number of available pods (ready for at least minReadySeconds) targeted by this replication_controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resourceMetrics:
- key: k8s.resourcequota.uid
value:
stringValue: test-resourcequota-1-uid
schemaUrl: https://opentelemetry.io/schemas/1.18.0
schemaUrl: https://opentelemetry.io/schemas/1.27.0
scopeMetrics:
- metrics:
- description: The upper limit for a particular resource in a specific namespace. Will only be sent if a quota is specified. CPU requests/limits will be sent as millicores
Expand Down
2 changes: 1 addition & 1 deletion receiver/k8sclusterreceiver/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ status:
codeowners:
active: [dmitryax, TylerHelmuth, povilasv, ChrsMark]

sem_conv_version: 1.18.0
sem_conv_version: 1.27.0

resource_attributes:
k8s.namespace.uid:
Expand Down
Loading
Loading