brainzlab 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612fc535ff22f4fb1edb3d986ca4200f6fbbcb32e82718619a6f711d11e0d98b
-  data.tar.gz: 665fefbcba13cfb7c14395b37dc8157c0938c3cc52935fe5fd7767b7cff3a3f5
+  metadata.gz: '0816189a1797239a3394e13fb0e08c33eddc061e146d4a1d3874b5b67777c967'
+  data.tar.gz: 3ff73e1d6babbd0b4f54f53eab270267be9e822d305cafeb59748b02f88f9b45
 SHA512:
-  metadata.gz: 06e2a33185951e80bd102e6aee4d4e8417750be993949822983ceb66fd807394924e0546a3769ab6ffd0f30d1055c0f213fdc7458a66304bea89b9d304ad34a0
-  data.tar.gz: 4675a166a98ed230885fae6926d7949c235ca1ab75c129702a643955089a130dddbe445351bfac0331247204083b0ce7223c7b1f1b9c4759ca2e73482f2c06b6
+  metadata.gz: e4733d1814297ebfd9cfe85aa909eddb3607e88efc024e07f55ea23ae5ee31d815538688a2fca1a67bba7a89ceb7b02a73aaa521f3114142539291c055dfff7a
+  data.tar.gz: 43a1826589f522ffdf678515798124729500e265c29f7860322db9a0a831e3b9433f738545024421c2667b029d96dfe2dcc7fd13dbd22cf2a990807585c57ceb

data/lib/brainzlab/configuration.rb

@@ -148,7 +148,8 @@ module BrainzLab
                   :devtools_allowed_ips,
                   :devtools_asset_path,
                   :devtools_panel_position,
-                  :devtools_expand_by_default
+                  :devtools_expand_by_default,
+                  :rails_instrumentation_handled_externally
 
     # Services that should not track themselves to avoid circular dependencies
     SELF_TRACKING_SERVICES = {
@@ -184,7 +185,7 @@ module BrainzLab
 
       # Recall settings
       @recall_enabled = true
-      @recall_url = ENV['RECALL_URL'] || 'https://recall.brainzlab.ai'
+      @recall_url = ENV['RECALL_URL'] || detect_product_url('recall')
       @recall_min_level = :debug
       @recall_buffer_size = 50
       @recall_flush_interval = 5
@@ -193,7 +194,7 @@ module BrainzLab
 
       # Reflex settings
       @reflex_enabled = true
-      @reflex_url = ENV['REFLEX_URL'] || 'https://reflex.brainzlab.ai'
+      @reflex_url = ENV['REFLEX_URL'] || detect_product_url('reflex')
       @reflex_api_key = ENV.fetch('REFLEX_API_KEY', nil)
       @reflex_master_key = ENV.fetch('REFLEX_MASTER_KEY', nil)
       @reflex_auto_provision = true
@@ -204,7 +205,7 @@ module BrainzLab
 
       # Pulse settings
       @pulse_enabled = true
-      @pulse_url = ENV['PULSE_URL'] || 'https://pulse.brainzlab.ai'
+      @pulse_url = ENV['PULSE_URL'] || detect_product_url('pulse')
       @pulse_api_key = ENV.fetch('PULSE_API_KEY', nil)
       @pulse_master_key = ENV.fetch('PULSE_MASTER_KEY', nil)
       @pulse_auto_provision = true
@@ -225,7 +226,7 @@ module BrainzLab
 
       # Signal settings
       @signal_enabled = true
-      @signal_url = ENV['SIGNAL_URL'] || 'https://signal.brainzlab.ai'
+      @signal_url = ENV['SIGNAL_URL'] || detect_product_url('signal')
       @signal_api_key = ENV.fetch('SIGNAL_API_KEY', nil)
       @signal_master_key = ENV.fetch('SIGNAL_MASTER_KEY', nil)
       @signal_auto_provision = true
@@ -351,6 +352,11 @@ module BrainzLab
       @devtools_asset_path = '/__brainzlab__'
       @devtools_panel_position = 'bottom-right'
       @devtools_expand_by_default = false
+
+      # Rails instrumentation delegation
+      # When true, brainzlab-rails gem handles Rails-specific instrumentation
+      # SDK will only install non-Rails instrumentation (HTTP clients, Redis, etc.)
+      @rails_instrumentation_handled_externally = false
     end
 
     def recall_min_level=(level)
@@ -571,5 +577,21 @@ module BrainzLab
     rescue StandardError
       nil
     end
+
+    def detect_product_url(product)
+      # In development, use .localhost domains (works with Traefik)
+      # In production, use the real brainzlab.ai domains
+      if development?
+        "http://#{product}.localhost"
+      else
+        "https://#{product}.brainzlab.ai"
+      end
+    end
+
+    def development?
+      @environment == 'development' ||
+        ENV['RAILS_ENV'] == 'development' ||
+        ENV['RACK_ENV'] == 'development'
+    end
   end
 end

data/lib/brainzlab/flux/provisioner.rb

@@ -3,54 +3,121 @@
 require 'net/http'
 require 'json'
 require 'uri'
+require 'fileutils'
 
 module BrainzLab
   module Flux
     class Provisioner
+      CACHE_DIR = ENV.fetch('BRAINZLAB_CACHE_DIR') { File.join(Dir.home, '.brainzlab') }
+
       def initialize(config)
         @config = config
       end
 
       def ensure_project!
-        return if (@config.flux_ingest_key && !@config.flux_ingest_key.to_s.empty?) ||
-                  (@config.flux_api_key && !@config.flux_api_key.to_s.empty?)
-        return unless @config.flux_url && !@config.flux_url.to_s.empty?
-        return unless @config.secret_key && !@config.secret_key.to_s.empty?
+        return unless should_provision?
 
-        BrainzLab.debug_log('[Flux] Auto-provisioning project...')
-        provision_project
+        # Try cached credentials first
+        if (cached = load_cached_credentials)
+          apply_credentials(cached)
+          return cached
+        end
+
+        # Provision new project
+        project = provision_project
+        return unless project
+
+        # Cache and apply credentials
+        cache_credentials(project)
+        apply_credentials(project)
+
+        project
       end
 
       private
 
+      def should_provision?
+        # Already have credentials
+        return false if @config.flux_ingest_key.to_s.strip.length.positive?
+        return false if @config.flux_api_key.to_s.strip.length.positive?
+
+        # Need auto_provision enabled
+        return false unless @config.flux_auto_provision
+
+        # Need app_name for project name
+        return false unless @config.app_name.to_s.strip.length.positive?
+
+        # Need master key for provisioning
+        return false unless @config.flux_master_key.to_s.strip.length.positive?
+
+        # Need flux_url
+        return false unless @config.flux_url.to_s.strip.length.positive?
+
+        true
+      end
+
       def provision_project
+        BrainzLab.debug_log('[Flux] Auto-provisioning project...')
+
         uri = URI.parse("#{@config.flux_url}/api/v1/projects/provision")
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = uri.scheme == 'https'
-        http.open_timeout = 10
-        http.read_timeout = 30
+        http.open_timeout = 5
+        http.read_timeout = 10
 
         request = Net::HTTP::Post.new(uri.path)
         request['Content-Type'] = 'application/json'
-        request['Authorization'] = "Bearer #{@config.secret_key}"
+        request['X-Master-Key'] = @config.flux_master_key
         request['User-Agent'] = "brainzlab-sdk/#{BrainzLab::VERSION}"
         request.body = {
-          name: @config.service || 'default',
+          name: @config.app_name,
           environment: @config.environment
         }.to_json
 
         response = http.request(request)
 
         if response.is_a?(Net::HTTPSuccess)
-          data = JSON.parse(response.body)
-          @config.flux_ingest_key = data['ingest_key']
-          @config.flux_api_key = data['api_key']
+          data = JSON.parse(response.body, symbolize_names: true)
           BrainzLab.debug_log('[Flux] Project provisioned successfully')
+          data
         else
           BrainzLab.debug_log("[Flux] Provisioning failed: #{response.code} - #{response.body}")
+          nil
         end
       rescue StandardError => e
         BrainzLab.debug_log("[Flux] Provisioning error: #{e.message}")
+        nil
+      end
+
+      def load_cached_credentials
+        path = cache_file_path
+        return nil unless File.exist?(path)
+
+        data = JSON.parse(File.read(path), symbolize_names: true)
+
+        # Validate cached data has required keys
+        return nil unless data[:ingest_key]
+
+        data
+      rescue StandardError => e
+        BrainzLab.debug_log("[Flux] Failed to load cached credentials: #{e.message}")
+        nil
+      end
+
+      def cache_credentials(project)
+        FileUtils.mkdir_p(CACHE_DIR)
+        File.write(cache_file_path, JSON.generate(project))
+      rescue StandardError => e
+        BrainzLab.debug_log("[Flux] Failed to cache credentials: #{e.message}")
+      end
+
+      def cache_file_path
+        File.join(CACHE_DIR, "#{@config.app_name}.flux.json")
+      end
+
+      def apply_credentials(project)
+        @config.flux_ingest_key = project[:ingest_key]
+        @config.flux_api_key = project[:api_key]
       end
     end
   end

data/lib/brainzlab/instrumentation.rb

@@ -6,6 +6,14 @@ module BrainzLab
       def install!
         config = BrainzLab.configuration
 
+        # Skip Rails-specific instrumentation if brainzlab-rails gem is handling it
+        # This prevents double-tracking of events
+        if config.rails_instrumentation_handled_externally
+          BrainzLab.debug_log('[Instrumentation] Rails instrumentation handled by brainzlab-rails gem, skipping SDK instrumentation')
+          install_non_rails_instrumentation!(config)
+          return
+        end
+
         # HTTP client instrumentation
         if config.instrument_http
           install_net_http!
@@ -289,6 +297,58 @@ module BrainzLab
         install_faraday!
         install_httparty!
       end
+
+      private
+
+      # Install only non-Rails-specific instrumentation
+      # Used when brainzlab-rails gem handles Rails events via ActiveSupport::Notifications
+      def install_non_rails_instrumentation!(config)
+        # HTTP client instrumentation (not Rails-specific)
+        if config.instrument_http
+          install_net_http!
+          install_faraday!
+          install_httparty!
+        end
+
+        # Redis instrumentation (not Rails-specific)
+        install_redis! if config.instrument_redis
+
+        # Sidekiq instrumentation (not Rails-specific, has its own hooks)
+        install_sidekiq! if config.instrument_sidekiq
+
+        # GraphQL instrumentation (not Rails-specific)
+        install_graphql! if config.instrument_graphql
+
+        # MongoDB instrumentation (not Rails-specific)
+        install_mongodb! if config.instrument_mongodb
+
+        # Elasticsearch instrumentation (not Rails-specific)
+        install_elasticsearch! if config.instrument_elasticsearch
+
+        # Delayed::Job instrumentation (not Rails-specific, has its own hooks)
+        install_delayed_job! if config.instrument_delayed_job
+
+        # Grape API instrumentation (not Rails-specific)
+        install_grape! if config.instrument_grape
+
+        # Modern job queue instrumentation (have their own hooks)
+        install_solid_queue! if config.instrument_solid_queue
+        install_good_job! if config.instrument_good_job
+        install_resque! if config.instrument_resque
+
+        # Additional HTTP clients (not Rails-specific)
+        install_excon! if config.instrument_excon
+        install_typhoeus! if config.instrument_typhoeus
+
+        # Dalli/Memcached (not Rails-specific, has its own hooks)
+        install_dalli! if config.instrument_dalli
+
+        # Cloud & Payment (not Rails-specific)
+        install_aws! if config.instrument_aws
+        install_stripe! if config.instrument_stripe
+
+        BrainzLab.debug_log('[Instrumentation] Non-Rails instrumentation installed (HTTP, Redis, Sidekiq, GraphQL, etc.)')
+      end
     end
   end
 end

data/lib/brainzlab/pulse.rb

@@ -97,19 +97,43 @@ module BrainzLab
         ensure_provisioned!
         return unless BrainzLab.configuration.pulse_valid?
 
+        # Parse timestamp or use current time
+        started_at = if timestamp
+                       Time.parse(timestamp) rescue Time.now.utc
+                     else
+                       Time.now.utc
+                     end
+
         span_data = {
+          span_id: SecureRandom.uuid,
           name: name,
-          category: category,
+          kind: category,
+          started_at: started_at,
+          ended_at: started_at, # Same as started_at since we only have duration
           duration_ms: duration_ms,
-          timestamp: timestamp || Time.now.utc.iso8601(3),
-          attributes: attributes,
-          environment: BrainzLab.configuration.environment,
-          service: BrainzLab.configuration.service,
-          host: BrainzLab.configuration.host,
-          request_id: Context.current.request_id
-        }.compact
+          error: false,
+          data: attributes
+        }
 
-        client.send_span(span_data)
+        # If there's an active trace, add the span to it (will be sent with finish_trace)
+        # Otherwise, send it directly to the API as a standalone span
+        if tracer.current_trace
+          tracer.current_spans << span_data
+        else
+          # Send as standalone span (backward compatibility)
+          api_span_data = {
+            name: name,
+            category: category,
+            duration_ms: duration_ms,
+            timestamp: timestamp || Time.now.utc.iso8601(3),
+            attributes: attributes,
+            environment: BrainzLab.configuration.environment,
+            service: BrainzLab.configuration.service,
+            host: BrainzLab.configuration.host,
+            request_id: Context.current.request_id
+          }.compact
+          client.send_span(api_span_data)
+        end
       end
 
       def ensure_provisioned!

data/lib/brainzlab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrainzLab
-  VERSION = '0.1.5'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainzlab
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Brainz Lab