feat: enable metrics/traces collection from instrumentation by default

CHANGELOG.md

@@ -81,6 +81,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - move `otelcol.deployment.nodeSelector` to `tracesGateway.deployment.nodeSelector`
   - move `otelcol.deployment.priorityClassName` to `tracesGateway.deployment.priorityClassName`
   - move `otelgateway.deployment.nodeSelector` to `tracesGateway.deployment.nodeSelector`
+- feat: enable metrics and traces collection from instrumentation by default [#2154]
+  - change parameter `sumologic.traces.enabled` default value from `false` to `true`
 
 ### Changed
 
@@ -108,6 +110,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix: default.metrics source is not imported when metrics are disabled and traces are enabled [#2547]
 - fix(cleanup): fix cleanup job [#2600]
 
+[#2154]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2154
 [#2483]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2483
 [#2512]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2512
 [#2514]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2514

deploy/helm/sumologic/README.md

@@ -86,7 +86,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
 | `sumologic.metrics.remoteWriteProxy.priorityClassName`                           | Priority class name for the remote write proxy deployment.                                                                                                                                                                                                                                                                                                           | `Nil`                                                                                                             |
 | `sumologic.metrics.remoteWriteProxy.podLabels`                                   | Additional labels for the remote write proxy container.                                                                                                                                                                                                                                                                                                              | `{}`                                                                                                              |
 | `sumologic.metrics.remoteWriteProxy.podAnnotations`                              | Additional annotations for for the remote write proxy container.                                                                                                                                                                                                                                                                                                     | `{}`                                                                                                              |
-| `sumologic.traces.enabled`                                                       | Set the enabled flag to true to enable tracing ingestion. _Tracing must be enabled for the account first. Please contact your Sumo representative for activation details_                                                                                                                                                                                            | `false`                                                                                                           |
+| `sumologic.traces.enabled`                                                       | Set the enabled flag to true to enable tracing ingestion. _Tracing must be enabled for the account first. Please contact your Sumo representative for activation details_                                                                                                                                                                                            | `true`                                                                                                            |
 | `sumologic.envFromSecret`                                                        | If enabled, accessId and accessKey will be sourced from Secret Name given. Be sure to include at least the following env variables in your secret (1) SUMOLOGIC_ACCESSID, (2) SUMOLOGIC_ACCESSKEY                                                                                                                                                                    | `sumo-api-secret`                                                                                                 |
 | `sumologic.accessId`                                                             | Sumo access ID.                                                                                                                                                                                                                                                                                                                                                      | `Nil`                                                                                                             |
 | `sumologic.accessKey`                                                            | Sumo access key.                                                                                                                                                                                                                                                                                                                                                     | `Nil`                                                                                                             |

deploy/helm/sumologic/values.yaml

@@ -432,9 +432,9 @@ sumologic:
       podAnnotations: {}
 
   ### Traces configuration
-  ## Set the enabled flag to true to enable traces ingestion.
+  ## Set the enabled flag to false to disable traces ingestion.
   traces:
-    enabled: false
+    enabled: true
     ## How many spans per request should be send to receiver
     spans_per_request: 100
 
@@ -3322,7 +3322,7 @@ kube-prometheus-stack:
 
 ## Configure otelcol-instrumentation - Sumo OTel Distro Collector
 otelcolInstrumentation:
-  enabled: false
+  enabled: true
   sourceMetadata:
     ## Set the _sourceName metadata field in Sumo Logic.
     sourceName: "%{k8s.namespace.name}.%{k8s.pod.pod_name}.%{k8s.container.name}"
@@ -3924,7 +3924,7 @@ metadata:
 ## Configure traces-gateway
 ## ref: docs/opentelemetry_collector.md#load-balancing-using-the-gateway
 tracesGateway:
-  enabled: false
+  enabled: true
   deployment:
     replicas: 1
     nodeSelector: {}

tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.input.yaml

@@ -1,7 +1,3 @@
-sumologic:
-  traces:
-    enabled: true
-
 opentelemetry-operator:
   enabled: true
   createDefaultInstrumentation: true

tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.input.yaml

@@ -1,7 +1,3 @@
-sumologic:
-  traces:
-    enabled: true
-
 opentelemetry-operator:
   enabled: true
   createDefaultInstrumentation: true

tests/helm/otelcol-instrumentation-config/static/traces-gateway-disabled.input.yaml

@@ -1,9 +1,4 @@
-sumologic:
-  traces:
-    enabled: true
-
 otelcolInstrumentation:
-  enabled: true
   sourceMetadata:
       excludeNamespaceRegex: "kube\\s+"
       excludePodRegex: "^foo.*"

tests/helm/otelcol-instrumentation-config/static/traces-gateway-enabled.input.yaml

@@ -1,15 +1,6 @@
-sumologic:
-  traces:
-    enabled: true
-
 otelcolInstrumentation:
-  enabled: true
   sourceMetadata:
       excludeNamespaceRegex: "kube\\s+"
       excludePodRegex: "^foo.*"
       excludeContainerRegex: "[123+]bar$|xyz"
       excludeHostRegex: hhh123
-
-tracesGateway:
-  enabled: true
-

tests/helm/otelcol-instrumentation-statefulset/static/otelcol-instrumentation-statefulset.input.yaml

@@ -1,6 +1 @@
-sumologic:
-  traces:
-    enabled: true
 
-otelcolInstrumentation:
-  enabled: true

tests/helm/terraform/static/all_fields.output.yaml

@@ -271,6 +271,7 @@ data:
       scheduler_metrics_source                    = "kube-scheduler-metrics"
       state_metrics_source                        = "kube-state-metrics"
       test_source_metrics_source                  = "(Test source)"
+      default_traces_source                       = "traces"
     }
   main.tf: |
     terraform {
@@ -476,6 +477,12 @@ data:
         timezone                     = "local timezone"
         use_autoline_matching        = false
     }
+
+    resource "sumologic_http_source" "default_traces_source" {
+        name         = local.default_traces_source
+        collector_id = sumologic_collector.collector.id
+        content_type = "Zipkin"
+    }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
       metadata {
@@ -495,6 +502,7 @@ data:
         endpoint-metrics-kube-scheduler           = sumologic_http_source.scheduler_metrics_source.url
         endpoint-metrics-kube-state               = sumologic_http_source.state_metrics_source.url
         endpoint-test_source_metrics_source       = sumologic_http_source.test_source_metrics_source.url
+        endpoint-traces                           = sumologic_http_source.default_traces_source.url
       }
 
       type = "Opaque"
@@ -634,6 +642,7 @@ data:
     terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
     terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
     terraform import sumologic_http_source.test_source_metrics_source "${COLLECTOR_NAME}/(Test source)"
+    terraform import sumologic_http_source.default_traces_source "${COLLECTOR_NAME}/traces"
     fi
 
     # Kubernetes Secret

tests/helm/terraform/static/collector_fields.output.yaml

@@ -270,6 +270,7 @@ data:
       node_metrics_source                         = "node-exporter-metrics"
       scheduler_metrics_source                    = "kube-scheduler-metrics"
       state_metrics_source                        = "kube-state-metrics"
+      default_traces_source                       = "traces"
     }
   main.tf: |
     terraform {
@@ -432,6 +433,12 @@ data:
         name         = local.state_metrics_source
         collector_id = sumologic_collector.collector.id
     }
+
+    resource "sumologic_http_source" "default_traces_source" {
+        name         = local.default_traces_source
+        collector_id = sumologic_collector.collector.id
+        content_type = "Zipkin"
+    }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
       metadata {
@@ -450,6 +457,7 @@ data:
         endpoint-metrics-node-exporter            = sumologic_http_source.node_metrics_source.url
         endpoint-metrics-kube-scheduler           = sumologic_http_source.scheduler_metrics_source.url
         endpoint-metrics-kube-state               = sumologic_http_source.state_metrics_source.url
+        endpoint-traces                           = sumologic_http_source.default_traces_source.url
       }
 
       type = "Opaque"
@@ -588,6 +596,7 @@ data:
     terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
     terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
     terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
+    terraform import sumologic_http_source.default_traces_source "${COLLECTOR_NAME}/traces"
     fi
 
     # Kubernetes Secret

tests/helm/terraform/static/default.output.yaml

@@ -270,6 +270,7 @@ data:
       node_metrics_source                         = "node-exporter-metrics"
       scheduler_metrics_source                    = "kube-scheduler-metrics"
       state_metrics_source                        = "kube-state-metrics"
+      default_traces_source                       = "traces"
     }
   main.tf: |
     terraform {
@@ -430,6 +431,12 @@ data:
         name         = local.state_metrics_source
         collector_id = sumologic_collector.collector.id
     }
+
+    resource "sumologic_http_source" "default_traces_source" {
+        name         = local.default_traces_source
+        collector_id = sumologic_collector.collector.id
+        content_type = "Zipkin"
+    }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
       metadata {
@@ -448,6 +455,7 @@ data:
         endpoint-metrics-node-exporter            = sumologic_http_source.node_metrics_source.url
         endpoint-metrics-kube-scheduler           = sumologic_http_source.scheduler_metrics_source.url
         endpoint-metrics-kube-state               = sumologic_http_source.state_metrics_source.url
+        endpoint-traces                           = sumologic_http_source.default_traces_source.url
       }
 
       type = "Opaque"
@@ -586,6 +594,7 @@ data:
     terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
     terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
     terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
+    terraform import sumologic_http_source.default_traces_source "${COLLECTOR_NAME}/traces"
     fi
 
     # Kubernetes Secret

tests/helm/terraform/static/disable_default_metrics.output.yaml

@@ -269,6 +269,7 @@ data:
       node_metrics_source                         = "node-exporter-metrics"
       scheduler_metrics_source                    = "kube-scheduler-metrics"
       state_metrics_source                        = "kube-state-metrics"
+      default_traces_source                       = "traces"
     }
   main.tf: |
     terraform {
@@ -424,6 +425,12 @@ data:
         name         = local.state_metrics_source
         collector_id = sumologic_collector.collector.id
     }
+
+    resource "sumologic_http_source" "default_traces_source" {
+        name         = local.default_traces_source
+        collector_id = sumologic_collector.collector.id
+        content_type = "Zipkin"
+    }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
       metadata {
@@ -441,6 +448,7 @@ data:
         endpoint-metrics-node-exporter            = sumologic_http_source.node_metrics_source.url
         endpoint-metrics-kube-scheduler           = sumologic_http_source.scheduler_metrics_source.url
         endpoint-metrics-kube-state               = sumologic_http_source.state_metrics_source.url
+        endpoint-traces                           = sumologic_http_source.default_traces_source.url
       }
 
       type = "Opaque"
@@ -578,6 +586,7 @@ data:
     terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
     terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
     terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
+    terraform import sumologic_http_source.default_traces_source "${COLLECTOR_NAME}/traces"
     fi
 
     # Kubernetes Secret

tests/helm/terraform/static/disabled_dashboards.output.yaml

@@ -270,6 +270,7 @@ data:
       node_metrics_source                         = "node-exporter-metrics"
       scheduler_metrics_source                    = "kube-scheduler-metrics"
       state_metrics_source                        = "kube-state-metrics"
+      default_traces_source                       = "traces"
     }
   main.tf: |
     terraform {
@@ -430,6 +431,12 @@ data:
         name         = local.state_metrics_source
         collector_id = sumologic_collector.collector.id
     }
+
+    resource "sumologic_http_source" "default_traces_source" {
+        name         = local.default_traces_source
+        collector_id = sumologic_collector.collector.id
+        content_type = "Zipkin"
+    }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
       metadata {
@@ -448,6 +455,7 @@ data:
         endpoint-metrics-node-exporter            = sumologic_http_source.node_metrics_source.url
         endpoint-metrics-kube-scheduler           = sumologic_http_source.scheduler_metrics_source.url
         endpoint-metrics-kube-state               = sumologic_http_source.state_metrics_source.url
+        endpoint-traces                           = sumologic_http_source.default_traces_source.url
       }
 
       type = "Opaque"
@@ -586,6 +594,7 @@ data:
     terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
     terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
     terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
+    terraform import sumologic_http_source.default_traces_source "${COLLECTOR_NAME}/traces"
     fi
 
     # Kubernetes Secret

tests/helm/terraform/static/disabled_monitors.output.yaml

@@ -270,6 +270,7 @@ data:
       node_metrics_source                         = "node-exporter-metrics"
       scheduler_metrics_source                    = "kube-scheduler-metrics"
       state_metrics_source                        = "kube-state-metrics"
+      default_traces_source                       = "traces"
     }
   main.tf: |
     terraform {
@@ -430,6 +431,12 @@ data:
         name         = local.state_metrics_source
         collector_id = sumologic_collector.collector.id
     }
+
+    resource "sumologic_http_source" "default_traces_source" {
+        name         = local.default_traces_source
+        collector_id = sumologic_collector.collector.id
+        content_type = "Zipkin"
+    }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
       metadata {
@@ -448,6 +455,7 @@ data:
         endpoint-metrics-node-exporter            = sumologic_http_source.node_metrics_source.url
         endpoint-metrics-kube-scheduler           = sumologic_http_source.scheduler_metrics_source.url
         endpoint-metrics-kube-state               = sumologic_http_source.state_metrics_source.url
+        endpoint-traces                           = sumologic_http_source.default_traces_source.url
       }
 
       type = "Opaque"
@@ -586,6 +594,7 @@ data:
     terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
     terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
     terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
+    terraform import sumologic_http_source.default_traces_source "${COLLECTOR_NAME}/traces"
     fi
 
     # Kubernetes Secret

tests/helm/terraform/static/monitors_with_email_notifications.output.yaml

@@ -270,6 +270,7 @@ data:
       node_metrics_source                         = "node-exporter-metrics"
       scheduler_metrics_source                    = "kube-scheduler-metrics"
       state_metrics_source                        = "kube-state-metrics"
+      default_traces_source                       = "traces"
     }
   main.tf: |
     terraform {
@@ -436,6 +437,12 @@ data:
         name         = local.state_metrics_source
         collector_id = sumologic_collector.collector.id
     }
+
+    resource "sumologic_http_source" "default_traces_source" {
+        name         = local.default_traces_source
+        collector_id = sumologic_collector.collector.id
+        content_type = "Zipkin"
+    }
 
     resource "kubernetes_secret" "sumologic_collection_secret" {
       metadata {
@@ -454,6 +461,7 @@ data:
         endpoint-metrics-node-exporter            = sumologic_http_source.node_metrics_source.url
         endpoint-metrics-kube-scheduler           = sumologic_http_source.scheduler_metrics_source.url
         endpoint-metrics-kube-state               = sumologic_http_source.state_metrics_source.url
+        endpoint-traces                           = sumologic_http_source.default_traces_source.url
       }
 
       type = "Opaque"
@@ -592,6 +600,7 @@ data:
     terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
     terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
     terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
+    terraform import sumologic_http_source.default_traces_source "${COLLECTOR_NAME}/traces"
     fi
 
     # Kubernetes Secret