Skip to content

deps: upgrade js-logger to v5 to support alloy (MAPCO-10962) #114

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

Merged
roicohen326 merged 5 commits into from
Jul 13, 2026
Merged

deps: upgrade js-logger to v5 to support alloy (MAPCO-10962) #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0bf009a
deps: upgrade js-logger to v5 to support alloy (MAPCO-10962)
roicohen326 Jul 12, 2026
c74b327
fix: resolve js-logger peer conflict from mc-priority-queue/mc-utils
roicohen326 Jul 12, 2026
648cc99
refactor: centralize opentelemetry helm merge into _tplValues.tpl
roicohen326 Jul 12, 2026
84c05cb
feat: wire OPENTELEMETRY_RESOURCE_ATTRIBUTES for alloy logging
roicohen326 Jul 12, 2026
75e1238
fix: rename logging URL env var to OPENTELEMETRY_LOGGING_URL
roicohen326 Jul 13, 2026
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
11 changes: 11 additions & 0 deletions config/custom-environment-variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@
"prettyPrint": {
"__name": "LOG_PRETTY_PRINT_ENABLED",
"__format": "boolean"
},
"opentelemetryOptions": {
"enabled": {
"__name": "OPENTELEMETRY_LOGGING_ENABLED",
Comment thread
CL-SHLOMIKONCHA marked this conversation as resolved.
"__format": "boolean"
},
"url": "OPENTELEMETRY_LOGGING_URL",
"resourceAttributes": {
"__name": "OPENTELEMETRY_RESOURCE_ATTRIBUTES",
"__format": "json"
}
}
},
"tracing": {
Expand Down
5 changes: 4 additions & 1 deletion config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"telemetry": {
"logger": {
"level": "info",
"prettyPrint": false
"prettyPrint": false,
"opentelemetryOptions": {
"enabled": false
}
},
"shared": {},
"tracing": {
Expand Down
1 change: 1 addition & 0 deletions helm/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,4 @@ Returns the tracing url from global if exists or from the chart's values
{{- .Values.env.tracing.url -}}
{{- end -}}
{{- end -}}

4 changes: 4 additions & 0 deletions helm/templates/_tplValues.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@ Custom definitions
{{- define "common.fs.merged" -}}
{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.storage.fs .Values.global.storage.fs ) "context" . ) }}
{{- end -}}

{{- define "common.openTelemetryOptions.merged" -}}
{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.env.openTelemetryOptions .Values.global.openTelemetryOptions ) "context" . ) }}
{{- end -}}
8 changes: 8 additions & 0 deletions helm/templates/configmap.yaml
View file
Open in desktop
Comment thread
CL-SHLOMIKONCHA marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{{- $configmapName := include "configmap.fullname" . }}
{{- $tracingUrl := include "raster-catalog-manager.tracingUrl" . -}}
{{- $tracingEnabled := include "raster-catalog-manager.tracingEnabled" . -}}
{{- $openTelemetryOptions := (include "common.openTelemetryOptions.merged" .) | fromYaml }}
{{- $db := (include "common.db.merged" .) | fromYaml }}
{{- if .Values.enabled -}}
apiVersion: v1
Expand All @@ -17,6 +18,13 @@ data:
{{ if $tracingEnabled }}
TELEMETRY_TRACING_URL: {{ $tracingUrl }}
{{ end }}
OPENTELEMETRY_LOGGING_ENABLED: {{ $openTelemetryOptions.enabled | quote }}
{{ if $openTelemetryOptions.enabled }}
OPENTELEMETRY_LOGGING_URL: {{ $openTelemetryOptions.url }}
{{ if $openTelemetryOptions.resourceAttributes }}
OPENTELEMETRY_RESOURCE_ATTRIBUTES: {{ $openTelemetryOptions.resourceAttributes | toJson | quote }}
{{ end }}
{{ end }}
DB_HOST: {{ $db.host }}
DB_PORT: {{ $db.port | quote }}
DB_NAME: {{ $db.name }}
Expand Down
4 changes: 4 additions & 0 deletions helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ spec:
mountPath: {{ .Values.db.sslMountPath }}
{{- end }}
env:
- name: K8S_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
- name: SERVER_PORT
value: {{ .Values.env.targetPort | quote }}
{{- if .Values.global.ca.secretName }}
Expand Down
5 changes: 5 additions & 0 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
global:
cloudProvider: {}
tracing: {}
openTelemetryOptions: {}
environment: ""
db:
host: ""
Expand Down Expand Up @@ -82,6 +83,10 @@ env:
tracing:
enabled: false
url: http://localhost:55681/v1/traces
openTelemetryOptions:
enabled: false
url: ''
resourceAttributes: {}

resources:
enabled: false
Expand Down
Loading
Loading