update opentelemetry reqs; unfreeze requests version (#234)

Remove unnecessary dependencies, remove version restrictions. Remove exporter patch, add version restriction for new opentelemetry api. --------- Co-authored-by: Roman Zlobin <[email protected]>
deeppavlov · Sep 26, 2023 · 82aff11 · 82aff11
1 parent d247a58
commit 82aff11
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 56 deletions.
diff --git a/dff/stats/__init__.py b/dff/stats/__init__.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa: F401
 
-from . import exporter_patch
 from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter
 from opentelemetry.sdk.trace.export import ConsoleSpanExporter
 from opentelemetry.sdk._logs.export import InMemoryLogExporter, ConsoleLogExporter

diff --git a/dff/stats/exporter_patch.py b/dff/stats/exporter_patch.py
diff --git a/dff/stats/utils.py b/dff/stats/utils.py
@@ -18,7 +18,6 @@
 from argparse import Namespace, Action
 
 import requests
-from . import exporter_patch  # noqa: F401
 from opentelemetry.sdk.resources import Resource
 from opentelemetry._logs import get_logger_provider, set_logger_provider
 from opentelemetry.trace import get_tracer_provider, set_tracer_provider

diff --git a/setup.py b/setup.py
@@ -79,29 +79,18 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]:
     "pytelegrambotapi",
 ]
 
-requests_requirements = [
-    "requests==2.31.0",
-]
-
 otl_dependencies = [
-    "opentelemetry-api==1.17.0",
-    "opentelemetry-exporter-otlp==1.17.0",
-    "opentelemetry-exporter-otlp-proto-grpc==1.17.0",
-    "opentelemetry-exporter-otlp-proto-http==1.17.0",
-    "opentelemetry-instrumentation==0.38b0",
-    "opentelemetry-proto==1.17.0",
-    "opentelemetry-sdk==1.17.0",
-    "opentelemetry-semantic-conventions==0.38b0",
+    "opentelemetry-exporter-otlp>=1.20.0",  # log body serialization is required
+    "opentelemetry-instrumentation",
 ]
 
 stats_dependencies = merge_req_lists(
-    _sql_dependencies,
-    requests_requirements,
     otl_dependencies,
     [
-        "wrapt==1.15.0",
-        "tqdm==4.62.3",
-        "omegaconf>=2.2.2",
+        "requests",
+        "wrapt",
+        "tqdm",
+        "omegaconf",
     ],
 )
 
@@ -118,6 +107,10 @@ def merge_req_lists(*req_lists: List[str]) -> List[str]:
     telegram_dependencies,
 )
 
+requests_requirements = [
+    "requests==2.31.0",
+]
+
 test_requirements = merge_req_lists(
     [
         "pytest==7.4.0",