Merge branch 'main' into ymotongpoo-patch-1

CONTRIBUTING.md

@@ -313,25 +313,25 @@ triaged and is ready for work. If someone who is assigned to an issue is no long
 
 ### Label Definitions
 
-| Label | When to apply |
-| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `bug` | Something that is advertised or intended to work isn't working as expected. |
-| `enhancement` | Something that isn't an advertised feature that would be useful to users or maintainers. |
-| `flaky test` | A test unexpectedly failed during CI, showing that there is a problem with the tests or test setup that is causing the tests to intermittently fail. |
-| `documentation` | This is a collector usability issue that could likely be resolved by providing relevant documentation. Please consider adding new or improving existing documentation before closing issues with this label.  |
-| `good first issue` | Implementing this issue would not require specialized or in-depth knowledge about the component and is ideal for a new or first-time contributor to take. |
-| `help wanted` | The code owners for this component do not expect to have time to work on it soon, and would welcome help from contributors. |
-| `discussion needed` | This issue needs more input from the maintainers or community before work can be started. |
-| `needs triage` | This label is added automatically, and can be removed when a triager or code owner deems that an issue is either ready for work or should not need any work.   |
-| `waiting for author` | Can be applied when input is required from the author before the issue can move any further. |
-| `priority:p0` | A critical security vulnerability or Collector panic using a default or common configuration unrelated to a specific component. |
-| `priority:p1` | An urgent issue that should be worked on quickly, before most other issues. |
-| `priority:p2` | A standard bug or enhancement. |
-| `priority:p3` | A technical improvement, lower priority bug, or other minor issue. Generally something that is considered a "nice to have." |
-| `release:blocker` | This issue must be resolved before the next Collector version can be released. |
-| `Sponsor Needed` | A new component has been proposed, but implementation is not ready to begin. This can be because a sponsor has not yet been decided, or because some details on the component still need to be decided. |
-| `Accepted Component` | A sponsor has elected to take on a component and implementation is ready to begin. |
-| `Vendor Specific Component` | This should be applied to any component proposal where the functionality for the component is particular to a vendor. |
+| Label | When to apply  |
+| -------------------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `bug` | Something that is advertised or intended to work isn't working as expected.  |
+| `enhancement` | Something that isn't an advertised feature that would be useful to users or maintainers.  |
+| `flaky test` | A test unexpectedly failed during CI, showing that there is a problem with the tests or test setup that is causing the tests to intermittently fail.  |
+| `documentation` | This is a collector usability issue that could likely be resolved by providing relevant documentation. Please consider adding new or improving existing documentation before closing issues with this label. |
+| `good first issue` | Implementing this issue would not require specialized or in-depth knowledge about the component and is ideal for a new or first-time contributor to take.  |
+| `help wanted` | The code owners for this component do not expect to have time to work on it soon, and would welcome help from contributors.  |
+| `discussion needed` | This issue needs more input from the maintainers or community before work can be started.  |
+| `needs triage` | This label is added automatically, and can be removed when a triager or code owner deems that an issue is either ready for work or should not need any work. See also the [triaging process](#triage-process). |
+| `waiting for author` | Can be applied when input is required from the author before the issue can move any further.  |
+| `priority:p0` | A critical security vulnerability or Collector panic using a default or common configuration unrelated to a specific component.  |
+| `priority:p1` | An urgent issue that should be worked on quickly, before most other issues.  |
+| `priority:p2` | A standard bug or enhancement.  |
+| `priority:p3` | A technical improvement, lower priority bug, or other minor issue. Generally something that is considered a "nice to have."  |
+| `release:blocker` | This issue must be resolved before the next Collector version can be released.  |
+| `Sponsor Needed` | A new component has been proposed, but implementation is not ready to begin. This can be because a sponsor has not yet been decided, or because some details on the component still need to be decided.  |
+| `Accepted Component` | A sponsor has elected to take on a component and implementation is ready to begin.  |
+| `Vendor Specific Component` | This should be applied to any component proposal where the functionality for the component is particular to a vendor.  |
 
 ### Adding Labels via Comments
 

exporter/signalfxexporter/exporter_test.go

@@ -1207,6 +1207,7 @@ func TestTLSExporterInit(t *testing.T) {
 }
 
 func TestTLSIngestConnection(t *testing.T) {
+ t.Skip("Flaky test see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29099")
  metricsPayload := pmetric.NewMetrics()
  rm := metricsPayload.ResourceMetrics().AppendEmpty()
  ilm := rm.ScopeMetrics().AppendEmpty()
@@ -1318,6 +1319,7 @@ func TestDefaultSystemCPUTimeExcludedAndTranslated(t *testing.T) {
 }
 
 func TestTLSAPIConnection(t *testing.T) {
+ t.Skip("Flaky test see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29099")
  cfg := createDefaultConfig().(*Config)
  converter, err := translation.NewMetricsConverter(
  zap.NewNop(),

pkg/stanza/operator/input/udp/udp.go

@@ -139,7 +139,7 @@ func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) {
  if c.AsyncConfig != nil {
  udpInput.messageQueue = make(chan messageAndAddress, c.AsyncConfig.MaxQueueLength)
  udpInput.readBufferPool = sync.Pool{
- New: func() interface{} {
+ New: func() any {
  buffer := make([]byte, MaxUDPSize)
  return &buffer
  },

processor/k8sattributesprocessor/README.md

@@ -143,7 +143,7 @@ k8sattributes/2:
  - k8s.pod.start_time
  labels:
  - tag_name: app.label.component
- key: app.kubenetes.io/component
+ key: app.kubernetes.io/component
  from: pod
  pod_association:
  - sources:
@@ -158,9 +158,9 @@ k8sattributes/2:
 
 ## Role-based access control
 
-The k8sattributesprocessor needs `get`, `watch` and `list` permissions on both `pods` and `namespaces` resources, for all namespaces and pods included in the configured filters. Additionally, when using `k8s.deployment.uid` or `k8s.deployment.name` the processor also needs `get`, `watch` and `list` permissions for `replicaset` resources. When extracting metadatas from `node`, the processor needs `get`, `watch` and `list` permissions for `node` resources.
+The k8sattributesprocessor needs `get`, `watch` and `list` permissions on both `pods` and `namespaces` resources, for all namespaces and pods included in the configured filters. Additionally, when using `k8s.deployment.uid` or `k8s.deployment.name` the processor also needs `get`, `watch` and `list` permissions for `replicasets` resources. When extracting metadatas from `node`, the processor needs `get`, `watch` and `list` permissions for `nodes` resources.
 
-Here is an example of a `ClusterRole` to give a `ServiceAccount` the necessary permissions for all pods and namespaces in the cluster (replace `<OTEL_COL_NAMESPACE>` with a namespace where collector is deployed):
+Here is an example of a `ClusterRole` to give a `ServiceAccount` the necessary permissions for all pods, nodes, and namespaces in the cluster (replace `<OTEL_COL_NAMESPACE>` with a namespace where collector is deployed):
 
 ```yaml
 apiVersion: v1
@@ -175,7 +175,7 @@ metadata:
  name: otel-collector
 rules:
 - apiGroups: [""]
- resources: ["pods", "namespaces"]
+ resources: ["pods", "namespaces", "nodes"]
  verbs: ["get", "watch", "list"]
 - apiGroups: ["apps"]
  resources: ["replicasets"]
@@ -220,7 +220,7 @@ to complete the following steps:
 Add the following snippet under the pod env section of the OpenTelemetry container.
 
 ```yaml
-2. spec:
+spec:
  containers:
  - env:
  - name: KUBE_NODE_NAME