bundle stufff

Author: jaronoff97

apis/v1alpha1/opampbridge_types.go

@@ -23,6 +23,9 @@ type OpAMPBridgeSpec struct {
 	// ComponentsAllowed is a list of allowed OpenTelemetry components for each pipeline type (receiver, processor, etc.)
 	// +optional
 	ComponentsAllowed map[string][]string `json:"componentsAllowed,omitempty"`
+	// Description allows the customization of the non identifying attributes for the OpAMP Bridge.
+	// +optional
+	Description *AgentDescription `json:"description,omitempty"`
 	// Resources to set on the OpAMPBridge pods.
 	// +optional
 	Resources v1.ResourceRequirements `json:"resources,omitempty"`
@@ -111,6 +114,12 @@ type OpAMPBridgeStatus struct {
 	Version string `json:"version,omitempty"`
 }
 
+type AgentDescription struct {
+	// NonIdentifyingAttributes are a map of key-value pairs that may be specified to provide
+	// extra information about the agent to the OpAMP server.
+	NonIdentifyingAttributes map[string]string `json:"non_identifying_attributes"`
+}
+
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"

apis/v1alpha1/zz_generated.deepcopy.go

@@ -99,7 +99,7 @@ metadata:
     categories: Logging & Tracing,Monitoring
     certified: "false"
     containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
-    createdAt: "2025-03-05T15:50:41Z"
+    createdAt: "2025-03-12T19:10:16Z"
     description: Provides the OpenTelemetry components, including the Collector
     operators.operatorframework.io/builder: operator-sdk-v1.29.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml

@@ -489,6 +489,15 @@ spec:
                     type: string
                   type: array
                 type: object
+              description:
+                properties:
+                  non_identifying_attributes:
+                    additionalProperties:
+                      type: string
+                    type: object
+                required:
+                - non_identifying_attributes
+                type: object
               endpoint:
                 type: string
               env:

bundle/community/manifests/opentelemetry.io_opampbridges.yaml

@@ -99,7 +99,7 @@ metadata:
     categories: Logging & Tracing,Monitoring
     certified: "false"
     containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
-    createdAt: "2025-03-05T15:50:41Z"
+    createdAt: "2025-03-12T19:10:16Z"
     description: Provides the OpenTelemetry components, including the Collector
     operators.operatorframework.io/builder: operator-sdk-v1.29.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

@@ -489,6 +489,15 @@ spec:
                     type: string
                   type: array
                 type: object
+              description:
+                properties:
+                  non_identifying_attributes:
+                    additionalProperties:
+                      type: string
+                    type: object
+                required:
+                - non_identifying_attributes
+                type: object
               endpoint:
                 type: string
               env:

bundle/openshift/manifests/opentelemetry.io_opampbridges.yaml

@@ -240,3 +240,17 @@ func TestGetDescription(t *testing.T) {
 		Value: &protobufs.AnyValue_StringValue{StringValue: "custom-value"},
 	}})
 }
+
+func TestGetDescriptionNoneSet(t *testing.T) {
+	got := NewConfig(logr.Discard())
+	instanceId := uuid.New()
+	got.instanceId = instanceId
+	err := LoadFromFile(got, "./testdata/agent.yaml")
+	require.NoError(t, err, fmt.Sprintf("Load(%v)", "./testdata/agent.yaml"))
+	desc := got.GetDescription()
+	assert.Len(t, desc.IdentifyingAttributes, 3)
+	assert.Contains(t, desc.IdentifyingAttributes, &protobufs.KeyValue{Key: "service.instance.id", Value: &protobufs.AnyValue{
+		Value: &protobufs.AnyValue_StringValue{StringValue: instanceId.String()},
+	}})
+	assert.Len(t, desc.NonIdentifyingAttributes, 2)
+}

cmd/operator-opamp-bridge/config/config_test.go

@@ -486,6 +486,15 @@ spec:
                     type: string
                   type: array
                 type: object
+              description:
+                properties:
+                  non_identifying_attributes:
+                    additionalProperties:
+                      type: string
+                    type: object
+                required:
+                - non_identifying_attributes
+                type: object
               endpoint:
                 type: string
               env:

config/crd/bases/opentelemetry.io_opampbridges.yaml

@@ -111,6 +111,13 @@ OpAMPBridgeSpec defines the desired state of OpAMPBridge.
           ComponentsAllowed is a list of allowed OpenTelemetry components for each pipeline type (receiver, processor, etc.)<br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b><a href="#opampbridgespecdescription">description</a></b></td>
+        <td>object</td>
+        <td>
+          Description allows the customization of the non identifying attributes for the OpAMP Bridge.<br/>
+        </td>
+        <td>false</td>
       </tr><tr>
         <td><b><a href="#opampbridgespecenvindex">env</a></b></td>
         <td>[]object</td>
@@ -1919,6 +1926,34 @@ merge patch.<br/>
 </table>
 
 
+### OpAMPBridge.spec.description
+<sup><sup>[↩ Parent](#opampbridgespec)</sup></sup>
+
+
+
+Description allows the customization of the non identifying attributes for the OpAMP Bridge.
+
+<table>
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Required</th>
+        </tr>
+    </thead>
+    <tbody><tr>
+        <td><b>non_identifying_attributes</b></td>
+        <td>map[string]string</td>
+        <td>
+          NonIdentifyingAttributes are a map of key-value pairs that may be specified to provide
+extra information about the agent to the OpAMP server.<br/>
+        </td>
+        <td>true</td>
+      </tr></tbody>
+</table>
+
+
 ### OpAMPBridge.spec.env[index]
 <sup><sup>[↩ Parent](#opampbridgespec)</sup></sup>
 

docs/api/opampbridges.md

@@ -39,6 +39,12 @@ func ConfigMap(params manifests.Params) (*corev1.ConfigMap, error) {
 		config["componentsAllowed"] = params.OpAMPBridge.Spec.ComponentsAllowed
 	}
 
+	if params.OpAMPBridge.Spec.Description != nil {
+		config["description"] = map[string]any{
+			"non_identifying_attributes": params.OpAMPBridge.Spec.Description.NonIdentifyingAttributes,
+		}
+	}
+
 	configYAML, err := yaml.Marshal(config)
 	if err != nil {
 		return &corev1.ConfigMap{}, err

internal/manifests/opampbridge/configmap.go

@@ -46,6 +46,9 @@ componentsAllowed:
   - memory_limiter
   receivers:
   - otlp
+description:
+  non_identifying_attributes:
+    hello: world
 endpoint: ws://opamp-server:4320/v1/opamp
 headers:
   authorization: access-12345-token
@@ -85,6 +88,11 @@ headers:
 					Image:    tc.image,
 					Endpoint: "ws://opamp-server:4320/v1/opamp",
 					Headers:  map[string]string{"authorization": "access-12345-token"},
+					Description: &v1alpha1.AgentDescription{
+						NonIdentifyingAttributes: map[string]string{
+							"hello": "world",
+						},
+					},
 					Capabilities: map[v1alpha1.OpAMPBridgeCapability]bool{
 						v1alpha1.OpAMPBridgeCapabilityReportsStatus:                  true,
 						v1alpha1.OpAMPBridgeCapabilityAcceptsRemoteConfig:            true,