[reciever/haproxy] remove unused resource attributes (open-telemetry#…

…26702) open-telemetry#24920
jmsnll · Nov 12, 2023 · d0de9d6 · d0de9d6
1 parent 97377d4
commit d0de9d6
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 188 deletions.
diff --git a/.chloggen/haproxyreceiver-remove-resource-attributes.yaml b/.chloggen/haproxyreceiver-remove-resource-attributes.yaml
@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: haproxyreceiver
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove unused resource attributes.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [24920]
+
+# (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:
+
+# 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]
diff --git a/receiver/haproxyreceiver/documentation.md b/receiver/haproxyreceiver/documentation.md
@@ -241,11 +241,5 @@ Cumulative number of sessions. Corresponds to HAProxy's `stot` metric.
 | Name | Description | Values | Enabled |
 | ---- | ----------- | ------ | ------- |
 | haproxy.addr | address:port or "unix". IPv6 has brackets around the address. | Any Str | true |
-| haproxy.algo | load balancing algorithm | Any Str | true |
-| haproxy.iid | unique proxy id | Any Str | true |
-| haproxy.pid | process id (0 for first instance, 1 for second, ...) | Any Str | true |
 | haproxy.proxy_name | Proxy name | Any Str | true |
 | haproxy.service_name | Service name (FRONTEND for frontend, BACKEND for backend, any name for server/listener) | Any Str | true |
-| haproxy.sid | server id (unique inside a proxy) | Any Str | true |
-| haproxy.type | (0=frontend, 1=backend, 2=server, 3=socket/listener) | Any Str | true |
-| haproxy.url | The path to the HAProxy socket or HTTP URL. | Any Str | true |
diff --git a/receiver/haproxyreceiver/internal/metadata/generated_config.go b/receiver/haproxyreceiver/internal/metadata/generated_config.go
diff --git a/receiver/haproxyreceiver/internal/metadata/generated_config_test.go b/receiver/haproxyreceiver/internal/metadata/generated_config_test.go
diff --git a/receiver/haproxyreceiver/internal/metadata/generated_metrics_test.go b/receiver/haproxyreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/haproxyreceiver/internal/metadata/generated_resource.go b/receiver/haproxyreceiver/internal/metadata/generated_resource.go
diff --git a/receiver/haproxyreceiver/internal/metadata/generated_resource_test.go b/receiver/haproxyreceiver/internal/metadata/generated_resource_test.go
diff --git a/receiver/haproxyreceiver/internal/metadata/testdata/config.yaml b/receiver/haproxyreceiver/internal/metadata/testdata/config.yaml
@@ -56,22 +56,10 @@ all_set:
   resource_attributes:
     haproxy.addr:
       enabled: true
-    haproxy.algo:
-      enabled: true
-    haproxy.iid:
-      enabled: true
-    haproxy.pid:
-      enabled: true
     haproxy.proxy_name:
       enabled: true
     haproxy.service_name:
       enabled: true
-    haproxy.sid:
-      enabled: true
-    haproxy.type:
-      enabled: true
-    haproxy.url:
-      enabled: true
 none_set:
   metrics:
     haproxy.bytes.input:
@@ -129,19 +117,7 @@ none_set:
   resource_attributes:
     haproxy.addr:
       enabled: false
-    haproxy.algo:
-      enabled: false
-    haproxy.iid:
-      enabled: false
-    haproxy.pid:
-      enabled: false
     haproxy.proxy_name:
       enabled: false
     haproxy.service_name:
       enabled: false
-    haproxy.sid:
-      enabled: false
-    haproxy.type:
-      enabled: false
-    haproxy.url:
-      enabled: false
diff --git a/receiver/haproxyreceiver/metadata.yaml b/receiver/haproxyreceiver/metadata.yaml
@@ -9,34 +9,10 @@ status:
     active: [atoulme, MovieStoreGuy]
 
 resource_attributes:
-  haproxy.url:
-    description: The path to the HAProxy socket or HTTP URL.
-    enabled: true
-    type: string
-  haproxy.pid:
-    description: process id (0 for first instance, 1 for second, ...)
-    enabled: true
-    type: string
-  haproxy.sid:
-    description: server id (unique inside a proxy)
-    enabled: true
-    type: string
-  haproxy.iid:
-    description: unique proxy id
-    enabled: true
-    type: string
-  haproxy.type:
-    description: (0=frontend, 1=backend, 2=server, 3=socket/listener)
-    enabled: true
-    type: string
   haproxy.addr:
     description: address:port or "unix". IPv6 has brackets around the address.
     enabled: true
     type: string
-  haproxy.algo:
-    description: load balancing algorithm
-    enabled: true
-    type: string
   haproxy.proxy_name:
     description: Proxy name
     enabled: true