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

feat(MeshTrace): add support for opentelemetry trace backend #5992

Merged
merged 4 commits into from
Feb 13, 2023
Merged

feat(MeshTrace): add support for opentelemetry trace backend #5992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65534dd
feat(policies): support opentelemetry tracing
frzifus Feb 11, 2023
7d52b24
feat(policies): regenerate meshtrace v1alpha1
frzifus Feb 11, 2023
04d1d87
feat(kumactl): observability jaeger deployment accepts now otlp
frzifus Feb 12, 2023
67fda65
feat(kumactl): regenerate golden files
frzifus Feb 13, 2023
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
14 changes: 13 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2807,7 +2807,8 @@ spec:
explained in MADR 009-tracing-policy this has to be a one element
array for now.
items:
description: Only one of zipkin or datadog can be used.
description: Only one of zipkin, datadog or openTelemetry can
be used.
properties:
datadog:
description: Datadog backend configuration.
Expand All @@ -2828,6 +2829,17 @@ spec:
required:
- url
type: object
openTelemetry:
description: OpenTelemetry backend configuration.
properties:
endpoint:
description: Address of OpenTelemetry collector.
example: otel-collector:4317
minLength: 1
type: string
required:
- endpoint
type: object
zipkin:
description: Zipkin backend configuration.
properties:
Expand Down
14 changes: 13 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present-not-enabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2807,7 +2807,8 @@ spec:
explained in MADR 009-tracing-policy this has to be a one element
array for now.
items:
description: Only one of zipkin or datadog can be used.
description: Only one of zipkin, datadog or openTelemetry can
be used.
properties:
datadog:
description: Datadog backend configuration.
Expand All @@ -2828,6 +2829,17 @@ spec:
required:
- url
type: object
openTelemetry:
description: OpenTelemetry backend configuration.
properties:
endpoint:
description: Address of OpenTelemetry collector.
example: otel-collector:4317
minLength: 1
type: string
required:
- endpoint
type: object
zipkin:
description: Zipkin backend configuration.
properties:
Expand Down
14 changes: 13 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2959,7 +2959,8 @@ spec:
explained in MADR 009-tracing-policy this has to be a one element
array for now.
items:
description: Only one of zipkin or datadog can be used.
description: Only one of zipkin, datadog or openTelemetry can
be used.
properties:
datadog:
description: Datadog backend configuration.
Expand All @@ -2980,6 +2981,17 @@ spec:
required:
- url
type: object
openTelemetry:
description: OpenTelemetry backend configuration.
properties:
endpoint:
description: Address of OpenTelemetry collector.
example: otel-collector:4317
minLength: 1
type: string
required:
- endpoint
type: object
zipkin:
description: Zipkin backend configuration.
properties:
Expand Down
14 changes: 13 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2827,7 +2827,8 @@ spec:
explained in MADR 009-tracing-policy this has to be a one element
array for now.
items:
description: Only one of zipkin or datadog can be used.
description: Only one of zipkin, datadog or openTelemetry can
be used.
properties:
datadog:
description: Datadog backend configuration.
Expand All @@ -2848,6 +2849,17 @@ spec:
required:
- url
type: object
openTelemetry:
description: OpenTelemetry backend configuration.
properties:
endpoint:
description: Address of OpenTelemetry collector.
example: otel-collector:4317
minLength: 1
type: string
required:
- endpoint
type: object
zipkin:
description: Zipkin backend configuration.
properties:
Expand Down
14 changes: 13 additions & 1 deletion app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3933,7 +3933,8 @@ spec:
explained in MADR 009-tracing-policy this has to be a one element
array for now.
items:
description: Only one of zipkin or datadog can be used.
description: Only one of zipkin, datadog or openTelemetry can
be used.
properties:
datadog:
description: Datadog backend configuration.
Expand All @@ -3954,6 +3955,17 @@ spec:
required:
- url
type: object
openTelemetry:
description: OpenTelemetry backend configuration.
properties:
endpoint:
description: Address of OpenTelemetry collector.
example: otel-collector:4317
minLength: 1
type: string
required:
- endpoint
type: object
zipkin:
description: Zipkin backend configuration.
properties:
Expand Down
14 changes: 13 additions & 1 deletion app/kumactl/cmd/install/testdata/install-crds.experimental-gatewayapi.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4085,7 +4085,8 @@ spec:
explained in MADR 009-tracing-policy this has to be a one element
array for now.
items:
description: Only one of zipkin or datadog can be used.
description: Only one of zipkin, datadog or openTelemetry can
be used.
properties:
datadog:
description: Datadog backend configuration.
Expand All @@ -4106,6 +4107,17 @@ spec:
required:
- url
type: object
openTelemetry:
description: OpenTelemetry backend configuration.
properties:
endpoint:
description: Address of OpenTelemetry collector.
example: otel-collector:4317
minLength: 1
type: string
required:
- endpoint
type: object
zipkin:
description: Zipkin backend configuration.
properties:
Expand Down
16 changes: 15 additions & 1 deletion app/kumactl/cmd/install/testdata/install-observability.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12926,7 +12926,9 @@ items:
- env:
- name: COLLECTOR_ZIPKIN_HOST_PORT
value: "9411"
image: jaegertracing/all-in-one:1.34.1
- name: COLLECTOR_OTLP_ENABLED
value: "true"
image: jaegertracing/all-in-one:1.42.0
name: jaeger
ports:
- containerPort: 5775
Expand All @@ -12941,6 +12943,10 @@ items:
protocol: TCP
- containerPort: 9411
protocol: TCP
- containerPort: 4317
protocol: TCP
- containerPort: 4318
protocol: TCP
readinessProbe:
httpGet:
path: "/"
Expand Down Expand Up @@ -12988,6 +12994,14 @@ items:
port: 9411
protocol: TCP
targetPort: 9411
- name: grpc-otlp
port: 4317
protocol: TCP
targetPort: 4317
- name: http-otlp
port: 4318
protocol: TCP
targetPort: 4318
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one
Expand Down
16 changes: 15 additions & 1 deletion app/kumactl/cmd/install/testdata/install-observability.no-grafana.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,7 +1366,9 @@ items:
- env:
- name: COLLECTOR_ZIPKIN_HOST_PORT
value: "9411"
image: jaegertracing/all-in-one:1.34.1
- name: COLLECTOR_OTLP_ENABLED
value: "true"
image: jaegertracing/all-in-one:1.42.0
name: jaeger
ports:
- containerPort: 5775
Expand All @@ -1381,6 +1383,10 @@ items:
protocol: TCP
- containerPort: 9411
protocol: TCP
- containerPort: 4317
protocol: TCP
- containerPort: 4318
protocol: TCP
readinessProbe:
httpGet:
path: "/"
Expand Down Expand Up @@ -1428,6 +1434,14 @@ items:
port: 9411
protocol: TCP
targetPort: 9411
- name: grpc-otlp
port: 4317
protocol: TCP
targetPort: 4317
- name: http-otlp
port: 4318
protocol: TCP
targetPort: 4318
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one
Expand Down
16 changes: 15 additions & 1 deletion app/kumactl/cmd/install/testdata/install-observability.no-loki.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12277,7 +12277,9 @@ items:
- env:
- name: COLLECTOR_ZIPKIN_HOST_PORT
value: "9411"
image: jaegertracing/all-in-one:1.34.1
- name: COLLECTOR_OTLP_ENABLED
value: "true"
image: jaegertracing/all-in-one:1.42.0
name: jaeger
ports:
- containerPort: 5775
Expand All @@ -12292,6 +12294,10 @@ items:
protocol: TCP
- containerPort: 9411
protocol: TCP
- containerPort: 4317
protocol: TCP
- containerPort: 4318
protocol: TCP
readinessProbe:
httpGet:
path: "/"
Expand Down Expand Up @@ -12339,6 +12345,14 @@ items:
port: 9411
protocol: TCP
targetPort: 9411
- name: grpc-otlp
port: 4317
protocol: TCP
targetPort: 4317
- name: http-otlp
port: 4318
protocol: TCP
targetPort: 4318
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one
Expand Down
16 changes: 15 additions & 1 deletion app/kumactl/cmd/install/testdata/install-observability.no-prometheus.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12267,7 +12267,9 @@ items:
- env:
- name: COLLECTOR_ZIPKIN_HOST_PORT
value: "9411"
image: jaegertracing/all-in-one:1.34.1
- name: COLLECTOR_OTLP_ENABLED
value: "true"
image: jaegertracing/all-in-one:1.42.0
name: jaeger
ports:
- containerPort: 5775
Expand All @@ -12282,6 +12284,10 @@ items:
protocol: TCP
- containerPort: 9411
protocol: TCP
- containerPort: 4317
protocol: TCP
- containerPort: 4318
protocol: TCP
readinessProbe:
httpGet:
path: "/"
Expand Down Expand Up @@ -12329,6 +12335,14 @@ items:
port: 9411
protocol: TCP
targetPort: 9411
- name: grpc-otlp
port: 4317
protocol: TCP
targetPort: 4317
- name: http-otlp
port: 4318
protocol: TCP
targetPort: 4318
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one
Expand Down
16 changes: 15 additions & 1 deletion app/kumactl/cmd/install/testdata/install-observability.overrides.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12926,7 +12926,9 @@ items:
- env:
- name: COLLECTOR_ZIPKIN_HOST_PORT
value: "9411"
image: jaegertracing/all-in-one:1.34.1
- name: COLLECTOR_OTLP_ENABLED
value: "true"
image: jaegertracing/all-in-one:1.42.0
name: jaeger
ports:
- containerPort: 5775
Expand All @@ -12941,6 +12943,10 @@ items:
protocol: TCP
- containerPort: 9411
protocol: TCP
- containerPort: 4317
protocol: TCP
- containerPort: 4318
protocol: TCP
readinessProbe:
httpGet:
path: "/"
Expand Down Expand Up @@ -12988,6 +12994,14 @@ items:
port: 9411
protocol: TCP
targetPort: 9411
- name: grpc-otlp
port: 4317
protocol: TCP
targetPort: 4317
- name: http-otlp
port: 4318
protocol: TCP
targetPort: 4318
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one
Expand Down
17 changes: 15 additions & 2 deletions app/kumactl/data/install/k8s/tracing/jaeger/all-in-one-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ items:
- env:
- name: COLLECTOR_ZIPKIN_HOST_PORT
value: "9411"
image: jaegertracing/all-in-one:1.34.1
- name: COLLECTOR_OTLP_ENABLED
value: "true"
image: jaegertracing/all-in-one:1.42.0
name: jaeger
ports:
- containerPort: 5775
Expand All @@ -62,6 +64,10 @@ items:
protocol: TCP
- containerPort: 9411
protocol: TCP
- containerPort: 4317
frzifus marked this conversation as resolved.
Show resolved Hide resolved
protocol: TCP
- containerPort: 4318
protocol: TCP
readinessProbe:
httpGet:
path: "/"
Expand Down Expand Up @@ -109,6 +115,14 @@ items:
port: 9411
protocol: TCP
targetPort: 9411
- name: grpc-otlp
port: 4317
protocol: TCP
targetPort: 4317
- name: http-otlp
port: 4318
protocol: TCP
targetPort: 4318
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one
Expand Down Expand Up @@ -163,4 +177,3 @@ items:
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one

Loading