opentelemetry-resource_detectors 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c64bed3d25422a99ec4246fc3afd7844837670a5750a3daba2cf63a1bbedfc6
-  data.tar.gz: 955ee4fc54c11b4f243aa67f89b42cf0865160d86b8703a385d4098c961d7782
+  metadata.gz: 9ed054945636f4234b1064072cda6f9de6d109df3a8a77e82a39041761a65be0
+  data.tar.gz: cf7b92dd1015c30491d7f6b24eb6d88bb3baaaf4bd5f68728270923b85804d64
 SHA512:
-  metadata.gz: 5eeae4f6e2bbf36a8dc0efb81f96c2960276fdca9bdab6acaa87229f55a36f8e4d85535b6d3d418c2b6f92ef59f6d5528ea98b46a4c035e90102aaeb6ba4aced
-  data.tar.gz: 353da61a51d2a7bca8ce94d13e262f4b51c23b6af4fd26fa55b6dbaae4b927732d3a910c1c6284c4297b5b0d9807ba257b8907f0e307782e5834845e6e339295
+  metadata.gz: e5e4213170d6449c7c7f05a3cee9bdcdbabdeb50ab48dbe14806a47bf2b9fc3e05546714f992303c0f2cba3c2a71140e89137fb0fde40eb272c60dec1ba65322
+  data.tar.gz: dd7e9133f474b0a3f41d52e5553a8c8731c8b7e64abdb12be3a9716e0d9b4d95c308b24bdfa26ab8f352bf8e7c54f8874be5efc7e3951c42521786af48dee804

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-resource_detectors
 
+### v0.20.0 / 2022-05-02
+
+* ADDED: Added Google Cloud Function Resource Detection 
+
 ### v0.19.1 / 2021-09-29
 
 * (No significant changes)

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, Metrics/CyclomaticComplexity, Metrics/MethodLength
+        def detect # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
           gcp_env = Google::Cloud::Env.new
           resource_attributes = {}
 
@@ -38,12 +38,29 @@ module OpenTelemetry
             resource_attributes[OpenTelemetry::SemanticConventions::Resource::CONTAINER_NAME] = ENV['CONTAINER_NAME']
           end
 
+          if gcp_env.knative?
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_PROVIDER] = 'gcp'
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_ACCOUNT_ID] = gcp_env.project_id
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::FAAS_NAME] = gcp_env.knative_service_id
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::FAAS_VERSION] = gcp_env.knative_service_revision
+            zone = gcp_env.instance_zone
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_REGION] = get_region zone
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_AVAILABILITY_ZONE] = zone
+          end
+
           resource_attributes.delete_if { |_key, value| value.nil? || value.empty? }
           OpenTelemetry::SDK::Resources::Resource.create(resource_attributes)
         end
 
         private
 
+        def get_region(zone)
+          return if zone.nil? || zone.empty?
+
+          split_arr = zone.split('-', 3)
+          split_arr[0].concat('-', split_arr[1])
+        end
+
         def safe_gethostname
           Socket.gethostname
         rescue StandardError

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Resource
     module Detectors
-      VERSION = '0.19.1'
+      VERSION = '0.20.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-resource_detectors
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-env
@@ -156,10 +156,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-resource_detectors/v0.19.1/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-resource_detectors/v0.20.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/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.19.1
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-resource_detectors/v0.20.0
 post_install_message: 
 rdoc_options: []
 require_paths: