Skip to content

Commit

Permalink
Remove grpc from loadgenerator (open-telemetry#688)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
svrnm authored Jan 17, 2023
1 parent 8c056c9 commit 114a791
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/loadgenerator/locustfile.py
Original file line number Diff line number Diff line change
@@ -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

3 changes: 1 addition & 2 deletions src/loadgenerator/requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 114a791

Please sign in to comment.