cleanup tests, logs, and semconv

Author: jj22ee

sampler/xray/lib/opentelemetry/sampler/xray/aws_xray_remote_sampler.rb

@@ -122,7 +122,7 @@ def retrieve_and_update_sampling_rules
             OpenTelemetry.logger.error('GetSamplingRules Response is falsy')
           end
         rescue StandardError => e
-          OpenTelemetry.logger.error("Error occurred when retrieving or updating Sampling Rules: #{e}")
+          OpenTelemetry.handle_error(exception: e, message: 'Error occurred when retrieving or updating Sampling Rules')
         end
 
         def update_sampling_rules(response_object)

sampler/xray/lib/opentelemetry/sampler/xray/aws_xray_sampling_client.rb

@@ -51,7 +51,7 @@ def parse_endpoint(endpoint)
           host, port = endpoint.split(':')
           [host, port.to_i]
         rescue StandardError => e
-          OpenTelemetry.logger.error("Invalid endpoint: #{endpoint}")
+          OpenTelemetry.handle_error(exception: e, message: "Invalid endpoint: #{endpoint}")
           raise e
         end
       end

sampler/xray/lib/opentelemetry/sampler/xray/sampling_rule_applier.rb

@@ -20,6 +20,7 @@ class SamplingRuleApplier
         attr_reader :sampling_rule
 
         MAX_DATE_TIME_SECONDS = Time.at(8_640_000_000_000)
+        SEMCONV = OpenTelemetry::SemanticConventions
 
         def initialize(sampling_rule, statistics = OpenTelemetry::Sampler::XRay::Statistics.new, target = nil)
           @sampling_rule = sampling_rule
@@ -38,10 +39,10 @@ def matches?(attributes, resource)
           http_host = nil
 
           unless attributes.nil?
-            http_target = attributes[OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET]
-            http_url = attributes[OpenTelemetry::SemanticConventions::Trace::HTTP_URL]
-            http_method = attributes[OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD]
-            http_host = attributes[OpenTelemetry::SemanticConventions::Trace::HTTP_HOST]
+            http_target = attributes[SEMCONV::Trace::HTTP_TARGET]
+            http_url = attributes[SEMCONV::Trace::HTTP_URL]
+            http_method = attributes[SEMCONV::Trace::HTTP_METHOD]
+            http_host = attributes[SEMCONV::Trace::HTTP_HOST]
           end
 
           service_type = nil
@@ -50,8 +51,8 @@ def matches?(attributes, resource)
           resource_hash = resource.attribute_enumerator.to_h
 
           if resource
-            service_name = resource_hash[OpenTelemetry::SemanticConventions::Resource::SERVICE_NAME] || ''
-            cloud_platform = resource_hash[OpenTelemetry::SemanticConventions::Resource::CLOUD_PLATFORM]
+            service_name = resource_hash[SEMCONV::Resource::SERVICE_NAME] || ''
+            cloud_platform = resource_hash[SEMCONV::Resource::CLOUD_PLATFORM]
             service_type = OpenTelemetry::Sampler::XRay::Utils::CLOUD_PLATFORM_MAPPING[cloud_platform] if cloud_platform.is_a?(String)
             resource_arn = get_arn(resource, attributes)
           end
@@ -99,11 +100,11 @@ def should_sample?(trace_id:, parent_context:, links:, name:, kind:, attributes:
 
         def get_arn(resource, attributes)
           resource_hash = resource.attribute_enumerator.to_h
-          arn = resource_hash[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_CONTAINER_ARN] ||
-                resource_hash[OpenTelemetry::SemanticConventions::Resource::AWS_ECS_CLUSTER_ARN] ||
-                resource_hash[OpenTelemetry::SemanticConventions::Resource::AWS_EKS_CLUSTER_ARN]
+          arn = resource_hash[SEMCONV::Resource::AWS_ECS_CONTAINER_ARN] ||
+                resource_hash[SEMCONV::Resource::AWS_ECS_CLUSTER_ARN] ||
+                resource_hash[SEMCONV::Resource::AWS_EKS_CLUSTER_ARN]
 
-          arn = attributes[OpenTelemetry::SemanticConventions::Trace::AWS_LAMBDA_INVOKED_ARN] || resource_hash[OpenTelemetry::SemanticConventions::Resource::FAAS_ID] if arn.nil?
+          arn = attributes[SEMCONV::Trace::AWS_LAMBDA_INVOKED_ARN] || resource_hash[SEMCONV::Resource::FAAS_ID] if arn.nil?
           arn
         end
       end

sampler/xray/test/aws_xray_remote_sampler_test.rb

@@ -9,6 +9,7 @@
 DATA_DIR_SAMPLING_RULES = File.join(__dir__, 'data/test-remote-sampler_sampling-rules-response-sample.json')
 DATA_DIR_SAMPLING_TARGETS = File.join(__dir__, 'data/test-remote-sampler_sampling-targets-response-sample.json')
 TEST_URL = 'localhost:2000'
+SEMCONV = OpenTelemetry::SemanticConventions
 
 describe OpenTelemetry::Sampler::XRay::AWSXRayRemoteSampler do
   it 'creates remote sampler with empty resource' do
@@ -33,8 +34,8 @@
       .to_return(status: 200, body: File.read(DATA_DIR_SAMPLING_TARGETS))
 
     resource = OpenTelemetry::SDK::Resources::Resource.create(
-      OpenTelemetry::SemanticConventions::Resource::SERVICE_NAME => 'test-service-name',
-      OpenTelemetry::SemanticConventions::Resource::CLOUD_PLATFORM => 'test-cloud-platform'
+      SEMCONV::Resource::SERVICE_NAME => 'test-service-name',
+      SEMCONV::Resource::CLOUD_PLATFORM => 'test-cloud-platform'
     )
     sampler = OpenTelemetry::Sampler::XRay::InternalAWSXRayRemoteSampler.new(resource: resource)
 
@@ -53,8 +54,8 @@
       .to_return(status: 200, body: File.read(DATA_DIR_SAMPLING_TARGETS))
 
     resource = OpenTelemetry::SDK::Resources::Resource.create(
-      OpenTelemetry::SemanticConventions::Resource::SERVICE_NAME => 'test-service-name',
-      OpenTelemetry::SemanticConventions::Resource::CLOUD_PLATFORM => 'test-cloud-platform'
+      SEMCONV::Resource::SERVICE_NAME => 'test-service-name',
+      SEMCONV::Resource::CLOUD_PLATFORM => 'test-cloud-platform'
     )
     sampler = OpenTelemetry::Sampler::XRay::InternalAWSXRayRemoteSampler.new(
       resource: resource,
@@ -78,14 +79,13 @@
       .to_return(status: 200, body: File.read(DATA_DIR_SAMPLING_TARGETS))
 
     resource = OpenTelemetry::SDK::Resources::Resource.create(
-      OpenTelemetry::SemanticConventions::Resource::SERVICE_NAME => 'test-service-name',
-      OpenTelemetry::SemanticConventions::Resource::CLOUD_PLATFORM => 'test-cloud-platform'
+      SEMCONV::Resource::SERVICE_NAME => 'test-service-name',
+      SEMCONV::Resource::CLOUD_PLATFORM => 'test-cloud-platform'
     )
     rs = OpenTelemetry::Sampler::XRay::AWSXRayRemoteSampler.new(resource: resource)
 
     attributes = { 'abc' => '1234' }
 
-    sleep(1.0)
     test_rule_applier = rs.instance_variable_get(:@root).instance_variable_get(:@root).instance_variable_get(:@rule_cache).instance_variable_get(:@rule_appliers)[0]
     assert_equal 'test', test_rule_applier.instance_variable_get(:@sampling_rule).instance_variable_get(:@rule_name)
     assert_equal OpenTelemetry::SDK::Trace::Samplers::Decision::DROP,