Merge remote-tracking branch 'upstream/main' into rename-classes-curr…

…ent-loaded

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+Fixes #
+
+## Changes
+
+Please provide a brief description of the changes here.
+
+Note: if the PR is touching an area that is not listed in the [existing areas](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/README.md), or the area does not have sufficient [domain experts coverage](https://github.com/open-telemetry/semantic-conventions/blob/main/.github/CODEOWNERS), the PR might be tagged as [experts needed](https://github.com/open-telemetry/semantic-conventions/labels/experts%20needed) and move slowly until experts are identified.
+
+## Merge requirement checklist
+
+* [ ] [CONTRIBUTING.md](https://github.com/open-telemetry/semantic-conventions/blob/main/CONTRIBUTING.md) guidelines followed.
+* [ ] [CHANGELOG.md](https://github.com/open-telemetry/semantic-conventions/blob/main/CHANGELOG.md) updated for non-trivial changes.
+* [ ] [schema-next.yaml](https://github.com/open-telemetry/semantic-conventions/blob/main/schema-next.yaml) updated with changes to existing conventions.

.vscode/settings.json

@@ -10,7 +10,7 @@
         "MD040": false,
     },
     "yaml.schemas": {
-        "https://raw.githubusercontent.com/open-telemetry/build-tools/v0.17.0/semantic-conventions/semconv.schema.json": [
+        "https://raw.githubusercontent.com/open-telemetry/build-tools/v0.20.0/semantic-conventions/semconv.schema.json": [
             "semantic_conventions/**/*.yaml"
         ]
     },

CHANGELOG.md

@@ -9,6 +9,23 @@ release.
 
 - Fix the unit of metric.process.runtime.jvm.system.cpu.load_1m to be {run_queue_item}
   ([#95](https://github.com/open-telemetry/semantic-conventions/pull/95))
+- Update `.count` metric naming convention so that it only applies to UpDownCounters,
+  and add that `.total` should not be used by either Counters or UpDownCounters
+  ([#107](https://github.com/open-telemetry/semantic-conventions/pull/107))
+- BREAKING: Rename `http.client.duration` and `http.server.duration` metrics to
+  `http.client.request.duration` and `http.server.request.duration` respectively.
+  ([#224](https://github.com/open-telemetry/semantic-conventions/pull/224))
+- Update HTTP `network.protocol.version` examples to match HTTP RFCs.
+  ([#228](https://github.com/open-telemetry/semantic-conventions/pull/228))
+- Re-introduce namespace and attributes to describe the original destination messages were
+  published to (`messaging.destination_publish.*`).
+  ([#156](https://github.com/open-telemetry/semantic-conventions/pull/156))
+- Generate FaaS metric semantic conventions from YAML.
+  ([#88](https://github.com/open-telemetry/semantic-conventions/pull/88))
+  The conventions cover metrics that are recorded by the FaaS itself and not by
+  clients invoking them.
+- BREAKING: Rename all JVM metrics from `process.runtime.jvm.*` to `jvm.*`
+  ([#241](https://github.com/open-telemetry/semantic-conventions/pull/241))
 
 ## v1.21.0 (2023-07-13)
 
@@ -114,6 +131,8 @@ Note: This is the first release of Semantic Conventions separate from the Specif
   ([#133](https://github.com/open-telemetry/semantic-conventions/pull/133))
 - Add markdown file for url semantic conventions
   ([#174](https://github.com/open-telemetry/semantic-conventions/pull/174))
+- Add `system.cpu.physical.count` and `system.cpu.logical.count` metrics.
+  ([#99](https://github.com/open-telemetry/opentelemetry-specification/pull/99))
 
 ## v1.20.0 (2023-04-07)
 

CONTRIBUTING.md

@@ -11,10 +11,51 @@ requirements and recommendations.
 Before you can contribute, you will need to sign the [Contributor License
 Agreement](https://identity.linuxfoundation.org/projects/cncf).
 
-## TODO
+## How to Contribute
+
+When contributing to semantic conventions, it's important to understand a few
+key, but non-obvious, aspects:
+
+- All attributes, metrics, etc. are formally defined in YAML files under
+  the `model/` directory.
+- All descriptions, normative language are defined in the `docs/`
+  directory.
+  - We provide tooling to generate Markdown documentation from the formal
+    YAML definitons.  See [Yaml to Markdown](#yaml-to-markdown).
+  - We use Hugo to render [semantic conventions on our website](https://opentelemetry.io/docs/specs/semconv/).
+    You will see `<!--- Hugo front matter used to generate ...` sections
+    in markdown.  See [Hugo frontmatter](#hugo-frontmatter) for details.
+- All changes to existing attributes, metrics, etc. MUST be allowed as
+  per our [stability guarantees](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.20.0/specification/versioning-and-stability.md#semantic-conventions-stability) and
+  defined in a schema file.  As part of any contribution, you should
+  include attribute changes defined in the `schema-next.yaml` file.
+  For details, please read [the schema specification](https://opentelemetry.io/docs/specs/otel/schemas/).
+- After creating a pull request, please update the [CHANGELOG](CHANGELOG.md) file with
+  a description of your changes.
+
+Please make sure all Pull Requests are compliant with these rules!
+
+### Hugo frontmatter
+
+At the top of all Markdown files under the `docs/` directory, you will see
+headers like the following:
 
-We need to flesh out the rest of the contributing document for specifics on
-semantic conventions.
+```
+<!--- Hugo front matter used to generate the website version of this page:
+linkTitle: HTTP
+path_base_for_github_subdir:
+  from: content/en/docs/specs/semconv/http/_index.md
+  to: http/README.md
+--->
+```
+
+When creating new pages, you should provide the `linkTitle` attribute. This is used
+to generate the navigation bar on the website, and will be listed relative to the
+"parent" document.
+
+## Automation
+
+Semantic Conventions provides a set of automated tools for general development.
 
 ### Consistency Checks
 

Makefile

@@ -8,7 +8,7 @@ MISSPELL = $(TOOLS_DIR)/$(MISSPELL_BINARY)
 
 # 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.19.0
+SEMCONVGEN_VERSION=0.20.0
 
 # TODO: add `yamllint` step to `all` after making sure it works on Mac.
 .PHONY: all

README.md

@@ -17,9 +17,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 Approvers ([@open-telemetry/specs-semconv-approvers](https://github.com/orgs/open-telemetry/teams/specs-semconv-approvers)):
 
+- [Alexander Wert](https://github.com/AlexanderWert), Elastic
 - [Christian Neumüller](https://github.com/Oberon00), Dynatrace
 - [James Moessis](https://github.com/jamesmoessis), Atlassian
-- [Joao Grassi](https://github.com/joaopgrassi), Dynatrace
 - [Johannes Tax](https://github.com/pyohannes), Grafana Labs
 - [Liudmila Molkova](https://github.com/lmolkova), Microsoft
 - [Sean Marciniak](https://github.com/MovieStoreGuy), Atlassian
@@ -29,9 +29,10 @@ _Find more about the approver role in [community repository](https://github.com/
 
 Maintainers ([@open-telemetry/specs-semconv-maintainers](https://github.com/orgs/open-telemetry/teams/specs-semconv-maintainers)):
 
-- [Josh Suereth](https://github.com/jsuereth)
-- [Armin Ruech](https://github.com/arminru)
-- [Reiley Yang](https://github.com/reyang)
+- [Armin Ruech](https://github.com/arminru), Dynatrace
+- [Joao Grassi](https://github.com/joaopgrassi), Dynatrace
+- [Josh Suereth](https://github.com/jsuereth), Google
+- [Reiley Yang](https://github.com/reyang), Microsoft
 
 _Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer)._