Skip to content

Commit 7f4627c

Browse files
committed
Merge branch 'main' into chore/#2601_IntroduceAdditionalRequirementLevels
2 parents e5a739b + 68a52f6 commit 7f4627c

File tree

159 files changed

+9685
-1695
lines changed

Some content is hidden

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

159 files changed

+9685
-1695
lines changed

.chloggen/2179.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
change_type: breaking
2+
component: gen-ai
3+
note: |
4+
Revamp how GenAI chat history is recorded. Instead of per-message events,
5+
we now have `gen_ai.system_instructions`, `gen_ai.input.messages`, and
6+
`gen_ai.output.messages` attributes that can appear on GenAI spans or the new
7+
`gen_ai.client.inference.operation.details` event.
8+
9+
New attributes are not recorded by default when content capturing is disabled.
10+
11+
Deprecations:
12+
- `gen_ai.system.message` event - use `gen_ai.system_instructions` or
13+
`gen_ai.input.messages` attributes instead.
14+
- `gen_ai.user.message`, `gen_ai.assistant.message`, `gen_ai.tool.message` events
15+
(use `gen_ai.input.messages` attribute instead)
16+
- `gen_ai.choice` event (use `gen_ai.output.messages` attribute instead)
17+
18+
issues: [2010, 2179, 1913, 1621, 1912]

.chloggen/2508.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
change_type: enhancement
2+
component: aspnetcore
3+
note: Add ASP.NET Core Identity metrics and update the registry.
4+
issues: [2509]

.chloggen/2530.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
change_type: enhancement
2+
component: aspnetcore
3+
note: Add ASP.NET Core authentication and authorization metrics and update the registry.
4+
issues: [2530]

.chloggen/2532.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
change_type: enhancement
2+
component: aspnetcore
3+
note: Add ASP.NET Core memory pool metrics and update the registry.
4+
issues: [2532]

.chloggen/add_app_build_id.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Use this changelog template to create an entry for release notes.
2+
#
3+
# If your change doesn't affect end users you should instead start
4+
# your pull request title with [chore] or use the "Skip Changelog" label.
5+
6+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
7+
change_type: enhancement
8+
9+
# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
10+
component: app
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: Defines a new app.build_id attribute.
14+
15+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
16+
# The values here must be integers.
17+
issues: [2591]
18+
19+
# (Optional) One or more lines of additional information to render under the primary note.
20+
# These lines will be padded with 2 spaces and then inserted directly into the document.
21+
# Use pipe (|) for multiline entries.
22+
subtext:

.chloggen/hw_battery.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Use this changelog template to create an entry for release notes.
2+
#
3+
# If your change doesn't affect end users you should instead start
4+
# your pull request title with [chore] or use the "Skip Changelog" label.
5+
6+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
7+
change_type: enhancement
8+
9+
# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
10+
component: hardware
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: Move text hardware metrics to the hardware components, yaml and md files
14+
15+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
16+
# The values here must be integers.
17+
issues: [2380]
18+
19+
# (Optional) One or more lines of additional information to render under the primary note.
20+
# These lines will be padded with 2 spaces and then inserted directly into the document.
21+
# Use pipe (|) for multiline entries.
22+
subtext:

.chloggen/jank-event.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Use this changelog template to create an entry for release notes.
2+
#
3+
# If your change doesn't affect end users you should instead start
4+
# your pull request title with [chore] or use the "Skip Changelog" label.
5+
6+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
7+
change_type: enhancement
8+
9+
# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
10+
component: app
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: Defines a new jank event in the app domain
14+
15+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
16+
# The values here must be integers.
17+
issues: [2552]
18+
19+
# (Optional) One or more lines of additional information to render under the primary note.
20+
# These lines will be padded with 2 spaces and then inserted directly into the document.
21+
# Use pipe (|) for multiline entries.
22+
subtext:
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Use this changelog template to create an entry for release notes.
2+
#
3+
# If your change doesn't affect end users you should instead start
4+
# your pull request title with [chore] or use the "Skip Changelog" label.
5+
6+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
7+
change_type: breaking
8+
9+
# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
10+
component: system
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: Rename system.network.dropped to system.network.packet.dropped
14+
and system.network.packets to system.network.packet.count
15+
16+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
17+
# The values here must be integers.
18+
issues: [1700]
19+
20+
# (Optional) One or more lines of additional information to render under the primary note.
21+
# These lines will be padded with 2 spaces and then inserted directly into the document.
22+
# Use pipe (|) for multiline entries.
23+
subtext:

.github/scripts/update-spec-repo-links.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# ./internal/tools/update-spec-repo-links.sh v1.41.0
66

77
# this version should be kept up-to-date with the spec version that links use
8-
PREVIOUS_SPECIFICATION_VERSION=v1.47.0
8+
PREVIOUS_SPECIFICATION_VERSION=v1.48.0
99

1010
# Set this to the version number you want to KEEP in URLs in the repository.
1111
LATEST_SPECIFICATION_VERSION=$1

.github/workflows/auto-update-spec-repo-links.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
latest-version: ${{ steps.check-versions.outputs.latest-version }}
1818
already-opened: ${{ steps.check-versions.outputs.already-opened }}
1919
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121

2222
- id: check-versions
2323
name: Check versions
@@ -55,7 +55,7 @@ jobs:
5555
needs:
5656
- check-versions
5757
steps:
58-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
58+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5959

6060
- name: Use CLA approved github bot
6161
run: .github/scripts/use-cla-approved-github-bot.sh
@@ -67,7 +67,7 @@ jobs:
6767
.github/scripts/update-spec-repo-links.sh $VERSION
6868
sed -i "s/^PREVIOUS_SPECIFICATION_VERSION=.*/PREVIOUS_SPECIFICATION_VERSION=$VERSION/" .github/scripts/update-spec-repo-links.sh
6969
70-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
70+
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
7171
id: otelbot-token
7272
with:
7373
app-id: ${{ vars.OTELBOT_APP_ID }}

0 commit comments

Comments
 (0)