Skip to content

Commit a67d537

Browse files
[9.1] (backport #9065) add k8s_leader_elector otel extension (#9243)
* add k8s_leader_elector otel extension (#9065) (cherry picked from commit 9b447e7) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod # internal/pkg/otel/README.md # internal/pkg/otel/components.go * fix merge conflicts --------- Co-authored-by: Roger Coll <[email protected]>
1 parent 4e9f71d commit a67d537

File tree

6 files changed

+458
-423
lines changed

6 files changed

+458
-423
lines changed

NOTICE-fips.txt

Lines changed: 211 additions & 211 deletions
Large diffs are not rendered by default.

NOTICE.txt

Lines changed: 211 additions & 211 deletions
Large diffs are not rendered by default.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: feature
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Add k8s leader elector Otel extension
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
#pr: https://github.com/owner/repo/1234
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ require (
5151
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.129.0
5252
github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.129.0
5353
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.129.0
54+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector v0.129.0
5455
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.129.0
5556
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.129.0
5657
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.129.0
@@ -516,7 +517,6 @@ require (
516517
github.com/onsi/ginkgo v1.16.5 // indirect
517518
github.com/open-telemetry/opamp-go v0.19.1-0.20250423191708-8d78a5169350 // indirect
518519
github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.129.0 // indirect
519-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector v0.129.0 // indirect
520520
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.129.0 // indirect
521521
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.129.0 // indirect
522522
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.129.0 // indirect

internal/pkg/otel/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ This section provides a summary of components included in the Elastic Distributi
9191
| [bearertokenauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/bearertokenauthextension/v0.129.0/extension/bearertokenauthextension/README.md) | v0.129.0 |
9292
| [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/storage/filestorage/v0.129.0/extension/storage/filestorage/README.md) | v0.129.0 |
9393
| [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/healthcheckextension/v0.129.0/extension/healthcheckextension/README.md) | v0.129.0 |
94+
| [k8sleaderelector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/k8sleaderelector/v0.129.0/extension/k8sleaderelector/README.md) | v0.129.0 |
9495
| [k8sobserver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/observer/k8sobserver/v0.129.0/extension/observer/k8sobserver/README.md) | v0.129.0 |
9596
| [memorylimiterextension](https://github.com/open-telemetry/opentelemetry-collector/blob/extension/memorylimiterextension/v0.129.0/extension/memorylimiterextension/README.md) | v0.129.0 |
9697
| [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/pprofextension/v0.129.0/extension/pprofextension/README.md) | v0.129.0 |

internal/pkg/otel/components.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import (
5959
// Extensions
6060
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension"
6161
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension"
62+
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/k8sleaderelector"
6263
k8sobserver "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver"
6364
pprofextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension"
6465
filestorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage"
@@ -155,6 +156,7 @@ func components(extensionFactories ...extension.Factory) func() (otelcol.Factori
155156
}
156157

157158
extensions := []extension.Factory{
159+
k8sleaderelector.NewFactory(),
158160
memorylimiterextension.NewFactory(),
159161
filestorage.NewFactory(),
160162
healthcheckextension.NewFactory(),

0 commit comments

Comments
 (0)