Skip to content

Commit 12ffb0f

Browse files
Merge branch 'main' into editoral/#189_StandardiseListSymbol
2 parents 340d4db + cfbac6a commit 12ffb0f

Some content is hidden

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

42 files changed

+81
-79
lines changed

.github/renovate.json5

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:recommended",
5-
"docker:pinDigests",
4+
"config:best-practices",
65
"helpers:pinGitHubActionDigestsToSemver"
76
],
87
"postUpdateOptions" : [

.github/scripts/triage/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/scripts/triage/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"yaml": "^2.8.1"
1010
},
1111
"devDependencies": {
12-
"@types/node": "^24.6.2"
12+
"@types/node": "24.10.1"
1313
}
1414
}

.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.50.0
8+
PREVIOUS_SPECIFICATION_VERSION=v1.51.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/check-changes-ownership.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ on:
55
branches: [ 'main' ]
66
paths:
77
- 'model/**'
8-
jobs:
98

9+
permissions:
10+
contents: read
11+
12+
jobs:
1013
get-changed-files:
1114
runs-on: ubuntu-latest
1215
permissions:

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
45+
uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
4646
with:
4747
sarif_file: results.sarif

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Checks](https://github.com/open-telemetry/semantic-conventions/workflows/Checks/badge.svg)](https://github.com/open-telemetry/semantic-conventions/actions?query=workflow%3A%22Checks%22+branch%3Amain)
44
[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/open-telemetry/semantic-conventions.svg?logo=opentelemetry&&color=f5a800&label=Latest%20release)](https://github.com/open-telemetry/semantic-conventions/releases/latest)
5-
[![Specification Version](https://img.shields.io/badge/OTel_specification_version-v1.50.0-blue?logo=opentelemetry&color=f5a800)](https://github.com/open-telemetry/opentelemetry-specification/releases/tag/v1.50.0)
6-
[![Slack](https://img.shields.io/badge/Slack-otel_semantic_conventions-purple)](https://cloud-native.slack.com/archives/C041APFBYQP)
5+
[![Specification Version](https://img.shields.io/badge/OTel_specification_version-v1.51.0-blue?logo=opentelemetry&color=f5a800)](https://github.com/open-telemetry/opentelemetry-specification/releases/tag/v1.51.0)
6+
[![Slack](https://img.shields.io/badge/Slack-%23otel--semantic--conventions-purple)](https://cloud-native.slack.com/archives/C041APFBYQP)
77

88
Semantic Conventions define a common set of (semantic) attributes which
99
provide meaning to data when collecting, producing and consuming it.

docs/database/cosmosdb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ This metric is [required][MetricRequired].
338338
It captures the Request Units consumed by each operation in Azure Cosmos DB. Since Request Units serve as a form of throughput control within the Azure Cosmos DB database, monitoring their usage is crucial to avoid throttling.
339339

340340
this metric SHOULD be specified with
341-
[`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.50.0/specification/metrics/api.md#instrument-advisory-parameters)
341+
[`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.51.0/specification/metrics/api.md#instrument-advisory-parameters)
342342
of `[ 1, 5, 10, 25, 50, 100, 250, 500, 1000]`.
343343

344344
Explaining bucket configuration:

docs/database/database-metrics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ This metric is [required][MetricRequired].
6363
When this metric is reported alongside a database operation span, the metric value SHOULD be the same as the database operation span duration.
6464

6565
This metric SHOULD be specified with
66-
[`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.50.0/specification/metrics/api.md#instrument-advisory-parameters)
66+
[`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.51.0/specification/metrics/api.md#instrument-advisory-parameters)
6767
of `[ 0.001, 0.005, 0.01, 0.05, 0.1, 0.5, 1, 5, 10 ]`.
6868

6969
<!-- semconv metric.db.client.operation.duration -->
@@ -248,7 +248,7 @@ The following metric instruments describe database query response.
248248
This metric is [recommended][MetricRecommended].
249249

250250
This metric SHOULD be specified with
251-
[`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.50.0/specification/metrics/api.md#instrument-advisory-parameters)
251+
[`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.51.0/specification/metrics/api.md#instrument-advisory-parameters)
252252
of `[1, 2, 5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000]`.
253253

254254
Explaining bucket configuration:

docs/database/database-spans.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ linkTitle: Spans
4747
4848
## Name
4949

50-
Database spans MUST follow the overall [guidelines for span names](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.50.0/specification/trace/api.md#span).
50+
Database spans MUST follow the overall [guidelines for span names](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.51.0/specification/trace/api.md#span).
5151

5252
The **span name** SHOULD be `{db.query.summary}` if a summary is available.
5353

0 commit comments

Comments
 (0)