appoptics_apm 4.8.1 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2e2e925a2150a9a97dac408048583fd1885d8355d2a66d979f241c00f49af6f
-  data.tar.gz: '059674909659d4f8d06ec999b8a26303614830507c7604d5812995079d85be3f'
+  metadata.gz: df0f7977cb5f0fdf91217b32c632c0349fd66eedca4e3aec3a744c5a93db5fa3
+  data.tar.gz: b85f35a591b5ce51050cdbbc5a59e1ca8dd3aa92f62578419aaca710fa3e23f7
 SHA512:
-  metadata.gz: 21e6138222a9bdf7a8c5372d96e695e82d563c48eee46a628107c9465936774e660c4a5d03c55ed07216e6f92f097533eab87addbb3fc49300f619c3cfa38ec1
-  data.tar.gz: be0c942c8c041e34f95cf46a66e9372ba22893dc78f5efe8c22d10a0b158776db2a6b31892edf9f2c0db339ec241b3b99fe9c57182a39b3e0864b72a82bf0bf0
+  metadata.gz: 347da55c1ec4b00c842b217171a256dc97a04f4c8a9cf57f64cc2a595e2809dc0cacaa7e7e52a7a2635bf203f1706c8e86bc83a54071887a868f5362cfdf86c8
+  data.tar.gz: 80466d964db1077a415c8d4ca39f63b0cf3af8bdd68f1b1c564389d74bc156c60386dca008e85ba7afecdf4b3650aa5c519ab974b0c25b81a23559ee058aad8b

data/.gitignore

@@ -1,5 +1,5 @@
 oboe*.gem
-Gemfile.lock
+*.lock
 gemfiles/*.lock
 .ruby-version
 *~
@@ -27,3 +27,6 @@ coverage
 doc
 .*byebug*
 gemfiles/vendor*
+scrap*
+.irbrc
+*.code-workspace

data/.travis.yml

@@ -11,10 +11,11 @@ env:
   - DBTYPE=mysql
 
 rvm:
-  - 2.6.2
-  - 2.5.3
+  - 2.6.4
+  - 2.5.5
   - 2.4.5
-  - ruby-head
+  - 2.7.0-preview1
+#  - ruby-head
 #  - jruby-9.0.5.0
 
 gemfile:
@@ -23,6 +24,7 @@ gemfile:
   - gemfiles/instrumentation_mocked.gemfile
   - gemfiles/instrumentation_mocked_oldgems.gemfile
   - gemfiles/frameworks.gemfile
+  - gemfiles/rails60.gemfile
   - gemfiles/rails52.gemfile
   - gemfiles/rails42.gemfile
   - gemfiles/delayed_job.gemfile
@@ -32,17 +34,22 @@ matrix:
   exclude:
     - rvm: ruby-head
       gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.6.2
+    - rvm: 2.7.0-preview1
       gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.6.4
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/rails60.gemfile
 
-
-    - rmv: 2.6.2
+    - rvm: ruby-head
       env: DBTYPE=mysql
-    - rvm: 2.5.3
+    - rvm: 2.7.0-preview1
       env: DBTYPE=mysql
-    - rvm: 2.4.5
+    - rmv: 2.6.4
       env: DBTYPE=mysql
-    - rvm: ruby-head
+    - rvm: 2.5.5
+      env: DBTYPE=mysql
+    - rvm: 2.4.5
       env: DBTYPE=mysql
 
     - gemfile: gemfiles/unit.gemfile
@@ -57,10 +64,10 @@ matrix:
       env: DBTYPE=mysql
     - gemfile: gemfiles/frameworks.gemfile
       env: DBTYPE=mysql
-    - gemfile: gemfiles/rails51.gemfile
-      env: DBTYPE=mysql
     - gemfile: gemfiles/rails52.gemfile
       env: DBTYPE=mysql
+    - gemfile: gemfiles/rails60.gemfile
+      env: DBTYPE=mysql
     - gemfile: gemfiles/delayed_job.gemfile
       env: DBTYPE=mysql
 
@@ -80,42 +87,57 @@ matrix:
       env: DBTYPE=mysql2
   allow_failures:
     - rvm: ruby-head
+    - rvm: 2.7.0-preview1
 
 # FIXME: Figure out if this is still an issue when reviewing cassandra test setup
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484
 # Updated Cassandra: https://github.com/travis-ci/travis-ci/issues/1650
 
-before_install:
-  - sudo service cassandra stop
-  - sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /etc/cassandra/cassandra-env.sh"
-  - echo "127.0.0.1 localhost"  | sudo tee /etc/hosts
-  - echo "127.0.0.1 " `hostname` | sudo tee -a /etc/hosts
-  - sudo service cassandra start
+# the following is not working anymore on travis
+# commenting it out as per AO-13532 as we currently don't have instrumentation
+# for cassandra
+#before_install:
+#  - sudo service cassandra stop
+#  - sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /etc/cassandra/cassandra-env.sh"
+#  - echo "127.0.0.1 localhost"  | sudo tee /etc/hosts
+#  - echo "127.0.0.1 " `hostname` | sudo tee -a /etc/hosts
+#  - sudo service cassandra start
 
 install:
-  - curl -LO http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
-  - tar xzf swig-3.0.8.tar.gz
-  - pushd swig-3.0.8
+  - curl -LO http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3.0.12.tar.gz
+  - tar xzf swig-3.0.12.tar.gz
+  - pushd swig-3.0.12
   - ./configure && make && sudo make install
   - popd
 
 before_script:
+  - export APPOPTICS_GEM_TEST=true
+  - export APPOPTICS_REPORTER=file
+  - export APPOPTICS_COLLECTOR=/tmp/appoptics_traces.bson
+  - export APPOPTICS_REPORTER_FILE_SINGLE=false
+  - export APPOPTICS_TOKEN_BUCKET_CAPACITY=1000
+  - export APPOPTICS_TOKEN_BUCKET_RATE=1000
+  - export APPOPTICS_FROM_S3=true
+
   - bundle update --jobs=3 --retry=3
-  - bundle exec rake fetch_ext_deps
-  - bundle exec rake clean
-  - bundle exec rake compile
+  - bundle exec rake clean fetch compile
   - psql -c 'create database travis_ci_test;' -U postgres
   - mysql -e 'create database travis_ci_test;'
   - redis-server --requirepass secret_pass &
   - sleep 10
-  - export APPOPTICS_TOKEN_BUCKET_CAPACITY=1000
-  - export APPOPTICS_TOKEN_BUCKET_RATE=1000
 
-script: "N=1 bundle exec rake test"
+script: "bundle exec rake test"
 
 services:
   - mongodb
   - memcached
-  - cassandra
-#  - redis
+  - mysql
+#  - cassandra
+  - postgresql
+#  - redis-server
   - rabbitmq
+
+addons:
+  apt:
+    packages:
+      - rabbitmq-server

data/CONFIG.md

@@ -17,7 +17,7 @@ Name | Description | Default
 
 Name | Description | Default
 ---- | ----------- | -------
-`APPOPTICS_GEM_TEST` | puts the gem in test mode.  Traces are written to /tmp/trace_output.bson. | `false`
+`APPOPTICS_GEM_TEST` | puts the gem in test mode to avoid restarting certain background services used in testing.   `false`
 `DBTYPE` | For tests on Ruby on Rails, specifies the database type to test against.  `postgres`, `mysql` and `mysql2` are valid options. | `postgres`
 `APPOPTICS_CASSANDRA_SERVER` | specifies the Cassandra server to test against. | `127.0.0.1:9160`
 `APPOPTICS_MONGO_SERVER` | specifies the Mongo server to test against. | `127.0.0.1:27017`

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
+gem 'rake'
 
 group :development, :test do
-  gem 'rake'
   gem 'minitest'
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
@@ -18,12 +18,12 @@ group :development, :test do
   gem 'byebug'
   gem 'get_process_mem'
   gem 'memory_profiler'
-end
 
-if defined?(JRUBY_VERSION)
-  gem 'sinatra', :require => false
-else
-  gem 'sinatra'
+  if defined?(JRUBY_VERSION)
+    gem 'sinatra', :require => false
+  else
+    gem 'sinatra'
+  end
 end
 
 gemspec

data/README.md

@@ -390,4 +390,4 @@ See the README in the test directory.
 
 Copyright (c) 2018 SolarWinds, LLC
 
-Released under the [Librato Open License](https://docs.appoptics.com/kb/apm_tracing/librato-open-license/)
+Released under the [Librato Open License](https://docs.appoptics.com/kb/apm_tracing/librato-open-license/)

data/appoptics_apm.gemspec

@@ -32,6 +32,9 @@ Automatic tracing and metrics for Ruby applications. Get started at appoptics.co
               'ext/oboe_metal/src/bson/bson.h',
               'ext/oboe_metal/src/bson/platform_hacks.h',
               'ext/oboe_metal/src/VERSION']
+  s.files -= ['build_gem.sh',
+              'build_gem_upload_to_packagecloud.sh',
+              'Rakefile']
 
   # TODO this is commented out util we can actually provide gems for different platforms
   # it will create a gem that goes into noop on Darwin and other unsupported platforms
@@ -54,6 +57,6 @@ Automatic tracing and metrics for Ruby applications. Get started at appoptics.co
     s.add_development_dependency('benchmark-ips', '>= 2.7.2')
   end
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.4.0'
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 end

data/examples/SDK/01_basic_tracing.rb

@@ -63,8 +63,6 @@ def do_traced_work
   end
 end
 
-# Example with logging
 AppOpticsAPM::SDK.start_trace('outer_span_2') do
-  AppopticsAPM.logger.warn "Hello World!"
   do_traced_work
 end

data/ext/oboe_metal/README.md

@@ -0,0 +1,69 @@
+# Debug the c-code with gdb
+
+inspired by: https://dev.to/wataash/how-to-create-and-debug-ruby-gem-with-c-native-extension-3l8b
+
+
+## install ruby with sources
+
+rbenv is your friend ;) 😄 -k means keep sources
+
+```
+rbenv install -k 2.6.3
+rbenv shell 2.6.3
+
+# check that ruby is debuggable
+type ruby           # => ruby is /home/wsh/.rbenv/shims/ruby
+rbenv which ruby    # => /home/wsh/.rbenv/versions/2.6.3/bin/ruby
+```
+
+
+##
+## add debug info when compiling appoptics_apm
+add this line to extconf.rb to turn off optimization
+
+```
+CONFIG["optflags"] = "-O0"
+```
+
+
+##
+## start ruby app with gdb
+
+This will run ruby and load the app with a breakpoint in the Reporter::startThread
+c-function.
+
+`bundle exec gdb -q -ex 'set breakpoint pending on' -ex 'b Reporter::startThread' -ex run --args ruby -e 'require "./app"'`
+
+If there is a bug in the ruby code or a ruby byebug binding that halts the 
+script, the debugger will hang without showing any output. 
+So, make sure `bundle exec ruby app.rb` runs.
+
+use the gdb navigation commands to step through the code. If it says:
+
+```
+(gdb) n
+Single stepping until exit from function _ZN8Reporter11startThreadEv@plt,
+which has no line number information.
+```
+
+type `c` and it may end up stopping in the right location.
+
+##
+## make ruby .gdbinit macros available
+
+These macros are pretty elaborate. They are checked in the ruby github 
+repo: https://github.com/ruby/ruby/blob/master/.gdbinit
+The code is nicely formatted and colorized in github and easiest to read there.
+
+installation in the user's home dir:
+```
+wget https://github.com/ruby/ruby/blob/master/.gdbinit
+```
+##
+## examples
+
+Some inspiring examples here:
+
+https://jvns.ca/blog/2016/06/12/a-weird-system-call-process-vm-readv/
+
+https://medium.com/@zanker/finding-a-ruby-bug-with-gdb-56d6b321bc86

data/ext/oboe_metal/noop/noop.c

@@ -3,5 +3,6 @@
 /* ruby calls this to load the extension */
 void Init_oboe_noop(void) {
   /* assume we haven't yet defined Hola */
-  VALUE klass = rb_define_class("OboeNoop", rb_cObject);
+//  VALUE klass = rb_define_class("OboeNoop", rb_cObject);
+  rb_define_class("OboeNoop", rb_cObject);
 }

data/ext/oboe_metal/src/VERSION

@@ -1 +1 @@
-5.0.1
+7.0.0

data/ext/oboe_metal/src/bson/bson.h

@@ -25,196 +25,196 @@
 MONGO_EXTERN_C_START
 
 typedef enum {
-    bson_error=-1,
-    bson_eoo=0,
-    bson_double=1,
-    bson_string=2,
-    bson_object=3,
-    bson_array=4,
-    bson_bindata=5,
-    bson_undefined=6,
-    bson_oid=7,
-    bson_bool=8,
-    bson_date=9,
-    bson_null=10,
-    bson_regex=11,
-    bson_dbref=12, /* deprecated */
-    bson_code=13,
-    bson_symbol=14,
-    bson_codewscope=15,
-    bson_int = 16,
-    bson_timestamp = 17,
-    bson_long = 18
-} bson_type;
-
-typedef int bson_bool_t;
+    oboe_bson_error=-1,
+    oboe_bson_eoo=0,
+    oboe_bson_double=1,
+    oboe_bson_string=2,
+    oboe_bson_object=3,
+    oboe_bson_array=4,
+    oboe_bson_bindata=5,
+    oboe_bson_undefined=6,
+    oboe_bson_oid=7,
+    oboe_bson_bool=8,
+    oboe_bson_date=9,
+    oboe_bson_null=10,
+    oboe_bson_regex=11,
+    oboe_bson_dbref=12, /* deprecated */
+    oboe_bson_code=13,
+    oboe_bson_symbol=14,
+    oboe_bson_codewscope=15,
+    oboe_bson_int = 16,
+    oboe_bson_timestamp = 17,
+    oboe_bson_long = 18
+} oboe_bson_type;
+
+typedef int oboe_bson_bool_t;
 
 typedef struct {
     char * data;
-    bson_bool_t owned;
-} bson;
+    oboe_bson_bool_t owned;
+} oboe_bson;
 
 typedef struct {
     const char * cur;
-    bson_bool_t first;
-} bson_iterator;
+    oboe_bson_bool_t first;
+} oboe_bson_iterator;
 
 typedef struct {
     char * buf;
     char * cur;
     int bufSize;
-    bson_bool_t finished;
+    oboe_bson_bool_t finished;
     int stack[32];
     int stackPos;
-} bson_buffer;
+} oboe_bson_buffer;
 
 #pragma pack(1)
 typedef union{
     char bytes[12];  // Flawfinder: ignore
     int ints[3];
-} bson_oid_t;
+} oboe_bson_oid_t;
 #pragma pack()
 
-typedef int64_t bson_date_t; /* milliseconds since epoch UTC */
+typedef int64_t oboe_bson_date_t; /* milliseconds since epoch UTC */
 
 /* ----------------------------
    READING
    ------------------------------ */
 
 
-bson * bson_empty(bson * obj); /* returns pointer to static empty bson object */
-int bson_copy(bson* out, const bson* in); /* puts data in new buffer. NOOP if out==NULL */
-bson * bson_from_buffer(bson * b, bson_buffer * buf);
-bson * bson_init( bson * b , char * data , bson_bool_t mine );
-bson * bson_init_safe( bson * b , char * data , bson_bool_t mine , size_t buflen);
-int bson_size(const bson * b );
-void bson_destroy( bson * b );
+oboe_bson * oboe_bson_empty(oboe_bson * obj); /* returns pointer to static empty bson object */
+int oboe_bson_copy(oboe_bson* out, const oboe_bson* in); /* puts data in new buffer. NOOP if out==NULL */
+oboe_bson * oboe_bson_from_buffer(oboe_bson * b, oboe_bson_buffer * buf);
+oboe_bson * oboe_bson_init( oboe_bson * b , char * data , oboe_bson_bool_t mine );
+oboe_bson * oboe_bson_init_safe( oboe_bson * b , char * data , oboe_bson_bool_t mine , size_t buflen);
+int oboe_bson_size(const oboe_bson * b );
+void oboe_bson_destroy( oboe_bson * b );
 
-void bson_print( bson * b );
-void bson_print_raw( const char * bson , int depth );
+void oboe_bson_print( oboe_bson * b );
+void oboe_bson_print_raw( const char * bson , int depth );
 
 /* advances iterator to named field */
 /* returns bson_eoo (which is false) if field not found */
-bson_type bson_find(bson_iterator* it, const bson* obj, const char* name);
+oboe_bson_type oboe_bson_find(oboe_bson_iterator* it, const oboe_bson* obj, const char* name);
 
-void bson_iterator_init( bson_iterator * i , const char * bson );
+void oboe_bson_iterator_init( oboe_bson_iterator * i , const char * bson );
 
 /* more returns true for eoo. best to loop with bson_iterator_next(&it) */
-bson_bool_t bson_iterator_more( const bson_iterator * i );
-bson_type bson_iterator_next( bson_iterator * i );
+oboe_bson_bool_t oboe_bson_iterator_more( const oboe_bson_iterator * i );
+oboe_bson_type oboe_bson_iterator_next( oboe_bson_iterator * i );
 
-bson_type bson_iterator_type( const bson_iterator * i );
-const char * bson_iterator_key( const bson_iterator * i );
-const char * bson_iterator_value( const bson_iterator * i );
+oboe_bson_type oboe_bson_iterator_type( const oboe_bson_iterator * i );
+const char * oboe_bson_iterator_key( const oboe_bson_iterator * i );
+const char * oboe_bson_iterator_value( const oboe_bson_iterator * i );
 
 /* these convert to the right type (return 0 if non-numeric) */
-double bson_iterator_double( const bson_iterator * i );
-int bson_iterator_int( const bson_iterator * i );
-int64_t bson_iterator_long( const bson_iterator * i );
+double oboe_bson_iterator_double( const oboe_bson_iterator * i );
+int oboe_bson_iterator_int( const oboe_bson_iterator * i );
+int64_t oboe_bson_iterator_long( const oboe_bson_iterator * i );
 
 /* false: boolean false, 0 in any type, or null */
 /* true: anything else (even empty strings and objects) */
-bson_bool_t bson_iterator_bool( const bson_iterator * i );
+oboe_bson_bool_t oboe_bson_iterator_bool( const oboe_bson_iterator * i );
 
 /* these assume you are using the right type */
-double bson_iterator_double_raw( const bson_iterator * i );
-int bson_iterator_int_raw( const bson_iterator * i );
-int64_t bson_iterator_long_raw( const bson_iterator * i );
-bson_bool_t bson_iterator_bool_raw( const bson_iterator * i );
-bson_oid_t* bson_iterator_oid( const bson_iterator * i );
+double oboe_bson_iterator_double_raw( const oboe_bson_iterator * i );
+int oboe_bson_iterator_int_raw( const oboe_bson_iterator * i );
+int64_t oboe_bson_iterator_long_raw( const oboe_bson_iterator * i );
+oboe_bson_bool_t oboe_bson_iterator_bool_raw( const oboe_bson_iterator * i );
+oboe_bson_oid_t* oboe_bson_iterator_oid( const oboe_bson_iterator * i );
 
 /* these can also be used with bson_code and bson_symbol*/
-const char * bson_iterator_string( const bson_iterator * i );
-int bson_iterator_string_len( const bson_iterator * i );
+const char * oboe_bson_iterator_string( const oboe_bson_iterator * i );
+int oboe_bson_iterator_string_len( const oboe_bson_iterator * i );
 
 /* works with bson_code, bson_codewscope, and bson_string */
 /* returns NULL for everything else */
-const char * bson_iterator_code(const bson_iterator * i);
+const char * oboe_bson_iterator_code(const oboe_bson_iterator * i);
 
 /* calls bson_empty on scope if not a bson_codewscope */
-void bson_iterator_code_scope(const bson_iterator * i, bson * scope);
+void oboe_bson_iterator_code_scope(const oboe_bson_iterator * i, oboe_bson * scope);
 
 /* both of these only work with bson_date */
-bson_date_t bson_iterator_date(const bson_iterator * i);
-time_t bson_iterator_time_t(const bson_iterator * i);
+oboe_bson_date_t oboe_bson_iterator_date(const oboe_bson_iterator * i);
+time_t oboe_bson_iterator_time_t(const oboe_bson_iterator * i);
 
-int bson_iterator_bin_len( const bson_iterator * i );
-char bson_iterator_bin_type( const bson_iterator * i );
-const char * bson_iterator_bin_data( const bson_iterator * i );
+int oboe_bson_iterator_bin_len( const oboe_bson_iterator * i );
+char oboe_bson_iterator_bin_type( const oboe_bson_iterator * i );
+const char * oboe_bson_iterator_bin_data( const oboe_bson_iterator * i );
 
-const char * bson_iterator_regex( const bson_iterator * i );
-const char * bson_iterator_regex_opts( const bson_iterator * i );
+const char * oboe_bson_iterator_regex( const oboe_bson_iterator * i );
+const char * oboe_bson_iterator_regex_opts( const oboe_bson_iterator * i );
 
 /* these work with bson_object and bson_array */
-void bson_iterator_subobject(const bson_iterator * i, bson * sub);
-void bson_iterator_subiterator(const bson_iterator * i, bson_iterator * sub);
+void oboe_bson_iterator_subobject(const oboe_bson_iterator * i, oboe_bson * sub);
+void oboe_bson_iterator_subiterator(const oboe_bson_iterator * i, oboe_bson_iterator * sub);
 
 /* str must be at least 24 hex chars + null byte */
-void bson_oid_from_string(bson_oid_t* oid, const char* str);
-void bson_oid_to_string(const bson_oid_t* oid, char* str);
-void bson_oid_gen(bson_oid_t* oid);
+void oboe_bson_oid_from_string(oboe_bson_oid_t* oid, const char* str);
+void oboe_bson_oid_to_string(const oboe_bson_oid_t* oid, char* str);
+void oboe_bson_oid_gen(oboe_bson_oid_t* oid);
 
-time_t bson_oid_generated_time(bson_oid_t* oid); /* Gives the time the OID was created */
+time_t oboe_bson_oid_generated_time(oboe_bson_oid_t* oid); /* Gives the time the OID was created */
 
 /* ----------------------------
    BUILDING
    ------------------------------ */
 
-bson_buffer * bson_buffer_init( bson_buffer * b );
-bson_buffer * bson_ensure_space( bson_buffer * b , const int bytesNeeded );
+oboe_bson_buffer * oboe_bson_buffer_init( oboe_bson_buffer * b );
+oboe_bson_buffer * oboe_bson_ensure_space( oboe_bson_buffer * b , const int bytesNeeded );
 
 /**
  * @return the raw data.  you either should free this OR call bson_destroy not both
  */
-char * bson_buffer_finish( bson_buffer * b );
-void bson_buffer_destroy( bson_buffer * b );
-
-bson_buffer * bson_append_oid( bson_buffer * b , const char * name , const bson_oid_t* oid );
-bson_buffer * bson_append_int( bson_buffer * b , const char * name , const int i );
-bson_buffer * bson_append_long( bson_buffer * b , const char * name , const int64_t i );
-bson_buffer * bson_append_double( bson_buffer * b , const char * name , const double d );
-bson_buffer * bson_append_string( bson_buffer * b , const char * name , const char * str );
-bson_buffer * bson_append_symbol( bson_buffer * b , const char * name , const char * str );
-bson_buffer * bson_append_code( bson_buffer * b , const char * name , const char * str );
-bson_buffer * bson_append_code_w_scope( bson_buffer * b , const char * name , const char * code , const bson * scope);
-bson_buffer * bson_append_binary( bson_buffer * b, const char * name, char type, const char * str, int len );
-bson_buffer * bson_append_bool( bson_buffer * b , const char * name , const bson_bool_t v );
-bson_buffer * bson_append_null( bson_buffer * b , const char * name );
-bson_buffer * bson_append_undefined( bson_buffer * b , const char * name );
-bson_buffer * bson_append_regex( bson_buffer * b , const char * name , const char * pattern, const char * opts );
-bson_buffer * bson_append_bson( bson_buffer * b , const char * name , const bson* bson);
-bson_buffer * bson_append_element( bson_buffer * b, const char * name_or_null, const bson_iterator* elem);
+char * oboe_bson_buffer_finish( oboe_bson_buffer * b );
+void oboe_bson_buffer_destroy( oboe_bson_buffer * b );
+
+oboe_bson_buffer * oboe_bson_append_oid( oboe_bson_buffer * b , const char * name , const oboe_bson_oid_t* oid );
+oboe_bson_buffer * oboe_bson_append_int( oboe_bson_buffer * b , const char * name , const int i );
+oboe_bson_buffer * oboe_bson_append_long( oboe_bson_buffer * b , const char * name , const int64_t i );
+oboe_bson_buffer * oboe_bson_append_double( oboe_bson_buffer * b , const char * name , const double d );
+oboe_bson_buffer * oboe_bson_append_string( oboe_bson_buffer * b , const char * name , const char * str );
+oboe_bson_buffer * oboe_bson_append_symbol( oboe_bson_buffer * b , const char * name , const char * str );
+oboe_bson_buffer * oboe_bson_append_code( oboe_bson_buffer * b , const char * name , const char * str );
+oboe_bson_buffer * oboe_bson_append_code_w_scope( oboe_bson_buffer * b , const char * name , const char * code , const oboe_bson * scope);
+oboe_bson_buffer * oboe_bson_append_binary( oboe_bson_buffer * b, const char * name, char type, const char * str, int len );
+oboe_bson_buffer * oboe_bson_append_bool( oboe_bson_buffer * b , const char * name , const oboe_bson_bool_t v );
+oboe_bson_buffer * oboe_bson_append_null( oboe_bson_buffer * b , const char * name );
+oboe_bson_buffer * oboe_bson_append_undefined( oboe_bson_buffer * b , const char * name );
+oboe_bson_buffer * oboe_bson_append_regex( oboe_bson_buffer * b , const char * name , const char * pattern, const char * opts );
+oboe_bson_buffer * oboe_bson_append_bson( oboe_bson_buffer * b , const char * name , const oboe_bson* bson);
+oboe_bson_buffer * oboe_bson_append_element( oboe_bson_buffer * b, const char * name_or_null, const oboe_bson_iterator* elem);
 
 /* these both append a bson_date */
-bson_buffer * bson_append_date(bson_buffer * b, const char * name, bson_date_t millis);
-bson_buffer * bson_append_time_t(bson_buffer * b, const char * name, time_t secs);
+oboe_bson_buffer * oboe_bson_append_date(oboe_bson_buffer * b, const char * name, oboe_bson_date_t millis);
+oboe_bson_buffer * oboe_bson_append_time_t(oboe_bson_buffer * b, const char * name, time_t secs);
 
-bson_buffer * bson_append_start_object( bson_buffer * b , const char * name );
-bson_buffer * bson_append_start_array( bson_buffer * b , const char * name );
-bson_buffer * bson_append_finish_object( bson_buffer * b );
+oboe_bson_buffer * oboe_bson_append_start_object( oboe_bson_buffer * b , const char * name );
+oboe_bson_buffer * oboe_bson_append_start_array( oboe_bson_buffer * b , const char * name );
+oboe_bson_buffer * oboe_bson_append_finish_object( oboe_bson_buffer * b );
 
-void bson_numstr(char* str, int i);
-void bson_incnumstr(char* str);
+void oboe_bson_numstr(char* str, int i);
+void oboe_bson_incnumstr(char* str);
 
 
 /* ------------------------------
    ERROR HANDLING - also used in mongo code
    ------------------------------ */
 
-void * bson_malloc(int size); /* checks return value */
+void * oboe_bson_malloc(int size); /* checks return value */
 
 /* bson_err_handlers shouldn't return!!! */
-typedef void(*bson_err_handler)(const char* errmsg);
+typedef void(*ob_bson_err_handler)(const char* errmsg);
 
 /* returns old handler or NULL */
 /* default handler prints error then exits with failure*/
-bson_err_handler set_bson_err_handler(bson_err_handler func);
+ob_bson_err_handler oboe_set_bson_err_handler(ob_bson_err_handler func);
 
 
 
 /* does nothing is ok != 0 */
-void bson_fatal( int ok );
-int bson_fatal_msg( int ok, const char* msg );
+void oboe_bson_fatal( int ok );
+int oboe_bson_fatal_msg( int ok, const char* msg );
 
 MONGO_EXTERN_C_END
 #endif