Skip to content
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
335e8d9
add more implementation
rakesh-garimella Feb 13, 2025
6e866a0
fix
rakesh-garimella Feb 18, 2025
c888326
fix
rakesh-garimella Feb 18, 2025
a3781bb
make it work
rakesh-garimella Feb 18, 2025
efc9634
Merge branch 'main' into test_k8s_receiver
rakesh-garimella Mar 4, 2025
4ccec22
code changes still not work
rakesh-garimella Mar 5, 2025
81a1e95
fix dockerfile
rakesh-garimella Mar 5, 2025
3c5602b
make it work
rakesh-garimella Mar 5, 2025
d2e6a1b
Merge branch 'main' into test_k8s_receiver
rakesh-garimella Mar 5, 2025
f863def
fix
rakesh-garimella Mar 6, 2025
fc9900f
[receiver/k8s cluster receiver] Add support for the k8s leader electo…
rakesh-garimella Mar 6, 2025
bc5304c
remove files
rakesh-garimella Mar 6, 2025
1b0c4fc
fix
rakesh-garimella Mar 6, 2025
57e3221
fix linting
rakesh-garimella Mar 7, 2025
be20299
fix
rakesh-garimella Mar 7, 2025
6c52395
Merge branch 'main' into k8s_leader_support_for_k8s_cluster_receiver
rakesh-garimella Mar 10, 2025
ef6dd4e
Merge branch 'main' into k8s_leader_support_for_k8s_cluster_receiver
rakesh-garimella Apr 1, 2025
4acd6f8
add some unit test
rakesh-garimella Apr 1, 2025
d74f105
add unit test
rakesh-garimella Apr 9, 2025
fd4cdf0
make unit tests happy
rakesh-garimella Apr 10, 2025
9f68d53
fix variable name
rakesh-garimella Apr 10, 2025
2a16e86
mod tidy
rakesh-garimella Apr 10, 2025
ef41e74
Merge branch 'main' into k8s_leader_support_for_k8s_cluster_receiver
rakesh-garimella Apr 10, 2025
98e8dfb
add chhloggen
rakesh-garimella Apr 10, 2025
c6e1f42
fix
rakesh-garimella Apr 10, 2025
21d2910
fix change log
rakesh-garimella Apr 10, 2025
d329a61
fixes
rakesh-garimella Apr 10, 2025
488d7dc
fixes
rakesh-garimella Apr 10, 2025
7fc085b
fix
rakesh-garimella Apr 10, 2025
24c2e65
Merge branch 'main' into k8s_leader_support_for_k8s_cluster_receiver
rakesh-garimella Apr 10, 2025
3fc91cd
fix
rakesh-garimella Apr 10, 2025
16846fa
revert renaming
rakesh-garimella Apr 14, 2025
c91074a
changes based on review comments
rakesh-garimella Apr 14, 2025
78e9d77
Merge branch 'main' into k8s_leader_support_for_k8s_cluster_receiver
rakesh-garimella Apr 14, 2025
ae656b7
fix imports
rakesh-garimella Apr 14, 2025
44199e1
Merge branch 'main' into k8s_leader_support_for_k8s_cluster_receiver
rakesh-garimella Apr 15, 2025
0e91cb7
Merge branch 'main' into k8s_leader_support_for_k8s_cluster_receiver
rakesh-garimella Apr 16, 2025
9dc31a9
Merge branch 'main' into k8s_leader_support_for_k8s_cluster_receiver
rakesh-garimella Apr 16, 2025
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
27 changes: 27 additions & 0 deletions .chloggen/k8s_leader_support_for_k8s_cluster_receiver.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: enhancement

# 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: "add support for k8s leader election in k8s cluster receiver"

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

# (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: Allows multiple instances of the k8s cluster receiver to run in a HA mode in a single cluster.

# 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: []
1 change: 1 addition & 0 deletions extension/k8sleaderelector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (
go.opentelemetry.io/collector/confmap v1.30.0
go.opentelemetry.io/collector/extension v1.30.0
go.opentelemetry.io/collector/extension/extensiontest v0.124.0
go.opentelemetry.io/collector/pipeline v0.124.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
k8s.io/apimachinery v0.32.3
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package k8sleaderelectortest // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector/k8sleaderelectortest"

import (
"context"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/pipeline"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector"
)

type FakeHost struct {
FakeLeaderElection *FakeLeaderElection
}

func (fh *FakeHost) GetExtensions() map[component.ID]component.Component {
extID := component.MustNewID("k8s_leader_elector")
return map[component.ID]component.Component{
extID: fh.FakeLeaderElection,
}
}

func (fh *FakeHost) GetExporters() map[pipeline.Signal]map[component.ID]component.Component {
return nil
}

type FakeLeaderElection struct {
OnLeading func(context.Context)
OnStopping func()
}

func (fle *FakeLeaderElection) SetCallBackFuncs(onLeading k8sleaderelector.StartCallback, onStopping k8sleaderelector.StopCallback) {
fle.OnLeading = onLeading
fle.OnStopping = onStopping
}

func (fle *FakeLeaderElection) InvokeOnLeading() {
if fle.OnLeading != nil {
fle.OnLeading(context.Background())
}
}

func (fle *FakeLeaderElection) Start(_ context.Context, _ component.Host) error { return nil }

func (fle *FakeLeaderElection) Shutdown(_ context.Context) error { return nil }

func (fle *FakeLeaderElection) InvokeOnStopping() {
if fle.OnStopping != nil {
fle.OnStopping()
}
}
12 changes: 12 additions & 0 deletions receiver/k8sclusterreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ Example:
```yaml
k8s_cluster:
auth_type: kubeConfig
k8s_leader_elector: <reference k8s leader elector extension>
node_conditions_to_report: [Ready, MemoryPressure]
allocatable_types_to_report: [cpu, memory]
metrics:
Expand All @@ -80,6 +81,16 @@ Example:
The full list of settings exposed for this receiver are documented in [config.go](./config.go)
with detailed sample configurations in [testdata/config.yaml](./testdata/config.yaml).

### k8s_leader_elector
Provide name of the k8s leader elector extension defined in config. This allows multiple instances of k8s cluster
receiver to be executed on a cluster. At a given time only the pod which has the is active.

```yaml
k8s_cluster:
k8s_leader_elector: k8s_leader_elector
...
```

### node_conditions_to_report

For example, with the config below the receiver will emit two metrics
Expand All @@ -96,6 +107,7 @@ k8s_cluster:
...
```


### metadata_exporters

A list of metadata exporters to which metadata being collected by this receiver
Expand Down
6 changes: 6 additions & 0 deletions receiver/k8sclusterreceiver/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"fmt"
"time"

"go.opentelemetry.io/collector/component"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/metadata"
)
Expand Down Expand Up @@ -44,6 +46,10 @@ type Config struct {
// will not be able to be observed. Setting this option is recommended in environments where due to security restrictions
// the collector cannot be granted cluster-wide permissions.
Namespace string `mapstructure:"namespace"`

// K8sLeaderElector defines the reference to the k8s leader elector extension
// use this when k8s cluster receiver needs to be deployed in HA mode
K8sLeaderElector *component.ID `mapstructure:"k8s_leader_elector"`
}

func (cfg *Config) Validate() error {
Expand Down
6 changes: 5 additions & 1 deletion receiver/k8sclusterreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/iancoleman/strcase v0.3.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.124.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.124.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.124.0
Expand Down Expand Up @@ -99,6 +100,7 @@ require (
go.opentelemetry.io/collector/config/configtls v1.30.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.124.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.124.0 // indirect
go.opentelemetry.io/collector/extension v1.30.0 // indirect
go.opentelemetry.io/collector/extension/extensionauth v1.30.0 // indirect
go.opentelemetry.io/collector/featuregate v1.30.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.124.0 // indirect
Expand Down Expand Up @@ -137,7 +139,7 @@ require (
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

Expand Down Expand Up @@ -165,3 +167,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest =
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ../../internal/sharedcomponent

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden

replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector => ../../extension/k8sleaderelector
6 changes: 4 additions & 2 deletions receiver/k8sclusterreceiver/go.sum

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

57 changes: 50 additions & 7 deletions receiver/k8sclusterreceiver/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ import (
"go.opentelemetry.io/collector/pipeline"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/receiverhelper"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/collection"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/metadata"
)
Expand Down Expand Up @@ -42,9 +44,7 @@ type getExporters interface {
GetExporters() map[pipeline.Signal]map[component.ID]component.Component
}

func (kr *kubernetesReceiver) Start(ctx context.Context, host component.Host) error {
ctx, kr.cancel = context.WithCancel(ctx)

func (kr *kubernetesReceiver) startReceiver(ctx context.Context, host component.Host) error {
if err := kr.resourceWatcher.initialize(); err != nil {
return err
}
Expand Down Expand Up @@ -97,15 +97,58 @@ func (kr *kubernetesReceiver) Start(ctx context.Context, host component.Host) er
}
}
}()
return nil
}

func (kr *kubernetesReceiver) Start(ctx context.Context, host component.Host) error {
ctx, kr.cancel = context.WithCancel(ctx)

// if extension is defined start with k8s leader elector
if kr.config.K8sLeaderElector != nil {
kr.settings.Logger.Info("Starting k8sClusterReceiver with leader election")
extList := host.GetExtensions()
if extList == nil {
return errors.New("extension list is empty")
}

ext := extList[*kr.config.K8sLeaderElector]
if ext == nil {
return errors.New("extension k8s leader elector not found")
}

leaderElectorExt, ok := ext.(k8sleaderelector.LeaderElection)
if !ok {
return errors.New("referenced extension is not k8s leader elector")
}

leaderElectorExt.SetCallBackFuncs(
func(ctx context.Context) {
if err := kr.startReceiver(ctx, host); err != nil {
kr.settings.Logger.Error("Failed to start receiver", zap.Error(err))
}
}, func() {
kr.stopReceiver()
},
)
} else {
kr.settings.Logger.Info("Starting k8sClusterReceiver without leader election")
if err := kr.startReceiver(ctx, host); err != nil {
return err
}
}

return nil
}

func (kr *kubernetesReceiver) Shutdown(context.Context) error {
if kr.cancel == nil {
return nil
func (kr *kubernetesReceiver) stopReceiver() {
kr.settings.Logger.Info("Stopping the receiver")
if kr.cancel != nil {
kr.cancel()
}
kr.cancel()
}

func (kr *kubernetesReceiver) Shutdown(context.Context) error {
kr.stopReceiver()
return nil
}

Expand Down
Loading