Skip to content

Commit 78a5078

Browse files
Update Telemetry Components (#1440)
* Update Telemetry Components * changelog
1 parent c6f4471 commit 78a5078

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

.env

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ IMAGE_NAME=ghcr.io/open-telemetry/demo
66
DEMO_VERSION=latest
77

88
# Dependent images
9-
COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.93.0
10-
GRAFANA_IMAGE=grafana/grafana:10.3.1
11-
JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.53
9+
COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.96.0
10+
GRAFANA_IMAGE=grafana/grafana:10.4.0
11+
JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.55
1212
# must also update version field in /src/grafana/provisioning/datasources/opensearch.yml
13-
OPENSEARCH_IMAGE=opensearchproject/opensearch:2.11.1
14-
POSTGRES_IMAGE=postgres:16.1
15-
PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.49.1
13+
OPENSEARCH_IMAGE=opensearchproject/opensearch:2.12.0
14+
POSTGRES_IMAGE=postgres:16.2
15+
PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.50.1
1616
REDIS_IMAGE=redis:7.2-alpine
17-
TRACETEST_IMAGE_VERSION=v0.15.8
17+
TRACETEST_IMAGE_VERSION=v0.16.0
1818
TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
1919

2020
# Demo Platform

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
.DS_Store
1212
\#*\#
1313

14+
docker-compose.override.yml
15+
1416
# Eclipse
1517
.classpath
1618
.project

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ the release.
2727
([#1415](https://github.com/open-telemetry/opentelemetry-demo/pull/1415))
2828
* [chore] - add tests and odd profiles to make stop
2929
([#1427](https://github.com/open-telemetry/opentelemetry-demo/pull/1427))
30+
* [chore] - Update Telemetry Components
31+
([#1440](https://github.com/open-telemetry/opentelemetry-demo/pull/1440))
3032

3133
## 1.8.0
3234

src/currencyservice/src/server.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@ class CurrencyService final : public oteldemo::CurrencyService::Service
207207

208208
CurrencyCounter(to_code);
209209

210-
// End the span
211210
span->AddEvent("Conversion successful, response sent back");
212211
span->SetStatus(StatusCode::kOk);
213212

214213
logger->Info(std::string(__func__) + " conversion successful");
215-
214+
215+
// End the span
216216
span->End();
217217
return Status::OK;
218218

src/grafana/provisioning/datasources/opensearch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ datasources:
1717
logMessageField: body
1818
pplEnabled: true
1919
timeField: observedTimestamp
20-
version: 2.11.1
20+
version: 2.12.0

0 commit comments

Comments
 (0)