Skip to content

Commit

Permalink
Make traces exist gem
Browse files Browse the repository at this point in the history
- Added has-sampled.rb, which uses tracesExist
- Bumped zipkin-query to 0.1.0
-
Added tracesExist to thrift files and generated ruby code

Author: @jerryli9876
Fixes #105
URL: #105
  • Loading branch information
jerryli9876 committed Aug 10, 2012
1 parent 6047e9d commit 727bd00
Show file tree
Hide file tree
Showing 6 changed files with 209 additions and 33 deletions.
2 changes: 1 addition & 1 deletion zipkin-gems/zipkin-query/lib/zipkin-query/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
module ZipkinQuery
VERSION = "0.0.3"
VERSION = "0.1.0"
end

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 0 additions & 31 deletions zipkin-hadoop-job-runner/src/scripts/find_data.sh

This file was deleted.

118 changes: 118 additions & 0 deletions zipkin-hadoop-job-runner/src/scripts/has-sampled.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
#!/usr/bin/env ruby
# Copyright 2012 Twitter Inc.
#
# Licensed 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 'rubygems'
require 'zipkin-query'
require 'thrift_client'
require 'finagle-thrift'
require 'zookeeper'
require 'optparse'
require 'ostruct'
require 'set'

class OptparseHasSampledArguments

#
# Return a structure describing the options.
#
def self.parse(args)
# The options specified on the command line will be collected in *options*.
# We set default values here.
options = OpenStruct.new
options.input = nil
options.output = nil
options.preprocessor = false

opts = OptionParser.new do |opts|
opts.banner = "Usage: run_job.rb -i INPUT -o OUTPUT"

opts.separator ""
opts.separator "Specific options:"

opts.on("-i", "--input INPUT",
"The INPUT file to read from") do |input|
options.input = input
end

opts.on("-o", "--output OUTPUT",
"The OUTPUT file to write to") do |output|
options.output = output
end

opts.separator ""
opts.separator "Common options:"
opts.on_tail("-h", "--help", "Show this message") do
puts opts
exit
end
end
opts.parse!(args)
options
end
end

options = OptparseHasSampledArguments.parse(ARGV)

$config = {
:zipkin_query_host => "localhost", #whatever the collector is
:zipkin_query_port => 9411,
:skip_zookeeper => true
}

def sampled_traces(trace_ids)
result = false
traces = nil
ZipkinQuery::Client.with_transport($config) do |client|
traces = client.tracesExist(trace_ids)
end
return traces
end

def get_trace_id(line)
return line.split("\t")[1].to_i
end

File.open(options.output, 'w') do |out_file|
trace_list = []
File.open(options.input, 'r').each do |line|
trace_list = trace_list << get_trace_id(line)
end
sampled = sampled_traces(trace_list)
File.open(options.input, 'r').each do |line|
if (sampled.include?(get_trace_id(line)))
out_file.print line
puts line
end
end
end

=begin
h = Hash.new
File.open(options.input, 'r').each do |line|
ary = line.split("\t")
if h[ary[0]] == nil
h[ary[0]] = Array.new(1, ary[1].to_i)
else
h[ary[0]] = h[ary[0]] << ary[1].to_i
end
end
ary = Array.new()
h.each do |service, traces|
p sampled_traces(traces)
end
=end
14 changes: 14 additions & 0 deletions zipkin-hadoop/src/scripts/run_all_jobs.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
#!/usr/bash/env ruby
# Copyright 2012 Twitter Inc.
#
# Licensed 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.

# Runs all scalding jobs in package com.twitter.zipkin.hadoop

require 'optparse'
Expand Down
16 changes: 15 additions & 1 deletion zipkin-hadoop/src/scripts/run_job.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
#!/usr/bash/env ruby
# Script that rxuns a single scalding job
# Copyright 2012 Twitter Inc.
#
# Licensed 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.

# Script that runs a single scalding job

require 'optparse'
require 'ostruct'
Expand Down

0 comments on commit 727bd00

Please sign in to comment.