Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update collector images in examples #2692

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions examples/connect/docker/collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ receivers:
protocols:
grpc:
http:
cors_allowed_origins:
- http://*
- https://*
cors:
allowed_origins:
- http://*
- https://*

exporters:
zipkin:
Expand All @@ -17,6 +18,9 @@ processors:
batch:

service:
telemetry:
logs:
level: debug
pipelines:
traces:
receivers: [otlp]
Expand Down
4 changes: 2 additions & 2 deletions examples/connect/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/fastify/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 4 additions & 3 deletions examples/graphql/docker/collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ receivers:
protocols:
grpc:
http:
cors_allowed_origins:
- http://*
- https://*
cors:
allowed_origins:
- http://*
- https://*

exporters:
zipkin:
Expand Down
2 changes: 1 addition & 1 deletion examples/graphql/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/mysql/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/react-load/preact/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion examples/react-load/react/docker/collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/react-load/react/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/web/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down