diff --git a/all-in-one/README.md b/all-in-one/README.md index 26d99509..177d6ec5 100644 --- a/all-in-one/README.md +++ b/all-in-one/README.md @@ -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 | diff --git a/all-in-one/confs/instance-1/deployment.toml b/all-in-one/confs/instance-1/deployment.toml index cb7ab67f..f6400685 100644 --- a/all-in-one/confs/instance-1/deployment.toml +++ b/all-in-one/confs/instance-1/deployment.toml @@ -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" diff --git a/all-in-one/confs/instance-2/deployment.toml b/all-in-one/confs/instance-2/deployment.toml index 0a752e89..8049b8cc 100644 --- a/all-in-one/confs/instance-2/deployment.toml +++ b/all-in-one/confs/instance-2/deployment.toml @@ -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" diff --git a/distributed/control-plane/README.md b/distributed/control-plane/README.md index 86f91fe5..cfe8e8ab 100644 --- a/distributed/control-plane/README.md +++ b/distributed/control-plane/README.md @@ -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 | diff --git a/distributed/control-plane/confs/instance-1/deployment.toml b/distributed/control-plane/confs/instance-1/deployment.toml index 89101ae0..4bd9a9e0 100644 --- a/distributed/control-plane/confs/instance-1/deployment.toml +++ b/distributed/control-plane/confs/instance-1/deployment.toml @@ -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 }} diff --git a/distributed/control-plane/confs/instance-2/deployment.toml b/distributed/control-plane/confs/instance-2/deployment.toml index ba463891..ae77da4e 100644 --- a/distributed/control-plane/confs/instance-2/deployment.toml +++ b/distributed/control-plane/confs/instance-2/deployment.toml @@ -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 }} diff --git a/distributed/gateway/README.md b/distributed/gateway/README.md index c5fc65bf..a9c46955 100644 --- a/distributed/gateway/README.md +++ b/distributed/gateway/README.md @@ -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 | diff --git a/distributed/gateway/confs/deployment.toml b/distributed/gateway/confs/deployment.toml index ca3b76f3..635b51c6 100644 --- a/distributed/gateway/confs/deployment.toml +++ b/distributed/gateway/confs/deployment.toml @@ -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 }} diff --git a/distributed/traffic-manager/README.md b/distributed/traffic-manager/README.md index 12c09c0d..4a48085a 100644 --- a/distributed/traffic-manager/README.md +++ b/distributed/traffic-manager/README.md @@ -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 | diff --git a/distributed/traffic-manager/confs/instance-1/deployment.toml b/distributed/traffic-manager/confs/instance-1/deployment.toml index a51f3c94..1ea0609f 100644 --- a/distributed/traffic-manager/confs/instance-1/deployment.toml +++ b/distributed/traffic-manager/confs/instance-1/deployment.toml @@ -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 diff --git a/distributed/traffic-manager/confs/instance-2/deployment.toml b/distributed/traffic-manager/confs/instance-2/deployment.toml index 7fb4bb71..c0682a2a 100644 --- a/distributed/traffic-manager/confs/instance-2/deployment.toml +++ b/distributed/traffic-manager/confs/instance-2/deployment.toml @@ -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