opentelemetry-resource_detectors 0.21.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db98369930c24852e9231f16db04359dcd8f71348b6da67d897b4a66cbad641c
-  data.tar.gz: c11ea7988ee128ea4a8b6d947415b4fdea68a8ef9e6012f82ca8a42794079bb8
+  metadata.gz: a0b9d2f6461890917886af47e0e2d49d94eb214e0d560dd22c2165f05a642f9d
+  data.tar.gz: d63c54874580213651aca1766412eabbd25abf878a02603eda4221893237094c
 SHA512:
-  metadata.gz: 7020f663835bf164493582f16eb0e955836a86bf0ff741f9933edd7adb5db4d96cd2c2549e954418faf9fcb605aaabd7a94e9828cf8ac9160b648746acd036f3
-  data.tar.gz: cdc869c6031a6b6512b374bf8286c927a54bdd214ae5760c2edb0dfe77a8c8a0d62732964e9c4533edbe3666032e1fefdb2f3f8f2f1c22913afcc3a86a02f91b
+  metadata.gz: 349a4aea1f2e4996644aab9d2a7dbad6c1029a2318c84dbd40d9367da254f5686bcce283af4eada287a5b84b6db05893f024fcc48420028bd8fed86303c2d358
+  data.tar.gz: c44fc71376aadd08f1435b71348025f84a268566a9e98d29ee99dda1da1a9b081a228e3bbb8ecc3fb3b2e6025cad8075202d22d8750aa53301e804dae2a8865c

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History: opentelemetry-resource_detectors
 
+### v0.23.0 / 2023-04-17
+
+* BREAKING CHANGE: Drop support for EoL Ruby 2.7 
+
+* ADDED: Drop support for EoL Ruby 2.7 
+
+### v0.22.0 / 2023-01-14
+
+* ADDED: Add azure resource detector. 
+* DOCS: Fix gem homepage 
+* DOCS: More gem documentation fixes 
+
 ### v0.21.0 / 2022-06-09
 
 * BREAKING CHANGE: This requires upgrading both the SDK and Instrumentation gem in tandem

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

@@ -12,6 +12,7 @@ module OpenTelemetry
         extend self
 
         DETECTORS = [
+          OpenTelemetry::Resource::Detectors::Azure,
           OpenTelemetry::Resource::Detectors::GoogleCloudPlatform
         ].freeze
 

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'net/http'
+
+module OpenTelemetry
+  module Resource
+    module Detectors
+      # Azure contains detect class method for determining Azure environment resource attributes
+      module Azure
+        extend self
+
+        AZURE_METADATA_URI = 'http://169.254.169.254/metadata/instance/compute?api-version=2019-08-15'
+
+        def detect
+          metadata = azure_metadata
+          resource_attributes = {}
+
+          unless metadata.nil?
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_PROVIDER] = 'azure'
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_ACCOUNT_ID] = metadata['subscriptionId']
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_PLATFORM] = cloud_platform(metadata['provider'])
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_REGION] = metadata['location']
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_AVAILABILITY_ZONE] = metadata['zone']
+
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::HOST_ID] = metadata['vmId']
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::HOST_IMAGE_ID] = metadata.dig('storageProfile', 'imageReference', 'id')
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::HOST_TYPE] = metadata['vmSize']
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::HOST_NAME] = metadata['name']
+          end
+
+          resource_attributes.delete_if { |_key, value| value.nil? || value.empty? }
+          OpenTelemetry::SDK::Resources::Resource.create(resource_attributes)
+        end
+
+        private
+
+        def azure_metadata
+          uri = URI(AZURE_METADATA_URI)
+
+          req = Net::HTTP::Get.new(uri)
+          req['Metadata'] = 'true'
+
+          response = Net::HTTP.start(uri.hostname, uri.port, open_timeout: 2) do |http|
+            http.request(req)
+          end
+
+          return unless response.code == '200'
+
+          JSON.parse(response.body)
+        rescue Errno::EHOSTDOWN, Net::OpenTimeout, SocketError
+          nil
+        end
+
+        def cloud_platform(metadata)
+          case metadata
+          when 'Microsoft.Compute'
+            'azure_vm'
+          else
+            ''
+          end
+        end
+      end
+    end
+  end
+end

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, Metrics/PerceivedComplexity
+        def detect # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
           gcp_env = Google::Cloud::Env.new
           resource_attributes = {}
 
@@ -35,7 +35,7 @@ module OpenTelemetry
             resource_attributes[OpenTelemetry::SemanticConventions::Resource::K8S_POD_NAME] = ENV['HOSTNAME'] || safe_gethostname
             resource_attributes[OpenTelemetry::SemanticConventions::Resource::K8S_NODE_NAME] = gcp_env.lookup_metadata('instance', 'hostname')
 
-            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CONTAINER_NAME] = ENV['CONTAINER_NAME']
+            resource_attributes[OpenTelemetry::SemanticConventions::Resource::CONTAINER_NAME] = ENV.fetch('CONTAINER_NAME', nil)
           end
 
           if gcp_env.knative?

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Resource
     module Detectors
-      VERSION = '0.21.0'
+      VERSION = '0.23.0'
     end
   end
 end

data/lib/opentelemetry/resource/detectors.rb

@@ -7,6 +7,7 @@
 require 'opentelemetry/sdk'
 require 'opentelemetry/resource/detectors/version'
 require 'opentelemetry/resource/detectors/google_cloud_platform'
+require 'opentelemetry/resource/detectors/azure'
 require 'opentelemetry/resource/detectors/auto_detector'
 
 # OpenTelemetry is an open source observability framework, providing a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-resource_detectors
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-env
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 1.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 1.49.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.18.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.18.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -150,16 +164,17 @@ files:
 - lib/opentelemetry-resource_detectors.rb
 - lib/opentelemetry/resource/detectors.rb
 - lib/opentelemetry/resource/detectors/auto_detector.rb
+- lib/opentelemetry/resource/detectors/azure.rb
 - lib/opentelemetry/resource/detectors/google_cloud_platform.rb
 - lib/opentelemetry/resource/detectors/version.rb
-homepage: https://github.com/open-telemetry/opentelemetry-ruby
+homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  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.21.0
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-resource_detectors/0.23.0/file/CHANGELOG.md
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/resource_detectors
+  bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-resource_detectors/0.23.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -168,14 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Resource detection helpers for OpenTelemetry