[receiver/apache] Add opt-in migration to new metric and attribute names behind feature gates

.chloggen/fix_47327.yaml

@@ -0,0 +1,38 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
+component: receiver/apache
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Update metric and attribute naming to follow semantic conventions
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [47327]
+
+# (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: |
+  Attribute Changes:
+    - `connection_state` is now `apache.connection.state`
+    - `state` is now `apache.worker.state`
+    - `mode` is now `cpu.mode`
+    - `level` is now `apache.process.level`
+  Metric Changes:
+    - `apache.connections.async` is now `apache.connections`
+    - `apache.current_connections` is now `apache.connection.active`
+    - `apache.requests` is now `apache.request.count`
+    - `apache.scoreboard` is now `apache.workers`
+    - `apache.workers` was replaced by `apache.worker.active` and `apache.worker.idle`
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

.chloggen/sentryexporter-validate-slugs.yaml

@@ -4,7 +4,7 @@
 change_type: bug_fix
 
 # The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
-component: sentryexporter
+component: exporter/sentry
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
 note: Validate organization and project slugs and URL-escape them when constructing Sentry API request paths.

receiver/apachereceiver/documentation.md

@@ -12,19 +12,27 @@ metrics:
     enabled: false
 ```
 
-### apache.connections.async
+### apache.connection.active
+
+The number of active connections currently attached to the HTTP server.
+
+| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
+| ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
+| {connection} | Sum | Int | Cumulative | false | Development |
+
+### apache.connections
 
 The number of connections in different asynchronous states reported by Apache's server-status.
 
 | Unit | Metric Type | Value Type | Stability |
 | ---- | ----------- | ---------- | --------- |
-| {connections} | Gauge | Int | Development |
+| {connection} | Gauge | Int | Development |
 
 #### Attributes
 
 | Name | Description | Values | Requirement Level | Semantic Convention |
 | ---- | ----------- | ------ | ----------------- | ------------------- |
-| connection_state | The asynchronous connection state reported by Apache's server-status. | Str: ``writing``, ``keepalive``, ``closing`` | Recommended | - |
+| apache.connection.state | The asynchronous connection state reported by Apache's server-status. | Str: ``writing``, ``keepalive``, ``closing`` | Recommended | - |
 
 ### apache.cpu.load
 
@@ -46,16 +54,8 @@ Jiffs used by processes of given category.
 
 | Name | Description | Values | Requirement Level | Semantic Convention |
 | ---- | ----------- | ------ | ----------------- | ------------------- |
-| level | Level of processes. | Str: ``self``, ``children`` | Recommended | - |
-| mode | Mode of processes. | Str: ``system``, ``user`` | Recommended | - |
-
-### apache.current_connections
-
-The number of active connections currently attached to the HTTP server.
-
-| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
-| ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
-| {connections} | Sum | Int | Cumulative | false | Development |
+| apache.process.level | Level of processes. | Str: ``self``, ``children`` | Recommended | - |
+| cpu.mode | Mode of processes. | Str: ``system``, ``user`` | Recommended | - |
 
 ### apache.load.1
 
@@ -81,6 +81,14 @@ The average server load during the last 5 minutes.
 | ---- | ----------- | ---------- | --------- |
 | % | Gauge | Double | Development |
 
+### apache.request.count
+
+The number of requests serviced by the HTTP server.
+
+| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
+| ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
+| {request} | Sum | Int | Cumulative | true | Development |
+
 ### apache.request.time
 
 Total time spent on handling requests.
@@ -89,59 +97,53 @@ Total time spent on handling requests.
 | ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
 | ms | Sum | Int | Cumulative | true | Development |
 
-### apache.requests
+### apache.traffic
 
-The number of requests serviced by the HTTP server per second.
+Total HTTP server traffic.
 
 | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
 | ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
-| {requests} | Sum | Int | Cumulative | true | Development |
-
-### apache.scoreboard
+| By | Sum | Int | Cumulative | true | Development |
 
-The number of workers in each state.
+### apache.uptime
 
-The [apache scoreboard](https://metacpan.org/pod/Apache::Scoreboard#DESCRIPTION) is an encoded representation of the state of all the server's workers. This metric decodes the scoreboard and presents a count of workers in each state.
+The amount of time that the server has been running in seconds.
 
 | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
 | ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
-| {workers} | Sum | Int | Cumulative | false | Development |
-
-#### Attributes
-
-| Name | Description | Values | Requirement Level | Semantic Convention |
-| ---- | ----------- | ------ | ----------------- | ------------------- |
-| state | The state of a connection. | Str: ``open``, ``waiting``, ``starting``, ``reading``, ``sending``, ``keepalive``, ``dnslookup``, ``closing``, ``logging``, ``finishing``, ``idle_cleanup``, ``unknown`` | Recommended | - |
+| s | Sum | Int | Cumulative | true | Development |
 
-### apache.traffic
+### apache.worker.active
 
-Total HTTP server traffic.
+The number of busy workers currently attached to the HTTP server.
 
 | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
 | ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
-| By | Sum | Int | Cumulative | true | Development |
+| {worker} | Sum | Int | Cumulative | false | Development |
 
-### apache.uptime
+### apache.worker.idle
 
-The amount of time that the server has been running in seconds.
+The number of idle workers currently attached to the HTTP server.
 
 | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
 | ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
-| s | Sum | Int | Cumulative | true | Development |
+| {worker} | Sum | Int | Cumulative | false | Development |
 
 ### apache.workers
 
-The number of workers currently attached to the HTTP server.
+The number of workers in each state.
+
+The [apache scoreboard](https://metacpan.org/pod/Apache::Scoreboard#DESCRIPTION) is an encoded representation of the state of all the server's workers. This metric decodes the scoreboard and presents a count of workers in each state.
 
 | Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | Stability |
 | ---- | ----------- | ---------- | ----------------------- | --------- | --------- |
-| {workers} | Sum | Int | Cumulative | false | Development |
+| {worker} | Sum | Int | Cumulative | false | Development |
 
 #### Attributes
 
 | Name | Description | Values | Requirement Level | Semantic Convention |
 | ---- | ----------- | ------ | ----------------- | ------------------- |
-| state | The state of workers. | Str: ``busy``, ``idle`` | Recommended | - |
+| apache.worker.state | The state of a worker. | Str: ``open``, ``waiting``, ``starting``, ``reading``, ``sending``, ``keepalive``, ``dnslookup``, ``closing``, ``logging``, ``finishing``, ``idle_cleanup``, ``unknown`` | Recommended | - |
 
 ## Resource Attributes
 

receiver/apachereceiver/internal/metadata/config.schema.yaml

@@ -4,8 +4,15 @@ $defs:
     description: MetricsConfig provides config for apache metrics.
     type: object
     properties:
-      apache.connections.async:
-        description: "ApacheConnectionsAsyncMetricConfig provides config for the apache.connections.async metric."
+      apache.connection.active:
+        description: "ApacheConnectionActiveMetricConfig provides config for the apache.connection.active metric."
+        type: object
+        properties:
+          enabled:
+            type: boolean
+            default: true
+      apache.connection.status:
+        description: "ApacheConnectionStatusMetricConfig provides config for the apache.connection.status metric."
         type: object
         properties:
           enabled:
@@ -24,9 +31,9 @@ $defs:
             items:
               type: string
               enum:
-                - "connection_state"
+                - "apache.connection.state"
             default:
-              - "connection_state"
+              - "apache.connection.state"
       apache.cpu.load:
         description: "ApacheCPULoadMetricConfig provides config for the apache.cpu.load metric."
         type: object
@@ -54,18 +61,11 @@ $defs:
             items:
               type: string
               enum:
-                - "level"
-                - "mode"
+                - "apache.process.level"
+                - "cpu.mode"
             default:
-              - "level"
-              - "mode"
-      apache.current_connections:
-        description: "ApacheCurrentConnectionsMetricConfig provides config for the apache.current_connections metric."
-        type: object
-        properties:
-          enabled:
-            type: boolean
-            default: true
+              - "apache.process.level"
+              - "cpu.mode"
       apache.load.1:
         description: "ApacheLoad1MetricConfig provides config for the apache.load.1 metric."
         type: object
@@ -87,59 +87,50 @@ $defs:
           enabled:
             type: boolean
             default: true
-      apache.request.time:
-        description: "ApacheRequestTimeMetricConfig provides config for the apache.request.time metric."
+      apache.request.count:
+        description: "ApacheRequestCountMetricConfig provides config for the apache.request.count metric."
         type: object
         properties:
           enabled:
             type: boolean
             default: true
-      apache.requests:
-        description: "ApacheRequestsMetricConfig provides config for the apache.requests metric."
+      apache.request.io.transmitted:
+        description: "ApacheRequestIoTransmittedMetricConfig provides config for the apache.request.io.transmitted metric."
         type: object
         properties:
           enabled:
             type: boolean
             default: true
-      apache.scoreboard:
-        description: "ApacheScoreboardMetricConfig provides config for the apache.scoreboard metric."
+      apache.request.time:
+        description: "ApacheRequestTimeMetricConfig provides config for the apache.request.time metric."
         type: object
         properties:
           enabled:
             type: boolean
             default: true
-          aggregation_strategy:
-            type: string
-            enum:
-              - "sum"
-              - "avg"
-              - "min"
-              - "max"
-            default: "sum"
-          attributes:
-            type: array
-            items:
-              type: string
-              enum:
-                - "state"
-            default:
-              - "state"
-      apache.traffic:
-        description: "ApacheTrafficMetricConfig provides config for the apache.traffic metric."
+      apache.uptime:
+        description: "ApacheUptimeMetricConfig provides config for the apache.uptime metric."
         type: object
         properties:
           enabled:
             type: boolean
             default: true
-      apache.uptime:
-        description: "ApacheUptimeMetricConfig provides config for the apache.uptime metric."
+      apache.worker.active:
+        description: "ApacheWorkerActiveMetricConfig provides config for the apache.worker.active metric."
+        type: object
+        properties:
+          enabled:
+            type: boolean
+            default: true
+      apache.worker.idle:
+        description: "ApacheWorkerIdleMetricConfig provides config for the apache.worker.idle metric."
         type: object
         properties:
           enabled:
             type: boolean
             default: true
-      apache.workers:
-        description: "ApacheWorkersMetricConfig provides config for the apache.workers metric."
+      apache.worker.status:
+        description: "ApacheWorkerStatusMetricConfig provides config for the apache.worker.status metric."
         type: object
         properties:
           enabled:
@@ -158,9 +149,9 @@ $defs:
             items:
               type: string
               enum:
-                - "state"
+                - "apache.worker.state"
             default:
-              - "state"
+              - "apache.worker.state"
   resource_attributes_config:
     description: ResourceAttributesConfig provides config for apache resource attributes.
     type: object