Intermediate changes

commit_hash:140d504a94c4880223aedd639cad7c222a722936

Author: robot-piglet

core/functional_tests/basic_chaos/tests-deadline/test_client.py

@@ -1,21 +1,12 @@
 import asyncio
-import datetime
 
 import pytest
 
 DP_TIMEOUT_MS = 'X-YaTaxi-Client-TimeoutMs'
 DP_DEADLINE_EXPIRED = 'X-YaTaxi-Deadline-Expired'
-DP_ABSOLUTE_DEADLINE = 'X-Request-Deadline'
 VERSION = {'version': '2'}
 
 
-def _make_iso_deadline(offset_seconds: float) -> str:
-    tp = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-        seconds=offset_seconds,
-    )
-    return tp.strftime('%Y-%m-%dT%H:%M:%S.') + f'{tp.microsecond:06d}Z'
-
-
 @pytest.fixture(name='call')
 def _call(service_client, mockserver_info):
     async def _call(htype='common', headers=None, **args):
@@ -394,22 +385,3 @@ async def test_dp_timeout_not_retried(
     assert response.text == ''
 
     assert fake_deadline_expired_mock.times_called == retries_performed
-
-
-async def test_absolute_deadline_propagated_as_is(call, mockserver):
-    iso_deadline = _make_iso_deadline(10.0)
-    captured = {}
-
-    @mockserver.handler('/test')
-    async def mock(request):
-        captured['headers'] = dict(request.headers)
-        return mockserver.make_response('OK!')
-
-    response = await call(
-        headers={
-            DP_TIMEOUT_MS: '500',
-            DP_ABSOLUTE_DEADLINE: iso_deadline,
-        },
-    )
-    assert response.status == 200
-    assert captured['headers'].get(DP_ABSOLUTE_DEADLINE) == iso_deadline

core/functional_tests/basic_chaos/tests-deadline/test_server.py

@@ -139,7 +139,7 @@ async def test_absolute_deadline_disabled_dynamically(call):
         headers={
             **HEADERS,
             DP_TIMEOUT_MS: '5000',
-            DP_ABSOLUTE_DEADLINE: _make_iso_deadline(-1.0),
+            DP_ABSOLUTE_DEADLINE: _make_iso_deadline(-120.0),
         },
     )
     assert response.status == 200

core/src/clients/http/request_state.cpp

@@ -24,7 +24,6 @@
 #include <userver/utils/algo.hpp>
 #include <userver/utils/assert.hpp>
 #include <userver/utils/async.hpp>
-#include <userver/utils/datetime_light.hpp>
 #include <userver/utils/encoding/hex.hpp>
 #include <userver/utils/from_string.hpp>
 #include <userver/utils/overloaded.hpp>
@@ -971,16 +970,6 @@ void RequestState::UpdateTimeoutHeader() {
         fmt::to_string(remote_timeout_.count()),
         curl::easy::DuplicateHeaderAction::kReplace
     );
-
-    if (inherited_original_deadline_.has_value()) {
-        const auto
-            iso_str = utils::datetime::UtcTimestring(*inherited_original_deadline_, utils::datetime::kTaximeterFormat);
-        easy().add_header(
-            USERVER_NAMESPACE::http::headers::kXRequestDeadline,
-            iso_str,
-            curl::easy::DuplicateHeaderAction::kReplace
-        );
-    }
 }
 
 void RequestState::HandleDeadlineAlreadyPassed() {
@@ -1107,7 +1096,6 @@ void RequestState::ResetDataForNewRequest() {
     retry_.current = 1;
     remote_timeout_ = original_timeout_;
     deadline_ = server::request::GetTaskInheritedDeadline();
-    inherited_original_deadline_ = server::request::GetTaskInheritedOriginalDeadline();
     deadline_expired_ = false;
     timeout_updated_by_deadline_ = false;
 

core/src/clients/http/request_state.hpp

@@ -22,7 +22,6 @@
 #include <userver/engine/single_consumer_event.hpp>
 #include <userver/http/common_headers.hpp>
 #include <userver/http/url.hpp>
-#include <userver/server/request/task_inherited_data.hpp>
 #include <userver/tracing/in_place_span.hpp>
 #include <userver/tracing/manager.hpp>
 #include <userver/tracing/span.hpp>
@@ -237,8 +236,6 @@ class RequestState : public std::enable_shared_from_this<RequestState> {
     std::chrono::milliseconds remote_timeout_;
 
     DeadlinePropagationConfig deadline_propagation_config_;
-    /// original absolute deadline from task inherited data
-    std::optional<server::request::TaskInheritedOriginalDeadline> inherited_original_deadline_;
     /// deadline from current task
     engine::Deadline deadline_;
     bool timeout_updated_by_deadline_{false};