Merge branch 'main' into startup

Author: sungam3r

.env

@@ -1,7 +1,7 @@
 
 
 # Images
-IMAGE_VERSION=1.7.1
+IMAGE_VERSION=1.7.2
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 TRACETEST_IMAGE_VERSION=v0.14.5
 

.github/workflows/build-images.yml

@@ -55,6 +55,10 @@ jobs:
             tag_suffix: emailservice
             context: ./src/emailservice
             setup-qemu: true
+          - file: ./src/ffspostgres/Dockerfile
+            tag_suffix: ffspostgres
+            context: ./
+            setup-qemu: true
           # NOTE:
           # https://github.com/open-telemetry/opentelemetry-demo/issues/956
           # Until dedicated ARM runners are available for GHA we cannot upgrade

CHANGELOG.md

@@ -7,6 +7,30 @@ release.
 
 ## Unreleased
 
+* [grafana] update grafana to 10.2.3
+  ([#1332](https://github.com/open-telemetry/opentelemetry-demo/pull/1332))
+* [frontendproxy] Enable envoy environment resource detector
+  ([#1291](https://github.com/open-telemetry/opentelemetry-demo/pull/1291))
+* [currencyservice] - add package name prefix to `rpc.service` attribute
+  ([#1333](https://github.com/open-telemetry/opentelemetry-demo/pull/1333))
+* [currency] fix metric exporter options
+  ([#1335](https://github.com/open-telemetry/opentelemetry-demo/pull/1335))
+* [ffspostgres] define and use demo specific postgres image
+  ([#1338](https://github.com/open-telemetry/opentelemetry-demo/pull/1338))
+* [accountingservice] update wiki link
+  ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
+* [checkoutservice] update wiki link
+  ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
+* [productcatalogservice] update wiki link
+  ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
+
+## 1.7.2
+
+* [cartservice] update .NET package to 1.7.0 release
+  ([#1326](https://github.com/open-telemetry/opentelemetry-demo/pull/1326))
+* [loadgenerator and recommendationservice] Update python base image
+  ([#1329](https://github.com/open-telemetry/opentelemetry-demo/pull/1329))
+
 ## 1.7.1
 
 * [grafana] revert to 10.2.0

CONTRIBUTING.md

@@ -113,7 +113,7 @@ GitHub pull requests (PRs).
 
 To create a new PR, fork the project in GitHub and clone the upstream repo:
 
-> **Note**
+> [!NOTE]
 > Please fork to a personal GitHub account rather than a corporate/enterprise
 > one so maintainers can push commits to your branch.
 > **Pull requests from protected forks will not be accepted.**

docker-compose.minimal.yml

@@ -256,6 +256,7 @@ services:
       - OTEL_COLLECTOR_HOST
       - OTEL_COLLECTOR_PORT_GRPC
       - OTEL_COLLECTOR_PORT_HTTP
+      - OTEL_RESOURCE_ATTRIBUTES
       - ENVOY_PORT
     depends_on:
       frontend:

docker-compose.yml

@@ -228,11 +228,11 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT
       - OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc
       - OTEL_SERVICE_NAME=featureflagservice
-      - DATABASE_URL=ecto://ffs:ffs@ffs_postgres:5432/ffs
+      - DATABASE_URL=ecto://ffs:ffs@ffspostgres:5432/ffs
     healthcheck:
       test: ["CMD", "curl", "-H", "baggage: synthetic_request=true", "-f", "http://localhost:${FEATURE_FLAG_SERVICE_PORT}"]
     depends_on:
-      ffs_postgres:
+      ffspostgres:
         condition: service_healthy
     logging: *logging
 
@@ -345,6 +345,7 @@ services:
       - OTEL_COLLECTOR_HOST
       - OTEL_COLLECTOR_PORT_GRPC
       - OTEL_COLLECTOR_PORT_HTTP
+      - OTEL_RESOURCE_ATTRIBUTES
       - ENVOY_PORT
     depends_on:
       frontend:
@@ -539,10 +540,14 @@ services:
   # Dependent Services
   # ******************
   # Postgres used by Feature Flag service
-  ffs_postgres:
-    image: postgres:16.1
-    container_name: postgres
-    user: postgres
+  ffspostgres:
+    image: ${IMAGE_NAME}:${IMAGE_VERSION}-ffspostgres
+    container_name: ffs-postgres
+    build:
+      context: ./
+      dockerfile: ./src/ffspostgres/Dockerfile
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-ffspostgres
     deploy:
       resources:
         limits:
@@ -553,8 +558,7 @@ services:
       - POSTGRES_DB=ffs
       - POSTGRES_PASSWORD=ffs
     volumes:
-      - ./src/ffs_postgres/10-ffs_schema.sql:/docker-entrypoint-initdb.d/10-ffs_schema.sql
-      - ./src/ffs_postgres/20-ffs_data.sql:/docker-entrypoint-initdb.d/20-ffs_data.sql
+      - ./src/ffspostgres/update-scripts/99-ffs_update.sql:/docker-entrypoint-initdb.d/99-ffs_update.sql
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -d ffs -U ffs"]
       interval: 10s
@@ -633,7 +637,7 @@ services:
 
   # Grafana
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.3
     container_name: grafana
     deploy:
       resources:

internal/tools/tools.go

@@ -6,7 +6,7 @@
 package tools
 
 // This file follows the recommendation at
-// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
+// https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
 // on how to pin tooling dependencies to a go.mod file.
 // This ensures that all systems use the same version of tools in addition to regular dependencies.