uptrace 1.2.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c94eb656b6d3d4a34ffd82f07b8241283ac0df131a1830dbaab1e267151efe26
-  data.tar.gz: c3992f5a354ee5377578526ffa523373d7623752ad6d61a700a8e8725e6486bc
+  metadata.gz: 38dd8206d1bf9212b72a56b017870d9be53ff8136e4ca3079778977025e2147c
+  data.tar.gz: ae1f04fbebf274f7e04aff463fb830a3e2e51428cce42de51b774b1992db1301
 SHA512:
-  metadata.gz: 29fea8f23477b55985c87e813342e08899f7f1182f535b3d4f868c5eaaf5ae97cdee203b4f5f9fb89c1544bc24861d7dd91ac9fa2c9e53fc215ec234c2cb8d95
-  data.tar.gz: ab741518c70fb6f755c0b7e4ce5805bc8448f3ece174862b8305275cf2b04349555a6abcc0f0bc4acfc72c805c1fe1782e3d2a8e1f068b6eb5f8202dae5eaf01
+  metadata.gz: 9266099177298e3228ad5ad57fbd466e4f201b2fe8903be555e67819c26564d7e9a5cd2704b68b05230d612135086ff33156ab30e3d1262acadb359ec8d8705e
+  data.tar.gz: 881cb73ac6ff636cc2d6dc6d879d3a36f39683eb9aa65215a3f8da250eaaebf60e60cee2dc43f78c26a94dd01404e200867b933fe479163b1a043557516eccee

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.3.0 - 2023-06-22
+
+- Updated OpenTelemetry to
+  [v1.3.0](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/sdk/CHANGELOG.md#v130--2023-06-08).
+
 ## v1.2.0 - 2022-10-15
 
 - Updated OpenTelemetry to

data/README.md

@@ -1,10 +1,10 @@
 # Uptrace Ruby exporter for OpenTelemetry
 
 ![build workflow](https://github.com/uptrace/uptrace-ruby/actions/workflows/build.yml/badge.svg)
-[![Documentation](https://img.shields.io/badge/uptrace-documentation-informational)](https://uptrace.dev/get/uptrace-ruby.html)
+[![Documentation](https://img.shields.io/badge/uptrace-documentation-informational)](https://uptrace.dev/get/opentelemetry-ruby.html)
 [![Chat](https://img.shields.io/badge/-telegram-red?color=white&logo=telegram&logoColor=black)](https://t.me/uptrace)
 
-<a href="https://uptrace.dev/get/uptrace-ruby.html">
+<a href="https://uptrace.dev/get/opentelemetry-ruby.html">
   <img src="https://uptrace.dev/get/devicon/ruby-original.svg" height="200px" />
 </a>
 
@@ -37,21 +37,28 @@ Uptrace.configure_opentelemetry(dsn: '') do |c|
   # c is OpenTelemetry::SDK::Configurator
   c.service_name = 'myservice'
   c.service_version = '1.0.0'
+
+  c.resource = OpenTelemetry::SDK::Resources::Resource.create(
+    'deployment.environment' => 'production'
+  )
 end
 
 # Create a tracer. Usually, tracer is a global variable.
 tracer = OpenTelemetry.tracer_provider.tracer('my_app_or_gem', '0.1.0')
 
 # Create a root span (a trace) to measure some operation.
-tracer.in_span('main-operation') do |main|
-  tracer.in_span('child1-of-main') do |child1|
-    child1.set_attribute('key1', 'value1')
+tracer.in_span('main-operation', kind: :client) do |main|
+  tracer.in_span('GET /posts/:id') do |child1|
+    child1.set_attribute('http.method', 'GET')
+    child1.set_attribute('http.route', '/posts/:id')
+    child1.set_attribute('http.url', 'http://localhost:8080/posts/123')
+    child1.set_attribute('http.status_code', 200)
     child1.record_exception(ArgumentError.new('error1'))
   end
 
-  tracer.in_span('child2-of-main') do |child2|
-    child2.set_attribute('key2', '24')
-    child2.set_attribute('key3', 123.456)
+  tracer.in_span('SELECT') do |child2|
+    child2.set_attribute('db.system', 'mysql')
+    child2.set_attribute('db.statement', 'SELECT * FROM posts LIMIT 100')
   end
 
   puts("trace URL: #{Uptrace.trace_url(main)}")
@@ -64,5 +71,7 @@ OpenTelemetry.tracer_provider.shutdown
 ## Links
 
 - [Examples](example)
-- [Documentation](https://uptrace.dev/get/uptrace-ruby.html)
-- [Instrumentations](https://uptrace.dev/opentelemetry/instrumentations/?lang=ruby)
+- [Documentation](https://uptrace.dev/get/opentelemetry-ruby.html)
+- [OpenTelemetry Instrumentations](https://uptrace.dev/opentelemetry/instrumentations/?lang=ruby)
+- [OpenTelemetry Rails](https://uptrace.dev/opentelemetry/instrumentations/ruby-rails.html)
+- [OpenTelemetry Sinatra](https://uptrace.dev/opentelemetry/instrumentations/ruby-sinatra.html)

data/lib/uptrace/client.rb

@@ -17,7 +17,7 @@ module Uptrace
         Uptrace.logger.error("Uptrace is disabled: #{e.message}")
         @disabled = true
 
-        @dsn = DSN.new('https://TOKEN@uptrace.dev/PROJECT_ID')
+        @dsn = DSN.new('https://TOKEN@uptrace.dev')
       end
     end
 
@@ -30,7 +30,8 @@ module Uptrace
     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}"
+      span_id = span.context.hex_span_id
+      "#{@dsn.site_url}/traces/#{trace_id}?span_id=#{span_id}"
     end
   end
 end

data/lib/uptrace/dsn.rb

@@ -3,7 +3,7 @@
 module Uptrace
   # Uptrace DSN
   class DSN
-    attr_reader :dsn, :scheme, :host, :port, :project_id, :token
+    attr_reader :dsn, :scheme, :host, :http_port, :token
 
     def initialize(dsn)
       raise ArgumentError, "DSN can't be empty" if dsn.empty?
@@ -17,8 +17,7 @@ module Uptrace
       @dsn = dsn
       @scheme = uri.scheme
       @host = uri.host
-      @port = uri.port
-      @project_id = uri.path.delete_prefix('/')
+      @http_port = uri.port
       @token = uri.user
 
       %w[scheme host].each do |k|
@@ -27,28 +26,24 @@ module Uptrace
       end
 
       @host = 'uptrace.dev' if @host == 'api.uptrace.dev'
-      return if @host != 'uptrace.dev'
-
-      %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
     end
 
     def to_s
       @dsn
     end
 
-    def app_addr
+    def site_url
       return 'https://app.uptrace.dev' if @host == 'uptrace.dev'
+      return "#{@scheme}://#{@host}:#{@http_port}" if @http_port != 443
 
-      "#{@scheme}://#{@host}:#{@port}"
+      "#{@scheme}://#{@host}"
     end
 
-    def otlp_addr
+    def otlp_http_endpoint
       return 'https://otlp.uptrace.dev' if @host == 'uptrace.dev'
+      return "#{@scheme}://#{@host}:#{@http_port}" if @http_port != 443
 
-      "#{@scheme}://#{@host}:#{@port}"
+      "#{@scheme}://#{@host}"
     end
   end
 end

data/lib/uptrace/id_generator.rb

@@ -5,6 +5,9 @@ module Uptrace
   module IdGenerator
     extend self
 
+    # An invalid span identifier, an 8-byte string with all zero bytes.
+    INVALID_SPAN_ID = ("\0" * 8).b
+
     # Random number generator for generating IDs. This is an object that can
     # respond to `#bytes` and uses the system PRNG. The current logic is
     # compatible with Ruby 2.5 (which does not implement the `Random.bytes`
@@ -13,7 +16,7 @@ module Uptrace
     # the class `Random`.
     #
     # @return [#bytes]
-    RANDOM = Random.respond_to?(:bytes) ? Random : Random::DEFAULT
+    RANDOM = Random.respond_to?(:bytes) ? Random : Random.new
 
     # Generates a valid trace identifier, a 16-byte string with at least one
     # non-zero byte.
@@ -31,10 +34,10 @@ module Uptrace
     #
     # @return [String] a valid span ID.
     def generate_span_id
-      time = (Time.now.to_f * 1000).to_i
-      high = [time].pack('N')
-      low = RANDOM.bytes(4)
-      high << low
+      loop do
+        id = Random.bytes(8)
+        return id unless id == INVALID_SPAN_ID
+      end
     end
   end
 end

data/lib/uptrace/version.rb

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

data/lib/uptrace.rb

@@ -44,7 +44,7 @@ module Uptrace
 
   def span_processor(dsn)
     exporter = OpenTelemetry::Exporter::OTLP::Exporter.new(
-      endpoint: "#{dsn.otlp_addr}/v1/traces",
+      endpoint: "#{dsn.otlp_http_endpoint}/v1/traces",
       # Set the Uptrace DSN here or use UPTRACE_DSN env var.
       headers: { 'uptrace-dsn': dsn.to_s },
       compression: 'gzip'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uptrace
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.1
 platform: ruby
 authors:
 - Uptrace Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.2
+        version: 1.57.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.2
+        version: 1.57.2
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.33.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.33.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -181,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Uptrace Ruby exporter for OpenTelemetry