Merge branch 'main' into feat/prototype-service-criticality

Author: julianocosta89

.github/workflows/gradle-wrapper-validation.yml

@@ -18,4 +18,4 @@ jobs:
     steps:
       - uses: actions/checkout@v6.0.2
 
-      - uses: gradle/actions/wrapper-validation@v5.0.1
+      - uses: gradle/actions/wrapper-validation@v5.0.2

.github/workflows/ossf-scorecard.yml

@@ -36,7 +36,7 @@ jobs:
       # uploads of run results in SARIF format to the repository Actions tab.
       # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f    # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f    # v7.0.0
         with:
           name: SARIF file
           path: results.sarif
@@ -45,6 +45,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9e907b5e64f6b83e7804b09294d44122997950d6    # v3.29.5
+        uses: github/codeql-action/upload-sarif@c793b717bc78562f491db7b0e93a3a178b099162    # v4.32.5
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -19,6 +19,12 @@ the release.
   [High-cardinality HTTP span names #54694](https://github.com/vercel/next.js/issues/54694)
   [#2942](https://github.com/open-telemetry/opentelemetry-demo/pull/2942)
 * add `main` tagged images, drop date suffix for `nightly` ([#2994](https://github.com/open-telemetry/opentelemetry-demo/pull/2994))
+* [docker] fix `docker-compose.minimal.yml` to be able to run by adding missing
+  postgresql service, environment variables, and dependencies
+  ([#3004](https://github.com/open-telemetry/opentelemetry-demo/pull/3004))
+* [flagd-ui] fix memory issue with BEAM-VM, this reduces flagd-ui memory
+  usage from 2.3GB to 228Mi
+  [#3022](https://github.com/open-telemetry/opentelemetry-demo/pull/3022)
 
 ## 2.2.0
 

README.md

@@ -61,20 +61,21 @@ keeping it up to date for you.
 
 |                           |                |                                  |
 |---------------------------|----------------|----------------------------------|
-| [AlibabaCloud LogService] | [Google Cloud] | [Oracle]                         |
-| [Apache Doris]            | [Grafana Labs] | [Parseable]                      |
-| [AppDynamics]             | [Guance]       | [Sentry]                         |
-| [Aspecto]                 | [Honeycomb.io] | [ServiceNow Cloud Observability] |
-| [Axiom]                   | [Instana]      | [SigNoz]                         |
-| [Axoflow]                 | [Kloudfuse]    | [Splunk]                         |
-| [Azure Data Explorer]     | [Kopai]        | [Sumo Logic]                     |
-| [Causely]                 | [Last9]        | [TelemetryHub]                   |
-| [ClickStack]              | [Liatrio]      | [Teletrace]                      |
-| [Coralogix]               | [Logz.io]      | [Tinybird]                       |
-| [Dash0]                   | [New Relic]    | [Tracetest]                      |
-| [Datadog]                 | [Oodle]        | [Tsuga]                          |
-| [Dynatrace]               | [OpenObserve]  | [Uptrace]                        |
-| [Elastic]                 | [OpenSearch]   | [VictoriaMetrics]                |
+| [AlibabaCloud LogService] | [Grafana Labs] | [Sentry]                         |
+| [Apache Doris]            | [Guance]       | [ServiceNow Cloud Observability] |
+| [AppDynamics]             | [Honeycomb.io] | [SigNoz]                         |
+| [Aspecto]                 | [Instana]      | [SolarWinds Observability]       |
+| [Axiom]                   | [Kloudfuse]    | [Splunk]                         |
+| [Axoflow]                 | [Kopai]        | [Sumo Logic]                     |
+| [Azure Data Explorer]     | [Last9]        | [TelemetryHub]                   |
+| [Causely]                 | [Liatrio]      | [Teletrace]                      |
+| [ClickStack]              | [Logz.io]      | [Tinybird]                       |
+| [Coralogix]               | [New Relic]    | [Tracetest]                      |
+| [Dash0]                   | [Oodle]        | [Tsuga]                          |
+| [Datadog]                 | [OpenObserve]  | [Uptrace]                        |
+| [Dynatrace]               | [OpenSearch]   | [VictoriaMetrics]                |
+| [Elastic]                 | [Oracle]       |                                  |
+| [Google Cloud]            | [Parseable]    |                                  |
 
 ## Contributing
 
@@ -152,6 +153,7 @@ For more information about the emeritus role, see the [community repository](htt
 [Sentry]: https://github.com/getsentry/opentelemetry-demo
 [ServiceNow Cloud Observability]: https://docs.lightstep.com/otel/quick-start-operator#send-data-from-the-opentelemetry-demo
 [SigNoz]: https://signoz.io/blog/opentelemetry-demo/
+[SolarWinds Observability]: https://github.com/solarwinds/opentelemetry-demo
 [Splunk]: https://github.com/signalfx/opentelemetry-demo
 [Sumo Logic]: https://www.sumologic.com/blog/common-opentelemetry-demo-application/
 [TelemetryHub]: https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend

docker-compose.minimal.yml

@@ -423,11 +423,13 @@ services:
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.criticality=high
       - OTEL_SERVICE_NAME=product-catalog
-    volumes:
-      - ./src/product-catalog/products:/usr/src/app/products
+      - OTEL_SEMCONV_STABILITY_OPT_IN=database
+      - DB_CONNECTION_STRING=postgres://otelu:otelp@${POSTGRES_HOST}/${POSTGRES_DB}?sslmode=disable
     depends_on:
       otel-collector:
         condition: service_started
+      postgresql:
+        condition: service_started
     logging: *logging
 
   # Product reviews service
@@ -460,6 +462,8 @@ services:
       - OPENAI_API_KEY
       - LLM_MODEL
       - PRODUCT_CATALOG_ADDR
+      - LLM_HOST
+      - LLM_PORT
     depends_on:
       product-catalog:
         condition: service_started
@@ -600,6 +604,25 @@ services:
     logging:
       *logging
 
+  # Postgresql used by Product Reviews service
+  postgresql:
+    image: ${POSTGRES_IMAGE}
+    container_name: postgresql
+    deploy:
+      resources:
+        limits:
+          memory: 80M
+    restart: unless-stopped
+    ports:
+      - ${POSTGRES_PORT}
+    environment:
+      - POSTGRES_USER=root
+      - POSTGRES_PASSWORD
+      - POSTGRES_DB
+    volumes:
+      - ./src/postgresql/init.sql:/docker-entrypoint-initdb.d/init.sql
+    logging: *logging
+
   # LLM used by Product Review service
   llm:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-llm