catpm 0.10.3 → 0.11.0

data/db/migrate/20250601000001_create_catpm_tables.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-class CreateCatpmTables < ActiveRecord::Migration[8.0]
+class CreateCatpmTables < ActiveRecord::Migration[Catpm::MIGRATION_VERSION]
   def up
-    create_table :catpm_buckets do |t|
+    create_table :catpm_buckets, if_not_exists: true do |t|
       t.string :kind, null: false
       t.string :target, null: false
       t.string :operation, null: false, default: ''
@@ -21,11 +21,11 @@ class CreateCatpmTables < ActiveRecord::Migration[8.0]
     end
 
     add_index :catpm_buckets, [:kind, :target, :operation, :bucket_start],
-              unique: true, name: 'idx_catpm_buckets_unique'
-    add_index :catpm_buckets, :bucket_start, name: 'idx_catpm_buckets_time'
-    add_index :catpm_buckets, [:kind, :bucket_start], name: 'idx_catpm_buckets_kind_time'
+              unique: true, name: 'idx_catpm_buckets_unique', if_not_exists: true
+    add_index :catpm_buckets, :bucket_start, name: 'idx_catpm_buckets_time', if_not_exists: true
+    add_index :catpm_buckets, [:kind, :bucket_start], name: 'idx_catpm_buckets_kind_time', if_not_exists: true
 
-    create_table :catpm_samples do |t|
+    create_table :catpm_samples, if_not_exists: true do |t|
       t.references :bucket, null: false, foreign_key: { to_table: :catpm_buckets }
       t.string :kind, null: false
       t.string :sample_type, null: false
@@ -36,12 +36,12 @@ class CreateCatpmTables < ActiveRecord::Migration[8.0]
       t.string :request_id, limit: 16
     end
 
-    add_index :catpm_samples, :recorded_at, name: 'idx_catpm_samples_time'
-    add_index :catpm_samples, [:kind, :recorded_at], name: 'idx_catpm_samples_kind_time'
-    add_index :catpm_samples, :error_fingerprint, name: 'idx_catpm_samples_error_fp'
-    add_index :catpm_samples, :request_id, name: 'idx_catpm_samples_request_id'
+    add_index :catpm_samples, :recorded_at, name: 'idx_catpm_samples_time', if_not_exists: true
+    add_index :catpm_samples, [:kind, :recorded_at], name: 'idx_catpm_samples_kind_time', if_not_exists: true
+    add_index :catpm_samples, :error_fingerprint, name: 'idx_catpm_samples_error_fp', if_not_exists: true
+    add_index :catpm_samples, :request_id, name: 'idx_catpm_samples_request_id', if_not_exists: true
 
-    create_table :catpm_errors do |t|
+    create_table :catpm_errors, if_not_exists: true do |t|
       t.string :fingerprint, null: false, limit: 64
       t.string :kind, null: false
       t.string :error_class, null: false
@@ -55,29 +55,29 @@ class CreateCatpmTables < ActiveRecord::Migration[8.0]
       t.boolean :pinned, null: false, default: false
     end
 
-    add_index :catpm_errors, :fingerprint, unique: true, name: 'idx_catpm_errors_fingerprint'
-    add_index :catpm_errors, [:kind, :last_occurred_at], name: 'idx_catpm_errors_kind_time'
+    add_index :catpm_errors, :fingerprint, unique: true, name: 'idx_catpm_errors_fingerprint', if_not_exists: true
+    add_index :catpm_errors, [:kind, :last_occurred_at], name: 'idx_catpm_errors_kind_time', if_not_exists: true
 
-    create_table :catpm_event_buckets do |t|
+    create_table :catpm_event_buckets, if_not_exists: true do |t|
       t.string :name, null: false
       t.datetime :bucket_start, null: false
       t.integer :count, null: false, default: 0
     end
 
     add_index :catpm_event_buckets, [:name, :bucket_start],
-              unique: true, name: 'idx_catpm_event_buckets_unique'
-    add_index :catpm_event_buckets, :bucket_start, name: 'idx_catpm_event_buckets_time'
+              unique: true, name: 'idx_catpm_event_buckets_unique', if_not_exists: true
+    add_index :catpm_event_buckets, :bucket_start, name: 'idx_catpm_event_buckets_time', if_not_exists: true
 
-    create_table :catpm_event_samples do |t|
+    create_table :catpm_event_samples, if_not_exists: true do |t|
       t.string :name, null: false
       t.json :payload
       t.datetime :recorded_at, null: false
     end
 
-    add_index :catpm_event_samples, [:name, :recorded_at], name: 'idx_catpm_event_samples_name_time'
-    add_index :catpm_event_samples, :recorded_at, name: 'idx_catpm_event_samples_time'
+    add_index :catpm_event_samples, [:name, :recorded_at], name: 'idx_catpm_event_samples_name_time', if_not_exists: true
+    add_index :catpm_event_samples, :recorded_at, name: 'idx_catpm_event_samples_time', if_not_exists: true
 
-    create_table :catpm_endpoint_prefs do |t|
+    create_table :catpm_endpoint_prefs, if_not_exists: true do |t|
       t.string :kind, null: false
       t.string :target, null: false
       t.string :operation, null: false, default: ''
@@ -86,27 +86,29 @@ class CreateCatpmTables < ActiveRecord::Migration[8.0]
     end
 
     add_index :catpm_endpoint_prefs, [:kind, :target, :operation],
-              unique: true, name: 'idx_catpm_endpoint_prefs_unique'
+              unique: true, name: 'idx_catpm_endpoint_prefs_unique', if_not_exists: true
 
-    create_table :catpm_event_prefs do |t|
+    create_table :catpm_event_prefs, if_not_exists: true do |t|
       t.string :name, null: false
       t.boolean :pinned, null: false, default: false
       t.boolean :ignored, null: false, default: false
     end
 
     add_index :catpm_event_prefs, :name,
-              unique: true, name: 'idx_catpm_event_prefs_unique'
+              unique: true, name: 'idx_catpm_event_prefs_unique', if_not_exists: true
 
     if postgresql?
-      execute <<~SQL
-        CREATE OR REPLACE FUNCTION catpm_merge_jsonb_sums(a jsonb, b jsonb)
-        RETURNS jsonb AS $$
-          SELECT COALESCE(a, '{}'::jsonb) || (
-            SELECT jsonb_object_agg(key, COALESCE((a ->> key)::numeric, 0) + value::numeric)
-            FROM jsonb_each_text(COALESCE(b, '{}'::jsonb))
-          );
-        $$ LANGUAGE sql IMMUTABLE;
-      SQL
+      safety_assured do
+        execute <<~SQL
+          CREATE OR REPLACE FUNCTION catpm_merge_jsonb_sums(a jsonb, b jsonb)
+          RETURNS jsonb AS $$
+            SELECT COALESCE(a, '{}'::jsonb) || (
+              SELECT jsonb_object_agg(key, COALESCE((a ->> key)::numeric, 0) + value::numeric)
+              FROM jsonb_each_text(COALESCE(b, '{}'::jsonb))
+            );
+          $$ LANGUAGE sql IMMUTABLE;
+        SQL
+      end
     end
   end
 

data/lib/catpm/call_tracer.rb

@@ -56,7 +56,8 @@ module Catpm
 
       started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       detail = format_detail(tp.defined_class, tp.method_id)
-      index = @request_segments.push_span(type: :code, detail: detail, started_at: started_at)
+      type = Fingerprint.app_code_type(path)
+      index = @request_segments.push_span(type: type, detail: detail, started_at: started_at)
       @call_stack.push(index)
     end