Skip to content

Commit ee439f1

Browse files
authored
Upgrade otel to 0.141.0 and 1.37.0 (#11671)
* upgrade otel to 0.141.0 and 1.37.0 * upgrade components * upgrade custom collector manifest too * upgrade more docs * restore the docs upgrade * set telemetry factory * upgrade profiling metrics * remove now defunct profilingmetrics metrics
1 parent 1e98fe8 commit ee439f1

File tree

10 files changed

+2853
-2604
lines changed

10 files changed

+2853
-2604
lines changed

NOTICE-fips.txt

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

NOTICE.txt

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

go.mod

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

go.sum

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

internal/edot/go.mod

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

internal/edot/go.sum

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

internal/edot/otelcol/components.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"go.opentelemetry.io/collector/otelcol"
1212
"go.opentelemetry.io/collector/processor"
1313
"go.opentelemetry.io/collector/receiver"
14+
"go.opentelemetry.io/collector/service/telemetry/otelconftelemetry"
1415

1516
// Receivers:
1617
apachereceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver"
@@ -102,7 +103,9 @@ import (
102103
func components(extensionFactories ...extension.Factory) func() (otelcol.Factories, error) {
103104
return func() (otelcol.Factories, error) {
104105
var err error
105-
factories := otelcol.Factories{}
106+
factories := otelcol.Factories{
107+
Telemetry: otelconftelemetry.NewFactory(),
108+
}
106109

107110
// Receivers
108111
receivers := []receiver.Factory{

internal/pkg/otel/README.md

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

internal/pkg/otel/samples/linux/profiles_metrics.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ receivers:
44

55
connectors:
66
profilingmetrics:
7-
by_frametype: true
8-
by_frame: true
9-
by_classification: true
107

118
exporters:
129
elasticsearch:

0 commit comments

Comments
 (0)