Ensure entity events are sent via gateway if enabled

Author: dmitryax

.chloggen/fix-entities-with-gateway.yaml

@@ -0,0 +1,8 @@
+# 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. agent, clusterReceiver, gateway, operator, chart, other)
+component: agent/gateway
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Ensure entity events are sent via gateway if enabled.
+# One or more tracking issues related to the change
+issues: [1732]

examples/collector-all-modes/rendered_manifests/configmap-agent.yaml

@@ -23,9 +23,7 @@ data:
         tls:
           insecure: true
       otlphttp/entities:
-        headers:
-          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
-        logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
+        endpoint: http://default-splunk-otel-collector:4318
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: http://default-splunk-otel-collector:6060

examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml

@@ -25,6 +25,10 @@ data:
         sending_queue:
           num_consumers: 32
         traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
+      otlphttp/entities:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com

examples/collector-all-modes/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: e7a0c25de991c8e1aebf9d671f91c44db517edf929904230adf462ea12d4eb80
+        checksum/config: e835fc38cee8d6140fb61aa9604e6faa455485306a89d94b3204d97163dc92e6
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: bb199f9676abe8e081c9d1baf013f8765f50cb4a8fbd77e9e3905ddb185fd1da
+        checksum/config: 6de4353f9d54523f97fd98b7303a67c786c5db29e774e133cf27953b77b3ad30
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml

@@ -25,6 +25,10 @@ data:
         sending_queue:
           num_consumers: 32
         traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
+      otlphttp/entities:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com

examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: bb199f9676abe8e081c9d1baf013f8765f50cb4a8fbd77e9e3905ddb185fd1da
+        checksum/config: 6de4353f9d54523f97fd98b7303a67c786c5db29e774e133cf27953b77b3ad30
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml

@@ -25,6 +25,10 @@ data:
         sending_queue:
           num_consumers: 32
         traces_endpoint: https://ingest.CHANGEME.signalfx.com/v2/trace/otlp
+      otlphttp/entities:
+        headers:
+          X-SF-Token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+        logs_endpoint: https://ingest.CHANGEME.signalfx.com/v3/event
       signalfx:
         access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
         api_url: https://api.CHANGEME.signalfx.com

examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 45e83563cc906164f7ae0bfadaa6c5cfea671e742fe7156f3a96805814235100
+        checksum/config: d7b4d716a875d54e4438f1f4f4b367e4f59f7728b86dd5b30080c833d431a8b3
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl

@@ -868,9 +868,13 @@ exporters:
 
   # To send entities (applicable only if discovery mode is enabled)
   otlphttp/entities:
+    {{- if $gatewayEnabled }}
+    endpoint: http://{{ include "splunk-otel-collector.fullname" . }}:4318
+    {{- else }}
     logs_endpoint: {{ include "splunk-otel-collector.o11yIngestUrl" . }}/v3/event
     headers:
       "X-SF-Token": ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
+    {{- end }}
 
   {{- if .Values.featureGates.useControlPlaneMetricsHistogramData }}
   signalfx/histograms:

helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl

@@ -113,6 +113,11 @@ exporters:
     access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
     sending_queue:
       num_consumers: 32
+  # To send entities (applicable only if discovery mode is enabled)
+  otlphttp/entities:
+    logs_endpoint: {{ include "splunk-otel-collector.o11yIngestUrl" . }}/v3/event
+    headers:
+      "X-SF-Token": ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
   {{- end }}
 
   {{- if (eq (include "splunk-otel-collector.o11yTracesEnabled" .) "true") }}
@@ -144,6 +149,21 @@ exporters:
   {{- if (eq (include "splunk-otel-collector.platformTracesEnabled" .) "true") }}
   {{- include "splunk-otel-collector.splunkPlatformTracesExporter" . | nindent 2 }}
   {{- end }}
+
+{{- if and
+  (or (eq (include "splunk-otel-collector.logsEnabled" .) "true") (eq (include "splunk-otel-collector.profilingEnabled" .) "true"))
+  (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true")
+}}
+connectors:
+  # Routing connector to separate entity events from regular logs
+  routing/logs:
+    default_pipelines: [logs]
+    table:
+      - context: log
+        condition: instrumentation_scope.attributes["otel.entity.event_as_log"] == true
+        pipelines: [logs/entities]
+{{- end }}
+
 service:
   telemetry:
     resource:
@@ -245,9 +265,32 @@ service:
     {{- end }}
 
     {{- if or (eq (include "splunk-otel-collector.logsEnabled" .) "true") (eq (include "splunk-otel-collector.profilingEnabled" .) "true") }}
+    {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }}
+    logs/split:
+      receivers: [otlp]
+      exporters: [routing/logs]
+    {{- end }}
+    {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }}
+    # entity events
+    logs/entities:
+      receivers:
+        {{- if or (eq (include "splunk-otel-collector.logsEnabled" .) "true") (eq (include "splunk-otel-collector.profilingEnabled" .) "true") }}
+        - routing/logs
+        {{- else }}
+        - otlp
+        {{- end }}
+      receivers: [routing/logs]
+      processors: [memory_limiter, batch]
+      exporters: [otlphttp/entities]
+    {{- end }}
     # default logs + profiling data pipeline
     logs:
-      receivers: [otlp]
+      receivers:
+        {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }}
+        - routing/logs
+        {{- else }}
+        - otlp
+        {{- end }}
       processors:
         - memory_limiter
         - k8sattributes