aspecto-opentelemetry 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42bf7169cad40cd8e0fc53c8ef85c766f783330e06ed185c5bb14fcf48ce4d4d
-  data.tar.gz: aa44a60faa0b08052bbfb60458e53697fe6c11c22f0b64fe7285a4f4cec19635
+  metadata.gz: c6dc0881d253f1a91182a09ae64a3464bc935b63744ea68654011bb317b1278b
+  data.tar.gz: b42327874bf790cfa4d4fbcea31f84a4bd9a8e31cf94362329f25c195202ec4f
 SHA512:
-  metadata.gz: 81009b5b65381793e19eee34fb04c579a910952a4ad965b6b7879f69d15ac42477ec274380895a38a49b6fd31a991090a7ac7ab6ca9b1bbc27da524ceae23971
-  data.tar.gz: 2a1ac520558ef20b6fa09e7cad8c310b0507336ed7f1ab715bfe42ae8ab2df5dd8670e7132810b009e7289298d4572d16370cf45b8199d9d318b8ea47917448d
+  metadata.gz: da5bc77255107ff1236861ab1ffcf61a98e27af86ad9a12787fa03f6d8d6ef3f32a7bb1de1032a717f0f51c647f59942924fd162e507c039d785f6b0272ea905
+  data.tar.gz: 905b157c77e02bb808ca5c4e5a2a644156b79be3fd8d39b2f8ebbc2a32c4cb7651d6ef4c6dec5b041d37ef574a05085a1d03dbc21f165ca5b32a217c613f6482

data/README.md

@@ -1,5 +1,7 @@
 # Aspecto::OpenTelemetry
 
+[![Gem Version](https://badge.fury.io/rb/aspecto-opentelemetry.svg)](https://badge.fury.io/rb/aspecto-opentelemetry)
+
 Aspecto's SDK for ruby.  
 This gem is a distribution of OpenTelemetry pre-configured to use all available instrumentations and export trace data to Aspecto.
 
@@ -97,14 +99,18 @@ The only required config options are [`aspecto_auth`](https://app.aspecto.io/app
 
 ### Configuration Options
 
-| Option Name                          | Environment Variable                 | Type        | Default                                 | Description                                                                                                                                          |
-| ------------------------------------ | ------------------------------------ | ----------- | --------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `aspecto_auth`                       | `ASPECTO_AUTH`                       | UUID string | -                                       | Aspecto's [API key for authentication](https://app.aspecto.io/app/integration/api-key)                                                               |
-| `service_name`                       | `OTEL_SERVICE_NAME`                  | string      | -                                       | name of the service which is sending telemetry                                                                                                       |
-| `env`                                | `ASPECTO_ENV`                        | string      | extracted from rails or sinatra if used | deployment environment: `production` / `staging` / `development`, etc.                                                                               |
-| `log_level`                          | `OTEL_LOG_LEVEL`                     | string      | `ERROR`                                 | `ERROR` / `WARN` / `INFO`, etc.                                                                                                                      |
-| `sampling_ratio`                     | `ASPECTO_SAMPLING_RATIO`             | float       | 1.0                                     | How many of the traces starting in this service should be sampled. set to number in range [0.0, 1.0] where 0.0 is no sampling, and 1.0 is sample all |
-| `otel_exporter_otlp_traces_endpoint` | `OTEL_EXPORTER_OTLP_TRACES_ENDPOINT` | URL         | "https://otelcol.aspecto.io/v1/trace"   | Url                                                                                                                                                  |
+| Option Name | Environment Variable | Type | Default | Description |
+| --- | --- | --- | --- | --- |
+| `aspecto_auth` | `ASPECTO_AUTH` | UUID string | - | Aspecto's [API key](https://app.aspecto.io/app/integration/api-key) for authentication |
+| `service_name` | `OTEL_SERVICE_NAME` | string | - | Name of the service which is sending telemetry|
+| `env` | `ASPECTO_ENV` | string | Extracted from Rails or Sinatra if used | Deployment environment: `production` / `staging` / `development`, etc. |
+| `log_level` | `OTEL_LOG_LEVEL` | string | `ERROR` | `ERROR` / `WARN` / `INFO`, etc. |
+| `sampling_ratio` | `ASPECTO_SAMPLING_RATIO` | float | 1.0| How many of the traces starting in this service should be sampled. set to number in range [0.0, 1.0] where 0.0 is no sampling, and 1.0 is sample all |
+| `otel_exporter_otlp_traces_endpoint` | `OTEL_EXPORTER_OTLP_TRACES_ENDPOINT` | URL | `https://otelcol.aspecto.io/v1/trace` | Url |
+| `require_config_for_traces` | `ASPECTO_REQUIRE_CONFIG_FOR_TRACES` | boolean | `false` | When `true`, the SDK will not trace anything until remote sampling configuration arrives (few hundreds ms). Can be used to enforce sampling configuration is always applied, with the cost of losing traces generated during service startup. |
+| `extract_b3_context` | `ASPECTO_EXTRACT_B3_CONTEXT` | boolean | `false` | Set to `true` when the service receives requests from another instrumented component that propagate context via B3 protocol multi or single header. For example: Envoy Proxy, Ambassador and Istio |
+| `inject_b3_context_single_header` | `ASPECTO_INJECT_B3_CONTEXT_SINGLE_HEADER` | boolean | `false` | Set to `true` when the service send traffic to another instrumented component that propagate context via B3 **single header** protocol |
+| `inject_b3_context_multi_header` | `ASPECTO_INJECT_B3_CONTEXT_MULTI_HEADER` | boolean | `false` | Set to `true` when the service send traffic to another instrumented component that propagate context via B3 **multi header** protocol. For example: Envoy Proxy, Istio |
 
 ## Contributing
 

data/lib/aspecto/opentelemetry/config/remote_config.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "faraday"
-require "faraday_middleware"
 require "rufus/scheduler"
+require "net/http"
+require "json"
 
 require_relative "../sampler/rules_sampler"
 require_relative "../sampler/message_process_sampler"
@@ -17,12 +17,9 @@ module Aspecto
           @service_name = service_name
           @env = env
           @fallback_sampler = fallback_sampler
-
-          aspecto_config_url = ENV.fetch("ASPECTO_CONFIG_HOST", "https://config.aspecto.io")
-          @http_client = Faraday.new "#{aspecto_config_url}/config/#{aspecto_auth}" do |f|
-            f.response :json # decode response bodies as JSON
-          end
-          @http_client.options.timeout = 10
+          aspecto_config_host = ENV.fetch("ASPECTO_CONFIG_HOST", "https://config.aspecto.io")
+          @aspecto_config_url = URI("#{aspecto_config_host}/config/#{aspecto_auth}")
+          init_http_client
 
           @scheduler = Rufus::Scheduler.new
           @remote_config_poll_frequency = ENV.fetch("ASPECTO_REMOTE_CONFIG_POLL_FREQUENCY", "30s")
@@ -39,19 +36,36 @@ module Aspecto
 
         private
 
+        def init_http_client
+          write_timeout_supported = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6")
+
+          @http_client = Net::HTTP.new(@aspecto_config_url.host, @aspecto_config_url.port)
+          @http_client.read_timeout = 10
+          @http_client.open_timeout = 10
+          @http_client.write_timeout = 10 if write_timeout_supported
+          @http_client.max_retries = 0
+
+          # use uri.scheme == 'https' instead
+          @http_client.use_ssl = true
+          @http_client.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
+
         def update_config # rubocop:disable Metrics/AbcSize
           ::OpenTelemetry::Common::Utilities.untraced do
-            response = @http_client.get do |req|
-              req.headers["If-None-Match"] = @latest_config_etag unless @latest_config_etag.nil?
-            end
-            @latest_config_etag = response.headers["etag"]
-            return if response.status == 304
+            request = Net::HTTP::Get.new(@aspecto_config_url.path)
+            request["If-None-Match"] = @latest_config_etag unless @latest_config_etag.nil?
+            response = @http_client.request(request)
+            response_code = response.code.to_i
 
-            if response.status >= 400
+            return if response_code == 304
+
+            if response_code >= 400
               ::OpenTelemetry.logger.error("[Aspecto] error when trying to get remote config. will try again in #{@remote_config_poll_frequency}")
               return
             end
-            handle_new_config response.body if response.status < 300
+
+            @latest_config_etag = response["etag"]
+            handle_new_config JSON.parse(response.body) if response_code < 300
           end
         rescue StandardError => e
           ::OpenTelemetry.logger.error "[Aspecto] updating remote config failed. using previous remote config"

data/lib/aspecto/opentelemetry/configurator.rb

@@ -4,7 +4,9 @@ module Aspecto
   module OpenTelemetry
     # Aspecto OpenTelemetry Distro Configurator
     class Configurator
-      def initialize
+      TRUTHY_VALUES = %w[1 T t true TRUE True].freeze
+
+      def initialize # rubocop:disable Metrics/AbcSize
         # initialize config options from environment variables.
         # they can later be overwritten with configurator attribute setters
         # that have precedence over env
@@ -14,6 +16,12 @@ module Aspecto
         self.env = ENV["ASPECTO_ENV"] if ENV["ASPECTO_ENV"]
         self.sampling_ratio = Float(ENV.fetch("ASPECTO_SAMPLING_RATIO", 1.0))
         self.otel_exporter_otlp_traces_endpoint = ENV.fetch("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", "https://otelcol.aspecto.io/v1/trace")
+        self.require_config_for_traces = self.class.bool_env_variable "ASPECTO_REQUIRE_CONFIG_FOR_TRACES", false
+
+        # b3 propagattor
+        self.extract_b3_context = self.class.bool_env_variable "ASPECTO_EXTRACT_B3_CONTEXT", false
+        self.inject_b3_context_single_header = self.class.bool_env_variable "ASPECTO_INJECT_B3_CONTEXT_SINGLE_HEADER", false
+        self.inject_b3_context_multi_header = self.class.bool_env_variable "ASPECTO_INJECT_B3_CONTEXT_MULTI_HEADER", false
       end
 
       def service_name=(service_name)
@@ -24,7 +32,7 @@ module Aspecto
         @override_resource_attributes[::OpenTelemetry::SemanticConventions::Resource::DEPLOYMENT_ENVIRONMENT] = env
       end
 
-      attr_accessor :sampling_ratio, :log_level, :otel_exporter_otlp_traces_endpoint
+      attr_accessor :sampling_ratio, :log_level, :otel_exporter_otlp_traces_endpoint, :require_config_for_traces, :extract_b3_context, :inject_b3_context_single_header, :inject_b3_context_multi_header
       attr_reader :aspecto_auth
 
       def aspecto_auth=(aspecto_auth)
@@ -35,6 +43,13 @@ module Aspecto
       def config_override_resource
         ::OpenTelemetry::SDK::Resources::Resource.create(@override_resource_attributes)
       end
+
+      def self.bool_env_variable(env_variable_name, default_value)
+        env_value = ENV[env_variable_name]
+        return default_value if env_value.nil?
+
+        TRUTHY_VALUES.include?(env_value.strip)
+      end
     end
   end
 end

data/lib/aspecto/opentelemetry/propagator/aspecto.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "opentelemetry"
+require "opentelemetry-propagator-b3"
+
+module Aspecto
+  module OpenTelemetry
+    module Propagator
+      # Aspecto OpenTelemetry Propagator Configuration
+      module Aspecto
+        extend self
+
+        W3C_PROPAGATOR = ::OpenTelemetry::Trace::Propagation::TraceContext.text_map_propagator
+        B3_SINGLE_PROPAGATOR = ::OpenTelemetry::Propagator::B3::Single.text_map_propagator
+        B3_MULTI_PROPAGATOR = ::OpenTelemetry::Propagator::B3::Multi.text_map_propagator
+
+        def from_configurator(configurator)
+          injectors = [W3C_PROPAGATOR]
+          injectors.push(B3_SINGLE_PROPAGATOR) if configurator.inject_b3_context_single_header
+          injectors.push(B3_MULTI_PROPAGATOR) if configurator.inject_b3_context_multi_header
+
+          extractors = [W3C_PROPAGATOR]
+          extractors.push(B3_SINGLE_PROPAGATOR, B3_MULTI_PROPAGATOR) if configurator.extract_b3_context
+
+          ::OpenTelemetry::Context::Propagation::CompositeTextMapPropagator.compose(injectors: injectors, extractors: extractors)
+        end
+      end
+    end
+  end
+end

data/lib/aspecto/opentelemetry/sampler/message_process_sampler.rb

@@ -29,7 +29,7 @@ module Aspecto
         private
 
         def should_sample_processing(parent_context, links, name, attributes)
-          return if links.length.zero?
+          return if !links || links.length.zero?
 
           decision = link_decision(links[0])
 

data/lib/aspecto/opentelemetry/version.rb

@@ -2,6 +2,6 @@
 
 module Aspecto
   module OpenTelemetry
-    VERSION = "0.1.5"
+    VERSION = "0.1.8"
   end
 end

data/lib/aspecto/opentelemetry.rb

@@ -2,14 +2,15 @@
 
 require_relative "opentelemetry/version"
 require_relative "opentelemetry/configurator"
+require_relative "opentelemetry/propagator/aspecto"
 require_relative "opentelemetry/resource/detectors/aspecto"
-require_relative "opentelemetry/resource/detectors/deployment"
 require_relative "opentelemetry/config/remote_config"
 
 require "opentelemetry/sdk"
 require "opentelemetry/exporter/otlp"
 require "opentelemetry/instrumentation/all"
 require "opentelemetry-instrumentation-aws_sdk"
+require "opentelemetry-resource-detector-deployment"
 
 module Aspecto
   # Aspecto OpenTelemetry Distro
@@ -27,7 +28,7 @@ module Aspecto
       ::OpenTelemetry::SDK.configure do |c|
         c.logger = Logger.new($stdout, level: configurator.log_level)
         c.resource = Aspecto::OpenTelemetry::Resource::Detectors::Aspecto.detect
-        c.resource = Aspecto::OpenTelemetry::Resource::Detectors::Deployment.detect
+        c.resource = ::OpenTelemetry::Resource::Detector::Deployment.detect
         c.resource = configurator.config_override_resource # must be last
         c.use_all "OpenTelemetry::Instrumentation::ActionPack" => { enable_recognize_route: true },
                   "OpenTelemetry::Instrumentation::AwsSdk" => {
@@ -50,6 +51,15 @@ module Aspecto
         end
       end
 
+      # Propagation
+      ::OpenTelemetry.propagation = ::Aspecto::OpenTelemetry::Propagator::Aspecto.from_configurator configurator
+
+      # Sampling
+      if configurator.require_config_for_traces
+        ::OpenTelemetry.logger.info "[Aspecto] Require config for traces. Applying ALWAYS_OFF sampler"
+        ::OpenTelemetry.tracer_provider.sampler = ::OpenTelemetry::SDK::Trace::Samplers::ALWAYS_OFF
+      end
+
       fallback_sampler = ::OpenTelemetry::SDK::Trace::Samplers.trace_id_ratio_based(configurator.sampling_ratio)
       # TODO: how to properly extract the data from resource?
       _, service_name = ::OpenTelemetry.tracer_provider.resource.attribute_enumerator.detect { |elem| elem[0] == ::OpenTelemetry::SemanticConventions::Resource::SERVICE_NAME }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspecto-opentelemetry
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Aspecto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aspecto-opentelemetry-instrumentation-aws_sdk
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: opentelemetry-exporter-otlp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: opentelemetry-instrumentation-all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-exporter-otlp
+  name: opentelemetry-propagator-b3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-instrumentation-all
+  name: opentelemetry-resource-detector-deployment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -195,8 +195,8 @@ files:
 - lib/aspecto/opentelemetry.rb
 - lib/aspecto/opentelemetry/config/remote_config.rb
 - lib/aspecto/opentelemetry/configurator.rb
+- lib/aspecto/opentelemetry/propagator/aspecto.rb
 - lib/aspecto/opentelemetry/resource/detectors/aspecto.rb
-- lib/aspecto/opentelemetry/resource/detectors/deployment.rb
 - lib/aspecto/opentelemetry/sampler/condition.rb
 - lib/aspecto/opentelemetry/sampler/message_process_sampler.rb
 - lib/aspecto/opentelemetry/sampler/operator.rb

data/lib/aspecto/opentelemetry/resource/detectors/deployment.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Aspecto
-  module OpenTelemetry
-    module Resource
-      module Detectors
-        # Deployment contains detect class method for determining deployment resource attributes
-        module Deployment
-          extend self
-
-          def detect
-            resource_attributes = {}
-            deployment_environment = rails_env || sinatra_env || rack_env
-            resource_attributes[::OpenTelemetry::SemanticConventions::Resource::DEPLOYMENT_ENVIRONMENT] = deployment_environment if deployment_environment
-            ::OpenTelemetry::SDK::Resources::Resource.create(resource_attributes)
-          end
-
-          private
-
-          def rails_env
-            # rails extract env like this:
-            # https://github.com/rails/rails/blob/5647a9c1ced68d20338552d47a3b755e10a271c4/railties/lib/rails.rb#L74
-            # ActiveSupport::EnvironmentInquirer.new(ENV["RAILS_ENV"].presence || ENV["RACK_ENV"].presence || "development")
-            ::Rails.env.to_s if defined?(::Rails.env)
-          end
-
-          def rack_env
-            ENV["RACK_ENV"]
-          end
-
-          def sinatra_env
-            # https://github.com/sinatra/sinatra/blob/e69b6b9dee7165d3a583fc8a6af10ceee1ea687d/lib/sinatra/base.rb#L1801
-            # cases:
-            #
-            # 1. if sinatra is "require"d before the detector, then we return the value from the library
-            # this case will return the default "development" fallback if not env variable is set which is good.
-            #
-            # 2. if sinatra is "require"d after the detector, then:
-            # 2.1 if user is setting environment via 'APP_ENV' or 'RACK_ENV' then those value will be picked up and reported
-            # 2.2 else, the sinatra environment will fallback to "development", but detector will return nil for it.
-            # this issue is not covered, as when detector initialize the immutable resource, it has no way
-            # of knowing if "sinatra" will be required later or not.
-            (::Sinatra::Base.environment.to_s if defined?(::Sinatra::Base.environment)) || ENV["APP_ENV"]
-          end
-        end
-      end
-    end
-  end
-end