Skip to content

Commit 38bbaec

Browse files
authored
Merge branch 'main' into 13956
2 parents 735ee0e + 587a7d2 commit 38bbaec

File tree

172 files changed

+3640
-728
lines changed

Some content is hidden

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

172 files changed

+3640
-728
lines changed

.chloggen/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ components:
5050
- pkg/xexporterhelper
5151
- pkg/xprocessor
5252
- pkg/xreceiver
53+
- pkg/xscraper
5354
- processor/batch
5455
- processor/memory_limiter
5556
- processor/sample
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
change_type: enhancement
2+
component: pkg/config/confighttp
3+
note: Setting `compression_algorithms` to an empty list now disables automatic decompression, ignoring Content-Encoding
4+
5+
# One or more tracking issues or pull requests related to the change
6+
issues: [14131]
7+
8+
# (Optional) One or more lines of additional information to render under the primary note.
9+
# These lines will be padded with 2 spaces and then inserted directly into the document.
10+
# Use pipe (|) for multiline entries.
11+
subtext:
12+
13+
# Optional: The change log or logs in which this entry should be included.
14+
# e.g. '[user]' or '[user, api]'
15+
# Include 'user' if the change is relevant to end users.
16+
# Include 'api' if there is a change to a library API.
17+
# Default: '[user]'
18+
change_logs: [user]
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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. otlpreceiver)
7+
component: pkg/config/confighttp
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Use configoptional.Optional for confighttp.ClientConfig.Cookies field
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14021]
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+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

.chloggen/scraper-profiles.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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. otlpreceiver)
7+
component: pkg/xscraper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Implement xscraper for Profiles.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [13915]
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+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [user]

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ receiver/otlpreceiver/ @open-telemetry/collector-approvers
6060
receiver/receiverhelper/ @open-telemetry/collector-approvers
6161
receiver/xreceiver/ @open-telemetry/collector-approvers @mx-psi @dmathieu
6262
scraper/ @open-telemetry/collector-approvers
63+
scraper/xscraper @open-telemetry/collector-approvers
6364
scraper/scraperhelper/ @open-telemetry/collector-approvers
6465
service/ @open-telemetry/collector-approvers
6566
service/internal/graph/ @open-telemetry/collector-approvers

.github/workflows/add-labels-and-owners.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-24.04
1616
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' && github.repository_owner == 'open-telemetry' && github.event.pull_request.draft == false }}
1717
steps:
18-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
18+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
1919

2020
- name: Run add-codeowners-to-pr.sh
2121
run: ./.github/workflows/scripts/add-labels-and-owners.sh

.github/workflows/add-labels-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
runs-on: ubuntu-24.04
1515
steps:
16-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
16+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
1717

1818
- name: Run add-labels-command.sh
1919
run: ./.github/workflows/scripts/add-labels-command.sh

.github/workflows/api-compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
HEAD_REF: ${{ github.head_ref }}
2121
steps:
2222
- name: Checkout-Main
23-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
23+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
2424
with:
2525
ref: ${{ github.base_ref }}
2626
path: ${{ github.base_ref }}
2727

2828
- name: Checkout-HEAD
29-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
29+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
3030
with:
3131
path: ${{ github.head_ref }}
3232

.github/workflows/build-and-test-arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
2929
runs-on: ${{ matrix.os }}
3030
steps:
31-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
31+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
3232
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
3333
with:
3434
go-version: oldstable

.github/workflows/build-and-test-windows.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ${{ matrix.os }}
2424
steps:
2525
- name: Checkout Repo
26-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
26+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
2727
- name: Setup Go
2828
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
2929
with:
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ${{ matrix.os }}
5353
steps:
5454
- name: Checkout Repo
55-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
55+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
5656
- name: Setup Go
5757
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
5858
with:

0 commit comments

Comments
 (0)