Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions api/envoy/config/trace/v3/dynamic_ot.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package envoy.config.trace.v3;

import "google/protobuf/struct.proto";

import "envoy/annotations/deprecation.proto";
import "udpa/annotations/migrate.proto";
import "udpa/annotations/status.proto";
import "udpa/annotations/versioning.proto";
Expand All @@ -29,9 +30,14 @@ message DynamicOtConfig {

// Dynamic library implementing the `OpenTracing API
// <https://github.com/opentracing/opentracing-cpp>`_.
string library = 1 [(validate.rules).string = {min_len: 1}];
string library = 1 [
deprecated = true,
Copy link
Member

Choose a reason for hiding this comment

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

An observation is that we could set a message-level deprecated annotation, but I'm guessing we would have to update some of the code for warning on this use of deprecated. Not strictly needed here, as to use this filter you need to set some stuff. But, for an empty filter config it would be needed in the future.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I had exactly the same thought. I'm inclined to leave that out of this PR and address it if/when we have an empty filter config to deprecate.

(validate.rules).string = {min_len: 1},
(envoy.annotations.deprecated_at_minor_version) = "3.0"
];

// The configuration to use when creating a tracer from the given dynamic
// library.
google.protobuf.Struct config = 2;
google.protobuf.Struct config = 2
[deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
}
4 changes: 4 additions & 0 deletions changelogs/current.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ date: Pending

behavior_changes:
# *Changes that are expected to cause an incompatibility if applicable; deployment changes are likely required*
- area: tracing
change: |
OpenTracing is now deprecated since the upstream project has been abandoned.

- area: eds
change: |
Introduced caching of EDS assignments when used with ADS. Prior to this change, Envoy required that EDS assignments were sent
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/extensions_metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ envoy.tracers.datadog:
envoy.tracers.dynamic_ot:
categories:
- envoy.tracers
security_posture: robust_to_untrusted_downstream
security_posture: unknown
status: stable
type_urls:
- envoy.config.trace.v3.DynamicOtConfig
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/tracers/dynamic_ot/config_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace Tracers {
namespace DynamicOt {
namespace {

TEST(DynamicOtTracerConfigTest, DynamicOpentracingHttpTracer) {
TEST(DynamicOtTracerConfigTest, DEPRECATED_FEATURE_TEST(DynamicOpentracingHttpTracer)) {
NiceMock<Server::Configuration::MockTracerFactoryContext> context;
EXPECT_CALL(context.server_factory_context_.cluster_manager_,
getThreadLocalCluster(Eq("fake_cluster")))
Expand Down