Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ OTEL_JAVA_AGENT_VERSION=2.17.0
OPENTELEMETRY_CPP_VERSION=1.21.0

# Dependent images
COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.128.0
COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.129.1
FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.12.5
GRAFANA_IMAGE=grafana/grafana:12.0.2
JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.70.0
Expand Down
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ the release.
([#2321](https://github.com/open-telemetry/opentelemetry-demo/pull/2321))
* [product-catalog] Add OTel grpc Logs to Product Catalog
([#2285](https://github.com/open-telemetry/opentelemetry-demo/pull/2285))
* [currency] update alpine to 3.21
([#2291](https://github.com/open-telemetry/opentelemetry-demo/pull/2291))
* [shipping]: replace debian image with distroless image
([#2294](https://github.com/open-telemetry/opentelemetry-demo/pull/2294))
* [currency] Update code to use new semconv and remove unused file
([#2319](https://github.com/open-telemetry/opentelemetry-demo/pull/2319))
* [currency] update alpine to 3.21
([#2291](https://github.com/open-telemetry/opentelemetry-demo/pull/2291))
* [image-provider] Add nginx metrics receiver and dashboard
([#2330](https://github.com/open-telemetry/opentelemetry-demo/pull/2330))

## 2.0.2

Expand Down
4 changes: 3 additions & 1 deletion docker-compose.minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,9 @@ services:
condition: service_healthy
logging: *logging
environment:
- ENVOY_PORT
- FRONTEND_PROXY_ADDR
- IMAGE_PROVIDER_HOST
- IMAGE_PROVIDER_PORT
- HOST_FILESYSTEM
- OTEL_COLLECTOR_HOST
- OTEL_COLLECTOR_PORT_GRPC
Expand Down
7 changes: 6 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,8 @@ services:
# Postgresql used by Accounting service
postgresql:
image: ${POSTGRES_IMAGE}
container_name: postgresql
restart: unless-stopped
ports:
- "5432"
environment:
Expand All @@ -699,6 +701,7 @@ services:
POSTGRES_DB: otel
volumes:
- ${PWD}/src/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
logging: *logging

# Valkey used by Cart service
valkey-cart:
Expand Down Expand Up @@ -784,7 +787,9 @@ services:
condition: service_healthy
logging: *logging
environment:
- ENVOY_PORT
- FRONTEND_PROXY_ADDR
Comment thread
rogercoll marked this conversation as resolved.
- IMAGE_PROVIDER_HOST
- IMAGE_PROVIDER_PORT
- HOST_FILESYSTEM
- OTEL_COLLECTOR_HOST
- OTEL_COLLECTOR_PORT_GRPC
Expand Down
Loading
Loading