diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c79a1458..cd291567 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: version: - - "1" + - 'lts' os: - ubuntu-latest - windows-latest @@ -23,12 +23,12 @@ jobs: arch: - x64 steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: actions/cache@v1 + - uses: actions/cache@v4 env: cache-name: cache-artifacts with: @@ -58,10 +58,10 @@ jobs: name: Documentation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: - version: "1" + version: 'lts' - name: Build docs env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token diff --git a/src/exporter/prometheus/src/OpenTelemetryExporterPrometheus.jl b/src/exporter/prometheus/src/OpenTelemetryExporterPrometheus.jl index 0f991b05..dae2f09e 100644 --- a/src/exporter/prometheus/src/OpenTelemetryExporterPrometheus.jl +++ b/src/exporter/prometheus/src/OpenTelemetryExporterPrometheus.jl @@ -5,14 +5,19 @@ export PrometheusExporter using OpenTelemetrySDK using HTTP -function handler(io, provider::Ref{MeterProvider}, resource_to_telemetry_conversion) +function handler( + io, + provider::Ref{MeterProvider}, + resource_to_telemetry_conversion, + with_timestamp, +) for ins in provider[].async_instruments ins() end HTTP.setstatus(io, 200) HTTP.setheader(io, "Content-Type" => "text/plain") HTTP.startwrite(io) - text_based_format(io, provider[], resource_to_telemetry_conversion) + text_based_format(io, provider[], resource_to_telemetry_conversion; with_timestamp) nothing end @@ -42,6 +47,7 @@ mutable struct PrometheusExporter <: OpenTelemetrySDK.AbstractExporter port = OTEL_EXPORTER_PROMETHEUS_PORT(), resource_to_telemetry_conversion = false, path = "/metrics", + with_timestamp = true, kw..., ) provider = Ref{MeterProvider}() @@ -51,7 +57,7 @@ mutable struct PrometheusExporter <: OpenTelemetrySDK.AbstractExporter router, "GET", path, - io -> handler(io, provider, resource_to_telemetry_conversion), + io -> handler(io, provider, resource_to_telemetry_conversion, with_timestamp), ) server = HTTP.serve!(router, host, port; stream = true, kw...)