Skip to content

Add support for OTLP OpenTelemetry and resource attributes #166

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

Open
schaer-bgs wants to merge 1 commit into
base: main
Choose a base branch
from
+78 −0
Open

Add support for OTLP OpenTelemetry and resource attributes #166

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 all-in-one/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ A Helm chart for the deployment of WSO2 API Manager all-in-one distribution.
| wso2.apim.configurations.openTelemetry.hostname | string | `""` | Remote tracer hostname |
| wso2.apim.configurations.openTelemetry.name | string | `""` | Remote tracer name. e.g. jaeger, zipkin, OTLP |
| wso2.apim.configurations.openTelemetry.port | string | `""` | Remote tracer port |
| wso2.apim.configurations.openTelemetry.url | string | `""` | Remote tracer URL. This should be used when name is OTLP |
| wso2.apim.configurations.openTelemetry.resourceAttributes | list | `[]` | Open Telemetry resource attributes |
| wso2.apim.configurations.openTracer.enabled | bool | `false` | Open Tracing enabled |
| wso2.apim.configurations.openTracer.name | string | `""` | Remote tracer name. e.g. jaeger, zipkin |
| wso2.apim.configurations.openTracer.properties.hostname | string | `""` | Remote tracer hostname |
Expand Down
10 changes: 10 additions & 0 deletions all-in-one/confs/instance-1/deployment.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,19 @@ remote_tracer.properties.port = {{ .Values.wso2.apim.configurations.openTracer.p
[apim.open_telemetry]
remote_tracer.enable = {{ .Values.wso2.apim.configurations.openTelemetry.enabled }}
remote_tracer.name = {{ .Values.wso2.apim.configurations.openTelemetry.name | quote }}
{{- if ne (.Values.wso2.apim.configurations.openTelemetry.url) "" }}
remote_tracer.url = {{ .Values.wso2.apim.configurations.openTelemetry.url | quote }}
{{- else }}
remote_tracer.hostname = {{ .Values.wso2.apim.configurations.openTelemetry.hostname | quote }}
remote_tracer.port = {{ .Values.wso2.apim.configurations.openTelemetry.port | quote }}
{{- end }}
{{- end }}

{{- range .Values.wso2.apim.configurations.openTelemetry.resourceAttributes }}
[[apim.open_telemetry.resource_attributes]]
name = {{ .name | quote }}
value = {{ .value | quote }}
{{- end }}

[apim.devportal]
url = "https://{{ .Values.kubernetes.ingress.management.hostname }}/devportal"
Expand Down
10 changes: 10 additions & 0 deletions all-in-one/confs/instance-2/deployment.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,19 @@ remote_tracer.properties.port = {{ .Values.wso2.apim.configurations.openTracer.p
[apim.open_telemetry]
remote_tracer.enable = {{ .Values.wso2.apim.configurations.openTelemetry.enabled }}
remote_tracer.name = {{ .Values.wso2.apim.configurations.openTelemetry.name | quote }}
{{- if ne (.Values.wso2.apim.configurations.openTelemetry.url) "" }}
remote_tracer.url = {{ .Values.wso2.apim.configurations.openTelemetry.url | quote }}
{{- else }}
remote_tracer.hostname = {{ .Values.wso2.apim.configurations.openTelemetry.hostname | quote }}
remote_tracer.port = {{ .Values.wso2.apim.configurations.openTelemetry.port | quote }}
{{- end }}
{{- end }}

{{- range .Values.wso2.apim.configurations.openTelemetry.resourceAttributes }}
[[apim.open_telemetry.resource_attributes]]
name = {{ .name | quote }}
value = {{ .value | quote }}
{{- end }}

[apim.devportal]
url = "https://{{ .Values.kubernetes.ingress.management.hostname }}/devportal"
Expand Down
2 changes: 2 additions & 0 deletions distributed/control-plane/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ A Helm chart for the deployment of WSO2 API Management API Control Plane profile
| wso2.apim.configurations.openTelemetry.hostname | string | `""` | Remote tracer hostname |
| wso2.apim.configurations.openTelemetry.name | string | `""` | Remote tracer name. e.g. jaeger, zipkin, OTLP |
| wso2.apim.configurations.openTelemetry.port | string | `""` | Remote tracer port |
| wso2.apim.configurations.openTelemetry.url | string | `""` | Remote tracer URL. This should be used when name is OTLP |
| wso2.apim.configurations.openTelemetry.resourceAttributes | list | `[]` | Open Telemetry resource attributes |
| wso2.apim.configurations.openTracer.enabled | bool | `false` | Open Tracing enabled |
| wso2.apim.configurations.openTracer.name | string | `""` | Remote tracer name. e.g. jaeger, zipkin |
| wso2.apim.configurations.openTracer.properties.hostname | string | `""` | Remote tracer hostname |
Expand Down
10 changes: 10 additions & 0 deletions distributed/control-plane/confs/instance-1/deployment.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,19 @@ remote_tracer.properties.port = {{ .Values.wso2.apim.configurations.openTracer.p
[apim.open_telemetry]
remote_tracer.enable = {{ .Values.wso2.apim.configurations.openTelemetry.enabled }}
remote_tracer.name = {{ .Values.wso2.apim.configurations.openTelemetry.name | quote }}
{{- if ne (.Values.wso2.apim.configurations.openTelemetry.url) "" }}
remote_tracer.url = {{ .Values.wso2.apim.configurations.openTelemetry.url | quote }}
{{- else }}
remote_tracer.hostname = {{ .Values.wso2.apim.configurations.openTelemetry.hostname | quote }}
remote_tracer.port = {{ .Values.wso2.apim.configurations.openTelemetry.port | quote }}
{{- end }}
{{- end }}

{{- range .Values.wso2.apim.configurations.openTelemetry.resourceAttributes }}
[[apim.open_telemetry.resource_attributes]]
name = {{ .name | quote }}
value = {{ .value | quote }}
{{- end }}

[apim.ai]
{{- if .Values.wso2.apim.configurations.ai.enabled }}
Expand Down
10 changes: 10 additions & 0 deletions distributed/control-plane/confs/instance-2/deployment.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,19 @@ remote_tracer.properties.port = {{ .Values.wso2.apim.configurations.openTracer.p
[apim.open_telemetry]
remote_tracer.enable = {{ .Values.wso2.apim.configurations.openTelemetry.enabled }}
remote_tracer.name = {{ .Values.wso2.apim.configurations.openTelemetry.name | quote }}
{{- if ne (.Values.wso2.apim.configurations.openTelemetry.url) "" }}
remote_tracer.url = {{ .Values.wso2.apim.configurations.openTelemetry.url | quote }}
{{- else }}
remote_tracer.hostname = {{ .Values.wso2.apim.configurations.openTelemetry.hostname | quote }}
remote_tracer.port = {{ .Values.wso2.apim.configurations.openTelemetry.port | quote }}
{{- end }}
{{- end }}

{{- range .Values.wso2.apim.configurations.openTelemetry.resourceAttributes }}
[[apim.open_telemetry.resource_attributes]]
name = {{ .name | quote }}
value = {{ .value | quote }}
{{- end }}

[apim.ai]
{{- if .Values.wso2.apim.configurations.ai.enabled }}
Expand Down
2 changes: 2 additions & 0 deletions distributed/gateway/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ A Helm chart for the deployment of WSO2 API Management Universal Gateway profile
| wso2.apim.configurations.openTelemetry.hostname | string | `""` | Remote tracer hostname |
| wso2.apim.configurations.openTelemetry.name | string | `""` | Remote tracer name. e.g. jaeger, zipkin, OTLP |
| wso2.apim.configurations.openTelemetry.port | string | `""` | Remote tracer port |
| wso2.apim.configurations.openTelemetry.url | string | `""` | Remote tracer URL. This should be used when name is OTLP |
| wso2.apim.configurations.openTelemetry.resourceAttributes | list | `[]` | Open Telemetry resource attributes |
| wso2.apim.configurations.openTracer.enabled | bool | `false` | Open Tracing enabled |
| wso2.apim.configurations.openTracer.name | string | `""` | Remote tracer name. e.g. jaeger, zipkin |
| wso2.apim.configurations.openTracer.properties.hostname | string | `""` | Remote tracer hostname |
Expand Down
10 changes: 10 additions & 0 deletions distributed/gateway/confs/deployment.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,19 @@ remote_tracer.properties.port = {{ .Values.wso2.apim.configurations.openTracer.p
[apim.open_telemetry]
remote_tracer.enable = {{ .Values.wso2.apim.configurations.openTelemetry.enabled }}
remote_tracer.name = {{ .Values.wso2.apim.configurations.openTelemetry.name | quote }}
{{- if ne (.Values.wso2.apim.configurations.openTelemetry.url) "" }}
remote_tracer.url = {{ .Values.wso2.apim.configurations.openTelemetry.url | quote }}
{{- else }}
remote_tracer.hostname = {{ .Values.wso2.apim.configurations.openTelemetry.hostname | quote }}
remote_tracer.port = {{ .Values.wso2.apim.configurations.openTelemetry.port | quote }}
{{- end }}
{{- end }}

{{- range .Values.wso2.apim.configurations.openTelemetry.resourceAttributes }}
[[apim.open_telemetry.resource_attributes]]
name = {{ .name | quote }}
value = {{ .value | quote }}
{{- end }}

[transport.passthru_https.sender.parameters]
HostnameVerifier = {{ .Values.wso2.apim.configurations.transport.passthru_https.sender.parameters.hostnameVerifier | quote }}
Expand Down
2 changes: 2 additions & 0 deletions distributed/traffic-manager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ A Helm chart for the deployment of WSO2 API Management Traffic Manager profile
| wso2.apim.configurations.openTelemetry.hostname | string | `""` | Remote tracer hostname |
| wso2.apim.configurations.openTelemetry.name | string | `""` | Remote tracer name. e.g. jaeger, zipkin, OTLP |
| wso2.apim.configurations.openTelemetry.port | string | `""` | Remote tracer port |
| wso2.apim.configurations.openTelemetry.url | string | `""` | Remote tracer URL. This should be used when name is OTLP |
| wso2.apim.configurations.openTelemetry.resourceAttributes | list | `[]` | Open Telemetry resource attributes |
| wso2.apim.configurations.openTracer.enabled | bool | `false` | Open Tracing enabled |
| wso2.apim.configurations.openTracer.name | string | `""` | Remote tracer name. e.g. jaeger, zipkin |
| wso2.apim.configurations.openTracer.properties.hostname | string | `""` | Remote tracer hostname |
Expand Down
10 changes: 10 additions & 0 deletions distributed/traffic-manager/confs/instance-1/deployment.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,19 @@ remote_tracer.properties.port = {{ .Values.wso2.apim.configurations.openTracer.p
[apim.open_telemetry]
remote_tracer.enable = {{ .Values.wso2.apim.configurations.openTelemetry.enabled }}
remote_tracer.name = {{ .Values.wso2.apim.configurations.openTelemetry.name | quote }}
{{- if ne (.Values.wso2.apim.configurations.openTelemetry.url) "" }}
remote_tracer.url = {{ .Values.wso2.apim.configurations.openTelemetry.url | quote }}
{{- else }}
remote_tracer.hostname = {{ .Values.wso2.apim.configurations.openTelemetry.hostname | quote }}
remote_tracer.port = {{ .Values.wso2.apim.configurations.openTelemetry.port | quote }}
{{- end }}
{{- end }}

{{- range .Values.wso2.apim.configurations.openTelemetry.resourceAttributes }}
[[apim.open_telemetry.resource_attributes]]
name = {{ .name | quote }}
value = {{ .value | quote }}
{{- end }}

[transport.https.properties]
proxyPort = 443
Expand Down
10 changes: 10 additions & 0 deletions distributed/traffic-manager/confs/instance-2/deployment.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,19 @@ remote_tracer.properties.port = {{ .Values.wso2.apim.configurations.openTracer.p
[apim.open_telemetry]
remote_tracer.enable = {{ .Values.wso2.apim.configurations.openTelemetry.enabled }}
remote_tracer.name = {{ .Values.wso2.apim.configurations.openTelemetry.name | quote }}
{{- if ne (.Values.wso2.apim.configurations.openTelemetry.url) "" }}
remote_tracer.url = {{ .Values.wso2.apim.configurations.openTelemetry.url | quote }}
{{- else }}
remote_tracer.hostname = {{ .Values.wso2.apim.configurations.openTelemetry.hostname | quote }}
remote_tracer.port = {{ .Values.wso2.apim.configurations.openTelemetry.port | quote }}
{{- end }}
{{- end }}

{{- range .Values.wso2.apim.configurations.openTelemetry.resourceAttributes }}
[[apim.open_telemetry.resource_attributes]]
name = {{ .name | quote }}
value = {{ .value | quote }}
{{- end }}

[transport.https.properties]
proxyPort = 443
Expand Down