Merge branch 'main' into messaging-settlement-span

Author: joaopgrassi

CHANGELOG.md

@@ -31,6 +31,8 @@
     - `type` to `process.context_switch_type`
   - Rename attributes for `process.paging.faults`
     - `type` to `process.paging.fault_type`
+- Fix JVM buffer metric schema translations
+  ([#683](https://github.com/open-telemetry/semantic-conventions/pull/683))
 
 ### Features
 

schema-next.yaml

@@ -140,8 +140,8 @@ versions:
             attribute_map:
               pool: jvm.buffer.pool.name
             apply_to_metrics:
-              - jvm.buffer.usage
-              - jvm.buffer.limit
+              - jvm.buffer.memory.usage
+              - jvm.buffer.memory.limit
               - jvm.buffer.count
         # https://github.com/open-telemetry/semantic-conventions/pull/89
         - rename_attributes: