uptrace 0.2.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e98c516863a2d2d3cf5befff7333a5347b9624ac4b4287177dffa93327fca89
-  data.tar.gz: b1081b536729d1de1a50717b21053816faa4801d7f886db81c23f8a2ca98c2a5
+  metadata.gz: d437c19b7fc3feb724d4fa895fb7ef5e9cfc8501931a16f53d598fb9ef5afddc
+  data.tar.gz: 6340b2ba9b3991f922777310e43d7e256384f621b18c6598e422332b1940efce
 SHA512:
-  metadata.gz: 7eb40d3d6563d1eec0f822a758ac4cbbccbb73dbcbe13e0ddfc992e9b9a39ed8746035fec3e85ab6610278584c3db873a37d9cd87ffbfbb0dd9152f7126c1da4
-  data.tar.gz: 6eef8ebe76bc77bae7efe13a78a43329ceeb8ae3e1aa44d5e444ebc7d09290f17fa9d31c0b9a6fe12599dda1f33230bea23e718b0ae919ebf955d5e0ff9aaac0
+  metadata.gz: cdb698a1ee148f598fbf2ecf93ddc47867d797fd0f72a33bdc44547dfe5cec846984eaaba71e69c198ce3423c64bfe8ff830313b770980624a8cff164b0b431d
+  data.tar.gz: 95c417612dd655203b05d3323188536f453fa03ba4f412e84491dc23bdca90397f9ae3d99cdfd1899f06e23632282efa6f74251a9e93da8436d1255aa74431df

data/README.md

@@ -1,21 +1,62 @@
 # Uptrace Ruby exporter for OpenTelemetry
 
-[![Build Status](https://travis-ci.org/uptrace/uptrace-ruby.svg?branch=master)](https://travis-ci.org/uptrace/uptrace-ruby)
+![build workflow](https://github.com/uptrace/uptrace-ruby/actions/workflows/build.yml/badge.svg)
 [![Documentation](https://img.shields.io/badge/uptrace-documentation-informational)](https://docs.uptrace.dev/ruby/)
 
 <a href="https://docs.uptrace.dev/ruby/">
   <img src="https://docs.uptrace.dev/devicons/ruby-original.svg" height="200px" />
 </a>
 
-## Installation
+## Introduction
+
+uptrace-ruby is an OpenTelemery distribution configured to export
+[traces](https://docs.uptrace.dev/tracing/#spans) to Uptrace.
+
+## Quickstart
+
+Install uptrace-ruby:
 
 ```bash
 gem install uptrace
 ```
 
-## Introduction
+Run the [basic example](example/basic) below using the DSN from the Uptrace project settings page.
+
+```ruby
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'rubygems'
+require 'bundler/setup'
+require 'uptrace'
 
-uptrace-ruby is the official Uptrace client for Ruby that sends your traces/spans and metrics to
-[Uptrace.dev](https://uptrace.dev).
+OpenTelemetry::SDK.configure do |c|
+  c.service_name = 'myservice'
+  c.service_version = '1.0.0'
+
+  # Configure OpenTelemetry to export data to Uptrace.
+  # Copy your project DSN here or use UPTRACE_DSN env var.
+  Uptrace.configure_opentelemetry(c, dsn: '')
+end
+
+tracer = OpenTelemetry.tracer_provider.tracer('my_app_or_gem', '0.1.0')
+
+tracer.in_span('main') do |span|
+  tracer.in_span('child1') do |child1|
+    child1.set_attribute('key1', 'value1')
+    child1.record_exception(ArgumentError.new('error1'))
+  end
+
+  tracer.in_span('child2') do |child2|
+    child2.set_attribute('key2', '24')
+    child2.set_attribute('key3', 123.456)
+  end
+
+  puts("trace URL: #{Uptrace.trace_url(span)}")
+end
+
+# Send buffered spans.
+OpenTelemetry.tracer_provider.shutdown
+```
 
-See [uptrace-ruby documentation](https://docs.uptrace.dev/ruby/) for details.
+Please see [uptrace-ruby documentation](https://docs.uptrace.dev/ruby/) for more details.

data/RELEASE.md

@@ -1,4 +1,6 @@
-```
+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,26 @@ 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
+
+  # @param [optional OpenTelemetry::Trace::Span] span
+  # @return [String]
+  def trace_url(span = nil)
+    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,43 @@ 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]
-    def trace_url(span)
-      dsn = @cfg.dsno
-      host = dsn.host.delete_prefix('api.')
+    # @param [optional OpenTelemetry::Trace::Span] span
+    # @return [String]
+    def trace_url(span = nil)
+      span = OpenTelemetry::Trace.current_span if span.nil?
+
+      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
 
-    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=#{dsn.inspect} does not have a #{k}) 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
@@ -53,6 +51,15 @@ module Uptrace
         send({ spans: out }, timeout: timeout)
       end
 
+      # Called when {OpenTelemetry::SDK::Trace::TracerProvider#force_flush} is called, if
+      # this exporter is registered to a {OpenTelemetry::SDK::Trace::TracerProvider}
+      # object.
+      #
+      # @param [optional Numeric] timeout An optional timeout in seconds.
+      def force_flush(timeout: nil) # rubocop:disable Lint/UnusedMethodArgument
+        SUCCESS
+      end
+
       # Called when {OpenTelemetry::SDK::Trace::Tracer#shutdown} is called, if
       # this exporter is registered to a {OpenTelemetry::SDK::Trace::Tracer}
       # object.
@@ -61,6 +68,7 @@ module Uptrace
       def shutdown(timeout: nil) # rubocop:disable Lint/UnusedMethodArgument
         @shutdown = true
         @http.finish if @http.started?
+        SUCCESS
       end
 
       private
@@ -82,18 +90,18 @@ module Uptrace
           attrs: span.attributes
         }
 
-        out[parentId] = span.parent_span_id.unpack1('Q') if span.parent_span_id
+        out[:parentId] = span.parent_span_id.unpack1('Q') if span.parent_span_id
 
-        out[events] = uptrace_events(span.events) unless span.events.nil?
-        out[links] = uptrace_links(span.links) unless span.links.nil?
+        out[:events] = uptrace_events(span.events) unless span.events.nil?
+        out[:links] = uptrace_links(span.links) unless span.links.nil?
 
         status = span.status
-        out[statusCode] = status_code_as_str(status.code)
-        out[statusMessage] = status.description unless status.description.empty?
+        out[:statusCode] = status_code_as_str(status.code)
+        out[:statusMessage] = status.description unless status.description.empty?
 
         il = span.instrumentation_library
-        out[tracerName] = il.name
-        out[tracerVersion] = il.name unless il.version.empty?
+        out[:tracerName] = il.name
+        out[:tracerVersion] = il.name unless il.version.empty?
 
         out
       end
@@ -133,7 +141,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.2'
+  VERSION = '0.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uptrace
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Uptrace Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: zstd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -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,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