uptrace 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28b464eb59ab1b56f877a0644fc10b90fb34854116a66967fa6086a2060d451f
-  data.tar.gz: 684424b1312d32a383914c5f2e3c1e77d1977eaab7599de19049e3ed31501920
+  metadata.gz: 7eaccd23f9b8a866577eb6ef2c81589306a4930280bedbed67340b8d908339c4
+  data.tar.gz: fe2bce7cfb97c14318f2cf63d65aa102d6e74ac6f01f12a600d2822856abf15c
 SHA512:
-  metadata.gz: 9df797cf0cca4a21826628f93c76bcc04099586327b7a52f9f41e9a8d2b5605fee04315c03475568e1914664a28b19530db80d81291a9e424dcea0d89a292f45
-  data.tar.gz: 818deef96037cbdcf64d2d24e2dd9e3a9fb0705ca70b9796ed91808dd51ac5eda532c622c0c6f8bac9d91159e4fa026bfd4ffb7cea7e97641d19907af8ce2df4
+  metadata.gz: a6f15e1110e43582d2aba18a19ef16aa6844a85584d101c9c4c72de0f072941d31c9a42deae5b42802f03b7da3050b7279e3a5b07b9ba9a3d4e76251d9293d24
+  data.tar.gz: 72fbe0da3afe6979150c16f5944fe140439ea552009aef1c84164d9cebed73d40a5639ed346e4e57029ba8c39087f78af7358f121d36084ed1715d7a96e3fb4d

data/RELEASE.md

@@ -0,0 +1,7 @@
+Bump version and then run:
+
+```shell
+gem build uptrace.gemspec
+bundle install
+gem push uptrace-0.2.0.gem
+```

data/lib/uptrace.rb

@@ -7,8 +7,24 @@ 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_opentelemetry(c, dsn: '')
+    @client = Client.new(dsn: dsn) unless dsn.empty?
+
+    c.add_span_processor(client.span_processor) unless client.disabled?
+  end
 end
 
 require 'uptrace/version'

data/lib/uptrace/client.rb

@@ -5,58 +5,41 @@ 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?
+    # @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(e.message)
-        @cfg.disabled = true
+        Uptrace.logger.error("Uptrace is disabled: #{e.message}")
+        @disabled = true
 
-        @cfg.dsn = 'https://TOKEN@api.uptrace.dev/PROJECT_ID'
+        @dsn = DSN.new('https://TOKEN@api.uptrace.dev/PROJECT_ID')
       end
-
-      setup_tracing unless @cfg.disabled
     end
 
-    # @param [optional Numeric] timeout An optional timeout in seconds.
-    def shutdown(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}/#{dsn.project_id}/search?q=#{trace_id}"
+      "#{@dsn.scheme}://#{host}/search/#{@dsn.project_id}?q=#{trace_id}"
     end
 
-    private
-
-    def setup_tracing
-      exp = Uptrace::Trace::Exporter.new(@cfg)
-
-      OpenTelemetry::SDK.configure do |c|
-        bsp = OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
-          exp,
-          max_queue_size: 1000,
-          max_export_batch_size: 1000,
-          schedule_delay: 5_000
-        )
-        c.add_span_processor(bsp)
-
-        c.service_name = @cfg.service_name
-        c.service_version = @cfg.service_version
-      end
+    # @return [OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor]
+    def span_processor
+      exp = Uptrace::Trace::Exporter.new(@dsn)
+      OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
+        exp,
+        max_queue_size: 1000,
+        max_export_batch_size: 1000,
+        schedule_delay: 5_000
+      )
     end
   end
 end

data/lib/uptrace/dsn.rb

@@ -8,12 +8,12 @@ module Uptrace
     attr_reader :dsn, :port, *KEYS
 
     def initialize(dsn)
-      raise ArgumentError, "uptrace: DSN can't be empty" if dsn.empty?
+      raise ArgumentError, "DSN can't be empty" if dsn.empty?
 
       begin
         uri = URI.parse(dsn)
       rescue URI::InvalidURIError => e
-        raise ArgumentError, %(uptrace: can't parse DSN=#{dsn.inspect}: #{e})
+        raise ArgumentError, %(can't parse DSN=#{dsn.inspect}: #{e})
       end
 
       @dsn = dsn
@@ -25,7 +25,7 @@ module Uptrace
 
       KEYS.each do |k|
         v = public_send(k)
-        raise ArgumentError, %(uptrace: DSN does not have #{k} (DSN=#{dsn.inspect})) if v.nil? || v.empty?
+        raise ArgumentError, %(DSN does not have #{k} (DSN=#{dsn.inspect})) if v.nil? || v.empty?
       end
     end
 

data/lib/uptrace/trace.rb

@@ -6,5 +6,4 @@ module Uptrace
   end
 end
 
-require 'uptrace/trace/config'
 require 'uptrace/trace/exporter'

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
@@ -79,18 +77,21 @@ module Uptrace
           endTime: as_unix_nano(span.end_timestamp),
 
           resource: uptrace_resource(span.resource),
-          attrs: span.attributes,
+          attrs: span.attributes
+        }
 
-          statusCode: status_code_as_str(span.status.code),
-          statusMessage: span.status.description,
+        out[:parentId] = span.parent_span_id.unpack1('Q') if span.parent_span_id
 
-          tracer: uptrace_tracer(span.instrumentation_library)
-        }
+        out[:events] = uptrace_events(span.events) unless span.events.nil?
+        out[:links] = uptrace_links(span.links) unless span.links.nil?
 
-        out['parentId'] = span.parent_span_id.unpack1('Q') if span.parent_span_id
+        status = span.status
+        out[:statusCode] = status_code_as_str(status.code)
+        out[:statusMessage] = status.description unless status.description.empty?
 
-        out['events'] = uptrace_events(span.events) unless span.events.nil?
-        out['links'] = uptrace_links(span.links) unless span.links.nil?
+        il = span.instrumentation_library
+        out[:tracerName] = il.name
+        out[:tracerVersion] = il.name unless il.version.empty?
 
         out
       end
@@ -130,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')
@@ -216,17 +217,6 @@ module Uptrace
         end
         out
       end
-
-      ##
-      # @param [OpenTelemetry::SDK::InstrumentationLibrary] il
-      # @return [Hash]
-      #
-      def uptrace_tracer(il)
-        {
-          name: il.name,
-          version: il.version
-        }
-      end
     end
   end
 end

data/lib/uptrace/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uptrace
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Uptrace Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -174,12 +174,12 @@ files:
 - ".yardopts"
 - LICENSE
 - README.md
+- RELEASE.md
 - lib/uptrace.rb
 - lib/uptrace/client.rb
 - 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,30 +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 initialize
-        @dsn = ENV.fetch('UPTRACE_DSN', '')
-      end
-
-      def dsno
-        @dsno ||= DSN.new(@dsn)
-      end
-    end
-  end
-end