philbot-scheduler 1.3.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfdb1868af424341b615986e599981eabc136f8c3383544f273dd178b95ff5e0
-  data.tar.gz: 563da33d33b14f2c42a6f60380c9f8e70bd4059c2610bbe6f3f0ab4e32abeab1
+  metadata.gz: 49a7fca6e5c448e17f2bfd0e36c93e1f2e87ea78230094142d03470b3db469d4
+  data.tar.gz: d7486a4b06f9399bb6b3131e23ba93f818f755c54f393a9c59cb299315275bba
 SHA512:
-  metadata.gz: 0c0da0ffbf7cecaaa73344508495c755a026884414dc115f8c7aff8f0d315c3211ef5e42fe494b453dc60f17b5def9abee7c325f66e45cadc6fadf2ab9940da7
-  data.tar.gz: 5a59579482d20a5f49506edbde8f9188965a89efa9d6eddc456bfae56e6d4af39d5fd6a4afb8021311b89a975585e85d9d5b27f233db1ccae41588209a6788c8
+  metadata.gz: 368bedf690b2b4a8b50308af4ffc3cb8dc62aae499da6f840caffcc4df5d6c33b211190fce1be12c7fd823b553798705d346d02d6989235feeb3584ed499f17d
+  data.tar.gz: 0dad12df59bf85179bed8b236b5a6e7c08ffa99c9c80c9fd3f6943b891a97c757dae9927f5cf51974b34996fc8e6b8be1a967cdbcee2c4aa3b7b048f925a844e

data/lib/scheduler.rb

@@ -8,21 +8,67 @@ require 'net/http'
 
 $stdout.sync = true
 
-OpenTelemetry::SDK.configure do |c|
-  c.use_all()
-  c.resource = OpenTelemetry::SDK::Resources::Resource.create({
-    OpenTelemetry::SemanticConventions::Resource::SERVICE_NAMESPACE => 'Philbot',
-    OpenTelemetry::SemanticConventions::Resource::SERVICE_NAME => 'Philbot Scheduler',
-    OpenTelemetry::SemanticConventions::Resource::SERVICE_INSTANCE_ID => SecureRandom.uuid,
-    OpenTelemetry::SemanticConventions::Resource::SERVICE_VERSION => ENV['SERVICE_VERSION']
-  })
-  for name in ["dt_metadata_e617c525669e072eebe3d0f08212e8f2.properties", "/var/lib/dynatrace/enrichment/dt_metadata.properties"] do
+module ServiceResourceDetector
+  extend self
+  def detect()
+    version = 'unknown'
     begin
-      c.resource = OpenTelemetry::SDK::Resources::Resource.create(Hash[*File.read(name.start_with?("/var") ? name : File.read(name)).split(/[=\n]+/)])
+      version = File.read('version.txt')
     rescue
     end
+    return OpenTelemetry::SDK::Resources::Resource.create({
+      OpenTelemetry::SemanticConventions::Resource::SERVICE_NAMESPACE => 'Philbot',
+      OpenTelemetry::SemanticConventions::Resource::SERVICE_NAME => 'Philbot Scheduler',
+      OpenTelemetry::SemanticConventions::Resource::SERVICE_INSTANCE_ID => SecureRandom.uuid,
+      OpenTelemetry::SemanticConventions::Resource::SERVICE_VERSION => version
+    })
+  end
+end
+
+module AwsEC2ResourceDetector
+  extend self
+  
+  def detect
+    token_request = Net::HTTP.new(URI('http://169.254.169.254/latest/api/token'))
+    token_request['X-aws-ec2-metadata-token-ttl-seconds'] = '60'
+    token = token_request.send_request('PUT', '/latest/api/token').body    
+    identity = JSON.parse(Net::HTTP.get(URI('http://169.254.169.254/latest/dynamic/instance-identity/document'), { 'X-aws-ec2-metadata-token' => token }).body)
+    hostname = Net::HTTP.get(URI('http://169.254.169.254/latest/meta-data/hostname'), { 'X-aws-ec2-metadata-token' => token }).body
+    resource_attributes = {}
+    unless identity.nil?
+      resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_PROVIDER] = 'aws'
+      resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_PLATFORM] = 'aws_ec2'
+      resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_ACCOUNT_ID] = identity['accountId']
+      resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_REGION] = identity['region']
+      resource_attributes[OpenTelemetry::SemanticConventions::Resource::CLOUD_AVAILABILITY_ZONE] = identity['availabilityZone']
+      resource_attributes[OpenTelemetry::SemanticConventions::Resource::HOST_ID] = identity['instanceId']
+      resource_attributes[OpenTelemetry::SemanticConventions::Resource::HOST_TYPE] = identity['instanceType']
+      resource_attributes[OpenTelemetry::SemanticConventions::Resource::HOST_NAME] = hostname
+    end
+    resource_attributes.delete_if { |_key, value| value.nil? || value.empty? }
+    OpenTelemetry::SDK::Resources::Resource.create(resource_attributes)
+  end
+end
+
+module DynatraceResourceDetector
+  extend self
+  def detect()
+    for name in ["dt_metadata_e617c525669e072eebe3d0f08212e8f2.properties", "/var/lib/dynatrace/enrichment/dt_metadata.properties"] do
+      begin
+        return OpenTelemetry::SDK::Resources::Resource.create(Hash[*File.read(name.start_with?("/var") ? name : File.read(name)).split(/[=\n]+/)])
+      rescue
+      end
+    end
+    return OpenTelemetry::SDK::Resources::Resource.create({})
   end
+end
+
+OpenTelemetry::SDK.configure do |c|
+  c.resource = DynatraceResourceDetector.detect
+  c.resource = AwsEC2ResourceDetector.detect
+  c.resource = ServiceResourceDetector.detect
   c.resource = OpenTelemetry::Resource::Detectors::AutoDetector.detect
+
   c.add_span_processor(
     OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
       OpenTelemetry::Exporter::OTLP::Exporter.new(
@@ -31,6 +77,8 @@ OpenTelemetry::SDK.configure do |c|
       )
     )
   )
+
+  c.use_all()
 end
 
 tracer = OpenTelemetry.tracer_provider.tracer('scheduler', '1.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: philbot-scheduler
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.1
 platform: ruby
 authors:
 - Philipp Lengauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: p.lengauer@gmail.com