From 3d57e943eee567732c4995d2f0f2232be81d9f0b Mon Sep 17 00:00:00 2001 From: svrnm Date: Sun, 15 Jan 2023 21:49:01 +0100 Subject: [PATCH 1/3] Remove grpc from loadgenerator Signed-off-by: svrnm --- docker-compose.yml | 2 +- src/loadgenerator/locustfile.py | 2 +- src/loadgenerator/requirements.txt | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 406f40b92e..b8a044ded5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -366,7 +366,7 @@ services: - LOCUST_HOST - LOCUST_HEADLESS - LOCUST_AUTOSTART - - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:4318/v1/traces - OTEL_RESOURCE_ATTRIBUTES - OTEL_SERVICE_NAME=loadgenerator - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python diff --git a/src/loadgenerator/locustfile.py b/src/loadgenerator/locustfile.py index 090c012490..ca51511ca1 100644 --- a/src/loadgenerator/locustfile.py +++ b/src/loadgenerator/locustfile.py @@ -22,7 +22,7 @@ from opentelemetry import context, baggage, trace from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter +from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter from opentelemetry.instrumentation.requests import RequestsInstrumentor from opentelemetry.instrumentation.urllib3 import URLLib3Instrumentor diff --git a/src/loadgenerator/requirements.txt b/src/loadgenerator/requirements.txt index 8b4c100a76..d3d108d847 100644 --- a/src/loadgenerator/requirements.txt +++ b/src/loadgenerator/requirements.txt @@ -12,7 +12,6 @@ gevent==22.10.2 geventhttpclient==2.0.8 googleapis-common-protos==1.57.0 greenlet==2.0.1 -grpcio==1.51.1 idna==3.4 itsdangerous==2.1.2 jinja2==3.1.2 @@ -20,7 +19,7 @@ locust==2.14.0 markupsafe==2.1.1 msgpack==1.0.4 opentelemetry-api==1.15.0 -opentelemetry-exporter-otlp-proto-grpc==1.15.0 +opentelemetry-exporter-otlp-proto-http==1.15.0 opentelemetry-instrumentation==0.36b0 opentelemetry-instrumentation-requests==0.36b0 opentelemetry-instrumentation-urllib3==0.36b0 From bc2342772d155fc43adc60e7fb0af2723549d509 Mon Sep 17 00:00:00 2001 From: svrnm Date: Sun, 15 Jan 2023 21:53:53 +0100 Subject: [PATCH 2/3] Update CHANGELOG.md Signed-off-by: svrnm --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14105df556..021af23823 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -184,3 +184,5 @@ significant modifications will be credited to OpenTelemetry Authors. ([#676](https://github.com/open-telemetry/opentelemetry-demo/pull/676)) * Add resource detectors to product catalog service ([#677](https://github.com/open-telemetry/opentelemetry-demo/pull/677)) +* Remove grpc from loadgenerator +([#688](https://github.com/open-telemetry/opentelemetry-demo/pull/688)) From e9010397826f78fb02c9e02861806526d41f9cde Mon Sep 17 00:00:00 2001 From: svrnm Date: Mon, 16 Jan 2023 08:35:12 +0100 Subject: [PATCH 3/3] remove white space in changelog Signed-off-by: svrnm --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1da57c5867..0eb931be98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -188,5 +188,5 @@ significant modifications will be credited to OpenTelemetry Authors. ([#678](https://github.com/open-telemetry/opentelemetry-demo/pull/678)) * Rebuild currency service Dockerfile with alpine ([#687](https://github.com/open-telemetry/opentelemetry-demo/pull/687)) -* Remove grpc from loadgenerator +* Remove grpc from loadgenerator ([#688](https://github.com/open-telemetry/opentelemetry-demo/pull/688))