Skip to content

Commit 5e18297

Browse files
sv-splunksv-splunk
authored
Merge branch 'open-telemetry:main' into main
2 parents ae28536 + ea75b50 commit 5e18297

Some content is hidden

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

44 files changed

+1712
-108
lines changed

‎.chloggen/clickhouse-export-json-type.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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: 'clickhouseexporter'
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Support JSON type for logs and traces
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: [40547]
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+
Added a feature gate to enable a JSON pipeline for logs and traces.
20+
This feature gate ID is `clickhouse.json`, and will automatically use the new
21+
DDL and column type on supported server versions.
22+
You may also need to add `enable_json_type=1` to your connection
23+
settings, depending on the server version.
24+
25+
# If your change doesn't affect end users or the exported elements of any package,
26+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
27+
# Optional: The change log or logs in which this entry should be included.
28+
# e.g. '[user]' or '[user, api]'
29+
# Include 'user' if the change is relevant to end users.
30+
# Include 'api' if there is a change to a library API.
31+
# Default: '[user]'
32+
change_logs: [user]

‎.chloggen/gzip-concurrent.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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: awslogsencodingextension
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix bug in which concurrent go routines can end up using the same gzip reader
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: [40838]
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: []

‎.chloggen/jm-prom-translation-rw2-add-support-for-histogram.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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: pkg/translator/prometheusremotewrite
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "`FromMetricsV2` now supports translating histograms."
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: [33661]
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: The translation layer for Prometheus remote write 2 now supports histograms but is not fully implemented and ready for use.
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: []

‎.chloggen/nickange_prometheusremotewriteexporter_feat-add-wal-latency-metrics.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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: prometheusremotewriteexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: |
11+
Adds WAL latency metrics to the Prometheus Remote Write Exporter. The new metrics are:
12+
- `otelcol_exporter_prometheusremotewrite_wal_write_latency`: The latency of WAL writes.
13+
- `otelcol_exporter_prometheusremotewrite_wal_read_latency`: The latency of WAL reads.
14+
15+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
16+
issues: [39556]
17+
18+
# (Optional) One or more lines of additional information to render under the primary note.
19+
# These lines will be padded with 2 spaces and then inserted directly into the document.
20+
# Use pipe (|) for multiline entries.
21+
subtext:
22+
23+
# If your change doesn't affect end users or the exported elements of any package,
24+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
25+
# Optional: The change log or logs in which this entry should be included.
26+
# e.g. '[user]' or '[user, api]'
27+
# Include 'user' if the change is relevant to end users.
28+
# Include 'api' if there is a change to a library API.
29+
# Default: '[user]'
30+
change_logs: [user]

‎.chloggen/prometheusreceiver-targetallocator-unset-config.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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: prometheusreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix invalid metric name validation error in scrape start from target allocator.
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: [35459,40788]
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: Prometheus made setting metric_name_validation_scheme, metric_name_escaping_scheme mandatory mandatory, use sane defaults.
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: []

‎.chloggen/refactor_40663-datadogreceiver-unexport-endpoint.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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: datadogreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Unexport `Endpoint` struct
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: [40663]
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: [api]

‎.github/workflows/check-lychee-config.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Lychee Config Check
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '.github/lychee.toml'
7+
push:
8+
paths:
9+
- '.github/lychee.toml'
10+
11+
jobs:
12+
check-lychee-config:
13+
runs-on: ubuntu-latest
14+
name: Validate Lychee Config
15+
steps:
16+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
17+
18+
- name: Lychee Config Checker
19+
id: lychee
20+
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
21+
with:
22+
args: "--verbose --config .github/lychee.toml --dump .github/lychee.toml"
23+
failIfEmpty: false

‎README.md‎

Lines changed: 45 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,36 @@ Even though the OpenTelemetry Collector Contrib maintainers are ultimately respo
6767

6868
See [CONTRIBUTING.md](CONTRIBUTING.md).
6969

70-
Triagers ([@open-telemetry/collector-contrib-triagers](https://github.com/orgs/open-telemetry/teams/collector-contrib-triagers))
70+
### Maintainers
71+
72+
- [Alex Boten](https://github.com/codeboten), Honeycomb
73+
- [Andrzej Stencel](https://github.com/andrzej-stencel), Elastic
74+
- [Antoine Toulme](https://github.com/atoulme), Splunk
75+
- [Bogdan Drutu](https://github.com/bogdandrutu), Snowflake
76+
- [Dmitrii Anoshin](https://github.com/dmitryax), Splunk
77+
- [Evan Bradley](https://github.com/evan-bradley), Dynatrace
78+
- [Pablo Baeyens](https://github.com/mx-psi), DataDog
79+
- [Sean Marciniak](https://github.com/MovieStoreGuy), Splunk
80+
- [Tyler Helmuth](https://github.com/TylerHelmuth), Honeycomb
81+
- [Yang Song](https://github.com/songy23), DataDog
82+
83+
For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
84+
85+
### Approvers
86+
87+
- [Arthur Silva Sens](https://github.com/ArthurSens), Grafana Labs
88+
- [Braydon Kains](https://github.com/braydonk), Google
89+
- [Christos Markou](https://github.com/ChrsMark), Elastic
90+
- [Curtis Robert](https://github.com/crobert-1), Splunk
91+
- [David Ashpole](https://github.com/dashpole), Google
92+
- [Edmo Vamerlatti Costa](https://github.com/edmocosta), Elastic
93+
- [Matt Wear](https://github.com/mwear), Lightstep
94+
- [Sam DeHaan](https://github.com/dehaansa), Grafana Labs
95+
- [Ziqi Zhao](https://github.com/fatsheep9146), Alibaba
96+
97+
For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).
98+
99+
### Triagers
71100

72101
- [Andrew Wilkins](https://github.com/axw), Elastic
73102
- [Benedikt Bongartz](https://github.com/frzifus), Red Hat
@@ -81,53 +110,34 @@ Triagers ([@open-telemetry/collector-contrib-triagers](https://github.com/orgs/o
81110
- [Vihas Makwana](https://github.com/VihasMakwana), Elastic
82111
- Actively seeking contributors to triage issues
83112

84-
Emeritus Triagers:
113+
For more information about the triager role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#triagers).
85114

86-
- [Alolita Sharma](https://github.com/alolita)
87-
- [Gabriel Aszalos](https://github.com/gbbr)
88-
- [Goutham Veeramachaneni](https://github.com/gouthamve)
89-
- [Punya Biswal](https://github.com/punya)
90-
- [Steve Flanders](https://github.com/flands)
115+
### Emeritus Maintainers
91116

92-
Approvers ([@open-telemetry/collector-contrib-approvers](https://github.com/orgs/open-telemetry/teams/collector-contrib-approvers)):
117+
- [Daniel Jaglowski](https://github.com/djaglowski), Bindplane
118+
- [Juraci Paixão Kröhling](https://github.com/jpkrohling), OllyGarden
119+
- [Tigran Najaryan](https://github.com/tigrannajaryan)
93120

94-
- [Arthur Silva Sens](https://github.com/ArthurSens), Grafana Labs
95-
- [Braydon Kains](https://github.com/braydonk), Google
96-
- [Christos Markou](https://github.com/ChrsMark), Elastic
97-
- [Curtis Robert](https://github.com/crobert-1), Splunk
98-
- [David Ashpole](https://github.com/dashpole), Google
99-
- [Edmo Vamerlatti Costa](https://github.com/edmocosta), Elastic
100-
- [Matt Wear](https://github.com/mwear), Lightstep
101-
- [Sam DeHaan](https://github.com/dehaansa), Grafana Labs
102-
- [Ziqi Zhao](https://github.com/fatsheep9146), Alibaba
121+
For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
103122

104-
Emeritus Approvers:
123+
### Emeritus Approvers
105124

106125
- [Anthony Mirabella](https://github.com/Aneurysm9)
107126
- [Bryan Aguilar](https://github.com/bryan-aguilar)
108127
- [Przemek Maciolek](https://github.com/pmm-sumo)
109128
- [Ruslan Kovalov](https://github.com/kovrus)
110129

111-
Maintainers ([@open-telemetry/collector-contrib-maintainers](https://github.com/orgs/open-telemetry/teams/collector-contrib-maintainers)):
112-
113-
- [Alex Boten](https://github.com/codeboten), Honeycomb
114-
- [Andrzej Stencel](https://github.com/andrzej-stencel), Elastic
115-
- [Antoine Toulme](https://github.com/atoulme), Splunk
116-
- [Bogdan Drutu](https://github.com/bogdandrutu), Snowflake
117-
- [Dmitrii Anoshin](https://github.com/dmitryax), Splunk
118-
- [Evan Bradley](https://github.com/evan-bradley), Dynatrace
119-
- [Pablo Baeyens](https://github.com/mx-psi), DataDog
120-
- [Sean Marciniak](https://github.com/MovieStoreGuy), Splunk
121-
- [Tyler Helmuth](https://github.com/TylerHelmuth), Honeycomb
122-
- [Yang Song](https://github.com/songy23), DataDog
130+
For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
123131

124-
Emeritus Maintainers
132+
### Emeritus Triagers
125133

126-
- [Daniel Jaglowski](https://github.com/djaglowski), Bindplane
127-
- [Juraci Paixão Kröhling](https://github.com/jpkrohling), OllyGarden
128-
- [Tigran Najaryan](https://github.com/tigrannajaryan)
134+
- [Alolita Sharma](https://github.com/alolita)
135+
- [Gabriel Aszalos](https://github.com/gbbr)
136+
- [Goutham Veeramachaneni](https://github.com/gouthamve)
137+
- [Punya Biswal](https://github.com/punya)
138+
- [Steve Flanders](https://github.com/flands)
129139

130-
Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md).
140+
For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
131141

132142
### No Over-Representation
133143

0 commit comments

Comments
 (0)