opentelemetry-resource-detector-aws 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c33d7a76ab1f55c8ae05709a72136b9063ef1bd20e6baf2ef1b9ca393d3a9760
-  data.tar.gz: f6ace2338eaa9089aa950351b6b44864e88d459113f441d977e41a4e8261a0d8
+  metadata.gz: 87bc3d87967be6d6ea2a1303f78fc3347c060983b0931a25ace5559b93abd86f
+  data.tar.gz: bd9b141d06677d4c47a7dc7d76ac91a6b16b9fe9a63077c8f831eb920f8c7421
 SHA512:
-  metadata.gz: 441a273890e25c9b61ff3187d98e86b10da94a5e57497e88c7b310de86ccc2255659522b7dfcaee70718569882504cc46667fdf82fb9da44bf62b70fbd0d3f06
-  data.tar.gz: 000b2b695a571b483fc840003b7e84fb49d6791d1ee0df4fbae7db9d05f7ee4b620174c286f3e4dbf17fc489ce23954be4569c10a69d42983de1d79847c0ad8f
+  metadata.gz: 4c3c596f86e3a8052efcfdd39fb22af027400db89117bf763c1e375420962f8923c1d1636fe1f9c0291204569f831fc946f5fe237ee5ba76d76588b9d22fd2b4
+  data.tar.gz: 6ff3808c917d91d77cb231dd0079f64ac89340bfcb40ac264357b427e8538066c67b04277ecd2a1fa5dc4fa94675a8b12717b27e3b369f8d7cc3f42646b60a5e

data/README.md

@@ -31,11 +31,13 @@ require 'opentelemetry/resource/detector'
 
 OpenTelemetry::SDK.configure do |c|
   # Specify which AWS resource detectors to use
-  c.resource = OpenTelemetry::Resource::Detector::AWS.detect([:ec2, :ecs])
+  c.resource = OpenTelemetry::Resource::Detector::AWS.detect([:ec2, :ecs, :eks, :lambda])
 
   # Or use just one detector
   c.resource = OpenTelemetry::Resource::Detector::AWS.detect([:ec2])
   c.resource = OpenTelemetry::Resource::Detector::AWS.detect([:ecs])
+  c.resource = OpenTelemetry::Resource::Detector::AWS.detect([:eks])
+  c.resource = OpenTelemetry::Resource::Detector::AWS.detect([:lambda])
 end
 ```
 
@@ -75,7 +77,32 @@ Populates `cloud`, `container`, and AWS ECS-specific attributes for processes ru
 | `aws.log.stream.names` | The CloudWatch log stream names (if awslogs driver is used) |
 | `aws.log.stream.arns` | The CloudWatch log stream ARNs (if awslogs driver is used) |
 
-Additional AWS platforms (EKS, Lambda) will be supported in future versions.
+### AWS EKS Detector
+
+Populates `cloud`, `container`, and Kubernetes (k8s) attributes for processes running on Amazon EKS.
+| Resource Attribute | Description |
+|--------------------|-------------|
+| `cloud.platform` | The cloud platform. In this context, it's always "aws_eks" |
+| `cloud.provider` | The cloud provider. In this context, it's always "aws" |
+| `container.id` | The container ID from the `/proc/self/cgroup` file |
+| `k8s.cluster.name` | The name of the EKS cluster from the `cluster-info` config map in the `amazon-cloudwatch` namespace |
+
+The EKS detector verifies that the process is running on EKS by checking:
+1. Presence of Kubernetes service account token and certificate
+2. Ability to access the `aws-auth` config map in the `kube-system` namespace
+3. Availability of either cluster name or container ID
+
+### AWS Lambda Detector
+Populates `cloud` and `faas` (Function as a Service) attributes for processes running on AWS Lambda.
+| Resource Attribute | Description |
+|--------------------|-------------|
+| `cloud.platform` | The cloud platform. In this context, it's always "aws_lambda" |
+| `cloud.provider` | The cloud provider. In this context, it's always "aws" |
+| `cloud.region` | The AWS region from the `AWS_REGION` environment variable |
+| `faas.name` | The Lambda function name from the `AWS_LAMBDA_FUNCTION_NAME` environment variable |
+| `faas.version` | The Lambda function version from the `AWS_LAMBDA_FUNCTION_VERSION` environment variable |
+| `faas.instance` | The Lambda function instance ID from the `AWS_LAMBDA_LOG_STREAM_NAME` environment variable |
+| `faas.max_memory` | The Lambda function memory size in MB from the `AWS_LAMBDA_FUNCTION_MEMORY_SIZE` environment variable |
 
 ## License
 

data/lib/opentelemetry/resource/detector/aws/ec2.rb

@@ -7,6 +7,7 @@
 require 'net/http'
 require 'json'
 require 'opentelemetry/common'
+require 'opentelemetry/semantic_conventions/resource'
 
 module OpenTelemetry
   module Resource
@@ -59,7 +60,7 @@ module OpenTelemetry
               resource_attributes[RESOURCE::HOST_TYPE] = identity['instanceType']
               resource_attributes[RESOURCE::HOST_NAME] = hostname
             rescue StandardError => e
-              OpenTelemetry.logger.debug("EC2 resource detection failed: #{e.message}")
+              OpenTelemetry.handle_error(exception: e, message: 'EC2 resource detection failed')
               return OpenTelemetry::SDK::Resources::Resource.create({})
             end
 
@@ -133,7 +134,7 @@ module OpenTelemetry
                 http.request(request)
               end
             rescue StandardError => e
-              OpenTelemetry.logger.debug("EC2 metadata service request failed: #{e.message}")
+              OpenTelemetry.handle_error(exception: e, message: 'EC2 metadata service request failed')
               nil
             end
           end

data/lib/opentelemetry/resource/detector/aws/ecs.rb

@@ -8,6 +8,7 @@ require 'net/http'
 require 'json'
 require 'socket'
 require 'opentelemetry/common'
+require 'opentelemetry/semantic_conventions/resource'
 
 module OpenTelemetry
   module Resource
@@ -68,7 +69,7 @@ module OpenTelemetry
               logs_attributes = get_logs_resource(container_metadata)
               resource_attributes.merge!(logs_attributes)
             rescue StandardError => e
-              OpenTelemetry.logger.debug("ECS resource detection failed: #{e.message}")
+              OpenTelemetry.handle_error(exception: e, message: 'ECS resource detection failed')
               return OpenTelemetry::SDK::Resources::Resource.create({})
             end
 
@@ -92,7 +93,7 @@ module OpenTelemetry
                 end
               end
             rescue Errno::ENOENT => e
-              OpenTelemetry.logger.debug("Failed to get container ID on ECS: #{e.message}")
+              OpenTelemetry.handle_error(exception: e, message: 'Failed to get container ID on ECS')
             end
 
             ''
@@ -139,7 +140,7 @@ module OpenTelemetry
                 log_attributes[RESOURCE::AWS_LOG_STREAM_NAMES] = [logs_stream_name].compact
                 log_attributes[RESOURCE::AWS_LOG_STREAM_ARNS] = [logs_stream_arn].compact
               else
-                OpenTelemetry.logger.debug("The metadata endpoint v4 has returned 'awslogs' as 'LogDriver', but there is no 'LogOptions' data")
+                OpenTelemetry.handle_error(message: 'The metadata endpoint v4 has returned \'awslogs\' as \'LogDriver\', but there is no \'LogOptions\' data')
               end
             end
 

data/lib/opentelemetry/resource/detector/aws/eks.rb

@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'net/http'
+require 'json'
+require 'openssl'
+require 'uri'
+require 'opentelemetry/common'
+require 'opentelemetry/semantic_conventions/resource'
+
+module OpenTelemetry
+  module Resource
+    module Detector
+      module AWS
+        # EKS contains detect class method for determining EKS resource attributes
+        module EKS
+          extend self
+
+          # Container ID length from cgroup file
+          CONTAINER_ID_LENGTH = 64
+
+          # HTTP request timeout in seconds
+          HTTP_TIMEOUT = 5
+
+          # Kubernetes token and certificate paths
+          TOKEN_PATH = '/var/run/secrets/kubernetes.io/serviceaccount/token'
+          CERT_PATH = '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt'
+
+          # Kubernetes API paths
+          AWS_AUTH_PATH = '/api/v1/namespaces/kube-system/configmaps/aws-auth'
+          CLUSTER_INFO_PATH = '/api/v1/namespaces/amazon-cloudwatch/configmaps/cluster-info'
+
+          # Create a constant for resource semantic conventions
+          RESOURCE = OpenTelemetry::SemanticConventions::Resource
+
+          def detect
+            # Return empty resource if not running on K8s
+            return OpenTelemetry::SDK::Resources::Resource.create({}) unless k8s?
+
+            resource_attributes = {}
+
+            begin
+              # Get K8s credentials
+              cred_value = k8s_cred_value
+
+              # Verify this is an EKS cluster
+              unless eks?(cred_value)
+                OpenTelemetry.logger.debug('Could not confirm process is running on EKS')
+                return OpenTelemetry::SDK::Resources::Resource.create({})
+              end
+
+              # Get cluster name and container ID
+              cluster_name_val = cluster_name(cred_value)
+              container_id_val = container_id
+
+              if container_id_val.empty? && cluster_name_val.empty?
+                OpenTelemetry.logger.debug('Neither cluster name nor container ID found on EKS process')
+                return OpenTelemetry::SDK::Resources::Resource.create({})
+              end
+
+              # Set resource attributes
+              resource_attributes[RESOURCE::CLOUD_PROVIDER] = 'aws'
+              resource_attributes[RESOURCE::CLOUD_PLATFORM] = 'aws_eks'
+              resource_attributes[RESOURCE::K8S_CLUSTER_NAME] = cluster_name_val unless cluster_name_val.empty?
+              resource_attributes[RESOURCE::CONTAINER_ID] = container_id_val unless container_id_val.empty?
+            rescue StandardError => e
+              OpenTelemetry.logger.debug("EKS resource detection failed: #{e.message}")
+              return OpenTelemetry::SDK::Resources::Resource.create({})
+            end
+
+            resource_attributes.delete_if { |_key, value| value.nil? || value.empty? }
+            OpenTelemetry::SDK::Resources::Resource.create(resource_attributes)
+          end
+
+          private
+
+          # Check if running on K8s
+          #
+          # @return [Boolean] true if running on K8s
+          def k8s?
+            File.exist?(TOKEN_PATH) && File.exist?(CERT_PATH)
+          end
+
+          # Get K8s token
+          #
+          # @return [String] K8s token
+          # @raise [StandardError] if token could not be read
+          def k8s_cred_value
+            token = File.read(TOKEN_PATH).strip
+            "Bearer #{token}"
+          rescue StandardError => e
+            OpenTelemetry.logger.debug("Failed to get k8s token: #{e.message}")
+            raise e
+          end
+
+          # Check if running on EKS
+          #
+          # @param cred_value [String] K8s credentials
+          # @return [Boolean] true if running on EKS
+          def eks?(cred_value)
+            # Just try to to access the aws-auth configmap
+            # If it exists and we can access it, we're on EKS
+            aws_http_request(AWS_AUTH_PATH, cred_value)
+            true
+          rescue StandardError
+            false
+          end
+
+          # Get EKS cluster name
+          #
+          # @param cred_value [String] K8s credentials
+          # @return [String] Cluster name or empty string if not found
+          def cluster_name(cred_value)
+            begin
+              response = aws_http_request(CLUSTER_INFO_PATH, cred_value)
+              cluster_info = JSON.parse(response)
+              return cluster_info['data']['cluster.name'] if cluster_info['data'] && cluster_info['data']['cluster.name']
+            rescue StandardError => e
+              OpenTelemetry.logger.debug("Cannot get cluster name on EKS: #{e.message}")
+            end
+            ''
+          end
+
+          # Get container ID from cgroup file
+          #
+          # @return [String] Container ID or empty string if not found
+          def container_id
+            begin
+              File.open('/proc/self/cgroup', 'r') do |file|
+                file.each_line do |line|
+                  line = line.strip
+                  # Look for container ID (64 chars) at the end of the line
+                  return line[-CONTAINER_ID_LENGTH..-1] if line.length > CONTAINER_ID_LENGTH
+                end
+              end
+            rescue StandardError => e
+              OpenTelemetry.logger.debug("Failed to get container ID on EKS: #{e.message}")
+            end
+            ''
+          end
+
+          # Make HTTP GET request to K8s API
+          #
+          # @param path [String] API path
+          # @param cred_value [String] Authorization header value
+          # @return [String] Response body
+          # @raise [StandardError] if request fails
+          def aws_http_request(path, cred_value)
+            uri = URI.parse("https://kubernetes.default.svc#{path}")
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+            http.ca_file = CERT_PATH
+            http.open_timeout = HTTP_TIMEOUT
+            http.read_timeout = HTTP_TIMEOUT
+
+            request = Net::HTTP::Get.new(uri)
+            request['Authorization'] = cred_value
+
+            OpenTelemetry::Common::Utilities.untraced do
+              response = http.request(request)
+              raise "HTTP request failed with status #{response.code}" unless response.is_a?(Net::HTTPSuccess)
+
+              response.body
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/resource/detector/aws/lambda.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'opentelemetry/semantic_conventions/resource'
+
+module OpenTelemetry
+  module Resource
+    module Detector
+      module AWS
+        # Lambda contains detect class method for determining Lambda resource attributes
+        module Lambda
+          extend self
+
+          # Create a constant for resource semantic conventions
+          RESOURCE = OpenTelemetry::SemanticConventions::Resource
+
+          def detect
+            # Return empty resource if not running on Lambda
+            return OpenTelemetry::SDK::Resources::Resource.create({}) unless lambda_environment?
+
+            resource_attributes = {}
+
+            begin
+              # Set Lambda-specific attributes from environment variables
+              resource_attributes[RESOURCE::CLOUD_PROVIDER] = 'aws'
+              resource_attributes[RESOURCE::CLOUD_PLATFORM] = 'aws_lambda'
+              resource_attributes[RESOURCE::CLOUD_REGION] = ENV.fetch('AWS_REGION', nil)
+              resource_attributes[RESOURCE::FAAS_NAME] = ENV.fetch('AWS_LAMBDA_FUNCTION_NAME', nil)
+              resource_attributes[RESOURCE::FAAS_VERSION] = ENV.fetch('AWS_LAMBDA_FUNCTION_VERSION', nil)
+              resource_attributes[RESOURCE::FAAS_INSTANCE] = ENV.fetch('AWS_LAMBDA_LOG_STREAM_NAME', nil)
+
+              # Convert memory size to integer
+              resource_attributes[RESOURCE::FAAS_MAX_MEMORY] = ENV['AWS_LAMBDA_FUNCTION_MEMORY_SIZE'].to_i if ENV['AWS_LAMBDA_FUNCTION_MEMORY_SIZE']
+            rescue StandardError => e
+              OpenTelemetry.handle_error(exception: e, message: 'Lambda resource detection failed')
+              return OpenTelemetry::SDK::Resources::Resource.create({})
+            end
+
+            # Filter out nil or empty values
+            # Note: we need to handle integers differently since they don't respond to empty?
+            resource_attributes.delete_if do |_key, value|
+              value.nil? || (value.respond_to?(:empty?) && value.empty?)
+            end
+
+            OpenTelemetry::SDK::Resources::Resource.create(resource_attributes)
+          end
+
+          private
+
+          # Determines if the current environment is AWS Lambda
+          #
+          # @return [Boolean] true if running on AWS Lambda
+          def lambda_environment?
+            # Check for Lambda-specific environment variables
+            !ENV['AWS_LAMBDA_FUNCTION_NAME'].nil? &&
+              !ENV['AWS_LAMBDA_FUNCTION_VERSION'].nil? &&
+              !ENV['AWS_LAMBDA_LOG_STREAM_NAME'].nil?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/resource/detector/aws/version.rb

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Resource
     module Detector
       module AWS
-        VERSION = '0.2.0'
+        VERSION = '0.4.0'
       end
     end
   end

data/lib/opentelemetry/resource/detector/aws.rb

@@ -6,6 +6,8 @@
 
 require 'opentelemetry/resource/detector/aws/ec2'
 require 'opentelemetry/resource/detector/aws/ecs'
+require 'opentelemetry/resource/detector/aws/lambda'
+require 'opentelemetry/resource/detector/aws/eks'
 
 module OpenTelemetry
   module Resource
@@ -29,6 +31,10 @@ module OpenTelemetry
               EC2.detect
             when :ecs
               ECS.detect
+            when :eks
+              EKS.detect
+            when :lambda
+              Lambda.detect
             else
               OpenTelemetry.logger.warn("Unknown AWS resource detector: #{detector}")
               OpenTelemetry::SDK::Resources::Resource.create({})

data/lib/opentelemetry-resource-detector-aws.rb

@@ -4,4 +4,5 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'opentelemetry/semantic_conventions/resource'
 require_relative 'opentelemetry/resource/detector'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-resource-detector-aws
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
@@ -38,6 +38,8 @@ files:
 - lib/opentelemetry/resource/detector/aws.rb
 - lib/opentelemetry/resource/detector/aws/ec2.rb
 - lib/opentelemetry/resource/detector/aws/ecs.rb
+- lib/opentelemetry/resource/detector/aws/eks.rb
+- lib/opentelemetry/resource/detector/aws/lambda.rb
 - lib/opentelemetry/resource/detector/aws/version.rb
 homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses: