Skip to content

Commit 33decae

Browse files
heyamsheyams
committed
Merge remote-tracking branch 'upstream/main' into heya/add-enduser-namespace
2 parents e076c4e + 867ed9c commit 33decae

Some content is hidden

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

52 files changed

+1623
-829
lines changed

‎.chloggen/1734.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
change_type: breaking
2+
3+
component: db
4+
5+
note: |
6+
Rename `db.system` to `db.system.name` and clean up its values.
7+
Rename `db.elasticsearch.*`, `db.cassandra.*`, `db.cosmosdb.*` attributes to `elasticsearch.*`, `cassandra.*`, and `azure.cosmosdb.*` respectively.
8+
Rename `db.client.cosmosdb.*` metrics to `azure.cosmosdb.client.*`.
9+
10+
issues: [1581, 608]
11+
12+
subtext:

‎.chloggen/1772.yaml

+22
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: process
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: Update `process.runtime` example for the Python language.
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: [1772]
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/1779.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
change_type: enhancement
2+
component: db
3+
note: Add metrics section to each of the database system-specific conventions.
4+
issues: [1447, 1779]

‎.github/ISSUE_TEMPLATE/bug_report.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ body:
2828
- area:aws
2929
- area:azure
3030
- area:browser
31+
- area:cassandra
3132
- area:cicd
3233
- area:client
3334
- area:cloud
@@ -44,6 +45,7 @@ body:
4445
- area:dns
4546
- area:dotnet
4647
- area:enduser
48+
- area:elasticsearch
4749
- area:error
4850
- area:exception
4951
- area:faas

‎.github/ISSUE_TEMPLATE/change_proposal.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ body:
2020
- area:aws
2121
- area:azure
2222
- area:browser
23+
- area:cassandra
2324
- area:cicd
2425
- area:client
2526
- area:cloud
@@ -36,6 +37,7 @@ body:
3637
- area:dns
3738
- area:dotnet
3839
- area:enduser
40+
- area:elasticsearch
3941
- area:error
4042
- area:exception
4143
- area:faas

‎.github/workflows/scripts/prepare-new-issue.sh ‎.github/scripts/prepare-new-issue.sh

File renamed without changes.

‎.github/workflows/scripts/prepare-new-pr.sh ‎.github/scripts/prepare-new-pr.sh

File renamed without changes.

‎internal/tools/update_specification_version.sh ‎.github/scripts/update-spec-repo-links.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
# Example usage:
44
#
5-
# ./internal/tools/update_specification_version.sh
5+
# ./internal/tools/update-spec-repo-links.sh v1.41.0
66

7+
# this version should be kept up-to-date with the spec version that links use
8+
PREVIOUS_SPECIFICATION_VERSION=v1.40.0
79

8-
# Set this to the version number you want to CHANGE in URLs in the repository.
9-
PREVIOUS_SPECIFICATION_VERSION="v1.39.0"
1010
# Set this to the version number you want to KEEP in URLs in the repository.
11-
LATEST_SPECIFICATION_VERSION="v1.40.0"
11+
LATEST_SPECIFICATION_VERSION=$1
1212
# The specific pattern we look for when replacing URLs
1313
SPECIFICATION_URL_PREFIX="https://github.com/open-telemetry/opentelemetry-specification/tree/"
1414
SPECIFICATION_BLOB_URL_PREFIX="https://github.com/open-telemetry/opentelemetry-specification/blob/"

‎.github/workflows/scripts/use-cla-approved-github-bot.sh ‎.github/scripts/use-cla-approved-github-bot.sh

File renamed without changes.

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

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: Auto-update spec repo links
2+
on:
3+
schedule:
4+
# hourly at minute 46
5+
- cron: "46 * * * *"
6+
workflow_dispatch:
7+
8+
jobs:
9+
check-versions:
10+
runs-on: ubuntu-latest
11+
outputs:
12+
current-version: ${{ steps.check-versions.outputs.current-version }}
13+
latest-version: ${{ steps.check-versions.outputs.latest-version }}
14+
already-opened: ${{ steps.check-versions.outputs.already-opened }}
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- id: check-versions
19+
name: Check versions
20+
env:
21+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
run: |
23+
current_version=$(grep "PREVIOUS_SPECIFICATION_VERSION=v.*" \
24+
internal/tools/update_specification_version.sh \
25+
| sed "s/PREVIOUS_SPECIFICATION_VERSION=//")
26+
latest_version=$(gh release view \
27+
--repo open-telemetry/opentelemetry-specification \
28+
--json tagName \
29+
--jq .tagName)
30+
31+
matches=$(gh pr list \
32+
--author opentelemetrybot \
33+
--state open \
34+
--search "in:title \"Update spec repo links to $latest_version\"")
35+
if [ ! -z "$matches" ]
36+
then
37+
already_opened=true
38+
fi
39+
40+
echo "current-version=$current_version" >> $GITHUB_OUTPUT
41+
echo "latest-version=$latest_version" >> $GITHUB_OUTPUT
42+
echo "already-opened=$already_opened" >> $GITHUB_OUTPUT
43+
44+
update-spec-repo-links:
45+
runs-on: ubuntu-latest
46+
if: |
47+
needs.check-versions.outputs.current-version != needs.check-versions.outputs.latest-version &&
48+
needs.check-versions.outputs.already-opened != 'true'
49+
needs:
50+
- check-versions
51+
steps:
52+
- uses: actions/checkout@v4
53+
54+
- name: Use CLA approved github bot
55+
run: .github/scripts/use-cla-approved-github-bot.sh
56+
57+
- name: Update version
58+
env:
59+
VERSION: ${{ needs.check-versions.outputs.latest-version }}
60+
run: |
61+
.github/scripts/update-spec-repo-links.sh $VERSION
62+
sed -i "s/^PREVIOUS_SPECIFICATION_VERSION=.*/PREVIOUS_SPECIFICATION_VERSION=$VERSION/" .github/scripts/update-spec-repo-links.sh
63+
64+
- name: Create pull request
65+
env:
66+
VERSION: ${{ needs.check-versions.outputs.latest-version }}
67+
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
68+
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
69+
run: |
70+
message="Update spec repo links to $VERSION"
71+
body="Update spec repo links to \`$VERSION\`."
72+
branch="opentelemetrybot/update-spec-repo-links-to-$VERSION"
73+
74+
git checkout -b $branch
75+
git commit -a -m "$message"
76+
git push --set-upstream origin $branch
77+
gh pr create --title "$message" \
78+
--body "$body" \
79+
--label "Skip Changelog" \
80+
--base main

‎.github/workflows/prepare-new-issue.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v4
1212

1313
- name: Run prepare-new-issue.sh
14-
run: ./.github/workflows/scripts/prepare-new-issue.sh
14+
run: ./.github/scripts/prepare-new-issue.sh
1515
env:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1717
ISSUE: ${{ github.event.issue.number }}

‎.github/workflows/prepare-new-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# we're going to run prepare-new-pr script from the main branch
2727
# to parse changelog record from the PR branch.
2828
- name: Run prepare-new-pr.sh
29-
run: ./.github/workflows/scripts/prepare-new-pr.sh
29+
run: ./.github/scripts/prepare-new-pr.sh
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3232
PR: ${{ github.event.pull_request.number }}

‎.github/workflows/prepare-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fi
2222
2323
- name: Use CLA approved github bot
24-
run: .github/workflows/scripts/use-cla-approved-github-bot.sh
24+
run: .github/scripts/use-cla-approved-github-bot.sh
2525

2626
- name: Update schema files
2727
run: |

‎CONTRIBUTING.md

-9
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ requirements and recommendations.
3434
- [Misspell check](#misspell-check)
3535
- [Update the tables of content](#update-the-tables-of-content)
3636
- [Markdown link check](#markdown-link-check)
37-
- [Updating the referenced specification version](#updating-the-referenced-specification-version)
3837
- [Merging existing ECS conventions](#merging-existing-ecs-conventions)
3938

4039
<!-- tocstop -->
@@ -406,14 +405,6 @@ To check the validity of links in all markdown files, run the following command:
406405
make markdown-link-check
407406
```
408407

409-
## Updating the referenced specification version
410-
411-
1. Open the `./internal/tools/update_specification_version.sh` script.
412-
2. Modify the `PREVIOUS_SPECIFICATION_VERSION` to be the same value as `LATEST_SPECIFICATION_VERSION`
413-
3. Modify `LATEST_SPECIFICATION_VERSION` to the latest specification tag, e.g. `1.21`
414-
4. Run the script from the root directory, e.g. `semantic-conventions$ ./internal/tools/update_specification_version.sh`.
415-
5. Add all modified files to the change submit and submit a PR.
416-
417408
## Merging existing ECS conventions
418409

419410
The Elastic Common Schema (ECS) is being merged into OpenTelemetry Semantic

‎RELEASING.md

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
- Close the [release milestone](https://github.com/open-telemetry/semantic-conventions/milestones)
66
if there is one.
7-
- Ensure the referenced specification version is up to date. Use
8-
[tooling to update the spec](./CONTRIBUTING.md#updating-the-referenced-specification-version)
9-
if needed.
107
- Run [opentelemetry.io workflow](https://github.com/open-telemetry/opentelemetry.io/actions/workflows/build-dev.yml)
118
against `semantic-conventions` submodule as a smoke-test for docs. Fix broken links, if any.
129
- Run the [prepare release workflow](https://github.com/open-telemetry/semantic-conventions/actions/workflows/prepare-release.yml).

‎docs/attributes-registry/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Currently, the following namespaces exist:
3838
- [AWS](aws.md)
3939
- [Azure](azure.md)
4040
- [Browser](browser.md)
41+
- [Cassandra](cassandra.md)
4142
- [CICD](cicd.md)
4243
- [Client](client.md)
4344
- [Cloud](cloud.md)
@@ -53,6 +54,7 @@ Currently, the following namespaces exist:
5354
- [Disk](disk.md)
5455
- [DNS](dns.md)
5556
- [Dotnet](dotnet.md)
57+
- [Elasticsearch](elasticsearch.md)
5658
- [Enduser](enduser.md)
5759
- [Error](error.md)
5860
- [Event](event.md)

‎docs/attributes-registry/aws.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
## General AWS Attributes
1818

19-
This document defines generic attributes for AWS services.
19+
This section defines generic attributes for AWS services.
2020

2121
| Attribute | Type | Description | Examples | Stability |
2222
|---|---|---|---|---|

‎docs/attributes-registry/azure.md

+42-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,51 @@
66

77
# Azure
88

9-
## Azure SDK Attributes
9+
- [Azure Client Library Attributes](#azure-client-library-attributes)
10+
- [Azure Cosmos DB Attributes](#azure-cosmos-db-attributes)
1011

11-
This document defines generic attributes for Azure SDK.
12+
## Azure Client Library Attributes
13+
14+
This section defines generic attributes used by Azure Client Libraries.
1215

1316
| Attribute | Type | Description | Examples | Stability |
1417
|---|---|---|---|---|
1518
| <a id="az-namespace" href="#az-namespace">`az.namespace`</a> | string | [Azure Resource Provider Namespace](https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers) as recognized by the client. | `Microsoft.Storage`; `Microsoft.KeyVault`; `Microsoft.ServiceBus` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
1619
| <a id="az-service-request-id" href="#az-service-request-id">`az.service_request_id`</a> | string | The unique identifier of the service request. It's generated by the Azure service and returned with the response. | `00000000-0000-0000-0000-000000000000` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
20+
| <a id="azure-client-id" href="#azure-client-id">`azure.client.id`</a> | string | The unique identifier of the client instance. | `3ba4827d-4422-483f-b59f-85b74211c11d`; `storage-client-1` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
21+
22+
## Azure Cosmos DB Attributes
23+
24+
This section defines attributes for Azure Cosmos DB.
25+
26+
| Attribute | Type | Description | Examples | Stability |
27+
|---|---|---|---|---|
28+
| <a id="azure-cosmosdb-connection-mode" href="#azure-cosmosdb-connection-mode">`azure.cosmosdb.connection.mode`</a> | string | Cosmos client connection mode. | `gateway`; `direct` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
29+
| <a id="azure-cosmosdb-consistency-level" href="#azure-cosmosdb-consistency-level">`azure.cosmosdb.consistency.level`</a> | string | Account or request [consistency level](https://learn.microsoft.com/azure/cosmos-db/consistency-levels). | `Eventual`; `ConsistentPrefix`; `BoundedStaleness`; `Strong`; `Session` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
30+
| <a id="azure-cosmosdb-operation-contacted-regions" href="#azure-cosmosdb-operation-contacted-regions">`azure.cosmosdb.operation.contacted_regions`</a> | string[] | List of regions contacted during operation in the order that they were contacted. If there is more than one region listed, it indicates that the operation was performed on multiple regions i.e. cross-regional call. [1] | `["North Central US", "Australia East", "Australia Southeast"]` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
31+
| <a id="azure-cosmosdb-operation-request-charge" href="#azure-cosmosdb-operation-request-charge">`azure.cosmosdb.operation.request_charge`</a> | double | The number of request units consumed by the operation. | `46.18`; `1.0` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
32+
| <a id="azure-cosmosdb-request-body-size" href="#azure-cosmosdb-request-body-size">`azure.cosmosdb.request.body.size`</a> | int | Request payload size in bytes. | | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
33+
| <a id="azure-cosmosdb-response-sub-status-code" href="#azure-cosmosdb-response-sub-status-code">`azure.cosmosdb.response.sub_status_code`</a> | int | Cosmos DB sub status code. | `1000`; `1002` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
34+
35+
**[1] `azure.cosmosdb.operation.contacted_regions`:** Region name matches the format of `displayName` in [Azure Location API](https://learn.microsoft.com/rest/api/subscription/subscriptions/list-locations?view=rest-subscription-2021-10-01&tabs=HTTP#location)
36+
37+
---
38+
39+
`azure.cosmosdb.connection.mode` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used.
40+
41+
| Value | Description | Stability |
42+
|---|---|---|
43+
| `direct` | Direct connection. | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
44+
| `gateway` | Gateway (HTTP) connection. | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
45+
46+
---
47+
48+
`azure.cosmosdb.consistency.level` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used.
49+
50+
| Value | Description | Stability |
51+
|---|---|---|
52+
| `BoundedStaleness` | bounded_staleness | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
53+
| `ConsistentPrefix` | consistent_prefix | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
54+
| `Eventual` | eventual | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
55+
| `Session` | session | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
56+
| `Strong` | strong | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

‎docs/attributes-registry/cassandra.md

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!--- Hugo front matter used to generate the website version of this page:
2+
--->
3+
4+
<!-- NOTE: THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
5+
<!-- see templates/registry/markdown/attribute_namespace.md.j2 -->
6+
7+
# Cassandra
8+
9+
## Cassandra Attributes
10+
11+
This section defines attributes for Cassandra.
12+
13+
| Attribute | Type | Description | Examples | Stability |
14+
|---|---|---|---|---|
15+
| <a id="cassandra-consistency-level" href="#cassandra-consistency-level">`cassandra.consistency.level`</a> | string | The consistency level of the query. Based on consistency values from [CQL](https://docs.datastax.com/en/cassandra-oss/3.0/cassandra/dml/dmlConfigConsistency.html). | `all`; `each_quorum`; `quorum` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
16+
| <a id="cassandra-coordinator-dc" href="#cassandra-coordinator-dc">`cassandra.coordinator.dc`</a> | string | The data center of the coordinating node for a query. | `us-west-2` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
17+
| <a id="cassandra-coordinator-id" href="#cassandra-coordinator-id">`cassandra.coordinator.id`</a> | string | The ID of the coordinating node for a query. | `be13faa2-8574-4d71-926d-27f16cf8a7af` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
18+
| <a id="cassandra-page-size" href="#cassandra-page-size">`cassandra.page.size`</a> | int | The fetch size used for paging, i.e. how many rows will be returned at once. | `5000` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
19+
| <a id="cassandra-query-idempotent" href="#cassandra-query-idempotent">`cassandra.query.idempotent`</a> | boolean | Whether or not the query is idempotent. | | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
20+
| <a id="cassandra-speculative-execution-count" href="#cassandra-speculative-execution-count">`cassandra.speculative_execution.count`</a> | int | The number of times a query was speculatively executed. Not set or `0` if the query was not executed speculatively. | `0`; `2` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
21+
22+
---
23+
24+
`cassandra.consistency.level` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used.
25+
26+
| Value | Description | Stability |
27+
|---|---|---|
28+
| `all` | all | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
29+
| `any` | any | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
30+
| `each_quorum` | each_quorum | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
31+
| `local_one` | local_one | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
32+
| `local_quorum` | local_quorum | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
33+
| `local_serial` | local_serial | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
34+
| `one` | one | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
35+
| `quorum` | quorum | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
36+
| `serial` | serial | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
37+
| `three` | three | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
38+
| `two` | two | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

0 commit comments

Comments
 (0)