-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into postgresql-cp
- Loading branch information
Showing
364 changed files
with
9,473 additions
and
4,275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.2.0 | ||
3.0.0 |
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
syntax = "proto3"; | ||
|
||
package envoy.config.trace.v2; | ||
|
||
import "udpa/annotations/status.proto"; | ||
import "validate/validate.proto"; | ||
|
||
option java_package = "io.envoyproxy.envoy.config.trace.v2"; | ||
option java_outer_classname = "DatadogProto"; | ||
option java_multiple_files = true; | ||
option (udpa.annotations.file_status).package_version_status = FROZEN; | ||
|
||
// [#protodoc-title: Datadog tracer] | ||
|
||
// Configuration for the Datadog tracer. | ||
// [#extension: envoy.tracers.datadog] | ||
message DatadogConfig { | ||
// The cluster to use for submitting traces to the Datadog agent. | ||
string collector_cluster = 1 [(validate.rules).string = {min_bytes: 1}]; | ||
|
||
// The name used for the service when traces are generated by envoy. | ||
string service_name = 2 [(validate.rules).string = {min_bytes: 1}]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
syntax = "proto3"; | ||
|
||
package envoy.config.trace.v2; | ||
|
||
import "google/protobuf/struct.proto"; | ||
|
||
import "udpa/annotations/status.proto"; | ||
import "validate/validate.proto"; | ||
|
||
option java_package = "io.envoyproxy.envoy.config.trace.v2"; | ||
option java_outer_classname = "DynamicOtProto"; | ||
option java_multiple_files = true; | ||
option (udpa.annotations.file_status).package_version_status = FROZEN; | ||
|
||
// [#protodoc-title: Dynamically loadable OpenTracing tracer] | ||
|
||
// 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>`_. | ||
// [#extension: envoy.tracers.dynamic_ot] | ||
message DynamicOtConfig { | ||
// Dynamic library implementing the `OpenTracing API | ||
// <https://github.com/opentracing/opentracing-cpp>`_. | ||
string library = 1 [(validate.rules).string = {min_bytes: 1}]; | ||
|
||
// The configuration to use when creating a tracer from the given dynamic | ||
// library. | ||
google.protobuf.Struct config = 2; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
syntax = "proto3"; | ||
|
||
package envoy.config.trace.v2; | ||
|
||
import "google/protobuf/any.proto"; | ||
import "google/protobuf/struct.proto"; | ||
|
||
import "udpa/annotations/status.proto"; | ||
import "validate/validate.proto"; | ||
|
||
option java_package = "io.envoyproxy.envoy.config.trace.v2"; | ||
option java_outer_classname = "HttpTracerProto"; | ||
option java_multiple_files = true; | ||
option (udpa.annotations.file_status).package_version_status = FROZEN; | ||
|
||
// [#protodoc-title: Tracing] | ||
// Tracing :ref:`architecture overview <arch_overview_tracing>`. | ||
|
||
// The tracing configuration specifies settings for an HTTP tracer provider used by Envoy. | ||
// | ||
// Envoy may support other tracers in the future, but right now the HTTP tracer is the only one | ||
// supported. | ||
// | ||
// .. attention:: | ||
// | ||
// Use of this message type has been deprecated in favor of direct use of | ||
// :ref:`Tracing.Http <envoy_api_msg_config.trace.v2.Tracing.Http>`. | ||
message Tracing { | ||
// Configuration for an HTTP tracer provider used by Envoy. | ||
// | ||
// The configuration is defined by the | ||
// :ref:`HttpConnectionManager.Tracing <envoy_api_msg_config.filter.network.http_connection_manager.v2.HttpConnectionManager.Tracing>` | ||
// :ref:`provider <envoy_api_field_config.filter.network.http_connection_manager.v2.HttpConnectionManager.Tracing.provider>` | ||
// field. | ||
message Http { | ||
// The name of the HTTP trace driver to instantiate. The name must match a | ||
// supported HTTP trace driver. Built-in trace drivers: | ||
// | ||
// - *envoy.tracers.lightstep* | ||
// - *envoy.tracers.zipkin* | ||
// - *envoy.tracers.dynamic_ot* | ||
// - *envoy.tracers.datadog* | ||
// - *envoy.tracers.opencensus* | ||
// - *envoy.tracers.xray* | ||
string name = 1 [(validate.rules).string = {min_bytes: 1}]; | ||
|
||
// Trace driver specific configuration which depends on the driver being instantiated. | ||
// See the trace drivers for examples: | ||
// | ||
// - :ref:`LightstepConfig <envoy_api_msg_config.trace.v2.LightstepConfig>` | ||
// - :ref:`ZipkinConfig <envoy_api_msg_config.trace.v2.ZipkinConfig>` | ||
// - :ref:`DynamicOtConfig <envoy_api_msg_config.trace.v2.DynamicOtConfig>` | ||
// - :ref:`DatadogConfig <envoy_api_msg_config.trace.v2.DatadogConfig>` | ||
// - :ref:`OpenCensusConfig <envoy_api_msg_config.trace.v2.OpenCensusConfig>` | ||
// - :ref:`AWS X-Ray <envoy_api_msg_config.trace.v2alpha.XRayConfig>` | ||
oneof config_type { | ||
google.protobuf.Struct config = 2 [deprecated = true]; | ||
|
||
google.protobuf.Any typed_config = 3; | ||
} | ||
} | ||
|
||
// Provides configuration for the HTTP tracer. | ||
Http http = 1; | ||
} |
Oops, something went wrong.