Merge branch 'main' into baremetal

CHANGELOG.md

@@ -68,3 +68,9 @@ release.
   ([#3458](https://github.com/open-telemetry/opentelemetry-specification/pull/3458))
 - Specify the value range for JVM CPU metrics.
   ([#13](https://github.com/open-telemetry/semantic-conventions/pull/13))
+- Clarify `process.runtime.jvm.threads.count` refers to platform threads.
+  ([#54](https://github.com/open-telemetry/semantic-conventions/pull/54))
+- Add `gcp.gce.instance.name` and `gcp.gce.instance.hostname` resource
+  attributes for GCP Compute Engine VMs. ([#15](https://github.com/open-telemetry/semantic-conventions/pull/15))
+- Add note that HTTP duration metrics should match HTTP span duration.
+  ([#69](https://github.com/open-telemetry/semantic-conventions/pull/69))

semantic_conventions/metrics/process-runtime-jvm-metrics.yaml

@@ -92,7 +92,7 @@ groups:
   - id: metric.process.runtime.jvm.threads.count
     type: metric
     metric_name: process.runtime.jvm.threads.count
-    brief: "Number of executing threads."
+    brief: "Number of executing platform threads."
     instrument: updowncounter
     unit: "{thread}"
     attributes:

semantic_conventions/resource/cloud_provider/gcp/gce.yaml

@@ -0,0 +1,22 @@
+groups:
+  - id: gcp.gce
+    prefix: gcp.gce
+    type: resource
+    brief: >
+      Resources used by Google Compute Engine (GCE).
+    attributes:
+      - id: instance.name
+        type: string
+        brief: >
+          The instance name of a GCE instance. This is the value
+          provided by `host.name`, the visible name of the instance in
+          the Cloud Console UI, and the prefix for the default
+          hostname of the instance as defined by the [default internal
+          DNS
+          name](https://cloud.google.com/compute/docs/internal-dns#instance-fully-qualified-domain-names).
+        examples: ['instance-1', 'my-vm-name']
+      - id: instance.hostname
+        type: string
+        brief: >
+          The hostname of a GCE instance. This is the full value of the default or [custom hostname](https://cloud.google.com/compute/docs/instances/custom-hostname-vm).
+        examples: ['my-host1234.example.com', 'sample-vm.us-west1-b.c.my-project.internal']

specification/metrics/semantic_conventions/http-metrics.md

@@ -56,6 +56,8 @@ operations. By adding HTTP attributes to metric events it allows for finely tune
 
 This metric is required.
 
+When this metric is reported alongside an HTTP server span, the metric value SHOULD be the same as the HTTP server span duration.
+
 This metric SHOULD be specified with
 [`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/tree/v1.21.0/specification/metrics/api.md#instrument-advice)
 of `[ 0, 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10 ]`.
@@ -241,6 +243,8 @@ SHOULD NOT be set if only IP address is available and capturing name would requi
 
 This metric is required.
 
+When this metric is reported alongside an HTTP client span, the metric value SHOULD be the same as the HTTP client span duration.
+
 This metric SHOULD be specified with
 [`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/tree/v1.21.0/specification/metrics/api.md#instrument-advice)
 of `[ 0, 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10 ]`.

specification/metrics/semantic_conventions/runtime-environment-metrics.md

@@ -242,11 +242,12 @@ of `[]` (single bucket histogram capturing count, sum, min, max).
 This metric is [recommended][MetricRecommended].
 This metric is obtained from [`ThreadMXBean#getDaemonThreadCount()`](https://docs.oracle.com/javase/8/docs/api/java/lang/management/ThreadMXBean.html#getDaemonThreadCount--) and
 [`ThreadMXBean#getThreadCount()`](https://docs.oracle.com/javase/8/docs/api/java/lang/management/ThreadMXBean.html#getThreadCount--).
+Note that this is the number of platform threads (as opposed to virtual threads).
 
 <!-- semconv metric.process.runtime.jvm.threads.count(metric_table) -->
 | Name     | Instrument Type | Unit (UCUM) | Description    |
 | -------- | --------------- | ----------- | -------------- |
-| `process.runtime.jvm.threads.count` | UpDownCounter | `{thread}` | Number of executing threads. |
+| `process.runtime.jvm.threads.count` | UpDownCounter | `{thread}` | Number of executing platform threads. |
 <!-- endsemconv -->
 
 <!-- semconv metric.process.runtime.jvm.threads.count(full) -->

specification/resource/semantic_conventions/cloud_provider/gcp/gce.md

@@ -0,0 +1,12 @@
+# Google Compute Engine
+
+**Type:** `gcp.gce`
+
+**Description:** Resource attributes for GCE instances.
+
+<!-- semconv gcp.gce -->
+| Attribute  | Type | Description  | Examples  | Requirement Level |
+|---|---|---|---|---|
+| `gcp.gce.instance.name` | string | The instance name of a GCE instance. This is the value provided by `host.name`, the visible name of the instance in the Cloud Console UI, and the prefix for the default hostname of the instance as defined by the [default internal DNS name](https://cloud.google.com/compute/docs/internal-dns#instance-fully-qualified-domain-names). | `instance-1`; `my-vm-name` | Recommended |
+| `gcp.gce.instance.hostname` | string | The hostname of a GCE instance. This is the full value of the default or [custom hostname](https://cloud.google.com/compute/docs/instances/custom-hostname-vm). | `my-host1234.example.com`; `sample-vm.us-west1-b.c.my-project.internal` | Recommended |
+<!-- endsemconv -->