hephaestus 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 147a21893659ce7204805de5c82711196fbe1b7e3fce13bbeddb049e9cd151b3
-  data.tar.gz: fb39e4f9a955ae1d5925e53aaf68d3eb660d5d8858b5e49bfb9c5e9ea321b719
+  metadata.gz: d2ce525aec1a0e799119c58576c0620f33b61d6c4ec2e3eb720fb731fffe9f25
+  data.tar.gz: 73b98f732bce7334868f7f7e2cdccc67ee84df2ffd58a34140504414846b2240
 SHA512:
-  metadata.gz: 219a46bf7606c484fd297fe8563e3122edb33af266c4b566024f67269abd5f41a09b4aa1cdb445de827865457c66f0741843fd779cda2c812d1466cf6690f2c5
-  data.tar.gz: '049ed8fa2d285ac0c018d3a856b9d60de42be83efb25a490643aa47ac09742fd8dd94208491ae19911c563d25f0cd5ef606de914b7358de1dcfcc176d74a2165'
+  metadata.gz: '0874dddeb9a33837aede0dbf639ebfe7c94bc58daa24c1b16207ab6705e1f56d029c8230a8eec02f21c9a78217fcd60e12f2f534876de2a081b28e0b868e6bf8'
+  data.tar.gz: 5eac3b041ec6ea3ac7f2263c764b279f9aa7998e662e3f437084a383e801e812592c67561526f3afcfc8da9131feea6a1e77300ac4472bc255def552fa6e69fe

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v0.8.9] - 10-12-2024
+## What's Changed
+* Point OpenTelemetry to internal service by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/86
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.8.8...v0.8.9
 # [v0.8.8] - 09-12-2024
 ## What's Changed
 * Filter parameter logging in jobs by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/84

data/config/initializers/environment.rb

@@ -106,6 +106,8 @@ module Hephaestus
     ["Common"].each do |section_label|
       res["fields"].select { |f| f["section"] && f["section"]["label"] }.each do |field|
         next unless field["section"]["label"] == section_label
+        # exclude DATABASE_URL because it's been retrieved already in the plug boot up
+        next if field["label"].include?("DATABASE_URL")
 
         load_infra_secret(field)
       end

data/config/initializers/opentelemetry.rb

@@ -1,41 +1,53 @@
 # typed: false
 # frozen_string_literal: true
 
-unless Rails.env.development?
-  # establish the environment for OTEL
-  ENV["OTEL_EXPORTER_OTLP_ENDPOINT"] = "https://api.honeycomb.io"
+# development is intentionally disabled
+return if Rails.env.development?
+return if defined?(Rails::Console)
 
-  ENV["OTEL_EXPORTER_OTLP_HEADERS"] = fetch_infra_secret(
-    label: "OTEL_EXPORTER_OTLP_HEADERS",
-    default: "x-honeycomb-team=your-api-key",
-  )
+# establish the environment for OTEL
+ENV["OTEL_EXPORTER_OTLP_ENDPOINT"] = "http://service-otelcol-#{Rails.env}.internal:4318"
+ENV["OTEL_SERVICE_NAME"] = "plug-#{plug_shortname}-#{Rails.env}"
 
-  ENV["OTEL_SERVICE_NAME"] = "plug-#{plug_shortname}-#{Rails.env}"
+require "opentelemetry/sdk"
+require "opentelemetry/instrumentation/all"
+require "opentelemetry/exporter/otlp"
+require "opentelemetry/semantic_conventions"
 
-  require "opentelemetry/sdk"
-  require "opentelemetry/exporter/otlp"
-  require "opentelemetry/semantic_conventions"
+OpenTelemetry::SDK.configure do |c|
+  c.logger = Rails.logger
 
-  OpenTelemetry::SDK.configure do |c|
-    c.logger = Rails.logger
+  ##### Instruments
+  c.use("OpenTelemetry::Instrumentation::Rack", { use_rack_events: false })
+  c.use("OpenTelemetry::Instrumentation::ActionPack")
+  c.use("OpenTelemetry::Instrumentation::ActionView")
+  c.use("OpenTelemetry::Instrumentation::ActiveJob")
+  c.use("OpenTelemetry::Instrumentation::ActiveRecord")
+  c.use("OpenTelemetry::Instrumentation::AwsSdk")
+  c.use("OpenTelemetry::Instrumentation::ConcurrentRuby")
+  c.use("OpenTelemetry::Instrumentation::Faraday")
+  c.use("OpenTelemetry::Instrumentation::HttpClient")
+  c.use("OpenTelemetry::Instrumentation::Net::HTTP")
+  c.use("OpenTelemetry::Instrumentation::PG", {
+    # By default, this instrumentation includes the executed SQL as the `db.statement`
+    # semantic attribute. Optionally, you may disable the inclusion of this attribute entirely by
+    # setting this option to :omit or sanitize the attribute by setting to :obfuscate
+    db_statement: :obfuscate,
+  })
+  c.use("OpenTelemetry::Instrumentation::Rails")
+  c.use("OpenTelemetry::Instrumentation::RestClient")
 
-    c.use_all(
-      "OpenTelemetry::Instrumentation::PG" => { db_statement: :obfuscate },
-      "OpenTelemetry::Instrumentation::Rack" => { use_rack_events: false },
+  if !productionish?
+    c.add_span_processor(
+      OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
+        OpenTelemetry::Exporter::OTLP::Exporter.new,
+      ),
+    )
+  else # useful for testing instrumentation
+    c.add_span_processor(
+      OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
+        OpenTelemetry::SDK::Trace::Export::SpanExporter.new,
+      ),
     )
-
-    if productionish?
-      c.add_span_processor(
-        OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
-          OpenTelemetry::Exporter::OTLP::Exporter.new,
-        ),
-      )
-    else # useful for testing instrumentation
-      c.add_span_processor(
-        OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
-          OpenTelemetry::SDK::Trace::Export::SpanExporter.new,
-        ),
-      )
-    end # development is intentionally disabled
   end
 end

data/lib/hephaestus/version.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module Hephaestus
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
   RAILS_VERSION = ">= 8.0"
   RUBY_VERSION = File
     .read("#{File.dirname(__FILE__)}/../../.ruby-version")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hephaestus
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap