Skip to content

Commit

Permalink
Update Telemetry Components
Browse files Browse the repository at this point in the history
  • Loading branch information
julianocosta89 committed Mar 8, 2024
1 parent 0c80094 commit f7fdaa0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ IMAGE_NAME=ghcr.io/open-telemetry/demo
DEMO_VERSION=latest

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

# Demo Platform
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
.DS_Store
\#*\#

docker-compose.override.yml

# Eclipse
.classpath
.project
Expand Down
4 changes: 2 additions & 2 deletions src/currencyservice/src/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ class CurrencyService final : public oteldemo::CurrencyService::Service

CurrencyCounter(to_code);

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

logger->Info(std::string(__func__) + " conversion successful");


// End the span
span->End();
return Status::OK;

Expand Down
2 changes: 1 addition & 1 deletion src/grafana/provisioning/datasources/opensearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ datasources:
logMessageField: body
pplEnabled: true
timeField: observedTimestamp
version: 2.11.1
version: 2.12.0

0 comments on commit f7fdaa0

Please sign in to comment.