skylight 0.3.21 → 0.4.0.alpha1

data/lib/skylight/util/ssl.rb

@@ -0,0 +1,50 @@
+require 'openssl'
+
+module Skylight
+  module Util
+    class SSL
+      DEFAULT_CA_FILE  = File.expand_path('../../data/cacert.pem', __FILE__)
+
+      def self.detect_ca_cert_file!
+        @ca_cert_file = false
+        if defined?(OpenSSL::X509::DEFAULT_CERT_FILE)
+          f = OpenSSL::X509::DEFAULT_CERT_FILE
+
+          if f && File.exist?(f)
+            @ca_cert_file = f
+          end
+        end
+      end
+
+      def self.detect_ca_cert_dir!
+        @ca_cert_dir = false
+        if defined?(OpenSSL::X509::DEFAULT_CERT_DIR)
+          d = OpenSSL::X509::DEFAULT_CERT_DIR
+
+          if d && File.exist?(d)
+            @ca_cert_dir = d
+          end
+        end
+      end
+
+      detect_ca_cert_file!
+      detect_ca_cert_dir!
+
+      def self.ca_cert_file?
+        !!@ca_cert_file
+      end
+
+      def self.ca_cert_dir?
+        !!@ca_cert_dir
+      end
+
+      def self.ca_cert_file_or_default
+        @ca_cert_file || DEFAULT_CA_FILE
+      end
+
+      def self.ca_cert_dir
+        @ca_cert_dir
+      end
+    end
+  end
+end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.3.21'
+  VERSION = '0.4.0-alpha1'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.4.0.alpha1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -41,34 +41,17 @@ files:
 - bin/skylight
 - ext/extconf.rb
 - ext/libskylight.yml
-- ext/rust_support/ruby.h
-- ext/skylight.h
-- ext/skylight.map
 - ext/skylight_native.c
-- ext/test/extconf.rb
-- ext/test/skylight_native_test.c
-- ext/test/skylight_test.h
 - lib/skylight.rb
 - lib/skylight/api.rb
 - lib/skylight/cli.rb
 - lib/skylight/compat.rb
 - lib/skylight/config.rb
 - lib/skylight/data/cacert.pem
-- lib/skylight/formatters.rb
 - lib/skylight/formatters/http.rb
 - lib/skylight/gc.rb
 - lib/skylight/helpers.rb
 - lib/skylight/instrumenter.rb
-- lib/skylight/messages.rb
-- lib/skylight/messages/error.rb
-- lib/skylight/messages/hello.rb
-- lib/skylight/messages/trace.rb
-- lib/skylight/messages/trace_envelope.rb
-- lib/skylight/metrics.rb
-- lib/skylight/metrics/ewma.rb
-- lib/skylight/metrics/meter.rb
-- lib/skylight/metrics/process_cpu_gauge.rb
-- lib/skylight/metrics/process_mem_gauge.rb
 - lib/skylight/middleware.rb
 - lib/skylight/native.rb
 - lib/skylight/normalizers.rb
@@ -98,18 +81,19 @@ files:
 - lib/skylight/probes/redis.rb
 - lib/skylight/railtie.rb
 - lib/skylight/subscriber.rb
+- lib/skylight/trace.rb
 - lib/skylight/util.rb
 - lib/skylight/util/allocation_free.rb
 - lib/skylight/util/clock.rb
-- lib/skylight/util/conversions.rb
 - lib/skylight/util/gzip.rb
+- lib/skylight/util/hostname.rb
 - lib/skylight/util/http.rb
 - lib/skylight/util/inflector.rb
 - lib/skylight/util/logging.rb
+- lib/skylight/util/multi_io.rb
 - lib/skylight/util/native_ext_fetcher.rb
-- lib/skylight/util/queue.rb
-- lib/skylight/util/task.rb
-- lib/skylight/util/uniform_sample.rb
+- lib/skylight/util/platform.rb
+- lib/skylight/util/ssl.rb
 - lib/skylight/vendor/active_support/notifications.rb
 - lib/skylight/vendor/active_support/notifications/fanout.rb
 - lib/skylight/vendor/active_support/notifications/instrumenter.rb
@@ -158,15 +142,6 @@ files:
 - lib/skylight/vendor/thread_safe/synchronized_cache_backend.rb
 - lib/skylight/version.rb
 - lib/skylight/vm/gc.rb
-- lib/skylight/worker.rb
-- lib/skylight/worker/builder.rb
-- lib/skylight/worker/collector.rb
-- lib/skylight/worker/connection.rb
-- lib/skylight/worker/connection_set.rb
-- lib/skylight/worker/embedded.rb
-- lib/skylight/worker/metrics_reporter.rb
-- lib/skylight/worker/server.rb
-- lib/skylight/worker/standalone.rb
 - lib/sql_lexer.rb
 - lib/sql_lexer/lexer.rb
 - lib/sql_lexer/string_scanner.rb
@@ -185,9 +160,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/ext/rust_support/ruby.h

@@ -1,93 +0,0 @@
-#ifndef __RUST_H__
-#define __RUST_H__
-
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-/**
- * Rust types
- */
-
-typedef struct {
-  char* data;
-  long len;
-} RustSlice;
-
-typedef void* RustVec;
-typedef void* RustString;
-
-bool rust_string_as_slice(RustString, RustSlice*);
-
-#define TO_S(VAL) \
-  RSTRING_PTR(rb_funcall(VAL, rb_intern("to_s"), 0))
-
-#define CHECK_NUMERIC(VAL)                        \
-  do {                                            \
-    if (TYPE(VAL) != T_BIGNUM &&                  \
-        TYPE(VAL) != T_FIXNUM) {                  \
-      rb_raise(rb_eArgError, "expected " #VAL " to be numeric but was '%s' (%s [%i])", \
-                TO_S(VAL), rb_obj_classname(VAL), TYPE(VAL)); \
-      return Qnil;                                \
-    }                                             \
-  } while(0)                                      \
-
-#define CHECK_TYPE(VAL, T)                        \
-  do {                                            \
-    if (TYPE(VAL) != T) {                         \
-      rb_raise(rb_eArgError, "expected " #VAL " to be " #T " but was '%s' (%s [%i])", \
-                TO_S(VAL), rb_obj_classname(VAL), TYPE(VAL)); \
-      return Qnil;                                \
-    }                                             \
-  } while(0)                                      \
-
-#define CHECK_FFI(success, message)               \
-  ({                                              \
-    if (!(success))                               \
-      rb_raise(rb_eRuntimeError, message);        \
-  })
-
-#define SLICE2STR(slice)                        \
-  ({                                            \
-    RustSlice s = (slice);                      \
-    VALUE str = rb_str_new(s.data, s.len);      \
-    rb_enc_associate(str, rb_utf8_encoding());  \
-    str;                                        \
-  })
-
-#define STR2SLICE(string)         \
-  ({                              \
-    RustSlice s;                  \
-    VALUE rb_str = (string);      \
-    s.data = RSTRING_PTR(rb_str); \
-    s.len = RSTRING_LEN(rb_str);  \
-    s;                            \
-  })
-
-#define RUSTSTR2STR(string)          \
-  ({                                 \
-    RustString s = (string);         \
-    RustSlice slice;                  \
-    CHECK_FFI(rust_string_as_slice(s, &slice), "Couldn't convert String to &str"); \
-    SLICE2STR(slice);                    \
-  })
-
-#endif
-
-#define My_Struct(name, Type, msg)                \
-  Get_Struct(name, self, Type, msg);              \
-
-#define Transfer_My_Struct(name, Type, msg)       \
-  My_Struct(name, Type, msg);                     \
-  DATA_PTR(self) = NULL;                          \
-
-#define Transfer_Struct(name, obj, Type, msg)     \
-  Get_Struct(name, obj, Type, msg);               \
-  DATA_PTR(obj) = NULL;                           \
-
-#define Get_Struct(name, obj, Type, msg)          \
-  Type name;                                      \
-  Data_Get_Struct(obj, Type, name);               \
-  if (name == NULL) {                             \
-    rb_raise(rb_eRuntimeError, "%s", msg);        \
-  }

data/ext/skylight.h

@@ -1,85 +0,0 @@
-#ifndef __SKYLIGHT_H__
-#define __SKYLIGHT_H__
-
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <rust_support/ruby.h>
-
-/**
- * TODO: This is copied from rust_support
- */
-
-bool skylight_string_as_slice(RustString, RustSlice*);
-
-#define SKYLIGHT_RUSTSTR2STR(string)          \
-  ({                                 \
-    RustString s = (string);         \
-    RustSlice slice;                  \
-    CHECK_FFI(skylight_string_as_slice(s, &slice), "Couldn't convert String to &str"); \
-    SLICE2STR(slice);                    \
-  })
-
-/**
- * Externed Rust functions from libskylight
- */
-
-typedef void * RustSerializer;
-typedef void * RustHello;
-typedef void * RustError;
-typedef void * RustTrace;
-typedef void * RustBatch;
-
-void factory();
-
-// Rust skylight_hello prototypes
-bool skylight_hello_new(RustSlice, uint32_t, RustHello*);
-bool skylight_hello_free(RustHello);
-bool skylight_hello_load(RustSlice, RustHello*);
-bool skylight_hello_cmd_add(RustHello, RustSlice);
-bool skylight_hello_get_version(RustHello, RustSlice*);
-bool skylight_hello_cmd_length(RustHello, uint32_t*);
-bool skylight_hello_get_cmd(RustHello, uint32_t, RustSlice*);
-bool skylight_hello_get_serializer(RustHello, RustSerializer*);
-bool skylight_hello_serialize(RustHello, RustSerializer, RustSlice);
-bool skylight_high_res_time(uint64_t*);
-
-// Rust skylight_trace prototypes
-bool skylight_trace_new(uint64_t, RustSlice, RustTrace*);
-bool skylight_trace_free(RustTrace);
-bool skylight_trace_name_from_serialized_into_new_buffer(RustSlice, RustString*);
-bool skylight_trace_get_started_at(RustTrace, uint64_t*);
-bool skylight_trace_set_name(RustTrace, RustSlice);
-bool skylight_trace_get_name(RustTrace, RustSlice*);
-bool skylight_trace_get_uuid(RustTrace, RustSlice*);
-bool skylight_trace_start_span(RustTrace, uint64_t, RustSlice, uint32_t*);
-bool skylight_trace_stop_span(RustTrace, uint32_t, uint64_t);
-bool skylight_trace_span_set_title(RustTrace, uint64_t, RustSlice);
-bool skylight_trace_span_set_description(RustTrace, uint64_t, RustSlice);
-bool skylight_trace_get_serializer(RustTrace, RustSerializer*);
-bool skylight_trace_serialize(RustTrace, RustSerializer, RustSlice);
-
-// Batch methods
-bool skylight_batch_new(uint32_t, RustSlice*, RustBatch*);
-bool skylight_batch_free(RustBatch);
-bool skylight_batch_set_endpoint_count(RustBatch, RustSlice, uint64_t);
-bool skylight_batch_move_in(RustBatch, RustSlice);
-bool skylight_batch_get_serializer(RustBatch, RustSerializer*);
-bool skylight_batch_serialize(RustBatch, RustSerializer, RustSlice);
-
-// Error methods
-bool skylight_error_new(RustSlice, RustSlice, RustError*);
-bool skylight_error_free(RustError);
-bool skylight_error_load(RustSlice, RustError*);
-bool skylight_error_get_group(RustError, RustSlice*);
-bool skylight_error_get_description(RustError, RustSlice*);
-bool skylight_error_get_details(RustError, RustSlice*);
-bool skylight_error_set_details(RustError, RustSlice);
-bool skylight_error_get_serializer(RustError, RustSerializer*);
-bool skylight_error_serialize(RustError, RustSerializer, RustSlice);
-
-bool skylight_serializer_get_serialized_size(RustSerializer, size_t*);
-bool skylight_serializer_free(RustSerializer);
-
-#endif

data/ext/skylight.map

@@ -1,4 +0,0 @@
-{
-  global: Init_skylight_native;
-  local: *;
-};

data/ext/test/extconf.rb

@@ -1,18 +0,0 @@
-require 'mkmf'
-
-have_header 'dlfcn.h'
-
-find_header("rust_support/ruby.h", "..") || abort("No rust_support")
-find_library("skylight_test", "skylight_test_factory", ".") || abort("No skylight_test")
-
-$CFLAGS << " -Werror"
-if RbConfig::CONFIG["arch"] =~ /darwin(\d+)?/
-  $LDFLAGS << " -lpthread"
-else
-  $LDFLAGS << " -Wl"
-  $LDFLAGS << " -lrt -ldl -lm -lpthread"
-end
-
-CONFIG['warnflags'].gsub!('-Wdeclaration-after-statement', '')
-
-create_makefile 'skylight_native_test', '.'

data/ext/test/skylight_native_test.c

@@ -1,82 +0,0 @@
-#include <ruby.h>
-#include "skylight_test.h"
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
-#endif
-
-VALUE rb_mSkylightTest;
-VALUE rb_mNumeric;
-VALUE rb_mStrings;
-VALUE rb_mStructs;
-VALUE rb_cPerson;
-
-static VALUE numeric_multiply(VALUE klass, VALUE a, VALUE b) {
-  CHECK_NUMERIC(a);
-  CHECK_NUMERIC(b);
-
-  uint64_t ret;
-
-  CHECK_FFI(skylight_test_numeric_multiply(NUM2ULL(a), NUM2ULL(b), &ret), "could not multiply");
-
-  return ULL2NUM(ret);
-}
-
-static VALUE strings_multiple(VALUE klass, VALUE input) {
-  CHECK_TYPE(input, T_STRING);
-
-  RustString string;
-
-  CHECK_FFI(skylight_test_strings_reverse(STR2SLICE(input), &string), "could not reverse");
-
-  return RUSTSTR2STR(string);
-}
-
-static const char* freedPerson = "You can't do anything with a Person once it is freed";
-
-static VALUE person_new(VALUE klass, VALUE name, VALUE age) {
-  CHECK_TYPE(name, T_STRING);
-  CHECK_NUMERIC(age);
-
-  RustPerson person;
-
-  CHECK_FFI(skylight_test_person_new(STR2SLICE(name), NUM2ULL(age), &person), "could not create new Person");
-
-  return Data_Wrap_Struct(rb_cPerson, NULL, skylight_test_person_free, person);
-}
-
-static VALUE person_get_name(VALUE self) {
-  My_Struct(person, RustPerson, freedPerson);
-
-  RustSlice name;
-
-  CHECK_FFI(skylight_test_person_get_name(person, &name), "could not get person name");
-
-  return SLICE2STR(name);
-}
-
-static VALUE person_get_age(VALUE self) {
-  My_Struct(person, RustPerson, freedPerson);
-
-  uint64_t age;
-
-  CHECK_FFI(skylight_test_person_get_age(person, &age), "could not get person age");
-
-  return ULL2NUM(age);
-}
-
-void Init_skylight_native_test() {
-  rb_mSkylightTest = rb_define_module("SkylightTest");
-  rb_mNumeric = rb_define_module_under(rb_mSkylightTest, "Numeric");
-  rb_mStrings = rb_define_module_under(rb_mSkylightTest, "Strings");
-  rb_mStructs = rb_define_module_under(rb_mSkylightTest, "Structs");
-  rb_cPerson = rb_define_class_under(rb_mStructs, "Person", rb_cObject);
-  
-  rb_define_singleton_method(rb_mNumeric, "multiply", numeric_multiply, 2);
-
-  rb_define_singleton_method(rb_mStrings, "reverse", strings_multiple, 1);
-
-  rb_define_singleton_method(rb_cPerson, "new", person_new, 2);
-  rb_define_method(rb_cPerson, "name", person_get_name, 0);
-  rb_define_method(rb_cPerson, "age", person_get_age, 0);
-}