Skip to content

Commit

Permalink
[flagd] - upgrade to latest version and memory limits (open-telemetry…
Browse files Browse the repository at this point in the history
…#1554)

* set 50M memory limit for flagd

* clean up old FFS references

* update flagd to 0.10.1
  • Loading branch information
puckpuck authored May 1, 2024
1 parent 9027cfc commit 2e6cb5a
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
15 changes: 4 additions & 11 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,6 @@ CURRENCY_SERVICE_ADDR=currencyservice:${CURRENCY_SERVICE_PORT}
EMAIL_SERVICE_PORT=6060
EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}

# Feature Flag Service
FEATURE_FLAG_SERVICE_PORT=8081
FEATURE_FLAG_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_SERVICE_PORT}
FEATURE_FLAG_SERVICE_HOST=feature-flag-service
FEATURE_FLAG_GRPC_SERVICE_PORT=50053
FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_GRPC_SERVICE_PORT}

# flagd
FLAGD_HOST=flagd
FLAGD_PORT=8013

# Frontend
FRONTEND_PORT=8080
FRONTEND_ADDR=frontend:${FRONTEND_PORT}
Expand Down Expand Up @@ -110,6 +99,10 @@ SHIPPING_SERVICE_ADDR=shippingservice:${SHIPPING_SERVICE_PORT}
# ******************
# Dependent Services
# ******************
# flagd
FLAGD_HOST=flagd
FLAGD_PORT=8013

# Kafka
KAFKA_SERVICE_PORT=9092
KAFKA_SERVICE_ADDR=kafka:${KAFKA_SERVICE_PORT}
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ the release.
([#1537](https://github.com/open-telemetry/opentelemetry-demo/pull/1537))
* [traceBasedTests] update to v1.0.0
([#1551](https://github.com/open-telemetry/opentelemetry-demo/pull/1551))
* [flagd] update to 0.10.1 and set 50M memory limit
([#1554](https://github.com/open-telemetry/opentelemetry-demo/pull/1554))

## 1.9.0

Expand Down
45 changes: 25 additions & 20 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,26 +215,6 @@ services:
condition: service_started
logging: *logging

flagd:
image: ghcr.io/open-feature/flagd:v0.9.0
container_name: flagd
environment:
- FLAGD_OTEL_COLLECTOR_URI=${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
- FLAGD_METRICS_EXPORTER=otel
- OTEL_RESOURCE_ATTRIBUTES
- OTEL_SERVICE_NAME=flagd
command: [
"start",
"--uri",
"file:./etc/flagd/demo.flagd.json"
]
ports:
- 8013
volumes:
- ./src/flagd:/etc/flagd
logging:
*logging

# Fraud Detection service
frauddetectionservice:
image: ${IMAGE_NAME}:${DEMO_VERSION}-frauddetectionservice
Expand Down Expand Up @@ -585,6 +565,31 @@ services:
# ******************
# Dependent Services
# ******************
# Flagd, feature flagging service
flagd:
image: ghcr.io/open-feature/flagd:v0.10.1
container_name: flagd
deploy:
resources:
limits:
memory: 50M
environment:
- FLAGD_OTEL_COLLECTOR_URI=${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
- FLAGD_METRICS_EXPORTER=otel
- OTEL_RESOURCE_ATTRIBUTES
- OTEL_SERVICE_NAME=flagd
command: [
"start",
"--uri",
"file:./etc/flagd/demo.flagd.json"
]
ports:
- 8013
volumes:
- ./src/flagd:/etc/flagd
logging:
*logging

# Kafka used by Checkout, Accounting, and Fraud Detection services
kafka:
image: ${IMAGE_NAME}:${DEMO_VERSION}-kafka
Expand Down

0 comments on commit 2e6cb5a

Please sign in to comment.