Merge branch 'master' into master

example/otel/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       timeout: 1s
       retries: 30
     volumes:
-      - ch_data1:/var/lib/clickhouse
+      - ch_data2:/var/lib/clickhouse
     ports:
       - '8123:8123'
       - '9000:9000'
@@ -26,17 +26,17 @@ services:
       POSTGRES_PASSWORD: uptrace
       POSTGRES_DB: uptrace
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready']
+      test: ['CMD-SHELL', 'pg_isready', '-U', 'uptrace', '-d', 'uptrace']
       interval: 1s
       timeout: 1s
       retries: 30
     volumes:
-      - 'pg_data1:/var/lib/postgresql/data/pgdata'
+      - 'pg_data2:/var/lib/postgresql/data/pgdata'
     ports:
       - '5432:5432'
 
   uptrace:
-    image: 'uptrace/uptrace:1.4.7'
+    image: 'uptrace/uptrace:1.5.0'
     #image: 'uptrace/uptrace-dev:latest'
     restart: on-failure
     volumes:
@@ -51,7 +51,7 @@ services:
         condition: service_healthy
 
   otelcol:
-    image: otel/opentelemetry-collector-contrib:0.58.0
+    image: otel/opentelemetry-collector-contrib:0.70.0
     restart: on-failure
     volumes:
       - ./config/otel-collector.yaml:/etc/otelcol-contrib/config.yaml
@@ -78,5 +78,5 @@ services:
     image: redis
 
 volumes:
-  ch_data1:
-  pg_data1:
+  ch_data2:
+  pg_data2:

example/otel/uptrace.yml

@@ -79,30 +79,30 @@ metrics_from_spans:
     description: Spans duration (excluding events)
     instrument: histogram
     unit: microseconds
-    value: span.duration / 1000
+    value: .duration / 1000
     attrs:
-      - span.system
-      - span.group_id
+      - .system
+      - .group_id
       - service.name
       - host.name
-      - span.status_code
+      - .status_code
     annotations:
-      - span.name
-    where: not span.is_event
+      - display.name
+    where: .event_name = ''
 
   - name: uptrace.tracing.events
     description: Events count (excluding spans)
     instrument: counter
     unit: 1
-    value: span.count
+    value: .count
     attrs:
-      - span.system
-      - span.group_id
-      - service.name
+      - .system
+      - .group_id
+      - .name
       - host.name
     annotations:
-      - span.event_name
-    where: span.is_event
+      - display.name
+    where: .is_event = 1
 
 ##
 ## To require authentication, uncomment one of the following sections.
@@ -247,7 +247,7 @@ smtp_mailer:
 ##
 ## Logging configuration.
 ##
-logs:
+logging:
   # Zap minimal logging level.
   # Valid values: DEBUG, INFO, WARN, ERROR, DPANIC, PANIC, FATAL.
   level: INFO