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.

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

add tracing config to api #930

Merged
merged 5 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 1 addition & 0 deletions api/v1alpha1/common.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions api/v1alpha1/istiocontrolplane.gen.json
Original file line number Diff line number Diff line change
Expand Up @@ -2351,6 +2351,9 @@
},
"sidecarInjector": {
"$ref": "#/components/schemas/istio_operator.v2.api.v1alpha1.SidecarInjectorConfiguration"
},
"tracer": {
"$ref": "#/components/schemas/istio.mesh.v1alpha1.Tracing"
}
}
},
Expand Down Expand Up @@ -2822,6 +2825,10 @@
"type": "boolean",
"nullable": true
},
"tracer": {
"description": "Specify which tracer to use. One of: zipkin, lightstep, datadog, stackdriver",
"type": "string"
},
"enableCoreDump": {
"description": "If set, newly injected sidecars will have core dumps enabled.",
"type": "boolean",
Expand Down
1,173 changes: 601 additions & 572 deletions api/v1alpha1/istiocontrolplane.pb.go

Large diffs are not rendered by default.

123 changes: 122 additions & 1 deletion api/v1alpha1/istiocontrolplane.pb.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
layout: protoc-gen-docs
generator: protoc-gen-docs
schema: istio-operator.api.v1alpha1.IstioControlPlaneSpec
number_of_entries: 41
number_of_entries: 42
---
<h2 id="IstioControlPlaneSpec">IstioControlPlaneSpec</h2>
<section>
Expand Down Expand Up @@ -295,6 +295,17 @@ <h2 id="IstioControlPlaneSpec">IstioControlPlaneSpec</h2>
<td>
<p>Standalone sidecar injector configuration.</p>

</td>
<td>
No
</td>
</tr>
<tr id="IstioControlPlaneSpec-tracer">
<td><code>tracer</code></td>
<td><code><a href="https://istio.io/docs/reference/config/istio.mesh.v1alpha1.html#Tracing">Tracing</a></code></td>
<td>
<p>Tracing defines configuration for the tracing performed by Envoy instances.</p>

</td>
<td>
No
Expand Down Expand Up @@ -709,6 +720,17 @@ <h2 id="ProxyConfiguration">ProxyConfiguration</h2>
<td>
<p>ExcludeOutboundPorts the comma separated list of outbound ports to be excluded from redirection to Envoy</p>

</td>
<td>
No
</td>
</tr>
<tr id="ProxyConfiguration-tracer" class="oneof oneof-start">
<td><code>tracer</code></td>
<td><code>string (oneof)</code></td>
<td>
<p>Specify which tracer to use. One of: zipkin, lightstep, datadog, stackdriver</p>

</td>
<td>
No
Expand Down Expand Up @@ -1749,6 +1771,105 @@ <h2 id="ContainerImageConfiguration">ContainerImageConfiguration</h2>
<p>ImagePullSecrets is an optional list of references to secrets to use for pulling any of the images.
+optional</p>

</td>
<td>
No
</td>
</tr>
</tbody>
</table>
</section>
<h2 id="istio-mesh-v1alpha1-Tracing">istio.mesh.v1alpha1.Tracing</h2>
<section>
<p>Tracing defines configuration for the tracing performed by Envoy instances.</p>

<table class="message-fields">
<thead>
<tr>
<th>Field</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody>
<tr id="istio-mesh-v1alpha1-Tracing-zipkin" class="oneof oneof-start">
<td><code>zipkin</code></td>
<td><code><a href="https://istio.io/docs/reference/config/istio.mesh.v1alpha1.html#Tracing-Zipkin">Zipkin (oneof)</a></code></td>
<td>
<p>Use a Zipkin tracer.</p>

</td>
<td>
No
</td>
</tr>
<tr id="istio-mesh-v1alpha1-Tracing-lightstep" class="oneof">
<td><code>lightstep</code></td>
<td><code><a href="#istio-mesh-v1alpha1-Tracing-Lightstep">Lightstep (oneof)</a></code></td>
<td>
<p>Use a Lightstep tracer.
NOTE: For Istio 1.15+, this configuration option will result
in using OpenTelemetry-based Lightstep integration.</p>

</td>
<td>
No
</td>
</tr>
<tr id="istio-mesh-v1alpha1-Tracing-datadog" class="oneof">
<td><code>datadog</code></td>
<td><code><a href="https://istio.io/docs/reference/config/istio.mesh.v1alpha1.html#Tracing-Datadog">Datadog (oneof)</a></code></td>
<td>
<p>Use a Datadog tracer.</p>

</td>
<td>
No
</td>
</tr>
<tr id="istio-mesh-v1alpha1-Tracing-stackdriver" class="oneof">
<td><code>stackdriver</code></td>
<td><code><a href="https://istio.io/docs/reference/config/istio.mesh.v1alpha1.html#Tracing-Stackdriver">Stackdriver (oneof)</a></code></td>
<td>
<p>Use a Stackdriver tracer.</p>

</td>
<td>
No
</td>
</tr>
<tr id="istio-mesh-v1alpha1-Tracing-open_census_agent" class="oneof">
<td><code>openCensusAgent</code></td>
<td><code><a href="https://istio.io/docs/reference/config/istio.mesh.v1alpha1.html#Tracing-OpenCensusAgent">OpenCensusAgent (oneof)</a></code></td>
<td>
<p>Use an OpenCensus tracer exporting to an OpenCensus agent.</p>

</td>
<td>
No
</td>
</tr>
<tr id="istio-mesh-v1alpha1-Tracing-sampling">
<td><code>sampling</code></td>
<td><code>double</code></td>
<td>
<p>The percentage of requests (0.0 - 100.0) that will be randomly selected for trace generation,
if not requested by the client or not forced. Default is 1.0.</p>

</td>
<td>
No
</td>
</tr>
<tr id="istio-mesh-v1alpha1-Tracing-tls_settings">
<td><code>tlsSettings</code></td>
<td><code><a href="https://istio.io/docs/reference/config/networking/destination-rule.html#ClientTLSSettings">ClientTLSSettings</a></code></td>
<td>
<p>Use the tls_settings to specify the tls mode to use. If the remote tracing service
uses Istio mutual TLS and shares the root CA with Pilot, specify the TLS
mode as <code>ISTIO_MUTUAL</code>.</p>

</td>
<td>
No
Expand Down
5 changes: 5 additions & 0 deletions api/v1alpha1/istiocontrolplane.proto
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import "api/v1alpha1/common.proto";
import "api/v1alpha1/istiomeshgateway.proto";
import "k8s.io/api/core/v1/generated.proto";
import "mesh/v1alpha1/config.proto";
import "mesh/v1alpha1/proxy.proto";
import "google/api/field_behavior.proto";
import "google/protobuf/wrappers.proto";

Expand Down Expand Up @@ -122,6 +123,8 @@ message IstioControlPlaneSpec {
string networkName = 23;
// Standalone sidecar injector configuration.
SidecarInjectorConfiguration sidecarInjector = 24;
// Tracing defines configuration for the tracing performed by Envoy instances.
istio.mesh.v1alpha1.Tracing tracer = 25;
}

enum ModeType {
Expand Down Expand Up @@ -231,6 +234,8 @@ message ProxyConfiguration {
string excludeInboundPorts = 12;
// ExcludeOutboundPorts the comma separated list of outbound ports to be excluded from redirection to Envoy
string excludeOutboundPorts = 13;
// Specify which tracer to use. One of: zipkin, lightstep, datadog, stackdriver
optional string tracer = 14;
}

enum ProxyLogLevel {
Expand Down
Loading
Loading