uptrace 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c320ccec5439c9c74f4127443eb875ad2426bdb3efb3e83ef246ac8f1a69d4e3
-  data.tar.gz: 88449bc895c39171505069b5d10574b807ebdcc3badc95a77792609ef7f63b90
+  metadata.gz: 6666340ea7b7556a09c06a41878efdd58bb10b4d05cdc711654189e01eec4011
+  data.tar.gz: 78c26e6a6f6e59e2ac01fd14a872a5c9c164e72431238d5c8d79322201fd1a20
 SHA512:
-  metadata.gz: aed13462dbcefbceae6a239cc4cf206c46d69740f70a752c0317aac40c4b073d2ae965b413868af63f4520276bbdff39c46ee70cc9f22233d3699d9478c8435b
-  data.tar.gz: e8f8e3fd095d9fee1bea930870ca5b330f848510005504c31a5f3c9f610c2eb2897d451ce40a81392b9e50c7c62d66fa767664c290c37caff3dd64d43e82b832
+  metadata.gz: b3780a0f3fa9841f4883618f0a7b28f1ec86e046e0f99c90ab6a5ffc0bd7a6c3e2ab3a004c2c3f7f848a62afbea5c9d699ecb07105f4f398c4594c6ce52099bf
+  data.tar.gz: '08270a500502c272d6eda9f96eab25909ea26a834e070ba8d6c4cb7ab7ccfee428d2094c63a353402c1a720b03d11fe7a3f95dad8e09171ad879df96eb2e3466'

data/lib/uptrace/client.rb

@@ -24,5 +24,13 @@ module Uptrace
     def disabled?
       @disabled
     end
+
+    # @param [optional OpenTelemetry::Trace::Span] span
+    # @return [String]
+    def trace_url(span = nil)
+      span = OpenTelemetry::Trace.current_span if span.nil?
+      trace_id = span.context.hex_trace_id
+      "#{@dsn.app_addr}/traces/#{trace_id}"
+    end
   end
 end

data/lib/uptrace/dsn.rb

@@ -3,9 +3,7 @@
 module Uptrace
   # Uptrace DSN
   class DSN
-    KEYS = %w[scheme host project_id token].freeze
-
-    attr_reader :dsn, :port, *KEYS
+    attr_reader :dsn, :scheme, :host, :port, :project_id, :token
 
     def initialize(dsn)
       raise ArgumentError, "DSN can't be empty" if dsn.empty?
@@ -17,13 +15,21 @@ module Uptrace
       end
 
       @dsn = dsn
-      @project_id = uri.path.delete_prefix('/')
-      @token = uri.user
+      @scheme = uri.scheme
       @host = uri.host
       @port = uri.port
-      @scheme = uri.scheme
+      @project_id = uri.path.delete_prefix('/')
+      @token = uri.user
+
+      %w[scheme host].each do |k|
+        v = public_send(k)
+        raise ArgumentError, %(DSN=#{dsn.inspect} does not have a #{k}) if v.nil? || v.empty?
+      end
+
+      @host = 'uptrace.dev' if @host == 'api.uptrace.dev'
+      return if @host != 'uptrace.dev'
 
-      KEYS.each do |k|
+      %w[project_id token].each do |k|
         v = public_send(k)
         raise ArgumentError, %(DSN=#{dsn.inspect} does not have a #{k}) if v.nil? || v.empty?
       end
@@ -32,5 +38,17 @@ module Uptrace
     def to_s
       @dsn
     end
+
+    def app_addr
+      return 'https://app.uptrace.dev' if @host == 'uptrace.dev'
+
+      "#{@scheme}://#{@host}:#{@port}"
+    end
+
+    def otlp_addr
+      return 'https://otlp.uptrace.dev' if @host == 'uptrace.dev'
+
+      "#{@scheme}://#{@host}:#{@port}"
+    end
   end
 end

data/lib/uptrace/version.rb

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

data/lib/uptrace.rb

@@ -21,9 +21,7 @@ module Uptrace
   # @param [optional OpenTelemetry::Trace::Span] span
   # @return [String]
   def trace_url(span = nil)
-    span = OpenTelemetry::Trace.current_span if span.nil?
-    trace_id = span.context.hex_trace_id
-    "https://app.uptrace.dev/traces/#{trace_id}"
+    @client.trace_url(span)
   end
 
   # ConfigureOpentelemetry configures OpenTelemetry to export data to Uptrace.
@@ -35,7 +33,7 @@ module Uptrace
   def configure_opentelemetry(dsn: '')
     OpenTelemetry::SDK.configure do |c|
       @client = Client.new(dsn: dsn) unless dsn.empty?
-      c.add_span_processor(span_processor(@client.dsn.to_s)) unless client.disabled?
+      c.add_span_processor(span_processor(@client.dsn)) unless client.disabled?
 
       yield c if block_given?
     end
@@ -45,9 +43,9 @@ module Uptrace
 
   def span_processor(dsn)
     exporter = OpenTelemetry::Exporter::OTLP::Exporter.new(
-      endpoint: 'https://otlp.uptrace.dev/v1/traces',
+      endpoint: "#{dsn.otlp_addr}/v1/traces",
       # Set the Uptrace DSN here or use UPTRACE_DSN env var.
-      headers: { 'uptrace-dsn': dsn },
+      headers: { 'uptrace-dsn': dsn.to_s },
       compression: 'gzip'
     )
     OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: uptrace
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Uptrace Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.20.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.20.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +92,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 1.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +175,8 @@ files:
 homepage: https://github.com/uptrace/uptrace-ruby
 licenses:
 - BSD-2-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: