Skip to content

Commit

Permalink
apply otel_service on metrics (apache#42242) (apache#42441)
Browse files Browse the repository at this point in the history
* apply otel_service on metrics

* change version_added to 2.10.3

(cherry picked from commit e14b4ca)
  • Loading branch information
romsharon98 authored Sep 25, 2024
1 parent 8932610 commit 4849328
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
7 changes: 7 additions & 0 deletions airflow/config_templates/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1232,6 +1232,13 @@ metrics:
type: string
example: ~
default: "False"
otel_service:
description: |
The default service name of traces.
version_added: 2.10.3
type: string
example: ~
default: "Airflow"
otel_ssl_active:
description: |
If ``True``, SSL will be enabled. Defaults to ``False``.
Expand Down
3 changes: 2 additions & 1 deletion airflow/metrics/otel_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,9 @@ def get_otel_logger(cls) -> SafeOtelLogger:
# PeriodicExportingMetricReader will default to an interval of 60000 millis.
interval = conf.getint("metrics", "otel_interval_milliseconds", fallback=None) # ex: 30000
debug = conf.getboolean("metrics", "otel_debugging_on")
service_name = conf.get("metrics", "otel_service")

resource = Resource(attributes={SERVICE_NAME: "Airflow"})
resource = Resource(attributes={SERVICE_NAME: service_name})

protocol = "https" if ssl_active else "http"
endpoint = f"{protocol}://{host}:{port}/v1/metrics"
Expand Down

0 comments on commit 4849328

Please sign in to comment.