solarwinds_apm 7.0.0.prev1 → 7.0.0.prev3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d66514bebfccf2f3c5a2b2e6924fe7fc7abe6a33fa90ce2dcc94de968e64018
-  data.tar.gz: 55cd6df597c8db22130b6322ede1deae4911c1409674734cb11ccf9223734dcb
+  metadata.gz: 434e6f5c7d08a287fe5f6160eff2e5c901603b25f9aa31b8e247aa2c4ac28d5f
+  data.tar.gz: a4036a5696705e6cd1ea0ff0905ad93120ab95ff40d3b487ea286c42070ce191
 SHA512:
-  metadata.gz: fa5dd5bb46399211d816833f257b69fec64a325cb6ee3c256d612d64be0e4cb50e5b1e195025afad69dee4d5c79726d9e5b6ff8f5a25d952724b01521e8d9331
-  data.tar.gz: 6b9e3f5bc1e8e35b419d9a2c04c43bca23268ea9fed3832368d5f0c708925abd1e46d9f2e215833fae5e6154fa77c7ec696e3819a0ff37188c1c407aa4965522
+  metadata.gz: e1ab9ebd49e435da6e8cf90c255f53ea9d6e4a4f6308f39548ab3a3b4acec2462dc6679cb2cfbfaa137c4dc24f10e59e094b2484711cb3ff473435def6dc7759
+  data.tar.gz: cf251914d951aff610875e60edb959ebe6cf8a3a88ced6111e28d67bb99a59413bbb0a80234a9d87ad719101ebffd9484af1643d224103e7032817bd31a880bd

data/README.md

@@ -158,7 +158,7 @@ By default, transaction names are constructed based on attributes such as the re
 result = SolarWindsAPM::API.set_transaction_name('my-custom-trace-name')
 ```
 
-#### Send Custom Metrics
+#### Send Custom Metrics (Depreciated)
 
 Service metrics are automatically collected by this library.  In addition, the following methods support sending two types of custom metrics:
 

data/lib/rails/generators/solarwinds_apm/templates/solarwinds_apm_initializer.rb

@@ -16,8 +16,7 @@
 
 if defined?(SolarWindsAPM::Config)
 
-  # :service_key, :hostname_alias, :http_proxy, and :debug_level
-  # are startup settings and can't be changed afterwards.
+  # :service_key and :debug_level are startup settings and can't be changed afterwards.
 
   #
   # Set SW_APM_SERVICE_KEY
@@ -29,34 +28,6 @@ if defined?(SolarWindsAPM::Config)
   #
   # SolarWindsAPM::Config[:service_key] = '0123456789abcde0123456789abcde0123456789abcde0123456789abcde1234:my_service'
 
-  #
-  # Set SW_APM_HOSTNAME_ALIAS
-  # This setting will be overridden if SW_APM_HOSTNAME_ALIAS is set as an environment variable
-  #
-  # SolarWindsAPM::Config[:hostname_alias] = 'alias_name'
-
-  #
-  # Set Proxy for SolarWinds
-  # This setting will be overridden if SW_APM_PROXY is set as an environment variable.
-  #
-  # Please configure http_proxy if a proxy needs to be used to communicate with
-  # the SolarWinds APM collector.
-  # The format should either be http://<proxyHost>:<proxyPort> for a proxy
-  # server that does not require authentication, or
-  # http://<username>:<password>@<proxyHost>:<proxyPort> for a proxy server that
-  # requires basic authentication.
-  #
-  # Note that while HTTP is the only type of connection supported, the traffic
-  # to SolarWinds is still encrypted using SSL/TLS.
-  #
-  # It is recommended to configure the proxy in this file or as SW_APM_PROXY
-  # environment variable. However, the agent's underlying network library will
-  # use a system-wide proxy defined in the environment variables grpc_proxy,
-  # https_proxy or http_proxy if no SolarWindsAPM-specific configuration is set.
-  # Please refer to gRPC environment variables for more information.
-  #
-  # SolarWindsAPM::Config[:http_proxy] = http://<proxyHost>:<proxyPort>
-
   #
   # Set SW_APM_DEBUG_LEVEL
   # This setting will be overridden if SW_APM_DEBUG_LEVEL is set as an environment variable.

data/lib/solarwinds_apm/config.rb

@@ -226,6 +226,12 @@ module SolarWindsAPM
       when :tag_sql
         enable_disable_config('SW_APM_TAG_SQL', key, value, false, bool: true)
 
+      when :http_proxy
+        SolarWindsAPM.logger.warn { ':http_proxy is deprecated' }
+
+      when :hostname_alias
+        SolarWindsAPM.logger.warn { ':hostname_alias is deprecated' }
+
       else
         @@config[key.to_sym] = value
 

data/lib/solarwinds_apm/opentelemetry/otlp_processor.rb

@@ -26,7 +26,7 @@ module SolarWindsAPM
       def initialize(txn_manager)
         @txn_manager = txn_manager
         @meters      = { 'sw.apm.request.metrics' => ::OpenTelemetry.meter_provider.meter('sw.apm.request.metrics') }
-        @metrics     = { response_time: @meters['sw.apm.request.metrics'].create_histogram('trace.service.response_time', unit: 'ms', description: 'Duration of each entry span for the service, typically meaning the time taken to process an inbound request.') }
+        @metrics     = init_response_time_metrics
         @transaction_name = nil
       end
 
@@ -45,6 +45,8 @@ module SolarWindsAPM
       end
 
       def on_finishing(span)
+        return if non_entry_span(span: span)
+
         @transaction_name = calculate_transaction_names(span)
         span.set_attribute(SW_TRANSACTION_NAME, @transaction_name)
         @txn_manager.delete_root_context_h(span.context.hex_trace_id)
@@ -67,8 +69,35 @@ module SolarWindsAPM
         SolarWindsAPM.logger.info { "[#{self.class}/#{__method__}] error processing span on_finish: #{e.message}" }
       end
 
+      # @param [optional Numeric] timeout An optional timeout in seconds.
+      # @return [Integer] Export::SUCCESS if no error occurred, Export::FAILURE if
+      #   a non-specific failure occurred, Export::TIMEOUT if a timeout occurred.
+      def force_flush(timeout: nil) # rubocop:disable Lint/UnusedMethodArgument
+        ::OpenTelemetry::SDK::Trace::Export::SUCCESS
+      end
+
+      # @param [optional Numeric] timeout An optional timeout in seconds.
+      # @return [Integer] Export::SUCCESS if no error occurred, Export::FAILURE if
+      #   a non-specific failure occurred, Export::TIMEOUT if a timeout occurred.
+      def shutdown(timeout: nil) # rubocop:disable Lint/UnusedMethodArgument
+        ::OpenTelemetry::SDK::Trace::Export::SUCCESS
+      end
+
       private
 
+      def init_response_time_metrics
+        # add the ExponentialBucketHistogram view
+        if defined? ::OpenTelemetry::Exporter::OTLP::Metrics && Gem::Version.new(::OpenTelemetry::Exporter::OTLP::Metrics::VERSION) >= Gem::Version.new('0.5.0')
+          ::OpenTelemetry.meter_provider.add_view('trace.service.response_time',
+                                                  aggregation: ::OpenTelemetry::SDK::Metrics::Aggregation::ExponentialBucketHistogram.new(aggregation_temporality: :delta),
+                                                  type: :histogram,
+                                                  unit: 'ms')
+        end
+
+        instrument = @meters['sw.apm.request.metrics'].create_histogram('trace.service.response_time', unit: 'ms', description: 'Duration of each entry span for the service, typically meaning the time taken to process an inbound request.')
+        { response_time: instrument }
+      end
+
       def meter_attributes(span)
         meter_attrs = {
           SW_IS_ERROR => error?(span) == 1,

data/lib/solarwinds_apm/otel_native_config.rb

@@ -62,6 +62,9 @@ module SolarWindsAPM
         ENV["OTEL_EXPORTER_OTLP_#{signal}_COMPRESSION"] = 'gzip' if ENV["OTEL_EXPORTER_OTLP_#{signal}_COMPRESSION"].to_s.empty? && ENV['OTEL_EXPORTER_OTLP_COMPRESSION'].to_s.empty?
       end
 
+      # set http stable semconv
+      ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http' if ENV['OTEL_SEMCONV_STABILITY_OPT_IN'].to_s.empty?
+
       # set delta temporality
       ENV['OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE'] = 'delta' if ENV['OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE'].to_s.empty?
 

data/lib/solarwinds_apm/sampling/http_sampler.rb

@@ -81,6 +81,7 @@ module SolarWindsAPM
         end
       rescue StandardError => e
         @logger.warn { "Failed to retrieve sampling settings (#{e.message}), tracing will be disabled until valid ones are available." }
+        sleep(GET_SETTING_DURAION)
       end
     end
   end

data/lib/solarwinds_apm/sampling/oboe_sampler.rb

@@ -337,7 +337,7 @@ module SolarWindsAPM
       time_now = Time.now.to_i * 1000
       if time_now > expiry
         @logger.debug { 'settings expired, removing' }
-        @settings = nil
+        @settings = {}
         return
       end
       sampling_setting = SolarWindsAPM::SamplingSettings.merge(@settings, local_settings(params))

data/lib/solarwinds_apm/support/resource_detector.rb

@@ -13,7 +13,7 @@ require 'socket'
 require 'securerandom'
 require 'opentelemetry/resource/detector/azure'
 require 'opentelemetry/resource/detector/container'
-require_relative 'resource_detector/aws/ec2'
+require 'opentelemetry/resource/detector/aws/ec2'
 
 module SolarWindsAPM
   # ResourceDetector

data/lib/solarwinds_apm/support.rb

@@ -16,4 +16,3 @@ require_relative 'support/txn_name_manager'
 require_relative 'support/utils'
 require_relative 'support/otlp_endpoint'
 require_relative 'support/resource_detector'
-require_relative 'support/aws_resource_detector'

data/lib/solarwinds_apm/version.rb

@@ -14,7 +14,7 @@ module SolarWindsAPM
     MAJOR  = 7 # breaking,
     MINOR  = 0 # feature,
     PATCH  = 0 # fix => BFF
-    PRE    = 'prev1'
+    PRE    = 'prev3'
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 7.0.0.prev1
+  version: 7.0.0.prev3
 platform: ruby
 authors:
 - Maia Engeli
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-10 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp
@@ -70,7 +70,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-resource-detector-azure
+  name: opentelemetry-resource-detector-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,20 +83,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-resource-detector-azure
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-resource-detector-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -161,17 +175,11 @@ files:
 - lib/solarwinds_apm/sampling/token_bucket.rb
 - lib/solarwinds_apm/sampling/trace_options.rb
 - lib/solarwinds_apm/support.rb
-- lib/solarwinds_apm/support/aws_resource_detector.rb
 - lib/solarwinds_apm/support/logger_formatter.rb
 - lib/solarwinds_apm/support/logging_log_event.rb
 - lib/solarwinds_apm/support/lumberjack_formatter.rb
 - lib/solarwinds_apm/support/otlp_endpoint.rb
 - lib/solarwinds_apm/support/resource_detector.rb
-- lib/solarwinds_apm/support/resource_detector/aws/beanstalk.rb
-- lib/solarwinds_apm/support/resource_detector/aws/ec2.rb
-- lib/solarwinds_apm/support/resource_detector/aws/ecs.rb
-- lib/solarwinds_apm/support/resource_detector/aws/eks.rb
-- lib/solarwinds_apm/support/resource_detector/aws/lambda.rb
 - lib/solarwinds_apm/support/service_key_checker.rb
 - lib/solarwinds_apm/support/transaction_settings.rb
 - lib/solarwinds_apm/support/txn_name_manager.rb
@@ -194,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/lib/solarwinds_apm/support/aws_resource_detector.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-# © 2025 SolarWinds Worldwide, LLC. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-require_relative 'resource_detector/aws/ecs'
-require_relative 'resource_detector/aws/eks'
-require_relative 'resource_detector/aws/lambda'
-require_relative 'resource_detector/aws/beanstalk'

data/lib/solarwinds_apm/support/resource_detector/aws/beanstalk.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-# © 2023 SolarWinds Worldwide, LLC. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-require 'net/http'
-require 'uri'
-require 'json'
-require 'socket'
-
-module SolarWindsAPM
-  module ResourceDetector
-    # Beanstalk
-    module Beanstalk
-      module_function
-
-      DEFAULT_BEANSTALK_CONF_PATH = '/var/elasticbeanstalk/xray/environment.conf'
-      WIN_OS_BEANSTALK_CONF_PATH = 'C:\\Program Files\\Amazon\\XRay\\environment.conf'
-
-      def detect
-        beanstalk_config_path = if RUBY_PLATFORM.include?('mingw32') || RUBY_PLATFORM.include?('mswin')
-                                  WIN_OS_BEANSTALK_CONF_PATH
-                                else
-                                  DEFAULT_BEANSTALK_CONF_PATH
-                                end
-
-        attribute = gather_data(beanstalk_config_path)
-        ::OpenTelemetry::SDK::Resources::Resource.create(attribute)
-      end
-
-      def gather_data(config_path)
-        raw_data = File.read(config_path, encoding: 'utf-8')
-        parsed_data = JSON.parse(raw_data)
-        {
-          ::OpenTelemetry::SemanticConventions::Resource::CLOUD_PROVIDER => 'aws',
-          ::OpenTelemetry::SemanticConventions::Resource::CLOUD_PLATFORM => 'aws_elastic_beanstalk',
-          ::OpenTelemetry::SemanticConventions::Resource::SERVICE_NAME => 'aws_elastic_beanstalk',
-          ::OpenTelemetry::SemanticConventions::Resource::SERVICE_NAMESPACE => parsed_data['environment_name'],
-          ::OpenTelemetry::SemanticConventions::Resource::SERVICE_VERSION => parsed_data['version_label'],
-          ::OpenTelemetry::SemanticConventions::Resource::SERVICE_INSTANCE_ID => parsed_data['deployment_id']
-        }
-      rescue StandardError => e
-        SolarWindsAPM.logger.debug { "Gather data for AWS Elastic Beanstalk resource detector failed: #{e.message}" }
-        {}
-      end
-    end
-  end
-end

data/lib/solarwinds_apm/support/resource_detector/aws/ec2.rb

@@ -1,145 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require 'net/http'
-require 'json'
-require 'opentelemetry/common'
-require 'opentelemetry/semantic_conventions/resource'
-
-module OpenTelemetry
-  module Resource
-    module Detector
-      module AWS
-        # EC2 contains detect class method for determining EC2 resource attributes
-        module EC2
-          extend self
-
-          # EC2 metadata service endpoints and constants
-          EC2_METADATA_HOST = '169.254.169.254'
-          TOKEN_ENDPOINT = '/latest/api/token'
-          IDENTITY_DOCUMENT_ENDPOINT = '/latest/dynamic/instance-identity/document'
-          HOSTNAME_ENDPOINT = '/latest/meta-data/hostname'
-
-          TOKEN_HEADER = 'X-aws-ec2-metadata-token'
-          TOKEN_TTL_HEADER = 'X-aws-ec2-metadata-token-ttl-seconds'
-          TOKEN_TTL_VALUE = '60'
-
-          # Timeout in seconds for HTTP requests
-          HTTP_TIMEOUT = 1
-
-          # Create a constant for resource semantic conventions
-          RESOURCE = ::OpenTelemetry::SemanticConventions::Resource
-
-          def detect
-            # Implementation for EC2 detection supporting both IMDSv1 and IMDSv2
-            resource_attributes = {}
-
-            begin
-              # Attempt to get IMDSv2 token - this will fail if IMDSv2 is not supported
-              # but we'll still try IMDSv1 in that case
-              token = fetch_token
-
-              # Get instance identity document which contains most metadata
-              # Will try with token (IMDSv2) or without token (IMDSv1)
-              identity = fetch_identity_document(token) || {}
-              return ::OpenTelemetry::SDK::Resources::Resource.create({}) if identity.empty?
-
-              hostname = fetch_hostname(token)
-
-              # Set resource attributes from the identity document
-              resource_attributes[RESOURCE::CLOUD_PROVIDER] = 'aws'
-              resource_attributes[RESOURCE::CLOUD_PLATFORM] = 'aws_ec2'
-              resource_attributes[RESOURCE::CLOUD_ACCOUNT_ID] = identity['accountId']
-              resource_attributes[RESOURCE::CLOUD_REGION] = identity['region']
-              resource_attributes[RESOURCE::CLOUD_AVAILABILITY_ZONE] = identity['availabilityZone']
-
-              resource_attributes[RESOURCE::HOST_ID] = identity['instanceId']
-              resource_attributes[RESOURCE::HOST_TYPE] = identity['instanceType']
-              resource_attributes[RESOURCE::HOST_NAME] = hostname
-            rescue StandardError => e
-              ::OpenTelemetry.handle_error(exception: e, message: 'EC2 resource detection failed')
-              return ::OpenTelemetry::SDK::Resources::Resource.create({})
-            end
-
-            # Filter out nil or empty values
-            resource_attributes.delete_if { |_key, value| value.nil? || value.empty? }
-            ::OpenTelemetry::SDK::Resources::Resource.create(resource_attributes)
-          end
-
-          private
-
-          # Fetches an IMDSv2 token from the EC2 metadata service
-          #
-          # @return [String, nil] The token or nil if the request failed
-          def fetch_token
-            uri = URI.parse("http://#{EC2_METADATA_HOST}#{TOKEN_ENDPOINT}")
-            request = Net::HTTP::Put.new(uri)
-            request[TOKEN_TTL_HEADER] = TOKEN_TTL_VALUE
-
-            response = make_request(uri, request)
-            return nil unless response.is_a?(Net::HTTPSuccess)
-
-            response.body
-          end
-
-          # Fetches the instance identity document which contains EC2 instance metadata
-          #
-          # @param token [String, nil] IMDSv2 token (optional for IMDSv1)
-          # @return [Hash, nil] Parsed identity document or nil if the request failed
-          def fetch_identity_document(token)
-            uri = URI.parse("http://#{EC2_METADATA_HOST}#{IDENTITY_DOCUMENT_ENDPOINT}")
-            request = Net::HTTP::Get.new(uri)
-            request[TOKEN_HEADER] = token if token
-
-            response = make_request(uri, request)
-            return nil unless response.is_a?(Net::HTTPSuccess)
-
-            begin
-              JSON.parse(response.body)
-            rescue JSON::ParserError
-              nil
-            end
-          end
-
-          # Fetches the EC2 instance hostname
-          #
-          # @param token [String, nil] IMDSv2 token (optional for IMDSv1)
-          # @return [String, nil] The hostname or nil if the request failed
-          def fetch_hostname(token)
-            uri = URI.parse("http://#{EC2_METADATA_HOST}#{HOSTNAME_ENDPOINT}")
-            request = Net::HTTP::Get.new(uri)
-            request[TOKEN_HEADER] = token if token
-
-            response = make_request(uri, request)
-            return nil unless response.is_a?(Net::HTTPSuccess)
-
-            response.body
-          end
-
-          # Makes an HTTP request with timeout handling
-          #
-          # @param uri [URI] The request URI
-          # @param request [Net::HTTP::Request] The request to perform
-          # @return [Net::HTTPResponse, nil] The response or nil if the request failed
-          def make_request(uri, request)
-            http = Net::HTTP.new(uri.host, uri.port)
-            http.open_timeout = HTTP_TIMEOUT
-            http.read_timeout = HTTP_TIMEOUT
-
-            begin
-              ::OpenTelemetry::Common::Utilities.untraced do
-                http.request(request)
-              end
-            rescue StandardError
-              ::OpenTelemetry.logger.debug { 'EC2 metadata service request failed' }
-              nil
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/solarwinds_apm/support/resource_detector/aws/ecs.rb

@@ -1,173 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require 'net/http'
-require 'json'
-require 'socket'
-require 'opentelemetry/common'
-require 'opentelemetry/semantic_conventions/resource'
-
-module OpenTelemetry
-  module Resource
-    module Detector
-      module AWS
-        # ECS contains detect class method for determining the ECS resource attributes
-        module ECS
-          extend self
-
-          # Container ID length from cgroup file
-          CONTAINER_ID_LENGTH = 64
-
-          # HTTP request timeout in seconds
-          HTTP_TIMEOUT = 5
-
-          # Create a constant for resource semantic conventions
-          RESOURCE = ::OpenTelemetry::SemanticConventions::Resource
-
-          def detect
-            # Return empty resource if not running on ECS
-            metadata_uri = ENV.fetch('ECS_CONTAINER_METADATA_URI', nil)
-            metadata_uri_v4 = ENV.fetch('ECS_CONTAINER_METADATA_URI_V4', nil)
-
-            return ::OpenTelemetry::SDK::Resources::Resource.create({}) if metadata_uri.nil? && metadata_uri_v4.nil?
-
-            resource_attributes = {}
-            container_id = fetch_container_id
-
-            # Base ECS resource attributes
-            resource_attributes[RESOURCE::CLOUD_PROVIDER] = 'aws'
-            resource_attributes[RESOURCE::CLOUD_PLATFORM] = 'aws_ecs'
-            resource_attributes[RESOURCE::CONTAINER_NAME] = Socket.gethostname
-            resource_attributes[RESOURCE::CONTAINER_ID] = container_id unless container_id.empty?
-
-            # If v4 endpoint is not available, return basic resource
-            return ::OpenTelemetry::SDK::Resources::Resource.create(resource_attributes) if metadata_uri_v4.nil?
-
-            begin
-              # Fetch container and task metadata
-              container_metadata = JSON.parse(http_get(metadata_uri_v4.to_s))
-              task_metadata = JSON.parse(http_get("#{metadata_uri_v4}/task"))
-
-              task_arn = task_metadata['TaskARN']
-              base_arn = task_arn[0..task_arn.rindex(':') - 1]
-
-              cluster = task_metadata['Cluster']
-              cluster_arn = cluster.start_with?('arn:') ? cluster : "#{base_arn}:cluster/#{cluster}"
-
-              # Set ECS-specific attributes
-              resource_attributes[RESOURCE::AWS_ECS_CONTAINER_ARN] = container_metadata['ContainerARN']
-              resource_attributes[RESOURCE::AWS_ECS_CLUSTER_ARN] = cluster_arn
-              resource_attributes[RESOURCE::AWS_ECS_LAUNCHTYPE] = task_metadata['LaunchType'].downcase
-              resource_attributes[RESOURCE::AWS_ECS_TASK_ARN] = task_arn
-              resource_attributes[RESOURCE::AWS_ECS_TASK_FAMILY] = task_metadata['Family']
-              resource_attributes[RESOURCE::AWS_ECS_TASK_REVISION] = task_metadata['Revision']
-
-              # Add logging attributes if awslogs is used
-              logs_attributes = get_logs_resource(container_metadata)
-              resource_attributes.merge!(logs_attributes)
-            rescue StandardError => e
-              ::OpenTelemetry.handle_error(exception: e, message: 'ECS resource detection failed')
-              return ::OpenTelemetry::SDK::Resources::Resource.create({})
-            end
-
-            # Filter out nil or empty values
-            resource_attributes.delete_if { |_key, value| value.nil? || value.empty? }
-            ::OpenTelemetry::SDK::Resources::Resource.create(resource_attributes)
-          end
-
-          private
-
-          # Fetches container ID from /proc/self/cgroup file
-          #
-          # @return [String] The container ID or empty string if not found
-          def fetch_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..] if line.length > CONTAINER_ID_LENGTH
-                end
-              end
-            rescue Errno::ENOENT => e
-              ::OpenTelemetry.handle_error(exception: e, message: 'Failed to get container ID on ECS')
-            end
-
-            ''
-          end
-
-          # Extracting logging-related resource attributes
-          #
-          # @param container_metadata [Hash] Container metadata from ECS metadata endpoint
-          # @returhn [Hash] Resource attributes for logging configuration
-          def get_logs_resource(container_metadata)
-            log_attributes = {}
-
-            if container_metadata['LogDriver'] == 'awslogs'
-              log_options = container_metadata['LogOptions']
-
-              if log_options
-                logs_region = log_options['awslogs-region']
-                logs_group_name = log_options['awslogs-group']
-                logs_stream_name = log_options['awslogs-stream']
-
-                container_arn = container_metadata['ContainerARN']
-
-                # Parse region from ARN if not specified in log options
-                if logs_region.nil? || logs_region.empty?
-                  region_match = container_arn.match(/arn:aws:ecs:([^:]+):.*/)
-                  logs_region = region_match[1] if region_match
-                end
-
-                # Parse account ID from ARN
-                account_match = container_arn.match(/arn:aws:ecs:[^:]+:([^:]+):.*/)
-                aws_account = account_match[1] if account_match
-
-                logs_group_arn = nil
-                logs_stream_arn = nil
-
-                if logs_region && aws_account
-                  logs_group_arn = "arn:aws:logs:#{logs_region}:#{aws_account}:log-group:#{logs_group_name}" if logs_group_name
-
-                  logs_stream_arn = "arn:aws:logs:#{logs_region}:#{aws_account}:log-group:#{logs_group_name}:log-stream:#{logs_stream_name}" if logs_stream_name && logs_group_name
-                end
-
-                log_attributes[RESOURCE::AWS_LOG_GROUP_NAMES] = [logs_group_name].compact
-                log_attributes[RESOURCE::AWS_LOG_GROUP_ARNS] = [logs_group_arn].compact
-                log_attributes[RESOURCE::AWS_LOG_STREAM_NAMES] = [logs_stream_name].compact
-                log_attributes[RESOURCE::AWS_LOG_STREAM_ARNS] = [logs_stream_arn].compact
-              else
-                ::OpenTelemetry.handle_error(message: 'The metadata endpoint v4 has returned \'awslogs\' as \'LogDriver\', but there is no \'LogOptions\' data')
-              end
-            end
-
-            log_attributes
-          end
-
-          # Makes an HTTP GET request to the specified URL
-          #
-          # @param url [String] The URL to request
-          # @return [String] The response body
-          def http_get(url)
-            uri = URI.parse(url)
-            request = Net::HTTP::Get.new(uri)
-
-            http = Net::HTTP.new(uri.host, uri.port)
-            http.open_timeout = HTTP_TIMEOUT
-            http.read_timeout = HTTP_TIMEOUT
-
-            ::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/solarwinds_apm/support/resource_detector/aws/eks.rb

@@ -1,174 +0,0 @@
-# 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..] 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/solarwinds_apm/support/resource_detector/aws/lambda.rb

@@ -1,66 +0,0 @@
-# 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