From 93b1d0f30426c22d4b3e09ef059fa4fc8ac8114b Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Thu, 1 Aug 2024 15:24:03 +0200 Subject: [PATCH 1/3] recommendationservice: switch to elastic OTel distribution --- src/recommendationservice/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/recommendationservice/requirements.txt b/src/recommendationservice/requirements.txt index f78e3636ff..b4b03de1dd 100644 --- a/src/recommendationservice/requirements.txt +++ b/src/recommendationservice/requirements.txt @@ -1,7 +1,6 @@ grpcio-health-checking==1.60.0 grpcio==1.60.0 -opentelemetry-distro==0.46b0 -opentelemetry-exporter-otlp-proto-grpc==1.25.0 +elastic-opentelemetry==0.1.0 python-dotenv==1.0.0 python-json-logger==2.0.7 openfeature-sdk==0.7.0 From 56a3263a298520788e2209f3d05b8d1c473833d2 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Thu, 1 Aug 2024 15:30:35 +0200 Subject: [PATCH 2/3] Update README --- .github/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/README.md b/.github/README.md index 0ab925eefb..78ff841c30 100644 --- a/.github/README.md +++ b/.github/README.md @@ -6,6 +6,7 @@ The following guide describes how to setup the OpenTelemetry demo with Elastic O - The Java agent within the [Ad](../src/adservice/Dockerfile.elastic), the [Fraud Detection](../src/frauddetectionservice/Dockerfile.elastic) and the [Kafka](../src/kafka/Dockerfile.elastic) services have been replaced with the Elastic distribution of the OpenTelemetry Java Agent. You can find more information about the Elastic distribution in [this blog post](https://www.elastic.co/observability-labs/blog/elastic-distribution-opentelemetry-java-agent). - The .NET agent within the [Cart service](../src/cartservice/src/Directory.Build.props) has been replaced with the Elastic distribution of the OpenTelemetry .NET Agent. You can find more information about the Elastic distribution in [this blog post](https://www.elastic.co/observability-labs/blog/elastic-opentelemetry-distribution-dotnet-applications). - The Elastic distribution of the OpenTelemetry Node.js Agent has replaced the OpenTelemetry Node.js agent in the [Payment service](../src/paymentservice/package.json). Additional details about the Elastic distribution are available in [this blog post](https://www.elastic.co/observability-labs/blog/elastic-opentelemetry-distribution-node-js). +- The Elastic distribution for OpenTelemetry Python has replaced the OpenTelemetry Python agent in the [Recommendation service](..src/recommendationservice/requirements.txt). Additional details about the Elastic distribution are available in [this blog post](https://www.elastic.co/observability-labs/blog/elastic-opentelemetry-distribution-python). Additionally, the OpenTelemetry Contrib collector has also been changed to the [Elastic OpenTelemetry Collector distribution](https://github.com/elastic/elastic-agent/blob/main/internal/pkg/otel/README.md). This ensures a more integrated and optimized experience with Elastic Observability. From 2b556b96734da188d0113238dce7155381f2e35a Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Fri, 2 Aug 2024 11:43:00 +0200 Subject: [PATCH 3/3] loadgenerator: switch to elastic OTel distribution --- src/loadgenerator/requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/loadgenerator/requirements.txt b/src/loadgenerator/requirements.txt index dd520fee4d..4d7fabdf42 100644 --- a/src/loadgenerator/requirements.txt +++ b/src/loadgenerator/requirements.txt @@ -5,6 +5,7 @@ charset-normalizer==3.3.2 click==8.1.7 configargparse==1.7 deprecated==1.2.14 +elastic-opentelemetry==0.1.0 flask==3.0.0 flask-basicauth==0.2.0 flask-cors==4.0.0 @@ -20,7 +21,10 @@ locust_plugins==3.4.0 markupsafe==2.1.3 msgpack==1.0.7 opentelemetry-api==1.25.0 +opentelemetry-exporter-otlp==1.25.0 +opentelemetry-exporter-otlp-proto-common==1.25.0 opentelemetry-exporter-otlp-proto-grpc==1.25.0 +opentelemetry-exporter-otlp-proto-http==1.25.0 opentelemetry-instrumentation==0.46b0 opentelemetry-instrumentation-jinja2==0.46b0 opentelemetry-instrumentation-requests==0.46b0