remove traces for now

netobserv · Jun 10, 2024 · e92e117 · e92e117
1 parent f1f4c91
commit e92e117
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 87 deletions.
diff --git a/apis/flowcollector/v1beta2/flowcollector_types.go b/apis/flowcollector/v1beta2/flowcollector_types.go
@@ -445,10 +445,10 @@ type FlowCollectorOpenTelemetry struct {
 	// +optional
 	Metrics FlowCollectorOpenTelemetryMetrics `json:"metrics"`
 
-	// TODO: remove traces if confusing
+	// TODO: add traces in future
 	// Open telemetry configuration for traces.
 	// +optional
-	Traces FlowCollectorOpenTelemetryTraces `json:"traces"`
+	//Traces FlowCollectorOpenTelemetryTraces `json:"traces"`
 }
 
 type ServerTLSConfigType string

diff --git a/apis/flowcollector/v1beta2/zz_generated.deepcopy.go b/apis/flowcollector/v1beta2/zz_generated.deepcopy.go
diff --git a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml
@@ -5855,22 +5855,6 @@ spec:
                                   type: string
                               type: object
                           type: object
-                        traces:
-                          description: |-
-                            TODO: remove traces if confusing
-                            Open telemetry configuration for traces.
-                          properties:
-                            enable:
-                              default: true
-                              description: Set `enable` to `true` to send traces to
-                                Open Telemetry receiver.
-                              type: boolean
-                            spanSplitter:
-                              description: Separate span for each prefix listed
-                              items:
-                                type: string
-                              type: array
-                          type: object
                         type:
                           description: Type of Open Telemetry connection. The available
                             options are `http` and `grpc`.

diff --git a/config/crd/bases/flows.netobserv.io_flowcollectors.yaml b/config/crd/bases/flows.netobserv.io_flowcollectors.yaml
@@ -5401,21 +5401,6 @@ spec:
                                     type: string
                                 type: object
                             type: object
-                          traces:
-                            description: |-
-                              TODO: remove traces if confusing
-                              Open telemetry configuration for traces.
-                            properties:
-                              enable:
-                                default: true
-                                description: Set `enable` to `true` to send traces to Open Telemetry receiver.
-                                type: boolean
-                              spanSplitter:
-                                description: Separate span for each prefix listed
-                                items:
-                                  type: string
-                                type: array
-                            type: object
                           type:
                             description: Type of Open Telemetry connection. The available options are `http` and `grpc`.
                             type: string

diff --git a/config/samples/flows_v1beta2_flowcollector.yaml b/config/samples/flows_v1beta2_flowcollector.yaml
@@ -184,9 +184,4 @@ spec:
     #       enable: true
     #       prefix: netobserv
     #       pushTimeInterval: 20s
-    #       expiryTime: 2m
-    #     traces:
-    #       enable: true
-    #       spanSplitter:
-    #       - source.
-    #       - destination.
+    #       expiryTime: 2m
diff --git a/controllers/flp/flp_pipeline_builder.go b/controllers/flp/flp_pipeline_builder.go
@@ -514,12 +514,13 @@ func (b *PipelineBuilder) createOpenTelemetryStage(name string, spec *flowslates
 
 	// otel traces config
 	var traces *api.EncodeOtlpTraces
-	if spec.Traces.Enable != nil && *spec.Traces.Enable {
+	// TODO: add traces in future
+	/*if spec.Traces.Enable != nil && *spec.Traces.Enable {
 		traces = &api.EncodeOtlpTraces{
 			OtlpConnectionInfo: &conn,
 			SpanSplitter:       spec.Traces.SpanSplitter,
 		}
-	}
+	}*/
 
 	// add transform stage and encode otel if enabled
 	if logs != nil || metrics != nil || traces != nil {

diff --git a/docs/FlowCollector.md b/docs/FlowCollector.md
@@ -11959,14 +11959,6 @@ Setting `customRules` will fully override the default rules allowing you to expo
           TLS client configuration.<br/>
         </td>
         <td>false</td>
-      </tr><tr>
-        <td><b><a href="#flowcollectorspecexportersindexopentelemetrytraces">traces</a></b></td>
-        <td>object</td>
-        <td>
-          TODO: remove traces if confusing
-Open telemetry configuration for traces.<br/>
-        </td>
-        <td>false</td>
       </tr><tr>
         <td><b>type</b></td>
         <td>string</td>
@@ -12275,43 +12267,6 @@ If the namespace is different, the config map or the secret is copied so that it
 </table>
 
 
-### FlowCollector.spec.exporters[index].openTelemetry.traces
-<sup><sup>[↩ Parent](#flowcollectorspecexportersindexopentelemetry)</sup></sup>
-
-
-
-TODO: remove traces if confusing
-Open telemetry configuration for traces.
-
-<table>
-    <thead>
-        <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Description</th>
-            <th>Required</th>
-        </tr>
-    </thead>
-    <tbody><tr>
-        <td><b>enable</b></td>
-        <td>boolean</td>
-        <td>
-          Set `enable` to `true` to send traces to Open Telemetry receiver.<br/>
-          <br/>
-            <i>Default</i>: true<br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b>spanSplitter</b></td>
-        <td>[]string</td>
-        <td>
-          Separate span for each prefix listed<br/>
-        </td>
-        <td>false</td>
-      </tr></tbody>
-</table>
-
-
 ### FlowCollector.spec.kafka
 <sup><sup>[↩ Parent](#flowcollectorspec-1)</sup></sup>