dogapi 1.42.0 → 1.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18772d3cb81c83a5fd80ed6eb50c21860414635d0219dfea836673e272c3e52
-  data.tar.gz: 2a98454037254f50ea58c828be224c0906d6eb1ae7fa0f817e6f2df75b55c984
+  metadata.gz: ee43257bd0dee8a6d716ec81374f9c9345037eadb1d64ae56948354058611d42
+  data.tar.gz: f09c94bb876b09cf12dcf2bbe473b30e55964a62d8a78bedad6fbc54a6352e87
 SHA512:
-  metadata.gz: 82b3841b8ae9209a25b434194463b0a37f830004fc608a6eb29184fb3972791db94434a81ca7542b26166e903d80346b6e49fe49e80d55b18115451fc15837b4
-  data.tar.gz: 51a17532ec14faf58ea93448c390bdda914e12d8300e754998915cd3792b7a375a98cf6240478da357172ed8e77e9cf01ac52bf15eb2b0c64685e23d6cc191eb
+  metadata.gz: 7d69cb4d01bc6673e183f714899a2a21021114163a7f7d69d99a1ba73bd2badcb21f0795d6f78f3694ce24cee391ce1063566789ed3a85d7cbd19c25273b1ad5
+  data.tar.gz: 362e14cea14f234a3fe8649dc2c6044e245d903e255a0a78c61e0577e54e1046fbecdd7d3cb5277a374845d82bb1c5a9f45143d1eab9635656908a3c9b8cd63a

data/.azure-pipelines/all.yml

@@ -9,10 +9,36 @@ pr:
     include:
     - master
 
+resources:
+  containers:
+  - container: datadog-agent
+    image: datadog/agent:7
+    options: --health-cmd="exit 0" --health-interval=1s
+    ports:
+    - 8125:8125
+    - 8126:8126/tcp
+    env:
+      DD_API_KEY: $(ddAPIKey)
+      DD_APM_ENABLED: "true"
+      DD_APM_NON_LOCAL_TRAFFIC: "true"
+      DD_LOGS_ENABLED: "true"
+      DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL: "true"
+      DD_AC_EXCLUDE: "name:datadog-agent"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /proc/:/host/proc/:ro
+      - /sys/fs/cgroup/:/host/sys/fs/cgroup:ro
+
 jobs:
 - job: UnitTests
   pool:
     vmImage: "Ubuntu-16.04"
+  container:
+    image: ruby:$(RUBY_VERSION)
+    options: >-
+      -l com.datadoghq.ad.logs="[{\"source\": \"Azure Pipeline\", \"service\": \"dogapi-rb\"}]"
+  services:
+    datadog-agent: datadog-agent
   strategy:
     matrix:
       Rb24:
@@ -31,17 +57,19 @@ jobs:
         RUBY_VERSION: '2.6'
         TASK: rubocop
   steps:
-    - task: UseRubyVersion@0
-      displayName: Use Ruby $(RUBY_VERSION)
-      inputs:
-        versionSpec: $(RUBY_VERSION)
-        addToPath: true
-    - script: |
-        gem install bundler
-        bundle install --retry=3 --jobs=4
+    - script: bundle install --retry=3 --jobs=4
       displayName: 'bundle install'
+      env:
+        GEM_HOME: '~/.gem'
     - script: bundle exec rake $(TASK)
       displayName: Run $(TASK) via bundle
+      env:
+        GEM_HOME: '~/.gem'
+        DD_AGENT_HOST: datadog-agent
+        DD_ENV: ci
+        DD_SERVICE: dogapi-rb
+        DD_TAGS: "team:integration-tools-and-libraries,runtime:ruby-$(RUBY_VERSION),ci.job.name:$(System.JobName),matrix:$(TASK)"
+        DD_TRACE_ANALYTICS_ENABLED: "true"
 - job: TestRuby19
   pool:
     vmImage: "Ubuntu-16.04"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 1.43.0 / 2020-12-07
+
+* [Fixed] find_localhost: Try both `hostname` and `hostname -f` before raising. See [#242](https://github.com/DataDog/dogapi-rb/pull/242).
+
 ## 1.42.0 / 2020-09-17
 
 * [Added] Allow dashboard creation / updates using Template Variable Presets. See [#238](https://github.com/DataDog/dogapi-rb/pull/238).

data/Gemfile

@@ -3,10 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem 'ddtrace', git: 'https://github.com/datadog/dd-trace-rb'
   gem 'rubocop', "~> 0.49.0"
-  # NOTE: rake < 12.3.3 is vulnerable to CVE-2020-8130, but we only use it as a test dependency
-  # and neither our users nor our CI is vulnerable in any way
-  gem 'rake', '>= 2.4.2'
   gem 'rspec'
   gem 'simplecov'
   gem 'webmock'

data/Gemfile_1.9

@@ -4,9 +4,6 @@ gemspec
 
 group :test do
   gem 'rubocop', "~> 0.41.0"
-  # NOTE: rake < 12.3.3 is vulnerable to CVE-2020-8130, but we only use it as a test dependency
-  # and neither our users nor our CI is vulnerable in any way
-  gem 'rake', '>= 2.4.2'
   gem 'rspec'
   gem 'simplecov', "~> 0.11.2"
   gem 'webmock'

data/RELEASING.md

@@ -43,4 +43,4 @@ Install [bundler](https://bundler.io/) and setup your RubyGems credentials:
 1. Build the gem: `bundle exec gem build dogapi.gemspec`.
 1. Push the gem: `bundle exec gem push dogapi-x.x.x.gem`.
 1. Check that the [Ruby Gem is published](https://rubygems.org/gems/dogapi).
-1. Bump the version again in `lib/dogapi/version.rb` to a dev version (e.g. `1.39.0` -> `1.40.0.dev`), open a PR and merge it to master.
+1. Bump the version again in `lib/dogapi/version.rb` to a dev version (e.g. `1.42.0` -> `1.42.1.dev`), open a PR and merge it to master.

data/lib/dogapi/common.rb

@@ -210,14 +210,17 @@ module Dogapi
   @@hostname = nil
 
   def Dogapi.find_localhost
-    unless @@hostname
-      out, status = Open3.capture2('hostname', '-f', err: File::NULL)
-      # Get status to check if the call was successful
-      raise SystemCallError, 'Could not get hostname with `hostname -f`' unless status.exitstatus.zero?
-      @@hostname = out.strip
-    end
-  rescue SystemCallError
-    @@hostname = Addrinfo.getaddrinfo(Socket.gethostname, nil, nil, nil, nil, Socket::AI_CANONNAME).first.canonname
+    return @@hostname if @@hostname
+    out, status = Open3.capture2('hostname', '-f', err: File::NULL)
+    unless status.exitstatus.zero?
+      begin
+        out = Addrinfo.getaddrinfo(Socket.gethostname, nil, nil, nil, nil, Socket::AI_CANONNAME).first.canonname
+      rescue SocketError
+        out, status = Open3.capture2('hostname', err: File::NULL)
+        raise SystemCallError, 'Both `hostname` and `hostname -f` failed.' unless status.exitstatus.zero?
+      end
+    end
+    @@hostname = out.strip
   end
 
   def Dogapi.find_proxy

data/lib/dogapi/version.rb

@@ -3,5 +3,5 @@
 # Copyright 2011-Present Datadog, Inc.
 
 module Dogapi
-  VERSION = '1.42.0'
+  VERSION = '1.43.0'
 end

data/spec/spec_helper.rb

@@ -10,7 +10,19 @@ SimpleCov.start do
   add_filter 'spec'
 end
 
-WebMock.disable_net_connect!(allow_localhost: false)
+webmock_allow = []
+
+begin
+  require 'ddtrace'
+  Datadog.configure do |c|
+    c.use :rspec, service_name: 'dogapi-rb'
+  end
+  webmock_allow << "#{Datadog::Transport::HTTP.default_hostname}:#{Datadog::Transport::HTTP.default_port}"
+rescue LoadError
+  puts 'ddtrace gem not found'
+end
+
+WebMock.disable_net_connect!(allow_localhost: false, allow: webmock_allow)
 
 # include our code and methods
 require 'dogapi'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogapi
 version: !ruby/object:Gem::Version
-  version: 1.42.0
+  version: 1.43.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Ruby bindings for Datadog's API