You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2022/04/19 23:51:44 UTC
[trafficserver] 01/01: Merge ASF master into 10-Dev
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch 10-Dev
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit eaad9fb82639b2bfdd3b9dfcd15af4eb89d53fdd
Merge: 2e10110b6 6ad81f36a
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Tue Apr 19 23:50:47 2022 +0000
Merge ASF master into 10-Dev
Merges in from master commit 6ad81f36a6e9faa368ea6b33cc05a2f3669c22b5
Conflicts:
proxy/http/HttpSM.cc
.gitignore | 1 +
configure.ac | 25 ++
doc/admin-guide/plugins/index.en.rst | 4 +
doc/admin-guide/plugins/otel_tracer.en.rst | 114 ++++++
doc/appendices/command-line/traffic_manager.en.rst | 1 -
iocore/net/I_NetProcessor.h | 1 -
iocore/net/UnixNetAccept.cc | 4 +-
iocore/net/UnixNetProcessor.cc | 1 -
plugins/Makefile.am | 4 +
plugins/experimental/otel_tracer/Makefile.inc | 26 ++
plugins/experimental/otel_tracer/otel_tracer.cc | 378 ++++++++++++++++++
plugins/experimental/otel_tracer/tracer_common.h | 203 ++++++++++
proxy/http/HttpSM.cc | 204 +++++-----
proxy/http/HttpTransact.cc | 433 +++++++++------------
proxy/http/HttpTunnel.cc | 6 +-
proxy/http2/Http2Stream.cc | 6 +-
proxy/logging/LogUtils.cc | 2 +
src/traffic_manager/traffic_manager.cc | 2 +
tools/Makefile.am | 8 +
tools/escape_mapper/README | 14 +
tools/escape_mapper/escape_mapper.cc | 85 ++++
21 files changed, 1151 insertions(+), 371 deletions(-)