Skip to content

Commit 491086b

Browse files
authored
[Backport][9.1] bump elastic-agent dependencies (#9362)
* [Backport][9.1] bump elastic-agent dependencies
1 parent c3c56ad commit 491086b

File tree

13 files changed

+3543
-2115
lines changed

13 files changed

+3543
-2115
lines changed

NOTICE-fips.txt

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

NOTICE.txt

Lines changed: 1676 additions & 761 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: enhancement
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Update OTel components to v0.130.0
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: 214 additions & 209 deletions
Large diffs are not rendered by default.

go.sum

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

internal/pkg/composable/providers/kubernetes/node.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func NewNodeEventer(
5050
Node: cfg.Node,
5151
IsUpdated: isUpdated,
5252
HonorReSyncs: true,
53-
}, nil)
53+
}, nil, logger)
5454
if err != nil {
5555
return nil, errors.New(err, "couldn't create kubernetes watcher")
5656
}

internal/pkg/composable/providers/kubernetes/pod.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func NewPodEventer(
7272
Node: cfg.Node,
7373
Namespace: cfg.Namespace,
7474
HonorReSyncs: true,
75-
}, nil)
75+
}, nil, logger)
7676
if err != nil {
7777
return nil, errors.New(err, "couldn't create kubernetes watcher")
7878
}
@@ -86,7 +86,7 @@ func NewPodEventer(
8686
SyncTimeout: cfg.SyncPeriod,
8787
Node: cfg.Node,
8888
HonorReSyncs: true,
89-
}, nil)
89+
}, nil, logger)
9090
if err != nil {
9191
logger.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Node{}, err)
9292
}
@@ -97,7 +97,7 @@ func NewPodEventer(
9797
SyncTimeout: cfg.SyncPeriod,
9898
Namespace: cfg.Namespace,
9999
HonorReSyncs: true,
100-
}, nil)
100+
}, nil, logger)
101101
if err != nil {
102102
logger.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Namespace{}, err)
103103
}
@@ -122,7 +122,7 @@ func NewPodEventer(
122122
SyncTimeout: cfg.SyncPeriod,
123123
Namespace: cfg.Namespace,
124124
HonorReSyncs: true,
125-
}, nil, metadata.RemoveUnnecessaryReplicaSetData)
125+
}, nil, metadata.RemoveUnnecessaryReplicaSetData, logger)
126126
if err != nil {
127127
logger.Errorf("Error creating watcher for %T due to error %+v", &kubernetes.Namespace{}, err)
128128
}
@@ -132,7 +132,7 @@ func NewPodEventer(
132132
SyncTimeout: cfg.SyncPeriod,
133133
Namespace: cfg.Namespace,
134134
HonorReSyncs: true,
135-
}, nil)
135+
}, nil, logger)
136136
if err != nil {
137137
logger.Errorf("Error creating watcher for %T due to error %+v", &kubernetes.Job{}, err)
138138
}

internal/pkg/composable/providers/kubernetes/service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func NewServiceEventer(
5151
Node: cfg.Node,
5252
Namespace: cfg.Namespace,
5353
HonorReSyncs: true,
54-
}, nil)
54+
}, nil, logger)
5555
if err != nil {
5656
return nil, errors.New(err, "couldn't create kubernetes watcher")
5757
}
@@ -66,7 +66,7 @@ func NewServiceEventer(
6666
SyncTimeout: cfg.SyncPeriod,
6767
Namespace: cfg.Namespace,
6868
HonorReSyncs: true,
69-
}, nil)
69+
}, nil, logger)
7070
if err != nil {
7171
return nil, fmt.Errorf("couldn't create watcher for %T due to error %w", &kubernetes.Namespace{}, err)
7272
}

internal/pkg/otel/README.md

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

internal/pkg/otel/translate/otelconfig.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/elastic/beats/v7/x-pack/metricbeat/mbreceiver"
2424
"github.com/elastic/elastic-agent-client/v7/pkg/client"
2525
"github.com/elastic/elastic-agent-libs/config"
26+
"github.com/elastic/elastic-agent-libs/logp"
2627
"github.com/elastic/elastic-agent/internal/pkg/agent/application/info"
2728
"github.com/elastic/elastic-agent/internal/pkg/agent/application/paths"
2829
"github.com/elastic/elastic-agent/pkg/component"
@@ -397,7 +398,7 @@ func getDefaultDatastreamTypeForComponent(comp *component.Component) (string, er
397398

398399
// translateEsOutputToExporter translates an elasticsearch output configuration to an elasticsearch exporter configuration.
399400
func translateEsOutputToExporter(cfg *config.C) (map[string]any, error) {
400-
esConfig, err := elasticsearchtranslate.ToOTelConfig(cfg)
401+
esConfig, err := elasticsearchtranslate.ToOTelConfig(cfg, logp.NewLogger(""))
401402
if err != nil {
402403
return nil, err
403404
}

0 commit comments

Comments
 (0)