Merge branch 'main' into knex-sqlite3-v2

open-telemetry · Feb 6, 2025 · 2b3cea2 · 2b3cea2
2 parents 0f3c2ba + 5ecbd03
commit 2b3cea2
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 15 deletions.
diff --git a/examples/connect/docker/collector-config.yaml b/examples/connect/docker/collector-config.yaml
@@ -3,9 +3,10 @@ receivers:
     protocols:
       grpc:
       http:
-        cors_allowed_origins:
-        - http://*
-        - https://*
+        cors:
+          allowed_origins:
+          - http://*
+          - https://*
 
 exporters:
   zipkin:
@@ -17,6 +18,9 @@ processors:
   batch:
 
 service:
+  telemetry:
+    logs:
+      level: debug
   pipelines:
     traces:
       receivers: [otlp]

diff --git a/examples/connect/docker/docker-compose.yaml b/examples/connect/docker/docker-compose.yaml
@@ -2,9 +2,9 @@ version: "3"
 services:
   # Collector
   collector:
-    image: otel/opentelemetry-collector:0.38.0
+    image: otel/opentelemetry-collector:0.118.0
 #    image: otel/opentelemetry-collector:latest
-    command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"]
+    command: ["--config=/conf/collector-config.yaml"]
     volumes:
       - ./collector-config.yaml:/conf/collector-config.yaml
     ports:

diff --git a/examples/fastify/docker/docker-compose.yaml b/examples/fastify/docker/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   collector:
-    image: otel/opentelemetry-collector:0.92.0
+    image: otel/opentelemetry-collector:0.118.0
     command: ["--config=/conf/collector-config.yaml"]
     volumes:
       - ./collector-config.yaml:/conf/collector-config.yaml

diff --git a/examples/graphql/docker/collector-config.yaml b/examples/graphql/docker/collector-config.yaml
@@ -3,9 +3,10 @@ receivers:
     protocols:
       grpc:
       http:
-        cors_allowed_origins:
-          - http://*
-          - https://*
+        cors:
+          allowed_origins:
+            - http://*
+            - https://*
 
 exporters:
   zipkin:

diff --git a/examples/graphql/docker/docker-compose.yaml b/examples/graphql/docker/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
   # Collector
   collector:
     #    image: otel/opentelemetry-collector:latest
-    image: otel/opentelemetry-collector:0.38.0
+    image: otel/opentelemetry-collector:0.118.0
     command: ["--config=/conf/collector-config.yaml"]
     volumes:
       - ./collector-config.yaml:/conf/collector-config.yaml

diff --git a/examples/mysql/docker/docker-compose.yaml b/examples/mysql/docker/docker-compose.yaml
@@ -22,7 +22,7 @@ services:
 # Collector
 
   otel-collector:
-    image: otel/opentelemetry-collector-contrib:0.111.0
+    image: otel/opentelemetry-collector-contrib:0.118.0
     command: ["--config=/etc/otel-collector-config.yaml", ""]
     volumes:
       - ./collector/otel-collector-config.yaml:/etc/otel-collector-config.yaml

diff --git a/examples/react-load/preact/docker/docker-compose.yaml b/examples/react-load/preact/docker/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
 
   # Collector
   collector:
-    image: otel/opentelemetry-collector-contrib:0.75.0
+    image: otel/opentelemetry-collector-contrib:0.118.0
     command: ["--config=/conf/collector-config.yaml"]
     volumes:
       - ./collector-config.yaml:/conf/collector-config.yaml

diff --git a/examples/react-load/react/docker/collector-config.yaml b/examples/react-load/react/docker/collector-config.yaml
@@ -3,7 +3,9 @@ receivers:
     protocols:
       http:
         endpoint: 0.0.0.0:55678
-        cors_allowed_origins: http://localhost:3000
+        cors:
+          allowed_origins:
+          - http://localhost:3000
 
 exporters:
   zipkin:

diff --git a/examples/react-load/react/docker/docker-compose.yaml b/examples/react-load/react/docker/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
 
   # Collector
   collector:
-    image: otel/opentelemetry-collector-contrib:0.40.0
+    image: otel/opentelemetry-collector-contrib:0.118.0
     command: ["--config=/conf/collector-config.yaml"]
     volumes:
       - ./collector-config.yaml:/conf/collector-config.yaml

diff --git a/examples/web/docker/docker-compose.yaml b/examples/web/docker/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   collector:
-    image: otel/opentelemetry-collector:0.99.0
+    image: otel/opentelemetry-collector:0.118.0
     command: ["--config=/conf/collector-config.yaml"]
     volumes:
       - ./collector-config.yaml:/conf/collector-config.yaml