Skip to content

Commit a66a628

Browse files
Merge branch 'main' into fix/issue-4981
2 parents 8e9809a + 24aecac commit a66a628

406 files changed

Lines changed: 11384 additions & 2649 deletions

File tree

Some content is hidden

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

.chloggen/config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@ components:
1212
- cmd/mdatagen
1313
- connector/forward
1414
- connector/sample
15-
- consumer/consumererror/xconsumererror
16-
- consumer/xconsumer
1715
- docs/rfcs
1816
- exporter/debug
1917
- exporter/nop
2018
- exporter/otlp_grpc
2119
- exporter/otlp_http
2220
- extension/memory_limiter
2321
- extension/zpages
24-
- pdata/pprofile
2522
- pkg/client
2623
- pkg/component
2724
- pkg/component/componentstatus
@@ -44,6 +41,7 @@ components:
4441
- pkg/consumer
4542
- pkg/consumer/consumererror
4643
- pkg/consumer/consumertest
44+
- pkg/consumererror/xconsumererror
4745
- pkg/exporter
4846
- pkg/exporter/exportertest
4947
- pkg/exporterhelper
@@ -56,10 +54,12 @@ components:
5654
- pkg/extensionmiddleware/extensionmiddlewaretest
5755
- pkg/featuregate
5856
- pkg/filter
57+
- pkg/graph
5958
- pkg/otelcol
6059
- pkg/otelcol/otelcoltest
6160
- pkg/pdata
6261
- pkg/pipeline
62+
- pkg/pprofile
6363
- pkg/processor
6464
- pkg/processor/processortest
6565
- pkg/processorhelper
@@ -75,6 +75,7 @@ components:
7575
- pkg/service/telemetry/telemetrytest
7676
- pkg/xconfmap
7777
- pkg/xconnector
78+
- pkg/xconsumer
7879
- pkg/xexporter
7980
- pkg/xexporterhelper
8081
- pkg/xextension
@@ -100,4 +101,3 @@ components:
100101
- receiver/sample
101102
- receiver/sampleentity
102103
- scraper/sample
103-
- service/graph
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: enhancement
4+
change_type: bug_fix
55

66
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7-
component: cmd/mdatagen
7+
component: pkg/confighttp
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Handle default values for configuration fields in generated code in mdatagen.
10+
note: Recover from panics in decompression libraries, return HTTP 400 instead of 500.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [14560]
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:
13+
issues: [13228]
1914

2015
# Optional: The change log or logs in which this entry should be included.
2116
# e.g. '[user]' or '[user, api]'
2217
# Include 'user' if the change is relevant to end users.
2318
# Include 'api' if there is a change to a library API.
2419
# Default: '[user]'
25-
change_logs: [api]
20+
change_logs: [user]
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
change_type: bug_fix
2+
component: pkg/service
3+
note: Fix Prometheus config defaults mismatch when host is explicitly set in telemetry configuration.
4+
subtext: |
5+
When users explicitly configured the telemetry metrics section (e.g. to change the host),
6+
the Prometheus exporter boolean fields (WithoutScopeInfo, WithoutUnits, WithoutTypeSuffix)
7+
defaulted to nil/false instead of true, causing metric name format changes compared to the
8+
implicit default configuration. This fix applies the correct defaults during config unmarshaling.
9+
issues: [13867]
10+
change_logs: [user]
Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: enhancement
4+
change_type: bug_fix
55

66
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7-
component: pkg/config/configgrpc
7+
component: pkg/otelcol
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Accept gRPC resolver scheme URIs in client endpoint (e.g. passthrough:///host:port) to allow control over name resolution
10+
note: Stop emitting verbose gRPC transport messages at WARN during normal client disconnect.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [14990]
13+
issues: [5169]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
1717
# Use pipe (|) for multiline entries.
1818
subtext: |
19-
After the migration to grpc.NewClient, some gRPC client components such as the OTLP
20-
exporter experienced connection issues in dual-stack DNS environments. This can now be
21-
fixed by using the passthrough:/// gRPC resolver scheme in the endpoint field.
19+
grpc-go gates chatty per-RPC notices (e.g. "HandleStreams failed to read frame:
20+
connection reset by peer") behind `LoggerV2.V(2)`. zapgrpc.Logger.V conflates
21+
grpclog verbosity with zap severity, so V(2) returns true whenever WARN is
22+
enabled and these messages emit at WARN. Wrap the installed grpclog.LoggerV2
23+
with a corrected V() that compares against a fixed verbosity threshold,
24+
matching grpclog's intended semantics. See uber-go/zap#1544.
2225
2326
# Optional: The change log or logs in which this entry should be included.
2427
# e.g. '[user]' or '[user, api]'
2528
# Include 'user' if the change is relevant to end users.
2629
# Include 'api' if there is a change to a library API.
2730
# Default: '[user]'
28-
change_logs: [user, api]
31+
change_logs: [user]
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: breaking
4+
change_type: bug_fix
55

66
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7-
component: pkg/confighttp
7+
component: pkg/pdata
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Stabilize framedSnappy feature gate.
10+
note: "`pcommon.Value.AsString` no longer HTML-escapes `<`, `>`, and `&` inside `ValueTypeMap` and `ValueTypeSlice` values, matching the behavior already used for `ValueTypeStr`."
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [15096]
13+
issues: [14662]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
@@ -22,4 +22,4 @@ subtext:
2222
# Include 'user' if the change is relevant to end users.
2323
# Include 'api' if there is a change to a library API.
2424
# Default: '[user]'
25-
change_logs: []
25+
change_logs: [user, api]

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# Start components list
2020

21-
cmd/builder/ @open-telemetry/collector-approvers @ArthurSens @dmathieu
21+
cmd/builder/ @open-telemetry/collector-approvers @dmathieu
2222
cmd/mdatagen/ @open-telemetry/collector-approvers @dmitryax
2323
cmd/mdatagen/internal/sampleconnector/ @open-telemetry/collector-approvers
2424
cmd/mdatagen/internal/sampleentityreceiver/ @open-telemetry/collector-approvers @dmitryax

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug report
22
description: Create a report to help us improve
3-
labels: ["bug"]
3+
labels: ["bug", "needs triage"]
44
body:
55
- type: markdown
66
attributes:

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Feature request
22
description: Suggest an idea for this project
3-
labels: ["feature request"]
3+
labels: ["enhancement", "needs triage"]
44
body:
55
- type: dropdown
66
id: component

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Other issue
22
description: Create a new issue to help us improve the collector
3+
labels: ["needs triage"]
34
body:
45
- type: dropdown
56
id: component
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: "Approve Pending Workflows"
2+
on:
3+
issue_comment:
4+
types:
5+
- created
6+
7+
permissions: read-all
8+
9+
jobs:
10+
approve-workflows:
11+
if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/workflow-approve') && github.repository_owner == 'open-telemetry' }}
12+
permissions:
13+
actions: write
14+
contents: read
15+
runs-on: ubuntu-24.04
16+
steps:
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
18+
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
19+
id: otelbot-token
20+
with:
21+
app-id: ${{ vars.OTELBOT_APP_ID }}
22+
private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
23+
- name: Run approve-workflows.sh
24+
run: ./.github/workflows/scripts/approve-workflows.sh
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
ORG_TOKEN: ${{ steps.otelbot-token.outputs.token }}
28+
PR_NUMBER: ${{ github.event.issue.number }}
29+
COMMENT: ${{ github.event.comment.body }}
30+
SENDER: ${{ github.event.comment.user.login }}

0 commit comments

Comments
 (0)