[nr-ebpf-agent] Update protocol enablement logic (#1624)

<!--
Thank you for contributing to New Relic's Helm charts. Before you submit
this PR we'd like to
make sure you are aware of our technical requirements:

*
https://github.com/newrelic-experimental/helm-charts/blob/master/CONTRIBUTING.md#technical-requirements

For a quick overview across what we will look at reviewing your PR,
please read
our review guidelines:

*
https://github.com/newrelic-experimental/helm-charts/blob/master/REVIEW_GUIDELINES.md

Following our best practices right from the start will accelerate the
review process and
help get your PR merged quicker.

When updates to your PR are requested, please add new commits and do not
squash the
history. This will make it easier to identify new changes. The PR will
be squashed
anyways when it is merged. Thanks.

For fast feedback, please @-mention maintainers that are listed in the
Chart.yaml file.

Please make sure you test your changes before you push them. Once
pushed, a Github Action
will run across your changes and do some initial checks and linting.
These checks run
very quickly. Please check the results. We would like these checks to
pass before we
even continue reviewing your changes.
-->
#### Is this a new chart
No
#### What this PR does / why we need it:
Modifies the logic such that metrics are enabled by default when a
protocol is on.

#### Which issue this PR fixes
*(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)`
format, will close that issue when PR gets merged)*
  - fixes #

#### Special notes for your reviewer:

#### Checklist
[Place an '[x]' (no spaces) in all applicable fields. Please remove
unrelated fields.]
- [x] Chart Version bumped
- [x] Variables are documented in the README.md
- [x] Title of the PR starts with chart name (e.g. `[mychartname]`)

Signed-off-by: kpattaswamy <[email protected]>

Author: kpattaswamy

charts/nr-ebpf-agent/Chart.yaml

@@ -13,7 +13,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.20
+version: 0.1.21
 
 dependencies:
   - name: common-library

charts/nr-ebpf-agent/templates/_helpers.tpl

@@ -91,15 +91,11 @@ Pass environment variables to the agent container if tracing a specific protocol
 */}}
 {{- define "generateTracingEnvVars" -}}
 {{- range $protocol, $config := .Values.protocols }}
-  {{- $metricsEnabled := false }}
-  {{- if (hasKey $config "metrics") }}
-    {{- $metricsEnabled = eq $config.metrics.enabled true }}
+  {{- $protocolEnabled := false }}
+  {{- if (hasKey $config "enabled") }}
+    {{- $protocolEnabled = eq $config.enabled true }}
   {{- end }}
-  {{- $spansEnabled := false }}
-  {{- if (hasKey $config "spans") }}
-    {{- $spansEnabled = eq $config.spans.enabled true }}
-  {{- end }}
-  {{- if or (and (not $metricsEnabled) (not $spansEnabled)) (and (not (hasKey $config "metrics")) (not $spansEnabled)) }}
+  {{- if eq $protocolEnabled false }}
 - name: PX_STIRLING_ENABLE_{{ upper $protocol }}_TRACING
   value: "0"
   {{- end }}
@@ -112,23 +108,26 @@ Generate environment variables for disabling protocols and setting sampling late
 {{- define "generateClientScriptEnvVars" -}}
 {{- if .Values.protocols }}
 {{- range $protocol, $config := .Values.protocols }}
-  {{-  if (hasKey $config "metrics") }}
-    {{- if eq $config.metrics.enabled false }}
+  {{- if (hasKey $config "enabled") }}
+    {{- if eq $config.enabled false }}
 - name: NR_EBPF_ENABLE_{{ upper $protocol }}_METRICS
   value: "0"
-    {{- end }}
-  {{- end }}
-  {{-  if (hasKey $config "spans") }}
-    {{- if (eq $config.spans.enabled false) }}
 - name: NR_EBPF_ENABLE_{{ upper $protocol }}_SPANS
   value: "0"
-    {{- end }}  
-    {{- if (eq $config.spans.enabled true) }}
-  {{- include "validate.samplingLatency" (dict "protocol" $protocol "latency" $config.spans.samplingLatency) }}
+    {{- else if eq $config.enabled true }}
+      {{- if (hasKey $config "spans") }}
+        {{- if (eq $config.spans.enabled false) }}
+- name: NR_EBPF_ENABLE_{{ upper $protocol }}_SPANS
+  value: "0"
+        {{- end }}  
+      {{- if (eq $config.spans.enabled true) }}
+      {{- include "validate.samplingLatency" (dict "protocol" $protocol "latency" $config.spans.samplingLatency) }}
 - name: SAMPLE_{{ upper $protocol }}_LATENCY
   value: "{{ $config.spans.samplingLatency | regexMatch "p1|p10|p50|p90|p99" | ternary $config.spans.samplingLatency "" }}"
+      {{- end }}
     {{- end }}
-  {{- end }}
+  {{- end }} 
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}

charts/nr-ebpf-agent/values.yaml

@@ -33,58 +33,57 @@ tableStoreDataLimitMB: "250"
 # Note that socket_tracer tracks http, mysql, redis, mongodb, amqp, cassandra, dns, and postgresql
 # while tcp_stats tracks TCP metrics.
 stirlingSources: "socket_tracer,tcp_stats"
-# The protocols to enable for tracing in the socket_tracer.
+# The protocols to enable for tracing in the socket_tracer. There is an ability to configure span export if it is enabled.
+# Each protocol has the flexibility to selectively enable the type of OTLP data to export.
+# Metrics are sent by default when a protocol is enabled and it supports metrics. Note: AMQP, Kafka, DNS do not report metrics.
 # samplingLatency represents the sampling latency threshold for the spans to export.
 # Options: p1, p10, p50, p90, p99.
 protocols:
   http:
-    metrics:
-      enabled: true
+    enabled: true
     spans:
       enabled: true
-      samplingLatency: ""
+      samplingLatency: "p50"
       # -- samplingErrorRate represents the error rate threshold for an HTTP route where surpassing it would mean the corresponds spans of the route are exported.
       # Options: 1-100
       samplingErrorRate: ""
   mysql:
-    metrics:
-      enabled: true
+    enabled: true
     spans:
       enabled: false
       samplingLatency: ""
   pgsql:
-    metrics:
-      enabled: true
+    enabled: true
     spans:
       enabled: false
       samplingLatency: ""
   cass:
-    metrics:
-      enabled: true
+    enabled: true
     spans:
       enabled: false
       samplingLatency: ""
   redis:
-    metrics:
-      enabled: true
+    enabled: true
     spans:
       enabled: false
       samplingLatency: ""
   mongodb:
-    metrics:
-      enabled: true
+    enabled: true
     spans:
       enabled: false
       samplingLatency: ""
   kafka:
+    enabled: false
     spans:
       enabled: false
       samplingLatency: ""
   amqp:
+    enabled: false
     spans:
       enabled: false
       samplingLatency: ""
   dns:
+    enabled: false
     spans:
       enabled: false
       samplingLatency: ""