Merge branch 'main' into elixir-chat-service

open-telemetry · Sep 4, 2024 · ffbe7b3 · ffbe7b3
2 parents d925322 + 395f385
commit ffbe7b3
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/.env b/.env
@@ -6,17 +6,17 @@ IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.105.0
-FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.1
-GRAFANA_IMAGE=grafana/grafana:11.1.1
-JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.59
+COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.108.0
+FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.2
+GRAFANA_IMAGE=grafana/grafana:11.2.0
+JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.60
 # must also update version field in ./src/grafana/provisioning/datasources/opensearch.yaml
-OPENSEARCH_IMAGE=opensearchproject/opensearch:2.15.0
-POSTGRES_IMAGE=postgres:16.3
-PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.53.1
-VALKEY_IMAGE=valkey/valkey:7.2-alpine
+OPENSEARCH_IMAGE=opensearchproject/opensearch:2.16.0
+POSTGRES_IMAGE=postgres:16.4
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.54.1
+VALKEY_IMAGE=valkey/valkey:8.0-alpine
 # must also update the version arg in ./test/tracetesting/Dockerfile
-TRACETEST_IMAGE=kubeshop/tracetest:v1.4.2
+TRACETEST_IMAGE=kubeshop/tracetest:v1.5.2
 
 # Demo Platform
 ENV_PLATFORM=local

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ the release.
   ([#1692](https://github.com/open-telemetry/opentelemetry-demo/pull/1692))
 * [chore] Add yamllint to `make all`
   ([#1707](https://github.com/open-telemetry/opentelemetry-demo/pull/1707))
+* [chore] Fix gen-proto for accountingservice
+  ([#1709](https://github.com/open-telemetry/opentelemetry-demo/pull/1709))
 
 ## 1.11.1
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -553,7 +553,6 @@ services:
       - "${OTEL_COLLECTOR_PORT_GRPC}"
     environment:
       - METRICS_STORAGE_TYPE=prometheus
-      - COLLECTOR_OTLP_GRPC_HOST_PORT=${JAEGER_SERVICE_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
     logging: *logging
 
   # Grafana

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -608,6 +608,7 @@ services:
       resources:
         limits:
           memory: 50M
+    restart: unless-stopped
     environment:
       - FLAGD_OTEL_COLLECTOR_URI=${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
       - FLAGD_METRICS_EXPORTER=otel
@@ -715,7 +716,6 @@ services:
       - "${OTEL_COLLECTOR_PORT_GRPC}"
     environment:
       - METRICS_STORAGE_TYPE=prometheus
-      - COLLECTOR_OTLP_GRPC_HOST_PORT=${JAEGER_SERVICE_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
     logging: *logging
 
   # Grafana

diff --git a/ide-gen-proto.sh b/ide-gen-proto.sh
@@ -65,7 +65,7 @@ gen_proto_ts() {
   cd "$base_dir" || return
 }
 
-gen_proto_go accountingservice
+gen_proto_dotnet accountingservice
 # gen_proto_java adservice
 gen_proto_dotnet cartservice
 gen_proto_go checkoutservice

diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml
@@ -9910,7 +9910,7 @@ spec:
       serviceAccountName: opentelemetry-demo
       containers:
         - name: flagd
-          image: 'ghcr.io/open-feature/flagd:v0.11.1'
+          image: 'ghcr.io/open-feature/flagd:v0.11.2'
           imagePullPolicy: IfNotPresent
           command:
           - /flagd-build

diff --git a/src/grafana/provisioning/datasources/opensearch.yaml b/src/grafana/provisioning/datasources/opensearch.yaml
@@ -17,4 +17,4 @@ datasources:
       logMessageField: body
       pplEnabled: true
       timeField: observedTimestamp
-      version: 2.15.0
+      version: 2.16.0
diff --git a/test/tracetesting/Dockerfile b/test/tracetesting/Dockerfile
@@ -7,7 +7,7 @@ FROM alpine
 WORKDIR /app
 
 # The build-images workflow action does not set a build-arg so we need to specify a default value here
-ARG TRACETEST_IMAGE_VERSION=v1.4.2
+ARG TRACETEST_IMAGE_VERSION=v1.5.2
 
 RUN apk --update add bash jq curl
 RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- $TRACETEST_IMAGE_VERSION