uptrace 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b337f4c98d5b7ec15fd132be2ca475d847670849bc962ccf07c1b81231b70e5
-  data.tar.gz: 3132ef5b3ba04a8164b2f9f86e73d36ecb317309939fa877fe3363e2a98a75cd
+  metadata.gz: 5f18ccfecc949d79b9c0e06850f440ce7f137dcb4111e2646bd730e9c51107cb
+  data.tar.gz: e1456ae29aa3fc8581e142ef858562033a6fc27e154718af9aeb49c2045385df
 SHA512:
-  metadata.gz: aab99b93dc7a4aa77851f90f1ff65b946a9698df3b88a701c5541163e294a67eabe00fd36ff24e31069a9d0443c286e8a2ac1d7113cda2eef8ee9bcf5bb7ea19
-  data.tar.gz: 55f723706b0dee67cd20b37bde410ea3da339eb5064bffa7586efbbe3057fc1305908af994f4e17f5f6f602a9a6401673dd72623f9c48adfbe5ad136cc93b235
+  metadata.gz: 90942bebaa75ea64f57609c70f4be2c50a4dd8e0809f9b059e7c9d8d25ba0aeb6c31c29ad731e878fbe9df208dcce2998d2fe2e6ad6abfb1731dedcbca2cfb69
+  data.tar.gz: fd117c9046126740d7181b378752e2f1cfc169599a4df073c5c0c6f0e9ff842fb32b70ed89fa1c1a7dc726ed7cd6a7d863e6894d2075d108bfaa66aae4af16fc

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/dsn.rb

@@ -28,11 +28,6 @@ module Uptrace
 
       @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

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`
@@ -20,8 +23,8 @@ module Uptrace
     #
     # @return [String] a valid trace ID.
     def generate_trace_id
-      time = (Time.now.to_f * 1_000_000).to_i
-      high = [time & 0xFFFFFFFF, time >> 32].pack('VV')
+      time = (Time.now.to_f * 1_000_000_000).to_i
+      high = [time >> 32, time & 0xFFFFFFFF].pack('NN')
       low = RANDOM.bytes(8)
       high << low
     end
@@ -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 = RANDOM.bytes(4)
-      low = [time].pack('V')
-      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.2'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uptrace
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Uptrace Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2023-06-22 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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   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