Bump to Tempo 2.4.0

docker-compose/common/config/tempo/microservices-mode-traces.yaml

@@ -1,51 +1,54 @@
-usage_report:
-  reporting_enabled: false
+# For more information on this configuration, see the complete reference guide at
+# https://grafana.com/docs/tempo/latest/configuration/
+
+# stream_over_http_enabled: true
 
 multitenancy_enabled: false
+usage_report:
+  reporting_enabled: false
 
-server:
-  http_listen_port: 3100
-  grpc_listen_port: 9095
-  log_level: warn
+compactor:
+  ring:
+    kvstore:
+      store: memberlist
+  compaction:
+    block_retention: 1h
 
 distributor:
-  receivers:                           # this configuration will listen on all ports and protocols that tempo is capable of.
+  receivers:
     otlp:
       protocols:
         http:
         grpc:
 
 ingester:
-  max_block_duration: 5m               # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally
+  max_block_duration: 5m
 
 memberlist:
   join_members:
   - tempo-memberlist:7946
 
-compactor:
-  ring:
-    kvstore:
-      store: memberlist
-  compaction:
-    block_retention: 1h                # overall Tempo trace retention. set for demo purposes
-
 querier:
   frontend_worker:
     frontend_address: query-frontend:9095
 
+server:
+  grpc_server_max_recv_msg_size: 4194304
+  grpc_server_max_send_msg_size: 4194304
+  http_listen_port: 3100
+  grpc_listen_port: 9095
+  log_level: info
+
+
 storage:
   trace:
     backend: s3
     wal:
       path: /tmp/tempo/wal
     s3:
       bucket: tempo-data
-      # endpoint: ${TEMPO_S3_ENDPOINT:minio:9000}
-      # access_key: ${TEMPO_S3_ACCESS_KEY:lgtmp}
-      # secret_key: ${TEMPO_S3_SECRET_KEY:supersecret}
-      # insecure: ${TEMPO_S3_INSECURE:true}
-      endpoint: minio:9000
-      access_key: lgtmp
-      secret_key: supersecret
-      insecure: true
+      endpoint: ${TEMPO_S3_ENDPOINT:-minio:9000}
+      access_key: ${TEMPO_S3_ACCESS_KEY:-lgtmp}
+      secret_key: ${TEMPO_S3_SECRET_KEY:-supersecret}
+      insecure: ${TEMPO_S3_INSECURE:-true}
       tls_insecure_skip_verify: true

docker-compose/common/config/tempo/monolithic-mode-traces.yaml

@@ -1,27 +1,25 @@
-usage_report:
-  reporting_enabled: false
+# For more information on this configuration, see the complete reference guide at
+# https://grafana.com/docs/tempo/latest/configuration/
 
 multitenancy_enabled: false
+usage_report:
+  reporting_enabled: false
 
-server:
-  http_listen_port: 3200
-  grpc_listen_port: 9095
-  log_level: warn
+compactor:
+  compaction:
+    block_retention: 1h
 
 distributor:
-  receivers:                           # this configuration will listen on all ports and protocols that tempo is capable of.
+  receivers:
     otlp:
       protocols:
         http:
         grpc:
 
-ingester:
-  max_block_duration: 5m               # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally
 
+ingester:
+  max_block_duration: 5m
 
-compactor:
-  compaction:
-    block_retention: 1h                # overall Tempo trace retention. set for demo purposes
 
 metrics_generator:
   registry:
@@ -36,15 +34,22 @@ metrics_generator:
       headers:
         X-Scope-OrgID: "anonymous"
 
+server:
+  grpc_server_max_recv_msg_size: 4194304
+  grpc_server_max_send_msg_size: 4194304
+  http_listen_port: 3200
+  grpc_listen_port: 9095
+  log_level: info
+
 storage:
   trace:
-    backend: s3                     # backend configuration to use
+    backend: s3
     wal:
-      path: /tmp/tempo/wal             # where to store the the wal locally
+      path: /tmp/tempo/wal
     s3:
       bucket: tempo-data
-      endpoint: ${TEMPO_S3_ENDPOINT:minio:9000}
-      access_key: ${TEMPO_S3_ACCESS_KEY:lgtmp}
-      secret_key: ${TEMPO_S3_SECRET_KEY:supersecret}
-      insecure: ${TEMPO_S3_INSECURE:true}
+      endpoint: ${TEMPO_S3_ENDPOINT:-minio:9000}
+      access_key: ${TEMPO_S3_ACCESS_KEY:-lgtmp}
+      secret_key: ${TEMPO_S3_SECRET_KEY:-supersecret}
+      insecure: ${TEMPO_S3_INSECURE:-true}
       tls_insecure_skip_verify: true

docker-compose/microservices-mode/traces/docker-compose.yaml

@@ -37,7 +37,7 @@ services:
     depends_on:
       ingester:
         condition: service_started
-    image: &tempoImage grafana/tempo:2.3.1
+    image: &tempoImage grafana/tempo:2.4.0
     volumes:
       - ../../common/config/tempo/microservices-mode-traces.yaml:/etc/tempo.yaml # Note: Tempo use microservices-mode-traces.yaml
     command:
@@ -128,7 +128,7 @@ services:
     environment:
       - GF_LOG_LEVEL=error
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}
-      - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor
+      # - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor pyroscopeFlameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceToMetrics traceToProfiles
       # - GF_TRACING_OPENTELEMETRY_OTLP_ADDRESS=agent:4317
       # - GF_TRACING_OPENTELEMETRY_CUSTOM_ATTRIBUTES=cluster:docker-compose,namespace:monitoring
     ports:

docker-compose/monolithic-mode/all-in-one/docker-compose.yaml

@@ -114,14 +114,9 @@ services:
         condition: service_healthy
       mimir:
         condition: service_healthy
-    image: grafana/tempo:2.3.1
+    image: grafana/tempo:2.4.0
     volumes:
       - ../../common/config/tempo/monolithic-mode-traces.yaml:/etc/config.yaml
-    environment:
-      - TEMPO_S3_ENDPOINT=minio:9000
-      - TEMPO_S3_ACCESS_KEY=lgtmp
-      - TEMPO_S3_SECRET_KEY=supersecret
-      - TEMPO_S3_INSECURE=true
     command:
       - -config.file=/etc/config.yaml
       - -target=all
@@ -180,7 +175,7 @@ services:
     environment:
       - GF_LOG_LEVEL=error
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}
-      - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor,pyroscopeFlameGraph
+      # - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor pyroscopeFlameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceToMetrics traceToProfiles
       - GF_DIAGNOSTICS_PROFILING_ENABLED=true
       - GF_DIAGNOSTICS_PROFILING_ADDR=0.0.0.0
       - GF_DIAGNOSTICS_PROFILING_PORT=6060

docker-compose/monolithic-mode/traces/config/tempo/scalable-single-binary.yaml

@@ -1,44 +1,48 @@
-usage_report:
-  reporting_enabled: false
+# For more information on this configuration, see the complete reference guide at
+# https://grafana.com/docs/tempo/latest/configuration/
 
 multitenancy_enabled: false
+usage_report:
+  reporting_enabled: false
 
-server:
-  http_listen_port: 3100
-  grpc_listen_port: 9095
-  log_level: warn
+compactor:
+  compaction:
+    block_retention: 1h
 
 distributor:
-  receivers:                           # this configuration will listen on all ports and protocols that tempo is capable of.
+  receivers:
     otlp:
       protocols:
         http:
         grpc:
 
 ingester:
-  max_block_duration: 5m               # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally
+  max_block_duration: 5m
 
 memberlist:
   join_members:
   - tempo-memberlist:7946
 
-compactor:
-  compaction:
-    block_retention: 1h                # overall Tempo trace retention. set for demo purposes
-
 querier:
   frontend_worker:
     frontend_address: tempo-memberlist:9095
 
+server:
+  grpc_server_max_recv_msg_size: 4194304
+  grpc_server_max_send_msg_size: 4194304
+  http_listen_port: 3100
+  grpc_listen_port: 9095
+  log_level: warn
+
 storage:
   trace:
-    backend: s3                     # backend configuration to use
+    backend: s3
     wal:
-      path: /tmp/tempo/wal             # where to store the the wal locally
+      path: /tmp/tempo/wal
     s3:
       bucket: tempo-data
-      endpoint: ${TEMPO_S3_ENDPOINT:minio:9000}
-      access_key: ${TEMPO_S3_ACCESS_KEY:lgtmp}
-      secret_key: ${TEMPO_S3_SECRET_KEY:supersecret}
-      insecure: ${TEMPO_S3_INSECURE:true}
+      endpoint: ${TEMPO_S3_ENDPOINT:-minio:9000}
+      access_key: ${TEMPO_S3_ACCESS_KEY:-lgtmp}
+      secret_key: ${TEMPO_S3_SECRET_KEY:-supersecret}
+      insecure: ${TEMPO_S3_INSECURE:-true}
       tls_insecure_skip_verify: true

docker-compose/monolithic-mode/traces/docker-compose.yaml

@@ -37,15 +37,10 @@ services:
     depends_on:
       minio:
         condition: service_healthy
-    image: &tempoImage grafana/tempo:2.3.1
+    image: &tempoImage grafana/tempo:2.4.0
     restart: always
     volumes:
       - ./config/tempo/scalable-single-binary.yaml:/etc/tempo.yaml # Note: Tempo use scalable-single-binary.yaml
-    environment:
-      - TEMPO_S3_ENDPOINT=minio:9000
-      - TEMPO_S3_ACCESS_KEY=lgtmp
-      - TEMPO_S3_SECRET_KEY=supersecret
-      - TEMPO_S3_INSECURE=true
     command:
       - -config.file=/etc/tempo.yaml
       - -target=scalable-single-binary
@@ -83,7 +78,7 @@ services:
     environment:
       - GF_LOG_LEVEL=error
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}
-      - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor
+      # - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor pyroscopeFlameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceToMetrics traceToProfiles
       # - GF_TRACING_OPENTELEMETRY_OTLP_ADDRESS=agent:4317
       # - GF_TRACING_OPENTELEMETRY_CUSTOM_ATTRIBUTES=cluster:docker-compose,namespace:monitoring
     ports:

go.mod

@@ -5,25 +5,36 @@ go 1.21
 toolchain go1.21.5
 
 require (
-	dagger.io/dagger v0.9.11
+	dagger.io/dagger v0.10.0
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/dave/jennifer v1.7.0
+	github.com/prometheus/client_golang v1.19.0
+	github.com/prometheus/common v0.48.0
 	github.com/spf13/cobra v1.8.0
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
-	github.com/99designs/gqlgen v0.17.43 // indirect
+	github.com/99designs/gqlgen v0.17.44 // indirect
 	github.com/Khan/genqlient v0.6.0 // indirect
 	github.com/adrg/xdg v0.4.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/sosodev/duration v1.2.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.11 // indirect
-	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
+	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )