Remove grpc from loadgenerator (open-telemetry#688)

* Remove grpc from loadgenerator Signed-off-by: svrnm <neumanns@cisco.com> * Update CHANGELOG.md Signed-off-by: svrnm <neumanns@cisco.com> * remove white space in changelog Signed-off-by: svrnm <neumanns@cisco.com> Signed-off-by: svrnm <neumanns@cisco.com>
jmichalak9 · Jan 17, 2023 · 114a791 · 114a791
1 parent 8c056c9
commit 114a791
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -188,3 +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
+([#688](https://github.com/open-telemetry/opentelemetry-demo/pull/688))
diff --git 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
@@ -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
@@ -12,15 +12,14 @@ 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
 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