Skip to content

Commit 32c555b

Browse files
Fix ci and rename gem'name
1 parent 5cbb476 commit 32c555b

File tree

82 files changed

+69
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+69
-68
lines changed
Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,35 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
name: Ruby
17+
name: CI
1818

1919
on:
2020
pull_request:
2121
push:
2222
branches:
2323
- main
24+
tags:
25+
- 'v*'
2426
schedule:
2527
- cron: '0 18 * * *'
2628

29+
concurrency:
30+
group: CI-plugin-e2e-${{ github.event.pull_request.number || github.ref }}
31+
cancel-in-progress: true
32+
2733
jobs:
2834
build:
2935
runs-on: ubuntu-latest
3036
name: Ruby ${{ matrix.ruby }}
3137
strategy:
38+
fail-fast: true
3239
matrix:
3340
ruby:
3441
- '3.2'
3542

3643
steps:
37-
- uses: actions/checkout@v4
38-
- name: Set up Ruby
39-
uses: ruby/setup-ruby@v1
40-
with:
41-
ruby-version: ${{ matrix.ruby }}
42-
bundler-cache: true
44+
- name: Set up Ruby
45+
uses: ruby/setup-ruby@v1
46+
with:
47+
ruby-version: ${{ matrix.ruby }}
48+
bundler-cache: true

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ AllCops:
1717
NewCops: enable
1818
Exclude:
1919
- 'examples/**/*'
20-
- 'skywalking_ruby.gemspec'
21-
- 'lib/skywalking_ruby/proto/**/*'
20+
- 'skywalking.gemspec'
21+
- 'lib/skywalking/proto/**/*'
2222
- 'vendor/**/*'
2323
TargetRubyVersion: 3.0
2424

Gemfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515

1616
source 'https://rubygems.org'
1717

18-
gemspec name: 'skywalking_ruby'
18+
gemspec name: 'skywalking'
1919

20-
ruby ">= 3.0.0"
21-
gem 'grpc'
22-
gem 'grpc-tools'
23-
gem 'sinatra'
24-
gem 'redis'
25-
gem 'puma'
20+
ruby ">= 3.0.0"

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515

1616
ROOT_DIR = File.expand_path('', __dir__)
17-
OUT_DIR = File.join(ROOT_DIR, 'lib', 'skywalking_ruby/proto/')
17+
OUT_DIR = File.join(ROOT_DIR, 'lib', 'skywalking/proto/')
1818

1919
task :gen_protos do
2020
system "gem install grpc grpc-tools"

docs/How-to-release.md

Lines changed: 1 addition & 1 deletion

examples/rails-demo/config/initializers/skywalking_ruby.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
require_relative '../../../../lib/skywalking_ruby'
16+
require_relative '../../../../lib/skywalking'
1717

18-
SkywalkingRuby.start
18+
Skywalking.start

examples/sinatra-demo/sinatra-demo.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
require 'sinatra'
1717
require 'redis'
1818

19-
require_relative '../../lib/skywalking_ruby'
20-
SkywalkingRuby.start
19+
require_relative '../../lib/skywalking'
20+
Skywalking.start
2121

2222
get '/sw' do
2323
"Hello, SkyWalking!"
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
require_relative 'skywalking_ruby/log/logger'
17-
require_relative 'skywalking_ruby/agent'
16+
require_relative 'skywalking/log/logger'
17+
require_relative 'skywalking/agent'
1818

19-
module SkywalkingRuby
19+
module Skywalking
2020
class << self
2121
def start(config = nil)
2222
if started?
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
require_relative 'tracing/segment'
2323
require_relative 'tracing/tag'
2424

25-
module SkywalkingRuby
25+
module Skywalking
2626
# @api private
2727
class Agent
2828
LOCK = Mutex.new
@@ -74,7 +74,7 @@ def initialize(config)
7474
end
7575

7676
def environment
77-
@environment ||= SkywalkingRuby::Environment.instance
77+
@environment ||= Skywalking::Environment.instance
7878
end
7979

8080
def start!
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
require 'yaml'
1717
require 'logger'
1818

19-
module SkywalkingRuby
19+
module Skywalking
2020
class Configuration
2121
DEFAULTS = {
2222
:service_name => {
@@ -41,7 +41,7 @@ class Configuration
4141
},
4242
:log_file => {
4343
type: :string,
44-
default: 'skywalking_ruby.log',
44+
default: 'skywalking.log',
4545
desc: 'The name of the log file'
4646
},
4747
:log_file_path => {
@@ -231,7 +231,7 @@ def log_destination
231231
elsif !agent_config[:log_file].nil?
232232
agent_config[:log_file]
233233
elsif !agent_config[:log_file_path].nil?
234-
"#{agent_config[:log_file_path]}/skywalking_ruby.log"
234+
"#{agent_config[:log_file_path]}/skywalking.log"
235235
else
236236
$stdout
237237
end

0 commit comments

Comments
 (0)