Merge pull request 'Adjust telemtry buckets for phoeix router and db metrics' (#970) from Oneric/akkoma:telemetry-router-buckets into develop

Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/970

.woodpecker/build-amd64.yml

@@ -1,9 +1,6 @@
 labels:
   platform: linux/amd64
 
-depends_on:
-  - test
-
 when:
   event:
     - push
@@ -21,14 +18,6 @@ variables:
     SCW_DEFAULT_ORGANIZATION_ID:
       from_secret: SCW_DEFAULT_ORGANIZATION_ID
   - &setup-hex "mix local.hex --force && mix local.rebar --force"
-  - &on-release
-    when:
-      event:
-        - push
-        - tag
-      branch:
-        - develop
-        - stable
   - &on-stable
     when:
       event:
@@ -36,10 +25,6 @@ variables:
         - tag
       branch:
         - stable
-  - &on-pr-open
-    when:
-      event:
-        - pull_request
 
   - &tag-build "export BUILD_TAG=$${CI_COMMIT_TAG:-\"$CI_COMMIT_BRANCH\"} && export PLEROMA_BUILD_BRANCH=$BUILD_TAG"
 

.woodpecker/build-arm64.yml

@@ -1,9 +1,6 @@
 labels:
   platform: linux/arm64
 
-depends_on:
-  - test
-
 when:
   event:
     - push
@@ -21,14 +18,6 @@ variables:
     SCW_DEFAULT_ORGANIZATION_ID:
       from_secret: SCW_DEFAULT_ORGANIZATION_ID
   - &setup-hex "mix local.hex --force && mix local.rebar --force"
-  - &on-release
-    when:
-      event:
-        - push
-        - tag
-      branch:
-        - stable
-        - develop
   - &on-stable
     when:
       event:
@@ -36,10 +25,6 @@ variables:
         - tag
       branch:
         - stable
-  - &on-pr-open
-    when:
-      event:
-        - pull_request
 
   - &tag-build "export BUILD_TAG=$${CI_COMMIT_TAG:-\"$CI_COMMIT_BRANCH\"} && export PLEROMA_BUILD_BRANCH=$BUILD_TAG"
 

.woodpecker/docs.yml

@@ -2,7 +2,6 @@ labels:
   platform: linux/amd64
 
 depends_on:
-  - test
   - build-amd64
 
 when:

.woodpecker/test.yml

@@ -3,10 +3,6 @@ labels:
 
 when:
   - event: pull_request
-  - event: push
-    branch:
-      - develop
-      - stable
 
 matrix:
   # test the lowest and highest versions
@@ -21,9 +17,6 @@ matrix:
 services:
   postgres:
     image: postgres:15
-    when:
-      event:
-        - pull_request
     environment:
       POSTGRES_DB: pleroma_test_${ELIXIR_VERSION}_${OTP_VERSION}
       POSTGRES_USER: postgres

CHANGELOG.md

@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   new setting `:pleroma, :instance, :short_description` is also preferred for nodeinfo use
 - Note AP objects now expose full `replies` collections and those collections can be accessed on their own;
   previously only self-replies were inlined as an anonymous collection into the Note object
+- Added a reference Grafana dashboard and improved documentation for Prometheus metrics
 
 ### Fixed
 - Internal actors no longer pretend to have unresolvable follow(er|ing) collections
@@ -37,10 +38,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - remote signing keys are no longer refreshed multiple times per incoming request
 - fix digest emails never being sent and clogging the job queue even if not enabled
 - `api/v1/instance`’s `uri` field now correctly shows the bare WebFinger domain
-- fixed bug leading to `content` and thw `contentMap` entry of the primary language to sometimes diverge
+- fixed bug leading to `content` and the `contentMap` entry of the primary language to sometimes diverge
 - reloading emoji with a broken `pack.json` file being on disk no longer crashes the whole server
 - fixed blocked servers being able to access local objects when authorized fetch isn’t enabled
   even when the remote server identifies itselfs
+- fixed handling of inlined "featured" collections
 
 ### Changed
 - Internal and relay actors are now again represented with type "Application"
@@ -57,6 +59,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   more time to come back up when e.g. processing repeats of a post not yet locally known
 - `/api/v1/statuses/:id/reblog` now honours all possible visibilities except `list` and `conversation`
   instead of mapping them down to a boolean private/public
+- we no longer repeatedly try to deliver to explicitly deleted inboxes
+- outgoing requests may now use HTTP2 by default
 
 
 ## 2025.03

lib/pleroma/web/telemetry.ex

@@ -130,7 +130,7 @@ defp distribution_metrics do
         unit: {:native, :second},
         tags: [:route],
         reporter_options: [
-          buckets: [0.1, 0.2, 0.5, 1, 2.5, 5, 10, 25, 50, 100, 250, 500, 1000]
+          buckets: [0.0005, 0.001, 0.005, 0.01, 0.025, 0.05, 0.10, 0.25, 0.5, 0.75, 1, 2, 5, 15]
         ]
       ),
 
@@ -232,8 +232,7 @@ defp summary_fallback_metrics(byte_unit \\ :byte) do
     # and we can use sum + counter to get the average between polls from their change
     # But for repo query times we need to use a full distribution
 
-    simple_buckets = [0, 1, 2, 4, 8, 16]
-    simple_buckets_quick = for t <- simple_buckets, do: t / 100.0
+    simple_buckets = [1, 2, 4, 8, 16, 32]
 
     # Already included in distribution metrics anyway:
     #   phoenix.router_dispatch.stop.duration
@@ -253,7 +252,7 @@ defp summary_fallback_metrics(byte_unit \\ :byte) do
         measurement: :decode_time,
         unit: {:native, :millisecond},
         reporter_options: [
-          buckets: simple_buckets_quick
+          buckets: [0.001, 0.0025, 0.005, 0.01, 0.02, 0.05, 0.1, 0.5]
         ]
       ),
       distribution("pleroma.repo.query.query_time.fdist",
@@ -261,7 +260,7 @@ defp summary_fallback_metrics(byte_unit \\ :byte) do
         measurement: :query_time,
         unit: {:native, :millisecond},
         reporter_options: [
-          buckets: simple_buckets
+          buckets: [0.1, 0.2, 0.5, 1, 1.5, 3, 5, 10, 25, 50]
         ]
       ),
       distribution("pleroma.repo.query.idle_time.fdist",