Add entites for Agent - GW setup (#6311)

* Add entites for Agent - GW setup

Signed-off-by: Dani Louca <[email protected]>

* Use otlp/gateway

Signed-off-by: Dani Louca <[email protected]>

---------

Signed-off-by: Dani Louca <[email protected]>

Author: dloucasfx

cmd/otelcol/config/collector/agent_config.yaml

@@ -220,6 +220,8 @@ service:
       receivers: [nop]
       processors: [memory_limiter, batch, resourcedetection]
       exporters: [otlphttp/entities]
+      # Use instead when sending to gateway
+      #exporters: [otlp/gateway]
     logs:
       receivers: [fluentforward, otlp]
       processors:

cmd/otelcol/config/collector/gateway_config.yaml

@@ -142,6 +142,22 @@ exporters:
     token: "${SPLUNK_ACCESS_TOKEN}"
     endpoint: "${SPLUNK_INGEST_URL}/v1/log"
     log_data_enabled: false
+  # To send entities (applicable only if discovery mode is enabled)
+  otlphttp/entities:
+    logs_endpoint: "${SPLUNK_INGEST_URL}/v3/event"
+    headers:
+      "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}"
+    auth:
+      authenticator: headers_setter
+
+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]
 
 service:
   extensions: [headers_setter, health_check, http_forwarder, zpages]
@@ -166,6 +182,13 @@ service:
       processors: [memory_limiter, batch]
       exporters: [signalfx]
     logs:
-      receivers: [otlp]
+      receivers: [routing/logs]
       processors: [memory_limiter, batch]
       exporters: [splunk_hec, splunk_hec/profiling]
+    logs/entities:
+      receivers: [routing/logs]
+      processors: [memory_limiter, batch]
+      exporters: [otlphttp/entities]
+    logs/split:
+      receivers: [otlp]
+      exporters: [routing/logs]

cmd/otelcol/config/collector/upstream_agent_config.yaml

@@ -146,6 +146,8 @@ exporters:
   # Entities (applicable only if discovery mode is enabled)
   otlphttp/entities:
     logs_endpoint: "${SPLUNK_INGEST_URL}/v3/event"
+    # Use instead when sending to gateway
+    # endpoint: http://${SPLUNK_GATEWAY_URL}:4318
     headers:
       "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}"
     auth:

cmd/otelcol/fips/config/agent_config.yaml

@@ -144,6 +144,8 @@ exporters:
   # Entities (applicable only if discovery mode is enabled)
   otlphttp/entities:
     logs_endpoint: "${SPLUNK_INGEST_URL}/v3/event"
+    # Use instead when sending to gateway
+    # endpoint: http://${SPLUNK_GATEWAY_URL}:4318
     headers:
       "X-SF-Token": "${SPLUNK_ACCESS_TOKEN}"
     auth:

tests/general/default_config_test.go

@@ -94,6 +94,15 @@ func TestDefaultGatewayConfig(t *testing.T) {
 						"token":            "<redacted>",
 						"log_data_enabled": false,
 					},
+					"otlphttp/entities": map[string]any{
+						"logs_endpoint": "https://ingest.not.real.signalfx.com/v3/event",
+						"headers": map[string]any{
+							"X-SF-Token": "<redacted>",
+						},
+						"auth": map[string]any{
+							"authenticator": "<redacted>",
+						},
+					},
 				},
 				"extensions": map[string]any{
 					"headers_setter": map[string]any{
@@ -195,19 +204,40 @@ func TestDefaultGatewayConfig(t *testing.T) {
 						"endpoint": fmt.Sprintf("%s:9411", ip),
 					},
 				},
+				"connectors": map[string]any{
+					"routing/logs": map[string]any{
+						"default_pipelines": []any{"logs"},
+						"table": []any{
+							map[string]any{
+								"context":   "log",
+								"condition": "instrumentation_scope.attributes[\"otel.entity.event_as_log\"] == true",
+								"pipelines": []any{"logs/entities"},
+							},
+						},
+					},
+				},
 				"service": map[string]any{
 					"extensions": []any{"headers_setter", "health_check", "http_forwarder", "zpages"},
 					"pipelines": map[string]any{
 						"logs": map[string]any{
 							"exporters":  []any{"splunk_hec", "splunk_hec/profiling"},
 							"processors": []any{"memory_limiter", "batch"},
-							"receivers":  []any{"otlp"},
+							"receivers":  []any{"routing/logs"},
 						},
 						"logs/signalfx": map[string]any{
 							"exporters":  []any{"signalfx"},
 							"processors": []any{"memory_limiter", "batch"},
 							"receivers":  []any{"signalfx"},
 						},
+						"logs/entities": map[string]any{
+							"exporters":  []any{"otlphttp/entities"},
+							"processors": []any{"memory_limiter", "batch"},
+							"receivers":  []any{"routing/logs"},
+						},
+						"logs/split": map[string]any{
+							"receivers": []any{"otlp"},
+							"exporters": []any{"routing/logs"},
+						},
 						"metrics": map[string]any{
 							"exporters":  []any{"signalfx"},
 							"processors": []any{"memory_limiter", "batch"},