skywalking 0.0.0.alpha → 0.0.0.beta2

data/lib/skywalking/plugins_manager.rb

@@ -34,7 +34,7 @@ module Skywalking
         Dir[File.join(__dir__, 'plugins', '*.rb')].each { |file| require file }
 
         installed_plugins = self.class.installed.keys
-        @enabled_plugins ||= installed_plugins - @config[:disable_plugins].split(',')
+        @enabled_plugins ||= installed_plugins - @config[:disable_plugins].split(',').map(&:to_sym)
         @enabled_plugins.each do |plugin_name|
           self.class.installed[plugin_name].try_install(plugin_name)
         end

data/lib/skywalking/reporter/buffer_trigger.rb

@@ -83,7 +83,7 @@ module Skywalking
               endTime: span.end_time,
               operationName: span.operation,
               peer: span.peer,
-              spanType: Tracing.find_mapping(Tracing::Kind, span.kind),
+              spanType: span.kind,
               spanLayer: span.layer,
               componentId: span.component,
               refs: span.refs.select { |ref| ref.trace_id }.map do |ref|

data/lib/skywalking/reporter/client/grpc_client.rb

@@ -26,7 +26,7 @@ module Skywalking
           def initialize(config)
             @config = config
             @management_service ||= ManagementServiceStub.new(
-              @config[:collector_backend_service],
+              @config[:collector_backend_services],
               :this_channel_is_insecure
             )
           end
@@ -97,7 +97,7 @@ module Skywalking
           def initialize(config)
             @config = config
             @trace_service ||= TraceSegmentReportServiceStub.new(
-              @config[:collector_backend_service],
+              @config[:collector_backend_services],
               :this_channel_is_insecure
             )
           end

data/lib/skywalking/reporter/report.rb

@@ -14,7 +14,7 @@
 #  limitations under the License.
 
 require_relative 'grpc'
-require_relative 'Scheduler'
+require_relative 'scheduler'
 require_relative 'buffer_trigger'
 
 module Skywalking

data/lib/skywalking/tracing/carrier.rb

@@ -20,7 +20,8 @@ module Skywalking
   module Tracing
     class Carrier < CarrierItem
       attr_reader :trace_id, :correlation_carrier, :service_instance,
-        :endpoint, :segment_id, :span_id, :peer
+        :endpoint, :segment_id, :span_id,
+        :peer, :items, :iter_index, :service
 
       def initialize(
         trace_id: '',
@@ -47,7 +48,7 @@ module Skywalking
         @correlation_carrier.correlation = correlation unless correlation.nil?
       end
 
-      def val
+      def value
         [
           '1',
           Base64.strict_encode64(@trace_id),
@@ -56,11 +57,11 @@ module Skywalking
           Base64.strict_encode64(@service),
           Base64.strict_encode64(@service_instance),
           Base64.strict_encode64(@endpoint),
-          Base64.strict_encode64(@client_address)
+          Base64.strict_encode64(@peer)
         ].join('-')
       end
 
-      def val=(val)
+      def value=(val)
         @val = val
         return if val.nil? || val.empty?
 
@@ -73,13 +74,13 @@ module Skywalking
         @service = Base64.strict_decode64(parts[4])
         @service_instance = Base64.strict_decode64(parts[5])
         @endpoint = Base64.strict_decode64(parts[6])
-        @client_address = Base64.strict_decode64(parts[7])
+        @peer = Base64.strict_decode64(parts[7])
       end
 
       def valid?
         !@trace_id.empty? && !@segment_id.empty? && !@service.empty? &&
           !@service_instance.empty? && !@endpoint.empty? &&
-          !@client_address.empty? && @span_id.match?(/^\d+$/)
+          !@peer.empty? && @span_id.match?(/^\d+$/)
       end
 
       def suppressed?
@@ -99,13 +100,13 @@ module Skywalking
         @correlation = {}
       end
 
-      def val
+      def value
         return '' if @correlation.nil? || @correlation.empty?
 
         @correlation.map { |k, v| "#{Base64.strict_encode64(k)}:#{Base64.strict_encode64(v)}" }.join(',')
       end
 
-      def val=(val)
+      def value=(val)
         @val = val
         return if val.nil? || val.empty?
 

data/lib/skywalking/tracing/constants.rb

@@ -17,33 +17,28 @@ module Skywalking
   module Tracing
     module Component
       Unknown = 0
+      HttpClient = 2
       Redis = 7
+      Memcached = 20
+      Elasticsearch = 47
       General = 12000
       Sinatra = 12001
     end
 
     module Layer
-      Unknown = 0
-      Database = 1
-      RPCFramework = 2
-      Http = 3
-      MQ = 4
-      Cache = 5
-      FAAS = 6
+      Unknown = "Unknown".freeze
+      Database = "Database".freeze
+      RPCFramework = "RPCFramework".freeze
+      Http = "Http".freeze
+      MQ = "MQ".freeze
+      Cache = "Cache".freeze
+      FAAS = "FAAS".freeze
     end
 
     module Kind
-      Local = 0
-      Entry = 1
-      Exit = 2
-    end
-
-    def self.find_mapping(category, value)
-      category.constants.each do |const_name|
-        return const_name if category.const_get(const_name) == value
-      end
-
-      'Unknown'
+      Local = "Local".freeze
+      Entry = "Entry".freeze
+      Exit = "Exit".freeze
     end
   end
 end

data/lib/skywalking/tracing/exit_span.rb

@@ -33,7 +33,7 @@ module Skywalking
       end
 
       def cfg
-        @config ||= ::Skywalking::Agent.config
+        @config ||= ::Skywalking::Agent.agent_config
       end
 
       def inject

data/lib/skywalking/tracing/noop_span.rb

@@ -19,7 +19,7 @@ module Skywalking
   module Tracing
     class NoopSpan < Span
       def initialize(context: nil)
-        super(context: context, operation: '', kind: Tracing::Kind::EXIT)
+        super(context: context, operation: '', kind: Kind::Exit)
       end
 
       def extract(carrier) end

data/lib/skywalking/tracing/segment.rb

@@ -32,7 +32,7 @@ module Skywalking
       end
 
       def relate(trace_id)
-        @related_traces.shift if @related_traces.first.is_a?(Utils::IDGen.new)
+        @related_traces.pop if @related_traces[0].is_a?(Utils::IDGen)
         @related_traces << trace_id
       end
     end

data/lib/skywalking/tracing/span.rb

@@ -21,7 +21,7 @@ module Skywalking
   module Tracing
     class Span
       attr_accessor :operation, :inherit, :component,
-        :context, :tags, :peer, :layer
+        :context, :tags, :peer, :layer, :error_occurred
 
       attr_reader :stack_depth, :kind, :parent_id,
         :start_time, :end_time, :span_id, :refs
@@ -104,6 +104,7 @@ module Skywalking
 
         ref = SegmentRef.new(carrier)
         @refs << ref unless @refs.include?(ref)
+
         self
       end
     end

data/lib/skywalking/tracing/span_context.rb

@@ -36,7 +36,7 @@ module Skywalking
       end
 
       def cfg
-        @config ||= ::Skywalking::Agent.config
+        @config ||= ::Skywalking::Agent.agent_config
       end
 
       def ignore_check(operation, carrier: nil)
@@ -87,7 +87,7 @@ module Skywalking
         return span if span
 
         parent = peek
-        info 'create new entry span'
+        debug 'create new entry span'
         if parent && parent.kind == Kind::Entry && inherit == parent.component
           span = parent
           span.operation = operation
@@ -104,7 +104,7 @@ module Skywalking
         return span if span
 
         parent = peek
-        info 'create new local span'
+        debug 'create new local span'
         new_span(Span, parent, operation: operation, kind: Kind::Local)
       end
 
@@ -113,7 +113,7 @@ module Skywalking
         return span if span
 
         parent = peek
-        info 'create new exit span'
+        debug 'create new exit span'
 
         if parent && parent.kind == Kind::Exit && inherit == parent.inherit
           span = parent
@@ -201,9 +201,9 @@ module Skywalking
           end
         end
 
-        def new_exit_span(operation:, peer: nil, component: nil, &block)
+        def new_exit_span(operation:, peer: nil, component: nil, inherit: nil, &block)
           context = current_context
-          span = context.new_exit_span(operation, peer, component: component)
+          span = context.new_exit_span(operation, peer, component: component, inherit: inherit)
           span&.start
 
           begin

data/lib/skywalking/tracing/tag.rb

@@ -31,7 +31,7 @@ module Skywalking
         @key = 'http.method'
       end
     end
-    
+
     class TagHttpURL < Tag
       def initialize(val)
         super
@@ -39,11 +39,60 @@ module Skywalking
       end
     end
 
+    class TagHttpStatusCode < Tag
+      def initialize(val)
+        super
+        @key = 'http.status_code'
+      end
+    end
+
     class TagDbType < Tag
       def initialize(val)
         super
         @key = 'db.type'
       end
     end
+
+    class TagDbStatement < Tag
+      def initialize(val)
+        super
+        @key = 'db.statement'
+      end
+    end
+
+    class TagCacheType < Tag
+      def initialize(val)
+        super
+        @key = 'cache.type'
+      end
+    end
+
+    class TagCacheOp < Tag
+      def initialize(val)
+        super
+        @key = 'cache.op'
+      end
+    end
+
+    class TagCacheCmd < Tag
+      def initialize(val)
+        super
+        @key = 'cache.cmd'
+      end
+    end
+
+    class TagCacheKey < Tag
+      def initialize(val)
+        super
+        @key = 'cache.key'
+      end
+    end
+
+    class TagCacheMiss < Tag
+      def initialize(val)
+        super
+        @key = 'cache.miss'
+      end
+    end
   end
 end

data/lib/skywalking/version.rb

@@ -14,5 +14,5 @@
 #  limitations under the License.
 
 module Skywalking
-  VERSION = "0.0.0.alpha".freeze
+  VERSION = "0.0.0.beta2".freeze
 end

data/skywalking.gemspec

@@ -0,0 +1,58 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+require File.expand_path('lib/skywalking/version', __dir__)
+
+Gem::Specification.new do |spec|
+  spec.name = 'skywalking'
+  spec.version = Skywalking::VERSION
+  spec.authors = ['Apache SkyWalking Team']
+  spec.email = ['dev@skywalking.apache.org']
+
+  spec.summary = 'Skywalking Ruby Agent'
+  spec.description = 'The Ruby Agent for Apache SkyWalking'
+  spec.homepage = 'https://skywalking.apache.org/'
+  spec.license = 'Apache-2.0'
+  spec.required_ruby_version = '>= 3.0.0'
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = 'https://github.com/apache/skywalking-ruby'
+  spec.metadata["changelog_uri"] = 'https://github.com/apache/skywalking-ruby/blob/main/CHANGELOG.md'
+
+  files =
+    begin
+      `git ls-files`.split("\n")
+    rescue StandardError
+      Dir.glob("**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
+    end
+  spec.files = files
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  # Communication with OAP
+  spec.add_dependency 'grpc', '~> 1.68.0'
+
+  # Base dev dependency
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '13.2.1'
+  spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'rubocop', '1.69.2'
+  spec.add_development_dependency 'rubocop-performance', '1.23.0'
+  spec.add_development_dependency 'bigdecimal', '3.1.5'
+
+  # E2E test dependency
+  spec.add_development_dependency 'testcontainers-compose', '~> 0.2.0'
+  spec.add_development_dependency 'faraday', '~> 2.12'
+end

data/spec/fixtures/agent.yaml

@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+common: &defaults
+  service_name: Ruby-Agent-Common
+  log_level: debug
+
+development:
+  <<: *defaults
+  service_name: Ruby-Agent-Development
+
+test:
+  <<: *defaults
+  service_name: Ruby-Agent-Test
+
+production:
+  <<: *defaults
+  service_name: Ruby-Agent-Production
+  

data/spec/scenarios/common/Dockerfile.agent

@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG SW_RUBY_VERSION
+
+FROM ruby:${SW_RUBY_VERSION}
+
+ARG ROOT=.
+
+WORKDIR /app
+
+ADD $ROOT /app
+
+RUN bundle

data/spec/scenarios/common/base-compose.yml

@@ -0,0 +1,46 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+version: '2.1'
+
+services:
+  oap:
+    image: ghcr.io/apache/skywalking-agent-test-tool/mock-collector:b6efe6af0a5499502b8cf8b76c7351e3f172a616
+    ports:
+      - "12800:12800"
+      - "19876:19876"
+    networks:
+      - gem
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/12800" ]
+      interval: 5s
+      timeout: 60s
+      retries: 120
+
+  agent:
+    build:
+      context: ../../../
+      dockerfile: spec/scenarios/common/Dockerfile.agent
+      args:
+        - SW_RUBY_VERSION=${SW_RUBY_VERSION:-3.0}
+    environment:
+      SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap:19876
+    networks:
+      - gem
+
+networks:
+  gem:

data/spec/scenarios/common/common_spec_helper.rb

@@ -0,0 +1,40 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+require 'testcontainers/compose'
+require 'faraday'
+require_relative 'validator'
+
+module CommonSpecHelper
+  include Validator
+
+  def test_plugin(plugin_name)
+    p "Now testing #{plugin_name} plugin"
+    expected_data = File.read(File.join(root_dir, 'expected.yml'))
+
+    with_retries do
+      resp = Faraday.post(data_validate_url) do |req|
+        req.body = expected_data
+        req.headers['Content-Type'] = 'application/x-yaml'
+      end
+      unless resp.status == 200
+        actual_data = Faraday.get(receive_data_url).body
+        raise "Data validation failed, actual Data: #{actual_data} and cause by: #{resp.body}"
+      end
+    end
+  end
+end
+
+

data/spec/scenarios/common/compose_context.rb

@@ -0,0 +1,39 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+RSpec.shared_context 'scenario value' do
+  let(:data_validate_url) { 'http://localhost:12800/dataValidate' }
+  let(:receive_data_url) { 'http://localhost:12800/receiveData' }
+end
+
+RSpec.shared_context 'compose' do
+  let(:client_url) { 'http://localhost:8080/execute' }
+
+  let(:compose) do
+    Testcontainers::ComposeContainer.new(
+      filepath: root_dir,
+      compose_filenames: ["docker-compose.yml"]
+    )
+  end
+
+  before(:each) do
+    compose.start
+    compose.wait_for_http(url: client_url, timeout: 800)
+  end
+
+  after(:each) do
+    compose.stop
+  end
+end

data/spec/scenarios/common/validator.rb

@@ -0,0 +1,41 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+module Validator
+  def with_retries(retries: 3, backoff_max: 16, backoff_base: 1)
+    return if retries < 0
+
+    backoff ||= 0
+
+    yield if block_given?
+  rescue SystemExit, Interrupt
+    raise
+  rescue Exception => e
+    p e
+    if retries.zero?
+      p "Retries exhausted"
+      raise e
+    else
+      retries -= 1
+      backoff = [backoff == 0 ? 1 : backoff * 2, backoff_max].min
+      backoff *= 0.5 * (1 + Kernel.rand)
+      backoff = [backoff_base, backoff].max
+      p "Retrying in #{backoff} seconds"
+
+      sleep backoff
+      retry
+    end
+  end
+end