opentelemetry-resource_detectors 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ebbdd9564adeb0c2247ca7b2983b3eecd26767ee7a626a8db30cf351f357e34
-  data.tar.gz: 697356bfa0e899b01c9bd7096ae70f4ab2dda92384fbdb11655d217120a86229
+  metadata.gz: 0a0ed927aefdb01b894d84105cbabcc2e06af196d61556fc9f4b382d4bd95c43
+  data.tar.gz: c2bad0ca1beb726a7015f379f4c1d6d208a7a74acb0356c44dc9ceff64897dca
 SHA512:
-  metadata.gz: 59f63420e68821a2ecfbbe85c5bf4c9f162058851a02a174c9f645c3f52e8a159d04540c1678b40bd9487f80b872cd6dfa2c257b4ada9d2bc6e020d4021379f2
-  data.tar.gz: 348e7116b130a12ff5bc55af93734b4ca00a426011fdc8ef833169978d69a0e9c6ed32b0e4d7f311c3362b345c5efb5867f024e480b78f3e0449002561079c14
+  metadata.gz: fbf411bde20705f06508a545a63372e8c662a32686c6078eb785fefe44fc2dc570ac43d449b3013304a4ea465249c9461d2cf221d2ab6286583d582ffc54c1be
+  data.tar.gz: 143db1dfd22614a684ebedfa7e553d994df7b4fafce1fafddc42115f4b7593efeae1acfc0fd84864b7493c8e7bd6432ba7553d8e2e4edb037df685544a38091a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-resource_detectors
 
+### v0.8.0 / 2020-10-27
+
+* (No significant changes)
+
 ### v0.7.0 / 2020-10-07
 
 * DOCS: Standardize toplevel docs structure and readme 

data/lib/opentelemetry/resource/detectors/google_cloud_platform.rb

@@ -13,7 +13,7 @@ module OpenTelemetry
       module GoogleCloudPlatform
         extend self
 
-        def detect # rubocop:disable Metrics/AbcSize
+        def detect # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
           gcp_env = Google::Cloud::Env.new
           resource_attributes = {}
           resource_constants = OpenTelemetry::SDK::Resources::Constants
@@ -24,15 +24,16 @@ module OpenTelemetry
             resource_attributes[resource_constants::CLOUD_RESOURCE[:region]] = gcp_env.instance_attribute('cluster-location')
             resource_attributes[resource_constants::CLOUD_RESOURCE[:zone]] = gcp_env.instance_zone
 
-            resource_attributes[resource_constants::HOST_RESOURCE[:hostname]] = hostname
             resource_attributes[resource_constants::HOST_RESOURCE[:id]] = gcp_env.lookup_metadata('instance', 'id')
-            resource_attributes[resource_constants::HOST_RESOURCE[:name]] = gcp_env.lookup_metadata('instance', 'hostname')
+            resource_attributes[resource_constants::HOST_RESOURCE[:name]] = ENV['HOSTNAME'] ||
+                                                                            gcp_env.lookup_metadata('instance', 'hostname') ||
+                                                                            safe_gethostname
           end
 
           if gcp_env.kubernetes_engine?
             resource_attributes[resource_constants::K8S_RESOURCE[:cluster_name]] = gcp_env.instance_attribute('cluster-name')
             resource_attributes[resource_constants::K8S_RESOURCE[:namespace_name]] = gcp_env.kubernetes_engine_namespace_id
-            resource_attributes[resource_constants::K8S_RESOURCE[:pod_name]] = hostname
+            resource_attributes[resource_constants::K8S_RESOURCE[:pod_name]] = ENV['HOSTNAME'] || safe_gethostname
 
             resource_attributes[resource_constants::CONTAINER_RESOURCE[:name]] = ENV['CONTAINER_NAME']
           end
@@ -43,8 +44,8 @@ module OpenTelemetry
 
         private
 
-        def hostname
-          ENV['HOSTNAME'] || Socket.gethostname
+        def safe_gethostname
+          Socket.gethostname
         rescue StandardError
           ''
         end

data/lib/opentelemetry/resource/detectors/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Resource
     module Detectors
-      VERSION = '0.7.0'
+      VERSION = '0.8.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-resource_detectors
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-env
@@ -141,7 +141,11 @@ files:
 homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-resource_detectors/v0.8.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/resource_detectors
+  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-resource_detectors/v0.8.0
 post_install_message: 
 rdoc_options: []
 require_paths: