uptrace 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cc81f964b6c014c38abbdfcf4250fa467ba0c8ef2dfd8077967d851bdd9f567
-  data.tar.gz: 5fb6975a0916e18d1603aa03ec78d7639b4e6a37de079e2ed72326a7db8c6ee0
+  metadata.gz: 525b8e2ad45dd955af7095839bfdf024e29b11309e8a0103b36bddb7980f3c41
+  data.tar.gz: 0766a2822dad2acb536aeccba788ac898ce7474ae4d74de355577de544772a4b
 SHA512:
-  metadata.gz: ba5ef3bc321a50fd4203a033a023bbfc491071d29a05edb9c9a93cd6a2c53a8a59ec6af2e97cc919d57695193993ecedbf42914b53cbda72a6ab80d9085b763c
-  data.tar.gz: e5a44d04828a788321193d00a6c7196fa38c92ce7aaa274636448f50609c3759410d11444360cd42f7d1ee066af020660e706732b2209686dc224da707d6ec33
+  metadata.gz: 36c69755595e07ffee78a62f3f1633fdd62def2d910b50876e8ffc4e2791800869d98f61b338bb2e30a01280610cc5fbeabe58a0f17214b5f2377031c2801f07
+  data.tar.gz: f33956036979a79d2f39e05f8a30f3008ffd967a828a048d88b187867e562bd013cecf9b0958584dc885142341633848739c3fc05dded624c8c16dc7ee8d7848

data/lib/uptrace.rb

@@ -7,8 +7,28 @@ module Uptrace
   extend self
 
   attr_accessor :logger
+  attr_writer :client
 
   self.logger = Logger.new($stdout)
+
+  # @return [Object, Client] registered client or a default no-op implementation of the client.
+  def client
+    @client ||= Client.new
+  end
+
+  def trace_url(span)
+    client.trace_url(span)
+  end
+
+  def configure_tracing(c, dsn: '')
+    upclient = if dsn.empty?
+                 client
+               else
+                 Client.new(dsn: dsn)
+               end
+
+    c.add_span_processor(upclient.span_processor) unless upclient.disabled?
+  end
 end
 
 require 'uptrace/version'

data/lib/uptrace/client.rb

@@ -5,43 +5,35 @@ require 'opentelemetry/sdk'
 module Uptrace
   # Uptrace client that configures OpenTelemetry SDK to use Uptrace exporter.
   class Client
-    ##
-    # @yieldparam config [Uptrace::Config]
-    # @return [void]
-    #
-    def initialize
-      @cfg = Uptrace::Trace::Config.new
-      yield @cfg if block_given?
-
-      @cfg.dsn = ENV.fetch('UPTRACE_DSN', '') if @cfg.dsn.nil? || @cfg.dsn.empty?
+    # @param [string] dsn
+    def initialize(dsn: '')
+      dsn = ENV.fetch('UPTRACE_DSN', '') if dsn.empty?
 
       begin
-        @cfg.dsno
+        @dsn = DSN.new(dsn)
       rescue ArgumentError => e
         Uptrace.logger.error("Uptrace is disabled: #{e.message}")
-        @cfg.disabled = true
+        @disabled = true
 
-        @cfg.dsn = 'https://TOKEN@api.uptrace.dev/PROJECT_ID'
+        @dsn = DSN.new('https://TOKEN@api.uptrace.dev/PROJECT_ID')
       end
     end
 
-    # @param [optional Numeric] timeout An optional timeout in seconds.
-    def close(timeout: nil)
-      return if @cfg.disabled
-
-      OpenTelemetry.tracer_provider.shutdown(timeout: timeout)
+    def disabled?
+      @disabled
     end
 
-    # @return [OpenTelemetry::Trace::Span]
+    # @param [OpenTelemetry::Trace::Span] span
+    # @return [String]
     def trace_url(span)
-      dsn = @cfg.dsno
-      host = dsn.host.delete_prefix('api.')
+      host = @dsn.host.delete_prefix('api.')
       trace_id = span.context.hex_trace_id
-      "#{dsn.scheme}://#{host}/search/#{dsn.project_id}?q=#{trace_id}"
+      "#{@dsn.scheme}://#{host}/search/#{@dsn.project_id}?q=#{trace_id}"
     end
 
+    # @return [OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor]
     def span_processor
-      exp = Uptrace::Trace::Exporter.new(@cfg)
+      exp = Uptrace::Trace::Exporter.new(@dsn)
       OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
         exp,
         max_queue_size: 1000,

data/lib/uptrace/trace/exporter.rb

@@ -20,13 +20,11 @@ module Uptrace
       ##
       # @param [Config] cfg
       #
-      def initialize(cfg)
-        @cfg = cfg
+      def initialize(dsn)
+        @dsn = dsn
+        @endpoint = "/api/v1/tracing/#{@dsn.project_id}/spans"
 
-        dsn = @cfg.dsno
-        @endpoint = "/api/v1/tracing/#{dsn.project_id}/spans"
-
-        @http = Net::HTTP.new(dsn.host, 443)
+        @http = Net::HTTP.new(@dsn.host, 443)
         @http.use_ssl = true
         @http.open_timeout = 5
         @http.read_timeout = 5
@@ -133,7 +131,7 @@ module Uptrace
         data = Zstd.compress(data, 3)
 
         req = Net::HTTP::Post.new(@endpoint)
-        req.add_field('Authorization', "Bearer #{@cfg.dsno.token}")
+        req.add_field('Authorization', "Bearer #{@dsn.token}")
         req.add_field('Content-Type', 'application/msgpack')
         req.add_field('Content-Encoding', 'zstd')
         req.add_field('Connection', 'keep-alive')

data/lib/uptrace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uptrace
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uptrace
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Uptrace Authors
@@ -180,7 +180,6 @@ files:
 - lib/uptrace/dsn.rb
 - lib/uptrace/metric.rb
 - lib/uptrace/trace.rb
-- lib/uptrace/trace/config.rb
 - lib/uptrace/trace/exporter.rb
 - lib/uptrace/version.rb
 homepage: https://github.com/uptrace/uptrace-ruby

data/lib/uptrace/trace/config.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'uptrace/dsn'
-
-module Uptrace
-  module Trace
-    # Config is a configuration for Uptrace span exporter.
-    class Config
-      # @return [string] a data source name to connect to uptrace.dev.
-      attr_accessor :dsn
-
-      # @return [string] `service.name` resource attribute.
-      attr_accessor :service_name
-
-      # @return [string] `service.name` resource attribute.
-      attr_accessor :service_version
-
-      # @return [boolean] disables the exporter.
-      attr_accessor :disabled
-
-      def dsno
-        @dsno ||= DSN.new(@dsn)
-      end
-    end
-  end
-end