Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] deps: Remove opentracing #28851

Closed
wants to merge 1 commit into from
Closed

[WIP] deps: Remove opentracing #28851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/envoy/config/trace/v3/dynamic_ot.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;

// [#protodoc-title: Dynamically loadable OpenTracing tracer]

// [#not-implemented-hide:]
//
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor point: If I'm understanding correctly, we're keeping around this proto message for configuring OT even though we no longer have code to support it. Should we remove this proto message?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably yes - altho i wasnt 100% if we can just to that

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be great if the configuration file could keep working (with a deprecation warning maybe) even if it becomes no-op. Otherwise this will break the startup of envoys that configured the now dropped feature.

// DynamicOtConfig is used to dynamically load a tracer from a shared library
// that implements the `OpenTracing dynamic loading API
// <https://github.com/opentracing/opentracing-cpp>`_.
Expand Down
16 changes: 0 additions & 16 deletions bazel/external/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,6 @@ licenses(["notice"]) # Apache 2

exports_files(["boringssl_fips.genrule_cmd"])

# Use a wrapper cc_library with an empty source source file to force
# compilation of other cc_library targets that only list *.a sources.
cc_library(
name = "all_external",
srcs = [":empty.cc"],
defines = ["OPENTRACING_STATIC"],
# TODO: external/io_opentracing_cpp/BUILD.bazel:19:1: Executing genrule
# @io_opentracing_cpp//:generate_version_h failed - needs porting
tags = ["skip_on_windows"],
deps = [
"@com_github_datadog_dd_trace_cpp//:dd_trace_cpp",
"@com_google_googletest//:gtest",
"@io_opentracing_cpp//:opentracing",
],
)

genrule(
name = "empty_cc",
outs = ["empty.cc"],
Expand Down
159 changes: 0 additions & 159 deletions bazel/io_opentracing_cpp.patch
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ WINDOWS_SKIP_TARGETS = [
"envoy.filters.http.file_system_buffer",
"envoy.filters.http.language",
"envoy.filters.http.sxg",
"envoy.tracers.dynamic_ot",
"envoy.tracers.datadog",
"envoy.tracers.opencensus",
# Extensions that require CEL.
Expand Down Expand Up @@ -336,7 +335,6 @@ def envoy_dependencies(skip_targets = []):
_com_googlesource_googleurl()
_io_hyperscan()
_io_vectorscan()
_io_opentracing_cpp()
_net_colm_open_source_colm()
_net_colm_open_source_ragel()
_net_zlib()
Expand Down Expand Up @@ -752,18 +750,6 @@ def _io_vectorscan():
patches = ["@envoy//bazel/foreign_cc:vectorscan.patch"],
)

def _io_opentracing_cpp():
external_http_archive(
name = "io_opentracing_cpp",
patch_args = ["-p1"],
# Workaround for LSAN false positive in https://github.com/envoyproxy/envoy/issues/7647
patches = ["@envoy//bazel:io_opentracing_cpp.patch"],
)
native.bind(
name = "opentracing",
actual = "@io_opentracing_cpp//:opentracing",
)

def _com_github_datadog_dd_trace_cpp():
external_http_archive("com_github_datadog_dd_trace_cpp")
native.bind(
Expand Down
18 changes: 0 additions & 18 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,24 +535,6 @@ REPOSITORY_LOCATIONS_SPEC = dict(
license = "BSD-3-Clause",
license_url = "https://github.com/VectorCamp/vectorscan/blob/vectorscan/{version}/LICENSE",
),
io_opentracing_cpp = dict(
project_name = "OpenTracing",
project_desc = "Vendor-neutral APIs and instrumentation for distributed tracing",
project_url = "https://opentracing.io",
version = "1.5.1",
sha256 = "015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301",
strip_prefix = "opentracing-cpp-{version}",
urls = ["https://github.com/opentracing/opentracing-cpp/archive/v{version}.tar.gz"],
use_category = ["observability_ext"],
extensions = [
"envoy.tracers.datadog",
"envoy.tracers.dynamic_ot",
],
release_date = "2019-01-16",
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/opentracing/opentracing-cpp/blob/v{version}/LICENSE",
),
skywalking_data_collect_protocol = dict(
project_name = "skywalking-data-collect-protocol",
project_desc = "Data Collect Protocols of Apache SkyWalking",
Expand Down
1 change: 0 additions & 1 deletion docs/root/start/sandboxes/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ The following sandboxes are available:
golang-network
grpc_bridge
gzip
jaeger_native_tracing
jaeger_tracing
kafka
load_reporting_service
Expand Down
121 changes: 0 additions & 121 deletions docs/root/start/sandboxes/jaeger_native_tracing.rst
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions docs/root/start/sandboxes/jaeger_tracing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,5 @@ to service2, as well as the latency incurred at each hop.
:ref:`Request tracing <arch_overview_tracing>`
Learn more about using Envoy's request tracing.

:ref:`Jaeger native tracing sandbox <install_sandboxes_jaeger_native_tracing>`
An example of using Jaeger natively with Envoy.

`Jaeger <https://jaegertracing.io/>`_
Jaeger tracing website.
1 change: 0 additions & 1 deletion docs/v2_mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
"envoy/extensions/retry/host/omit_host_metadata/v3/omit_host_metadata_config.proto": "envoy/config/retry/omit_host_metadata/v2/omit_host_metadata_config.proto",
"envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.proto": "envoy/config/retry/previous_hosts/v2/previous_hosts.proto",
"envoy/config/trace/v3/datadog.proto": "envoy/config/trace/v2/datadog.proto",
"envoy/config/trace/v3/dynamic_ot.proto": "envoy/config/trace/v2/dynamic_ot.proto",
"envoy/config/trace/v3/http_tracer.proto": "envoy/config/trace/v2/http_tracer.proto",
"envoy/config/trace/v3/lightstep.proto": "envoy/config/trace/v2/lightstep.proto",
"envoy/config/trace/v3/opencensus.proto": "envoy/config/trace/v2/opencensus.proto",
Expand Down
Loading
Loading