fix: unit tests, add details to some event

example/cfg/otel-collector-config.yml

@@ -4,22 +4,42 @@ receivers:
       grpc:
       http:
 
+processors:
+  batch:
+    timeout: 10s
+    send_batch_max_size: 1000
+    send_batch_size: 100
+
 exporters:
+  otlp:
+    endpoint: "jaeger:4317"
+    tls:
+      insecure: true
+    retry_on_failure:
+      enabled: true
+
   prometheus:
-    endpoint: 0.0.0.0:8889
-    namespace: default
-  jaeger:
-    endpoint: 0.0.0.0:14250
+    endpoint: "otel-collector:8889"
+    namespace: relayer
+    send_timestamps: true
+    enable_open_metrics: true
+    add_metric_suffixes: false
+    resource_to_telemetry_conversion:
+      enabled: true
+
+  logging:
+    loglevel: debug
+    sampling_initial: 5
+    sampling_thereafter: 200
 
-extensions:
-  health_check:
 
 service:
-  extensions: [health_check]
   pipelines:
     metrics:
-      exporters: [prometheus]
       receivers: [otlp]
+      processors:  [batch]
+      exporters: [prometheus, logging]
     traces:
       receivers: [otlp]
-      exporters: [jaeger]
+      processors: [batch]
+      exporters: [otlp]

example/cfg/prometheus.yml

@@ -0,0 +1,17 @@
+global:
+  scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
+  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
+  # scrape_timeout is set to the global default (10s).
+
+
+rule_files:
+# - "first_rules.yml"
+# - "second_rules.yml"
+
+scrape_configs:
+  - job_name: 'relayer'
+    scrape_interval: 10s
+    # metrics_path defaults to '/metrics'
+    # scheme defaults to 'http'.
+    static_configs:
+      - targets: [ 'otel-collector:8889' ]

example/docker-compose.yml

@@ -86,15 +86,41 @@ services:
       - ./cfg:/cfg
     restart: always
 
+
   otel-collector:
     container_name: otel-collector
     image: otel/opentelemetry-collector
     command: ["--config=/etc/otel-collector-config.yml"]
+    depends_on:
+      - jaeger
+      - prometheus
     volumes:
       - ./cfg/otel-collector-config.yml:/etc/otel-collector-config.yml
     ports:
       - "8889:8889"   # Prometheus exporter metrics
 
+  jaeger:
+    container_name: jaeger
+    image: jaegertracing/all-in-one
+    ports:
+      - "4318:4318"
+      - "16686:16686"
+      - "4317:4317"
+    environment:
+      - COLLECTOR_OTLP_ENABLED=true
+
+  prometheus:
+    container_name: prometheus
+    image: prom/prometheus:latest
+    volumes:
+      - ./cfg/prometheus.yml:/etc/prometheus/prometheus.yml
+    #      - prometheus_data:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+    ports:
+      - 9090:9090
+
 networks:
   evm2:
   evm1:

relayer/relayer.go

@@ -77,7 +77,11 @@ func (r *Relayer) route(msgs []*message.Message) {
 			span,
 			fmt.Sprintf("routing message %s", m.String()),
 			attribute.String("msg.id", m.ID()),
-			attribute.String("msg.type", string(m.Type)))
+			attribute.String("msg.type", string(m.Type)),
+			attribute.String("msg.dstChainId", fmt.Sprintf("%d", destChain.DomainID())),
+			attribute.String("msg.srcChainId", fmt.Sprintf("%d", m.Source)),
+		)
+
 		r.metrics.TrackDepositMessage(m)
 		for _, mp := range r.messageProcessors {
 			if err := mp(ctx, m); err != nil {

relayer/relayer_test.go

@@ -80,7 +80,7 @@ func (s *RouteTestSuite) TestLogsErrorIfMessageProcessorReturnsError() {
 func (s *RouteTestSuite) TestWriteFail() {
 	s.mockMetrics.EXPECT().TrackDepositMessage(gomock.Any())
 	s.mockMetrics.EXPECT().TrackExecutionError(gomock.Any())
-	s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1)).Times(3)
+	s.mockRelayedChain.EXPECT().DomainID().Return(uint8(1)).Times(2)
 	s.mockRelayedChain.EXPECT().Write(gomock.Any(), gomock.Any()).Return(fmt.Errorf("error"))
 	relayer := NewRelayer(
 		[]RelayedChain{},