Merge branch 'main' into messaging-client-id

.chloggen/634.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: messaging
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Add a GCP Pub/Sub unary pull example and the new GCP messaging attributes:
+- `messaging.gcp_pubsub.message.ack_deadline`,
+- `messaging.gcp_pubsub.message.ack_id`,
+- `messaging.gcp_pubsub.message.delivery_attempt`"
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [527]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/911.yaml

@@ -0,0 +1,4 @@
+change_type: breaking
+component: db
+note: Rename `db.name` and `db.redis.database_index` to `db.namespace`, deprecate `db.mssql.instance_name`.
+issues: [ 885 ]

.chloggen/917.yaml

@@ -0,0 +1,18 @@
+change_type: enhancement
+component: all
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Migrate Attribute Registry to be completely autogenerated.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [197]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  Migrate to using weaver for markdown generation (snippet + registry).
+  The entirety of the registry now is generated using weaver with templates
+  under the `templates/` directory.  Snippets still require a hardcoded
+  command.

.chloggen/972.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: db
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove `db.instance.id`. For Elasticsearch, replace with `db.elasticsearch.node.name`.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [ 972 ]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/975.yaml

@@ -0,0 +1,7 @@
+change_type: enhancement
+
+component: db
+
+note: Add `error.type` attribute to the database span and operation duration metric.
+
+issues: [975]

.chloggen/decouple_shared_memory_metric.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: 'breaking'
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: system
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Deprecate `shared` from `system.memory.state` values and make it a standalone metric
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [522]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/k8s-status.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: "k8s"
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: add container.status.last_terminated_reason resource attribute
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [922]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.github/CODEOWNERS

@@ -42,13 +42,6 @@
 /model/registry/url.yaml   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 /model/registry/user-agent.yaml   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 /docs/http/   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/docs/attribute-registry/http.md   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/docs/attribute-registry/server.md   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/docs/attribute-registry/client.md   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/docs/attribute-registry/network.md   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/docs/attribute-registry/error.md   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/docs/attribute-registry/url.md   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/docs/attribute-registry/user-agent.md   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 
 # System semantic conventions approvers
 /docs/system/             @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers
@@ -62,27 +55,25 @@
 
 # K8s semantic conventions approvers
 /docs/resource/k8s.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
-/docs/attributes-registry/k8s.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
 /model/resource/k8s.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
 /model/registry/k8s.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
 
 # Container semantic conventions approvers
 /docs/resource/container.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
-/docs/attributes-registry/container.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
-/docs/attributes-registry/oci.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
 /model/resource/container.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
 /model/registry/container.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
 /model/registry/oci.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
 
 # .NET semantic conventions approvers
 /model/metrics/dotnet/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver  @open-telemetry/semconv-http-approvers
-/docs/dotnet/          @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver  @open-telemetry/semconv-http-approvers
+/model/registry/aspnetcore.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver  @open-telemetry/semconv-http-approvers
+/model/registry/signalr.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver  @open-telemetry/semconv-http-approvers
+/docs/dotnet/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver  @open-telemetry/semconv-http-approvers
 
 # Gen-AI semantic conventions approvers
-/model/registry/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers 
-/model/metrics/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers 
+/model/registry/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
+/model/metrics/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
 /model/trace/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
 /docs/gen-ai/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
-/docs/attributes-registry/llm.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
 
 # TODO - Add semconv area experts

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -20,6 +20,7 @@ body:
         # DO NOT manually edit it.
         # Start semconv area list
         - area:android
+        - area:aspnetcore
         - area:aws
         - area:browser
         - area:client
@@ -46,6 +47,7 @@ body:
         - area:heroku
         - area:host
         - area:http
+        - area:jvm
         - area:k8s
         - area:log
         - area:messaging
@@ -60,6 +62,7 @@ body:
         - area:server
         - area:service
         - area:session
+        - area:signalr
         - area:source
         - area:system
         - area:telemetry

.github/ISSUE_TEMPLATE/change_proposal.yaml

@@ -13,6 +13,7 @@ body:
         # DO NOT manually edit it.
         # Start semconv area list
         - area:android
+        - area:aspnetcore
         - area:aws
         - area:browser
         - area:client
@@ -39,6 +40,7 @@ body:
         - area:heroku
         - area:host
         - area:http
+        - area:jvm
         - area:k8s
         - area:log
         - area:messaging
@@ -53,6 +55,7 @@ body:
         - area:server
         - area:service
         - area:session
+        - area:signalr
         - area:source
         - area:system
         - area:telemetry

.github/ISSUE_TEMPLATE/new-conventions.yaml

@@ -22,6 +22,7 @@ body:
         # DO NOT manually edit it.
         # Start semconv area list
         - area:android
+        - area:aspnetcore
         - area:aws
         - area:browser
         - area:client
@@ -48,6 +49,7 @@ body:
         - area:heroku
         - area:host
         - area:http
+        - area:jvm
         - area:k8s
         - area:log
         - area:messaging
@@ -62,6 +64,7 @@ body:
         - area:server
         - area:service
         - area:session
+        - area:signalr
         - area:source
         - area:system
         - area:telemetry

.markdown_link_check_config.json

@@ -2,6 +2,9 @@
   "ignorePatterns": [
     {
       "pattern": "^https://github\\.com/open-telemetry/opentelemetry-specification/(issues|pull)"
+    },
+    {
+      "pattern": "^https://github\\.com/open-telemetry/semantic-conventions/(issues|pull)"
     }
   ],
   "replacementPatterns": [

.markdownlint.yaml

@@ -12,3 +12,4 @@ ol-prefix:
   style: ordered
 no-inline-html: false
 fenced-code-language: false
+no-space-in-code: false

.prettierignore

@@ -5,5 +5,8 @@
 /docs/**
 !/docs/cloud*
 !/docs/cloud*/**
+!/docs/attributes-registry*
+!/docs/attributes-registry*/**
 /model
 /schemas
+CHANGELOG.md

CONTRIBUTING.md

@@ -103,10 +103,10 @@ You can also take examples from past changes inside the `schemas` folder.
 ### 2. Update the markdown files
 
 After updating the YAML file(s), you need to update
-the respective markdown files. For this, run the following command:
+the respective markdown files. For this, run the following commands:
 
 ```bash
-make table-generation
+make table-generation attribute-registry-generation
 ```
 
 #### Hugo frontmatter

Makefile

@@ -14,6 +14,7 @@ CHLOGGEN_CONFIG  := .chloggen/config.yaml
 # see https://github.com/open-telemetry/build-tools/releases for semconvgen updates
 # Keep links in model/README.md and .vscode/settings.json in sync!
 SEMCONVGEN_VERSION=0.24.0
+WEAVER_VERSION=latest
 
 # TODO: add `yamllint` step to `all` after making sure it works on Mac.
 .PHONY: all
@@ -95,13 +96,31 @@ yamllint:
 .PHONY: table-generation
 table-generation:
 	docker run --rm -v $(PWD)/model:/source -v $(PWD)/docs:/spec \
-		otel/semconvgen:$(SEMCONVGEN_VERSION) -f /source markdown -md /spec
+		otel/weaver:${WEAVER_VERSION} registry update-markdown \
+		--registry=/source \
+		--attribute-registry-base-url="/docs/attributes-registry" \
+		/spec
+
+# Generate attribute registry markdown.
+.PHONY: attribute-registry-generation
+attribute-registry-generation:
+	docker run --rm -v $(PWD)/model:/source -v $(PWD)/docs:/spec -v $(PWD)/templates:/weaver/templates \
+		otel/weaver:${WEAVER_VERSION} registry generate \
+		  --registry=/source \
+		  --templates=/weaver/templates \
+		  markdown \
+		  /spec/attributes-registry/
+	npm run fix:format
 
-# Check if current markdown tables differ from the ones that would be generated from YAML definitions
+# Check if current markdown tables differ from the ones that would be generated from YAML definitions (weaver).
 .PHONY: table-check
 table-check:
 	docker run --rm -v $(PWD)/model:/source -v $(PWD)/docs:/spec \
-		otel/semconvgen:$(SEMCONVGEN_VERSION) -f /source markdown -md /spec --md-check
+		otel/weaver:${WEAVER_VERSION} registry update-markdown \
+		--registry=/source \
+		--attribute-registry-base-url="/docs/attributes-registry" \
+		--dry-run \
+		/spec
 
 LATEST_RELEASED_SEMCONV_VERSION := $(shell git describe --tags --abbrev=0 | sed 's/v//g')
 .PHONY: compatibility-check
@@ -122,14 +141,15 @@ fix-format:
 	npm run fix:format
 
 # Run all checks in order of speed / likely failure.
+# As a last thing, run attribute registry generation and git-diff for differences.
 .PHONY: check
-check: misspell markdownlint check-format markdown-toc compatibility-check markdown-link-check
+check: misspell markdownlint check-format markdown-toc compatibility-check markdown-link-check attribute-registry-generation
 	git diff --exit-code ':*.md' || (echo 'Generated markdown Table of Contents is out of date, please run "make markdown-toc" and commit the changes in this PR.' && exit 1)
 	@echo "All checks complete"
 
 # Attempt to fix issues / regenerate tables.
 .PHONY: fix
-fix: table-generation misspell-correction fix-format markdown-toc
+fix: table-generation attribute-registry-generation misspell-correction fix-format markdown-toc
 	@echo "All autofixes complete"
 
 .PHONY: install-tools