From 3fe551ad4c28be47309aafb0daec1d8ca1177ec4 Mon Sep 17 00:00:00 2001 From: alrex Date: Mon, 22 Feb 2021 12:47:12 -0800 Subject: [PATCH] Update py otel (#51) --- python/launcher/Dockerfile.client | 2 +- python/launcher/Dockerfile.server | 2 +- python/launcher/requirements.txt | 2 ++ python/opentelemetry/requirements.txt | 6 +++--- python/opentracing/Dockerfile.client | 2 +- python/opentracing/Dockerfile.server | 2 +- python/opentracing/requirements.txt | 4 +++- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/python/launcher/Dockerfile.client b/python/launcher/Dockerfile.client index cc5b5c1b..6cfadaaa 100644 --- a/python/launcher/Dockerfile.client +++ b/python/launcher/Dockerfile.client @@ -5,7 +5,7 @@ WORKDIR /app ADD requirements.txt . RUN pip install -r requirements.txt -RUN opentelemetry-bootstrap -a install +# RUN opentelemetry-bootstrap -a install ADD client.py /app/client.py CMD ["opentelemetry-instrument", "/app/client.py"] diff --git a/python/launcher/Dockerfile.server b/python/launcher/Dockerfile.server index ee3c0464..3f4c2354 100644 --- a/python/launcher/Dockerfile.server +++ b/python/launcher/Dockerfile.server @@ -5,7 +5,7 @@ WORKDIR /app ADD requirements.txt . RUN pip install -r requirements.txt -RUN opentelemetry-bootstrap -a install +# RUN opentelemetry-bootstrap -a install ADD server.py /app/server.py CMD ["opentelemetry-instrument", "/app/server.py"] diff --git a/python/launcher/requirements.txt b/python/launcher/requirements.txt index ecdc5321..97410df3 100644 --- a/python/launcher/requirements.txt +++ b/python/launcher/requirements.txt @@ -5,3 +5,5 @@ redis requests sqlalchemy opentelemetry-launcher==0.17b0 +opentelemetry-instrumentation-requests==0.17b0 +opentelemetry-instrumentation-flask==0.17b0 diff --git a/python/opentelemetry/requirements.txt b/python/opentelemetry/requirements.txt index 951e7280..dcf0e2f2 100644 --- a/python/opentelemetry/requirements.txt +++ b/python/opentelemetry/requirements.txt @@ -4,6 +4,6 @@ pymongo redis requests sqlalchemy -opentelemetry-instrumentation==0.17b0 -opentelemetry-exporter-otlp==0.17b0 -opentelemetry-propagator-b3==0.17b0 +opentelemetry-instrumentation==0.18b0 +opentelemetry-exporter-otlp==1.0.0rc1 +opentelemetry-propagator-b3==1.0.0rc1 diff --git a/python/opentracing/Dockerfile.client b/python/opentracing/Dockerfile.client index a68b72e5..6ba0f564 100644 --- a/python/opentracing/Dockerfile.client +++ b/python/opentracing/Dockerfile.client @@ -5,7 +5,7 @@ WORKDIR /app ADD requirements.txt . RUN pip install -r requirements.txt -RUN opentelemetry-bootstrap -a install +# RUN opentelemetry-bootstrap -a install ADD client.py /app/client.py CMD ["opentelemetry-instrument", "python", "/app/client.py"] diff --git a/python/opentracing/Dockerfile.server b/python/opentracing/Dockerfile.server index 1e2d7687..9e18f4cf 100644 --- a/python/opentracing/Dockerfile.server +++ b/python/opentracing/Dockerfile.server @@ -5,7 +5,7 @@ WORKDIR /app ADD requirements.txt . RUN pip install -r requirements.txt -RUN opentelemetry-bootstrap -a install +# RUN opentelemetry-bootstrap -a install ADD server.py /app/server.py CMD ["opentelemetry-instrument", "python", "/app/server.py"] diff --git a/python/opentracing/requirements.txt b/python/opentracing/requirements.txt index c52e10c8..ea688494 100644 --- a/python/opentracing/requirements.txt +++ b/python/opentracing/requirements.txt @@ -5,4 +5,6 @@ redis requests sqlalchemy opentelemetry-launcher==0.17b0 -opentelemetry-opentracing-shim +opentelemetry-opentracing-shim==0.17b0 +opentelemetry-instrumentation-requests==0.17b0 +opentelemetry-instrumentation-flask==0.17b0