opentelemetry-resource_detectors 0.19.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e4a5f54a1144c44a8b7251ded0a525c671877fb2465acc119fd781e3e6de143
-  data.tar.gz: 4cfac5fe3c9702bcad97ab95efe72b376a27f105f6d3e83c3d18bdc032e64c94
+  metadata.gz: db98369930c24852e9231f16db04359dcd8f71348b6da67d897b4a66cbad641c
+  data.tar.gz: c11ea7988ee128ea4a8b6d947415b4fdea68a8ef9e6012f82ca8a42794079bb8
 SHA512:
-  metadata.gz: a02d9e3bb0e1aed166851d79d4e8378dd4cb5c5fa267bee579cc8c303756c32450207b1e0b79717580896b50d56b3cf2100bb5e03d60405ea54106bc5f57acbd
-  data.tar.gz: 5dcbbb0cdff2b11ad4ccd84a70f9338782c525a2aaae3e0f46caeeb388c8851458e1fa219baf006dce856a055ff6fa585954a72ba8f38e03022327b19b839b82
+  metadata.gz: 7020f663835bf164493582f16eb0e955836a86bf0ff741f9933edd7adb5db4d96cd2c2549e954418faf9fcb605aaabd7a94e9828cf8ac9160b648746acd036f3
+  data.tar.gz: cdc869c6031a6b6512b374bf8286c927a54bdd214ae5760c2edb0dfe77a8c8a0d62732964e9c4533edbe3666032e1fefdb2f3f8f2f1c22913afcc3a86a02f91b

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Release History: opentelemetry-resource_detectors
 
+### v0.21.0 / 2022-06-09
+
+* BREAKING CHANGE: This requires upgrading both the SDK and Instrumentation gem in tandem
+
+
+### v0.20.0 / 2022-05-02
+
+* ADDED: Added Google Cloud Function Resource Detection 
+
+### v0.19.1 / 2021-09-29
+
+* (No significant changes)
+
 ### v0.19.0 / 2021-08-12
 
 * BREAKING CHANGE: Use auto-generated resource constants in sdk and resource_detectors 

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.0'
+      VERSION = '0.21.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.0
+  version: 0.21.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-env
@@ -28,16 +28,16 @@ dependencies:
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -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.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-resource_detectors/v0.21.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.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-resource_detectors/v0.21.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="