From 52d315aeba7f6da80268eaf84613f6bf94e1f341 Mon Sep 17 00:00:00 2001 From: Zixin Zhou Date: Wed, 28 Aug 2024 14:16:43 +0800 Subject: [PATCH 1/3] Fix gen-proto for accountingservice (#1709) --- CHANGELOG.md | 2 ++ ide-gen-proto.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbd5d2f9a9..74f5e8ce28 100644 --- 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/ide-gen-proto.sh b/ide-gen-proto.sh index be28d20c2d..d219ee39a0 100755 --- 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 From 076afc4a7c3ee4003acb7cb4868688da65026332 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Fri, 30 Aug 2024 08:54:51 +0200 Subject: [PATCH 2/3] Upgrade flagd to v0.11.2 (#1711) * Upgrade flagd to v0.11.2 Close #1625 * Update opentelemetry-demo.yaml * Update docker-compose.yml --- .env | 2 +- docker-compose.yml | 1 + kubernetes/opentelemetry-demo.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.env b/.env index f54a0ecff4..7e7f1105ef 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ 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 +FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.2 GRAFANA_IMAGE=grafana/grafana:11.1.1 JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.59 # must also update version field in ./src/grafana/provisioning/datasources/opensearch.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 9ca0309bf3..191620d00b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -579,6 +579,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 diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml index 981bd55958..8a5c2b3485 100644 --- 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 From 395f38572d4b1352883712cc080d6894f5f9faf8 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Fri, 30 Aug 2024 18:52:44 +0200 Subject: [PATCH 3/3] Bump dependencies (#1713) --- .env | 16 ++++++++-------- docker-compose.minimal.yml | 1 - docker-compose.yml | 1 - .../provisioning/datasources/opensearch.yaml | 2 +- test/tracetesting/Dockerfile | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.env b/.env index 7e7f1105ef..4a7e37cccc 100644 --- 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 +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.1.1 -JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.59 +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/docker-compose.minimal.yml b/docker-compose.minimal.yml index 90a984c970..f10ad9470a 100644 --- 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 index 191620d00b..ab38c239ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -664,7 +664,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/src/grafana/provisioning/datasources/opensearch.yaml b/src/grafana/provisioning/datasources/opensearch.yaml index eecab4296e..4d23b5f7b5 100644 --- 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 index 1e72096181..388269cd48 100644 --- 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