[chore] adapt selfmon integration test

config_examples/self-monitoring-check-metrics.yaml

@@ -5,8 +5,13 @@ receivers:
   otlp:
     protocols:
       grpc:
-        endpoint: ${env:MY_POD_IP}:4317
+        endpoint: 0.0.0.0:4317
+  otlp/2:
+    protocols:
+      http:
+        endpoint: 0.0.0.0:4318
 processors:
+  cumulativetodelta:
   batch:
     send_batch_size: 5
     timeout: 5s
@@ -24,6 +29,14 @@ processors:
 exporters:
   debug:
     verbosity: detailed
+  otlp_grpc/self:
+    endpoint: 0.0.0.0:4317
+    tls:
+      insecure: true
+  otlp_http/self:
+    endpoint: http://0.0.0.0:4318
+    tls:
+      insecure: true
   otlp_http:
     endpoint: ${env:DT_ENDPOINT}
     headers:
@@ -32,33 +45,35 @@ service:
   extensions:
     - health_check
   pipelines:
-    metrics:
-      receivers:
-        - otlp
-      processors:
-        - filter
-        - batch
-      exporters:
-        - debug
-        - otlp_http
-    logs:
-      receivers:
-        - otlp
-      processors:
-        - filter
-        - batch
-      exporters:
-        - debug
-        - otlp_http
+    traces/self2:
+      receivers: [otlp/2]
+      processors: [filter, batch]
+      exporters: [otlp_grpc/self]
+
+    logs/self2:
+      receivers: [otlp/2]
+      processors: [filter, batch]
+      exporters: [otlp_grpc/self]
+
+    metrics/self2:
+      receivers: [otlp/2]
+      processors: [filter, batch]
+      exporters: [otlp_grpc/self]
+
     traces:
-      receivers:
-        - otlp
-      processors:
-        - filter
-        - batch
-      exporters:
-        - debug
-        - otlp_http
+      receivers: [otlp]
+      processors: [filter, batch]
+      exporters: [debug, otlp_http]
+
+    logs:
+      receivers: [otlp]
+      processors: [filter, batch]
+      exporters: [debug, otlp_http]
+
+    metrics:
+      receivers: [otlp]
+      processors: [filter, cumulativetodelta, batch]
+      exporters: [debug, otlp_http]
   # turn on self-monitoring
   telemetry:
     resource:

internal/testbed/integration/self-monitoring/e2e_test.go

@@ -314,12 +314,18 @@ func Test_Selfmonitoring_checkMetrics(t *testing.T) {
 			"otelcol_receiver_refused_log_records",
 			"otelcol_receiver_refused_metric_points",
 			"otelcol_receiver_refused_spans",
+			"otelcol_receiver_failed_log_records",
+			"otelcol_receiver_failed_metric_points",
+			"otelcol_receiver_failed_spans",
 			"otelcol_process_cpu_seconds",
 			"otelcol_process_memory_rss",
 			"otelcol_process_runtime_heap_alloc_bytes",
 			"otelcol_process_runtime_total_alloc_bytes",
 			"otelcol_process_runtime_total_sys_memory_bytes",
 			"otelcol_process_uptime",
+			"http.server.request.body.size",
+			"http.server.response.body.size",
+			"http.server.request.duration",
 			"http.client.request.body.size",
 			"http.client.request.duration",
 			"otelcol_processor_batch_batch_send_size",
@@ -331,15 +337,18 @@ func Test_Selfmonitoring_checkMetrics(t *testing.T) {
 			"otelcol_processor_outgoing_items",
 			"otelcol_processor_internal_duration",
 			"rpc.server.call.duration",
+			"rpc.client.call.duration",
 			"rpc.server.request.size",
 			"rpc.server.response.size",
-			"rpc.server.requests_per_rpc",
-			"rpc.server.responses_per_rpc",
+			"rpc.client.request.size",
+			"rpc.client.response.size",
 			"otelcol_exporter_queue_capacity",
 			"otelcol_exporter_queue_size",
-			"otelcol_exporter_send_failed_log_records",
-			"otelcol_exporter_send_failed_metric_points",
-			"otelcol_exporter_send_failed_spans",
+			// these metrics are not reported if their value is zero, which is the case in our test since we don't simulate any failed or refused items
+			// should be checked manually for changes when needed
+			// "otelcol_exporter_send_failed_log_records",
+			// "otelcol_exporter_send_failed_metric_points",
+			// "otelcol_exporter_send_failed_spans",
 			"otelcol_exporter_sent_log_records",
 			"otelcol_exporter_sent_metric_points",
 			"otelcol_exporter_sent_spans",

internal/testbed/integration/self-monitoring/testdata/collector/service.yaml

@@ -10,7 +10,7 @@ spec:
       port: 4318
       targetPort: 4318
       protocol: TCP
-      appProtocol: grpc
+      appProtocol: http
     - name: otlpgrpc
       port: 4317
       targetPort: 4317

internal/testbed/integration/self-monitoring/testdata/config-overlays/telemetrygen-receiver-local.yaml

@@ -1,41 +1,39 @@
-exporters:
-  debug:
-    verbosity: detailed
   otlp_http/traces:
     endpoint: http://%[1]s:4321
   otlp_http/metrics:
     endpoint: http://%[1]s:4320
   otlp_http/logs:
     endpoint: http://%[1]s:4319
-
 service:
   extensions:
     - health_check
   pipelines:
-    metrics:
-      receivers:
-        - otlp
-      processors:
-        - filter
-        - batch
-      exporters:
-        - debug
-        - otlp_http/metrics
-    logs:
-      receivers:
-        - otlp
-      processors:
-        - filter
-        - batch
-      exporters:
-        - debug
-        - otlp_http/logs
+    traces/self2:
+      receivers: [otlp/2]
+      processors: [filter, batch]
+      exporters: [otlp_grpc/self]
+
+    logs/self2:
+      receivers: [otlp/2]
+      processors: [filter, batch]
+      exporters: [otlp_grpc/self]
+
+    metrics/self2:
+      receivers: [otlp/2]
+      processors: [filter, batch]
+      exporters: [otlp_grpc/self]
+
     traces:
-      receivers:
-        - otlp
-      processors:
-        - filter
-        - batch
-      exporters:
-        - debug
-        - otlp_http/traces
+      receivers: [otlp]
+      processors: [filter, batch]
+      exporters: [debug, otlp_http/traces]
+
+    logs:
+      receivers: [otlp]
+      processors: [filter, batch]
+      exporters: [debug, otlp_http/logs]
+
+    metrics:
+      receivers: [otlp]
+      processors: [filter, cumulativetodelta, batch]
+      exporters: [debug, otlp_http/metrics]

internal/testbed/integration/self-monitoring/testdata/config-overlays/telemetrygen-receiver-original.yaml

@@ -1,6 +1,3 @@
-exporters:
-  debug:
-    verbosity: detailed
   otlp_http:
     endpoint: ${env:DT_ENDPOINT}
     headers:
@@ -9,30 +6,32 @@ service:
   extensions:
     - health_check
   pipelines:
-    metrics:
-      receivers:
-        - otlp
-      processors:
-        - filter
-        - batch
-      exporters:
-        - debug
-        - otlp_http
-    logs:
-      receivers:
-        - otlp
-      processors:
-        - filter
-        - batch
-      exporters:
-        - debug
-        - otlp_http
+    traces/self2:
+      receivers: [otlp/2]
+      processors: [filter, batch]
+      exporters: [otlp_grpc/self]
+
+    logs/self2:
+      receivers: [otlp/2]
+      processors: [filter, batch]
+      exporters: [otlp_grpc/self]
+
+    metrics/self2:
+      receivers: [otlp/2]
+      processors: [filter, batch]
+      exporters: [otlp_grpc/self]
+
     traces:
-      receivers:
-        - otlp
-      processors:
-        - filter
-        - batch
-      exporters:
-        - debug
-        - otlp_http
+      receivers: [otlp]
+      processors: [filter, batch]
+      exporters: [debug, otlp_http]
+
+    logs:
+      receivers: [otlp]
+      processors: [filter, batch]
+      exporters: [debug, otlp_http]
+
+    metrics:
+      receivers: [otlp]
+      processors: [filter, cumulativetodelta, batch]
+      exporters: [debug, otlp_http]