Permit to pass a custom transport to client

And a custom session to RequestsTransport

Author: xrmx

opamp/opentelemetry-opamp-client/src/opentelemetry/_opamp/client.py

@@ -21,6 +21,7 @@
 
 from opentelemetry._opamp import messages
 from opentelemetry._opamp.proto import opamp_pb2
+from opentelemetry._opamp.transport.base import HttpTransport
 from opentelemetry._opamp.transport.requests import RequestsTransport
 from opentelemetry._opamp.version import __version__
 from opentelemetry.context import (
@@ -61,9 +62,12 @@ def __init__(
         timeout_millis: int = _DEFAULT_OPAMP_TIMEOUT_MS,
         agent_identifying_attributes: Mapping[str, AnyValue],
         agent_non_identifying_attributes: Mapping[str, AnyValue] | None = None,
+        transport: HttpTransport = None,
     ):
         self._timeout_millis = timeout_millis
-        self._transport = RequestsTransport()
+        self._transport = (
+            RequestsTransport() if transport is None else transport
+        )
 
         self._endpoint = endpoint
         headers = headers or {}

opamp/opentelemetry-opamp-client/src/opentelemetry/_opamp/transport/requests.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from typing import Mapping
 
 import requests
@@ -22,8 +24,8 @@
 
 
 class RequestsTransport(HttpTransport):
-    def __init__(self):
-        self.session = requests.Session()
+    def __init__(self, session: requests.Session | None = None):
+        self.session = requests.Session() if session is None else session
 
     def send(
         self,

opamp/opentelemetry-opamp-client/tests/opamp/test_client.py

@@ -30,6 +30,7 @@
 from opentelemetry._opamp.proto.anyvalue_pb2 import (
     KeyValue as PB2KeyValue,  # pylint: disable=no-name-in-module
 )
+from opentelemetry._opamp.transport.requests import RequestsTransport
 from opentelemetry._opamp.version import __version__
 
 
@@ -61,12 +62,14 @@ def test_can_instantiate_opamp_client_with_defaults():
 
 
 def test_can_instantiate_opamp_client_all_params():
+    transport = RequestsTransport()
     client = OpAMPClient(
         endpoint="url",
         headers={"an": "header"},
         timeout_millis=2_000,
         agent_identifying_attributes={"foo": "bar"},
         agent_non_identifying_attributes={"bar": "baz"},
+        transport=transport,
     )
 
     assert client
@@ -85,6 +88,7 @@ def test_can_instantiate_opamp_client_all_params():
     assert client._agent_description.non_identifying_attributes == [
         PB2KeyValue(key="bar", value=PB2AnyValue(string_value="baz")),
     ]
+    assert client._transport is transport
 
 
 def test_client_headers_override_defaults():

opamp/opentelemetry-opamp-client/tests/opamp/transport/test_requests.py

@@ -15,6 +15,7 @@
 from unittest import mock
 
 import pytest
+import requests
 
 from opentelemetry._opamp.proto import opamp_pb2
 from opentelemetry._opamp.transport.base import base_headers
@@ -28,6 +29,14 @@ def test_can_instantiate_requests_transport():
     assert transport
 
 
+def test_can_instantiate_requests_transport_with_own_session():
+    session = requests.Session()
+    transport = RequestsTransport(session=session)
+
+    assert transport
+    assert transport.session is session
+
+
 def test_can_send():
     transport = RequestsTransport()
     serialized_message = opamp_pb2.ServerToAgent().SerializeToString()