solid_apm 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1c1e67891c00e76ce0f09899c23eaef403dd3daceeef92f58795525ee6a91e5
-  data.tar.gz: ed1e539e7e0d2d3764dcc45b7ad131a8e6c6fbfc513ed6f80c4869350cab7c17
+  metadata.gz: 5ae3dca7dc8bedd15f5e89ee1c533d5f7e95707c4afa8b550f679a799a3bed0e
+  data.tar.gz: 4b45583cb978b1b7515e4b3482f1bbc0fc9e67963228a5deaf74163abceeb333
 SHA512:
-  metadata.gz: a803be213c9785533bf87cf6fcb240926d47b63c47c3eff28aa5366349c3906bb9b46e17d7bd2190af3e1a35be2addf8140098f02611ff28b2b414bc85114047
-  data.tar.gz: fb982b73450b544990308dbf6de65917708d06826d5f11744b0fcf0123745dde19ee259effdd989273569072956cffe3ea363022b368fcf514a43b94e40e9b59
+  metadata.gz: 01cebd760d13efbfac07743552fc34a91b9230d60bee26ba061ee7aca5e2db536f3f57580b35442bbb7996ae991d6c9b824f40a5efd134f7e8f15ea0ced30f10
+  data.tar.gz: a48210bbf993f9da2c4a8200a3cbc01c2c661147bd5b6451ad5486029859fe0c6c29f1aa84f146c40943d535176d4ad8e388fb9cfc3d741e605099255e294e62

data/app/views/solid_apm/application/_time_range_form.html.erb

@@ -101,4 +101,223 @@
   </div>
 <% end %>
 
-<%= javascript_include_tag 'solid_apm/time_range_form' %>
+<script>
+class TimeRangeForm {
+  constructor() {
+    this.form = document.getElementById('time-range-form');
+    this.relativeTab = document.getElementById('relative-tab');
+    this.absoluteTab = document.getElementById('absolute-tab');
+    this.relativePanel = document.getElementById('relative-panel');
+    this.absolutePanel = document.getElementById('absolute-panel');
+    this.customFromControl = document.getElementById('custom-from-control');
+    this.customToControl = document.getElementById('custom-to-control');
+    
+    // Timezone handling
+    this.browserTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    this.timezoneOffset = new Date().getTimezoneOffset();
+    
+    this.init();
+  }
+  
+  init() {
+    this.setupEventListeners();
+    this.initializeFormState();
+    this.addTimezoneToForm();
+    this.adjustAbsoluteTimes();
+  }
+  
+  setupEventListeners() {
+    if (this.form) {
+      this.form.addEventListener('submit', (e) => this.handleFormSubmit(e));
+    }
+  }
+  
+  switchToRelative(event) {
+    event.preventDefault();
+    
+    this.relativeTab.classList.add('is-primary');
+    this.absoluteTab.classList.remove('is-primary');
+    this.relativePanel.classList.remove('is-hidden');
+    this.absolutePanel.classList.add('is-hidden');
+    
+    this.removeFields(['from_timestamp', 'to_timestamp']);
+    this.cleanupUrlParams(['from_timestamp', 'to_timestamp', 'from_datetime', 'to_datetime']);
+  }
+  
+  switchToAbsolute(event) {
+    event.preventDefault();
+    
+    this.absoluteTab.classList.add('is-primary');
+    this.relativeTab.classList.remove('is-primary');
+    this.absolutePanel.classList.remove('is-hidden');
+    this.relativePanel.classList.add('is-hidden');
+    
+    this.cleanupUrlParams(['quick_range', 'from_value', 'from_unit', 'to_value', 'to_unit', 'quick_range_apply']);
+  }
+  
+  handleQuickRangeChange(select) {
+    const isCustom = select.value === 'custom';
+    
+    this.toggleVisibility(this.customFromControl, isCustom);
+    this.toggleVisibility(this.customToControl, isCustom);
+    
+    if (!isCustom) {
+      this.applyQuickRange();
+    }
+  }
+  
+  applyQuickRange() {
+    const quickRangeSelect = this.form.querySelector('[name="quick_range"]');
+    if (!quickRangeSelect || quickRangeSelect.value === 'custom') return;
+    
+    this.removeFields(['from_datetime', 'to_datetime', 'from_timestamp', 'to_timestamp']);
+    this.addHiddenField('quick_range_apply', quickRangeSelect.value);
+    this.form.submit();
+  }
+  
+  handleFormSubmit(event) {
+    const isAbsoluteMode = !this.absolutePanel.classList.contains('is-hidden');
+    
+    if (isAbsoluteMode) {
+      this.handleAbsoluteModeSubmit();
+    } else {
+      this.handleRelativeModeSubmit();
+    }
+  }
+  
+  handleAbsoluteModeSubmit() {
+    const fromDatetime = this.form.querySelector('[name="from_datetime"]');
+    const toDatetime = this.form.querySelector('[name="to_datetime"]');
+    
+    if (fromDatetime?.value && toDatetime?.value) {
+      const fromTimestamp = Math.floor(new Date(fromDatetime.value).getTime() / 1000);
+      const toTimestamp = Math.floor(new Date(toDatetime.value).getTime() / 1000);
+      
+      fromDatetime.disabled = true;
+      toDatetime.disabled = true;
+      
+      this.addHiddenField('from_timestamp', fromTimestamp);
+      this.addHiddenField('to_timestamp', toTimestamp);
+      this.addHiddenField('browser_timezone', this.browserTimezone);
+      this.removeFields(['quick_range', 'from_value', 'from_unit', 'to_value', 'to_unit', 'quick_range_apply']);
+    }
+  }
+  
+  handleRelativeModeSubmit() {
+    const quickRangeSelect = this.form.querySelector('[name="quick_range"]');
+    const quickRangeValue = quickRangeSelect?.value;
+    
+    if (quickRangeValue && quickRangeValue !== 'custom') {
+      this.removeFields(['from_value', 'from_unit', 'to_value', 'to_unit', 'quick_range_apply']);
+    } else if (quickRangeValue === 'custom') {
+      this.removeFields(['quick_range_apply']);
+    }
+    
+    this.removeFields(['from_datetime', 'to_datetime', 'from_timestamp', 'to_timestamp']);
+  }
+  
+  initializeFormState() {
+    const urlParams = new URLSearchParams(window.location.search);
+    const hasCustomParams = urlParams.has('from_value') && urlParams.has('from_unit');
+    const hasQuickRange = urlParams.has('quick_range') && urlParams.get('quick_range') !== 'custom';
+    const quickRangeSelect = this.form.querySelector('[name="quick_range"]');
+    
+    if (hasQuickRange) {
+      this.toggleVisibility(this.customFromControl, false);
+      this.toggleVisibility(this.customToControl, false);
+    } else if (hasCustomParams || urlParams.get('quick_range') === 'custom') {
+      if (quickRangeSelect) quickRangeSelect.value = 'custom';
+      this.toggleVisibility(this.customFromControl, true);
+      this.toggleVisibility(this.customToControl, true);
+    } else {
+      // Default state - show quick range only
+      this.toggleVisibility(this.customFromControl, false);
+      this.toggleVisibility(this.customToControl, false);
+    }
+  }
+  
+  // Utility methods
+  removeFields(fieldNames) {
+    fieldNames.forEach(name => {
+      this.form.querySelectorAll(`[name="${name}"]`).forEach(field => field.remove());
+    });
+  }
+  
+  addHiddenField(name, value) {
+    const input = document.createElement('input');
+    input.type = 'hidden';
+    input.name = name;
+    input.value = value;
+    this.form.appendChild(input);
+  }
+  
+  toggleVisibility(element, show) {
+    if (!element) return;
+    element.classList.toggle('is-hidden', !show);
+  }
+  
+  cleanupUrlParams(params) {
+    const url = new URL(window.location);
+    params.forEach(param => url.searchParams.delete(param));
+    window.history.replaceState({}, '', url);
+  }
+  
+  // Timezone-related methods
+  addTimezoneToForm() {
+    // Add timezone information to form for server processing
+    this.addHiddenField('browser_timezone', this.browserTimezone);
+  }
+  
+  adjustAbsoluteTimes() {
+    // Convert timestamps from URL to browser timezone for datetime-local inputs
+    const urlParams = new URLSearchParams(window.location.search);
+    const fromTimestamp = urlParams.get('from_timestamp');
+    const toTimestamp = urlParams.get('to_timestamp');
+    
+    if (fromTimestamp && toTimestamp) {
+      const fromDatetime = this.form.querySelector('[name="from_datetime"]');
+      const toDatetime = this.form.querySelector('[name="to_datetime"]');
+      
+      if (fromDatetime && toDatetime) {
+        // Convert UTC timestamps to local datetime strings
+        const fromDate = new Date(parseInt(fromTimestamp) * 1000);
+        const toDate = new Date(parseInt(toTimestamp) * 1000);
+        
+        fromDatetime.value = this.formatDatetimeLocal(fromDate);
+        toDatetime.value = this.formatDatetimeLocal(toDate);
+      }
+    }
+  }
+  
+  formatDatetimeLocal(date) {
+    // Format date for datetime-local input (YYYY-MM-DDTHH:MM)
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    
+    return `${year}-${month}-${day}T${hours}:${minutes}`;
+  }
+}
+
+// Global functions for onclick handlers (maintaining backward compatibility)
+let timeRangeFormInstance;
+
+function switchToRelative(event) {
+  timeRangeFormInstance?.switchToRelative(event);
+}
+
+function switchToAbsolute(event) {
+  timeRangeFormInstance?.switchToAbsolute(event);
+}
+
+function handleQuickRangeChange(select) {
+  timeRangeFormInstance?.handleQuickRangeChange(select);
+}
+
+// Initialize when DOM is ready
+document.addEventListener('DOMContentLoaded', function() {
+  timeRangeFormInstance = new TimeRangeForm();
+});
+</script>

data/lib/solid_apm/engine.rb

@@ -6,32 +6,44 @@ module SolidApm
 
     config.app_middleware.use Middleware
 
-    initializer "solid_apm.assets.precompile" do |app|
-      app.config.assets.precompile += %w( application.css application.js )
+    initializer 'solid_apm.assets' do |app|
+      # Add engine's assets to the load path for both Propshaft and Sprockets
+      if app.config.respond_to?(:assets)
+        app.config.assets.paths << root.join('app/assets/stylesheets')
+        app.config.assets.paths << root.join('app/assets/javascripts')
+
+        # For Sprockets
+        unless defined?(Propshaft)
+          app.config.assets.precompile += %w[
+            solid_apm/application.css
+            solid_apm/application.js
+          ]
+        end
+      end
     end
 
     begin
       # Mount the MCP server only if the main app added the fast_mcp in is Gemfile.
       require 'fast_mcp'
-      initializer "solid_apm.mount_mcp_server" do |app|
-      mcp_server_config = SolidApm.mcp_server_config.reverse_merge(
-        name: 'solid-apm-mcp',
-        version: '1.0.0',
-        path: '/solid_apm/mcp'
-      )
+      initializer 'solid_apm.mount_mcp_server' do |app|
+        mcp_server_config = SolidApm.mcp_server_config.reverse_merge(
+          name: 'solid-apm-mcp',
+          version: '1.0.0',
+          path: '/solid_apm/mcp'
+        )
 
-      FastMcp.mount_in_rails(
-        app,
-        **mcp_server_config
-      ) do |server|
-        app.config.after_initialize do
-          require_relative 'mcp/spans_for_transaction_tool'
-          require_relative 'mcp/impactful_transactions_resource'
-          server.register_resources(SolidApm::Mcp::ImpactfulTransactionsResource)
-          server.register_tools(SolidApm::Mcp::SpansForTransactionTool)
+        FastMcp.mount_in_rails(
+          app,
+          **mcp_server_config
+        ) do |server|
+          app.config.after_initialize do
+            require_relative 'mcp/spans_for_transaction_tool'
+            require_relative 'mcp/impactful_transactions_resource'
+            server.register_resources(SolidApm::Mcp::ImpactfulTransactionsResource)
+            server.register_tools(SolidApm::Mcp::SpansForTransactionTool)
+          end
         end
       end
-    end
     rescue LoadError
       # Ignored
     end

data/lib/solid_apm/version.rb

@@ -1,3 +1,3 @@
 module SolidApm
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solid_apm
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Jean-Francis Bastien
@@ -119,7 +119,6 @@ files:
 - Rakefile
 - app/assets/config/solid_apm_manifest.js
 - app/assets/javascripts/solid_apm/application.js
-- app/assets/javascripts/solid_apm/time_range_form.js
 - app/assets/stylesheets/solid_apm/application.css
 - app/controllers/solid_apm/application_controller.rb
 - app/controllers/solid_apm/spans_controller.rb

data/app/assets/javascripts/solid_apm/time_range_form.js

@@ -1,219 +0,0 @@
-class TimeRangeForm {
-  constructor() {
-    this.form = document.getElementById('time-range-form');
-    this.relativeTab = document.getElementById('relative-tab');
-    this.absoluteTab = document.getElementById('absolute-tab');
-    this.relativePanel = document.getElementById('relative-panel');
-    this.absolutePanel = document.getElementById('absolute-panel');
-    this.customFromControl = document.getElementById('custom-from-control');
-    this.customToControl = document.getElementById('custom-to-control');
-    
-    // Timezone handling
-    this.browserTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-    this.timezoneOffset = new Date().getTimezoneOffset();
-    
-    this.init();
-  }
-  
-  init() {
-    this.setupEventListeners();
-    this.initializeFormState();
-    this.addTimezoneToForm();
-    this.adjustAbsoluteTimes();
-  }
-  
-  setupEventListeners() {
-    if (this.form) {
-      this.form.addEventListener('submit', (e) => this.handleFormSubmit(e));
-    }
-  }
-  
-  switchToRelative(event) {
-    event.preventDefault();
-    
-    this.relativeTab.classList.add('is-primary');
-    this.absoluteTab.classList.remove('is-primary');
-    this.relativePanel.classList.remove('is-hidden');
-    this.absolutePanel.classList.add('is-hidden');
-    
-    this.removeFields(['from_timestamp', 'to_timestamp']);
-    this.cleanupUrlParams(['from_timestamp', 'to_timestamp', 'from_datetime', 'to_datetime']);
-  }
-  
-  switchToAbsolute(event) {
-    event.preventDefault();
-    
-    this.absoluteTab.classList.add('is-primary');
-    this.relativeTab.classList.remove('is-primary');
-    this.absolutePanel.classList.remove('is-hidden');
-    this.relativePanel.classList.add('is-hidden');
-    
-    this.cleanupUrlParams(['quick_range', 'from_value', 'from_unit', 'to_value', 'to_unit', 'quick_range_apply']);
-  }
-  
-  handleQuickRangeChange(select) {
-    const isCustom = select.value === 'custom';
-    
-    this.toggleVisibility(this.customFromControl, isCustom);
-    this.toggleVisibility(this.customToControl, isCustom);
-    
-    if (!isCustom) {
-      this.applyQuickRange();
-    }
-  }
-  
-  applyQuickRange() {
-    const quickRangeSelect = this.form.querySelector('[name="quick_range"]');
-    if (!quickRangeSelect || quickRangeSelect.value === 'custom') return;
-    
-    this.removeFields(['from_datetime', 'to_datetime', 'from_timestamp', 'to_timestamp']);
-    this.addHiddenField('quick_range_apply', quickRangeSelect.value);
-    this.form.submit();
-  }
-  
-  handleFormSubmit(event) {
-    const isAbsoluteMode = !this.absolutePanel.classList.contains('is-hidden');
-    
-    if (isAbsoluteMode) {
-      this.handleAbsoluteModeSubmit();
-    } else {
-      this.handleRelativeModeSubmit();
-    }
-  }
-  
-  handleAbsoluteModeSubmit() {
-    const fromDatetime = this.form.querySelector('[name="from_datetime"]');
-    const toDatetime = this.form.querySelector('[name="to_datetime"]');
-    
-    if (fromDatetime?.value && toDatetime?.value) {
-      const fromTimestamp = Math.floor(new Date(fromDatetime.value).getTime() / 1000);
-      const toTimestamp = Math.floor(new Date(toDatetime.value).getTime() / 1000);
-      
-      fromDatetime.disabled = true;
-      toDatetime.disabled = true;
-      
-      this.addHiddenField('from_timestamp', fromTimestamp);
-      this.addHiddenField('to_timestamp', toTimestamp);
-      this.addHiddenField('browser_timezone', this.browserTimezone);
-      this.removeFields(['quick_range', 'from_value', 'from_unit', 'to_value', 'to_unit', 'quick_range_apply']);
-    }
-  }
-  
-  handleRelativeModeSubmit() {
-    const quickRangeSelect = this.form.querySelector('[name="quick_range"]');
-    const quickRangeValue = quickRangeSelect?.value;
-    
-    if (quickRangeValue && quickRangeValue !== 'custom') {
-      this.removeFields(['from_value', 'from_unit', 'to_value', 'to_unit', 'quick_range_apply']);
-    } else if (quickRangeValue === 'custom') {
-      this.removeFields(['quick_range_apply']);
-    }
-    
-    this.removeFields(['from_datetime', 'to_datetime', 'from_timestamp', 'to_timestamp']);
-  }
-  
-  initializeFormState() {
-    const urlParams = new URLSearchParams(window.location.search);
-    const hasCustomParams = urlParams.has('from_value') && urlParams.has('from_unit');
-    const hasQuickRange = urlParams.has('quick_range') && urlParams.get('quick_range') !== 'custom';
-    const quickRangeSelect = this.form.querySelector('[name="quick_range"]');
-    
-    if (hasQuickRange) {
-      this.toggleVisibility(this.customFromControl, false);
-      this.toggleVisibility(this.customToControl, false);
-    } else if (hasCustomParams || urlParams.get('quick_range') === 'custom') {
-      if (quickRangeSelect) quickRangeSelect.value = 'custom';
-      this.toggleVisibility(this.customFromControl, true);
-      this.toggleVisibility(this.customToControl, true);
-    } else {
-      // Default state - show quick range only
-      this.toggleVisibility(this.customFromControl, false);
-      this.toggleVisibility(this.customToControl, false);
-    }
-  }
-  
-  // Utility methods
-  removeFields(fieldNames) {
-    fieldNames.forEach(name => {
-      this.form.querySelectorAll(`[name="${name}"]`).forEach(field => field.remove());
-    });
-  }
-  
-  addHiddenField(name, value) {
-    const input = document.createElement('input');
-    input.type = 'hidden';
-    input.name = name;
-    input.value = value;
-    this.form.appendChild(input);
-  }
-  
-  toggleVisibility(element, show) {
-    if (!element) return;
-    element.classList.toggle('is-hidden', !show);
-  }
-  
-  cleanupUrlParams(params) {
-    const url = new URL(window.location);
-    params.forEach(param => url.searchParams.delete(param));
-    window.history.replaceState({}, '', url);
-  }
-  
-  // Timezone-related methods
-  addTimezoneToForm() {
-    // Add timezone information to form for server processing
-    this.addHiddenField('browser_timezone', this.browserTimezone);
-  }
-  
-  adjustAbsoluteTimes() {
-    // Convert timestamps from URL to browser timezone for datetime-local inputs
-    const urlParams = new URLSearchParams(window.location.search);
-    const fromTimestamp = urlParams.get('from_timestamp');
-    const toTimestamp = urlParams.get('to_timestamp');
-    
-    if (fromTimestamp && toTimestamp) {
-      const fromDatetime = this.form.querySelector('[name="from_datetime"]');
-      const toDatetime = this.form.querySelector('[name="to_datetime"]');
-      
-      if (fromDatetime && toDatetime) {
-        // Convert UTC timestamps to local datetime strings
-        const fromDate = new Date(parseInt(fromTimestamp) * 1000);
-        const toDate = new Date(parseInt(toTimestamp) * 1000);
-        
-        fromDatetime.value = this.formatDatetimeLocal(fromDate);
-        toDatetime.value = this.formatDatetimeLocal(toDate);
-      }
-    }
-  }
-  
-  formatDatetimeLocal(date) {
-    // Format date for datetime-local input (YYYY-MM-DDTHH:MM)
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, '0');
-    const day = String(date.getDate()).padStart(2, '0');
-    const hours = String(date.getHours()).padStart(2, '0');
-    const minutes = String(date.getMinutes()).padStart(2, '0');
-    
-    return `${year}-${month}-${day}T${hours}:${minutes}`;
-  }
-
-}
-
-// Global functions for onclick handlers (maintaining backward compatibility)
-let timeRangeFormInstance;
-
-function switchToRelative(event) {
-  timeRangeFormInstance?.switchToRelative(event);
-}
-
-function switchToAbsolute(event) {
-  timeRangeFormInstance?.switchToAbsolute(event);
-}
-
-function handleQuickRangeChange(select) {
-  timeRangeFormInstance?.handleQuickRangeChange(select);
-}
-
-// Initialize when DOM is ready
-document.addEventListener('DOMContentLoaded', function() {
-  timeRangeFormInstance = new TimeRangeForm();
-});