Skip to content

Commit e01e0a2

Browse files
authored
Merge branch 'main' into main
2 parents eab1701 + 4542bbf commit e01e0a2

File tree

85 files changed

+3979
-423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+3979
-423
lines changed

.chloggen/anvoy-als-receiver.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: new_component
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: envoyalsreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add a new receiver for the Envoy ALS (Access Log Service).
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [36464]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: opampsupervisor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: report own metrics via OTLP instead of prometheus receiver
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [37346]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: elasticsearchexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add config `logs_dynamic_id` to dynamically set the document ID of log records using log record attribute `elasticsearch.document_id`
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [36882]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: deltatocumulativeprocessor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: In order to cap number of histogram buckets take the min of desired scale across negative and positive buckets instead of the max
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [37416]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: jaegerreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Log the endpoints of different servers started by jaegerreceiver
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [36961]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext: |
19+
This change logs the endpoints of different servers started by jaegerreceiver. It simplifies debugging by ensuring log messages match configuration settings.
20+
21+
# If your change doesn't affect end users or the exported elements of any package,
22+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
23+
# Optional: The change log or logs in which this entry should be included.
24+
# e.g. '[user]' or '[user, api]'
25+
# Include 'user' if the change is relevant to end users.
26+
# Include 'api' if there is a change to a library API.
27+
# Default: '[user]'
28+
change_logs: [user]
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: processor/transformprocessor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Replace parser collection implementations with `ottl.ParserCollection` and add initial support for expressing statement's context via path names.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [29017]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ exporter/sapmexporter/ @open-telemetry
8080
exporter/sentryexporter/ @open-telemetry/collector-contrib-approvers @AbhiPrasad
8181
exporter/signalfxexporter/ @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1
8282
exporter/splunkhecexporter/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
83+
exporter/stefexporter/ @open-telemetry/collector-contrib-approvers @tigrannajaryan @dmitryax
8384
exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo @chan-tim-sumo
8485
exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kasia-kujawa @rnishtala-sumo @andrzej-stencel
8586
exporter/tencentcloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @wgliang
@@ -221,6 +222,7 @@ receiver/couchdbreceiver/ @open-telemetry
221222
receiver/datadogreceiver/ @open-telemetry/collector-contrib-approvers @boostchicken @gouthamve @MovieStoreGuy
222223
receiver/dockerstatsreceiver/ @open-telemetry/collector-contrib-approvers @jamesmoessis
223224
receiver/elasticsearchreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski
225+
receiver/envoyalsreceiver/ @open-telemetry/collector-contrib-approvers @evan-bradley
224226
receiver/expvarreceiver/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
225227
receiver/filelogreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski
226228
receiver/filestatsreceiver/ @open-telemetry/collector-contrib-approvers @atoulme

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ body:
8181
- exporter/sentry
8282
- exporter/signalfx
8383
- exporter/splunkhec
84+
- exporter/stef
8485
- exporter/sumologic
8586
- exporter/syslog
8687
- exporter/tencentcloudlogservice
@@ -219,6 +220,7 @@ body:
219220
- receiver/datadog
220221
- receiver/dockerstats
221222
- receiver/elasticsearch
223+
- receiver/envoyals
222224
- receiver/expvar
223225
- receiver/filelog
224226
- receiver/filestats

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ body:
7575
- exporter/sentry
7676
- exporter/signalfx
7777
- exporter/splunkhec
78+
- exporter/stef
7879
- exporter/sumologic
7980
- exporter/syslog
8081
- exporter/tencentcloudlogservice
@@ -213,6 +214,7 @@ body:
213214
- receiver/datadog
214215
- receiver/dockerstats
215216
- receiver/elasticsearch
217+
- receiver/envoyals
216218
- receiver/expvar
217219
- receiver/filelog
218220
- receiver/filestats

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ body:
7575
- exporter/sentry
7676
- exporter/signalfx
7777
- exporter/splunkhec
78+
- exporter/stef
7879
- exporter/sumologic
7980
- exporter/syslog
8081
- exporter/tencentcloudlogservice
@@ -213,6 +214,7 @@ body:
213214
- receiver/datadog
214215
- receiver/dockerstats
215216
- receiver/elasticsearch
217+
- receiver/envoyals
216218
- receiver/expvar
217219
- receiver/filelog
218220
- receiver/filestats

.github/ISSUE_TEMPLATE/unmaintained.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ body:
8080
- exporter/sentry
8181
- exporter/signalfx
8282
- exporter/splunkhec
83+
- exporter/stef
8384
- exporter/sumologic
8485
- exporter/syslog
8586
- exporter/tencentcloudlogservice
@@ -218,6 +219,7 @@ body:
218219
- receiver/datadog
219220
- receiver/dockerstats
220221
- receiver/elasticsearch
222+
- receiver/envoyals
221223
- receiver/expvar
222224
- receiver/filelog
223225
- receiver/filestats

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,8 @@ update-otel:$(MULTIMOD)
423423
$(MAKE) genoteltestbedcol
424424
$(MAKE) generate
425425
$(MAKE) crosslink
426+
# Tidy again after generating code
427+
$(MAKE) gotidy
426428
$(MAKE) remove-toolchain
427429
git add . && git commit -s -m "[chore] mod and toolchain tidy" ; \
428430

cmd/githubgen/allowlist.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ harishbohara11
1010
heitorganzeli
1111
Hemansh31
1212
jcreixell
13-
jerrytfleung
1413
jriguera
1514
KiranmayiB
1615
m1rp

cmd/opampsupervisor/supervisor/supervisor_test.go

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,6 @@ func Test_onMessage(t *testing.T) {
364364
require.Equal(t, newID, s.persistentState.InstanceID)
365365
t.Log(s.cfgState.Load())
366366
mergedCfg := s.cfgState.Load().(*configState).mergedConfig
367-
require.Contains(t, mergedCfg, "prometheus/own_metrics")
368367
require.Contains(t, mergedCfg, newID.String())
369368
require.Contains(t, mergedCfg, "runtime.type: test")
370369
})
@@ -1129,27 +1128,16 @@ func TestSupervisor_setupOwnMetrics(t *testing.T) {
11291128
DestinationEndpoint: "localhost",
11301129
})
11311130

1132-
expectedOwnMetricsSection := `receivers:
1133-
# Collect own metrics
1134-
prometheus/own_metrics:
1135-
config:
1136-
scrape_configs:
1137-
- job_name: 'otel-collector'
1138-
scrape_interval: 10s
1139-
static_configs:
1140-
- targets: ['0.0.0.0:55555']
1141-
exporters:
1142-
otlphttp/own_metrics:
1143-
metrics_endpoint: "localhost"
1144-
1131+
expectedOwnMetricsSection := `
11451132
service:
11461133
telemetry:
11471134
metrics:
1148-
address: ":55555"
1149-
pipelines:
1150-
metrics/own_metrics:
1151-
receivers: [prometheus/own_metrics]
1152-
exporters: [otlphttp/own_metrics]
1135+
readers:
1136+
- periodic:
1137+
exporter:
1138+
otlp:
1139+
protocol: http/protobuf
1140+
endpoint: localhost
11531141
`
11541142

11551143
assert.True(t, configChanged)
@@ -1209,10 +1197,7 @@ func TestSupervisor_loadAndWriteInitialMergedConfig(t *testing.T) {
12091197
debug/remote:
12101198
`
12111199

1212-
const expectedMergedConfig = `exporters:
1213-
otlphttp/own_metrics:
1214-
metrics_endpoint: localhost
1215-
extensions:
1200+
const expectedMergedConfig = `extensions:
12161201
health_check:
12171202
endpoint: ""
12181203
opamp:
@@ -1226,30 +1211,20 @@ extensions:
12261211
insecure: true
12271212
receiver:
12281213
debug/remote: null
1229-
receivers:
1230-
prometheus/own_metrics:
1231-
config:
1232-
scrape_configs:
1233-
- job_name: otel-collector
1234-
scrape_interval: 10s
1235-
static_configs:
1236-
- targets:
1237-
- 0.0.0.0:55555
12381214
service:
12391215
extensions:
12401216
- health_check
12411217
- opamp
1242-
pipelines:
1243-
metrics/own_metrics:
1244-
exporters:
1245-
- otlphttp/own_metrics
1246-
receivers:
1247-
- prometheus/own_metrics
12481218
telemetry:
12491219
logs:
12501220
encoding: json
12511221
metrics:
1252-
address: :55555
1222+
readers:
1223+
- periodic:
1224+
exporter:
1225+
otlp:
1226+
endpoint: localhost
1227+
protocol: http/protobuf
12531228
resource:
12541229
service.name: otelcol
12551230
`
Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
1-
receivers:
2-
# Collect own metrics
3-
prometheus/own_metrics:
4-
config:
5-
scrape_configs:
6-
- job_name: 'otel-collector'
7-
scrape_interval: 10s
8-
static_configs:
9-
- targets: ['0.0.0.0:{{.PrometheusPort}}']
10-
exporters:
11-
otlphttp/own_metrics:
12-
metrics_endpoint: "{{.MetricsEndpoint}}"
131

142
service:
153
telemetry:
164
metrics:
17-
address: ":{{.PrometheusPort}}"
18-
pipelines:
19-
metrics/own_metrics:
20-
receivers: [prometheus/own_metrics]
21-
exporters: [otlphttp/own_metrics]
5+
readers:
6+
- periodic:
7+
exporter:
8+
otlp:
9+
protocol: http/protobuf
10+
endpoint: {{.MetricsEndpoint}}

cmd/otelcontribcol/builder-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ replaces:
355355
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil => ../../internal/aws/ecsutil
356356
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver => ../../receiver/rabbitmqreceiver
357357
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver => ../../receiver/elasticsearchreceiver
358+
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/envoyalsreceiver => ../../receiver/envoyalsreceiver
358359
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor => ../../processor/metricsgenerationprocessor
359360
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor => ../../processor/attributesprocessor
360361
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver => ../../receiver/sqlqueryreceiver

0 commit comments

Comments
 (0)