appsignal 5.0.1-java → 5.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c0a9fb60c548877c42b28d1699c4aa625067bf6477d5f42c3d668a8fd477c77
-  data.tar.gz: 36cee0453b823e884447de04c004e02ee6a74981a6c4f2ee82e6b53dcecbf9e0
+  metadata.gz: f511b69fdbdeb226062bbaf05e00fe52eb3bd20854c3eeb202edba0b815b1db5
+  data.tar.gz: e1261b245afbc044c149b030ba2b4f4656c7d56f56e37223006ed21a68d1a8be
 SHA512:
-  metadata.gz: 810417245e4d326a430379896d16c859838cba12b5e8de84c652c45343b8ea016ea4d4776363d4f7696226372e2d4f5f84a4698fe695e95c75263e190ba0aaa0
-  data.tar.gz: 5fcb6ca575a989b8123f2ba225036520fbe74ff88cbcdec64b3b12eb919aaff35adc3c0c9f10e331be6a7764d4d238c185c2cd7a546d9b3459278d99721531ae
+  metadata.gz: a18f025051286fc68ff81d27cdc6d4d2fd91b71f79e3d439a9d957e39c98350c9dd46fc7626738c8dfddd13908f13884f9be13155475dedfc8e2844e10f44021
+  data.tar.gz: eb8047d550aaa8afd456483ef40db0d188ba492215e582b6f7ddc5c73b6d7e1d957c39bf0183e2b2d5fa1dbd5531a5064d66ac874a1112193feddf9d90f1cd94

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # AppSignal for Ruby gem Changelog
 
+## 5.0.3
+
+_Published on 2026-10-08._
+
+### Fixed
+
+- In collector mode, report counter metrics correctly from processes forked after AppSignal starts, such as Puma workers when using `preload_app!`. Before this change, applications running several forked processes would lose data points or report incorrect values for them. (patch [4e5a3e78](https://github.com/appsignal/appsignal-ruby/commit/4e5a3e781b4ce2b2620b172a15198a2a59e0ebee))
+
+## 5.0.2
+
+_Published on 2026-10-06._
+
+### Changed
+
+- Use the revision set by Heroku, Render, Kamal or Scalingo when the application also has a `REVISION` file. Since version 4.6.0, a `REVISION` file took precedence over the `HEROKU_SLUG_COMMIT`, `RENDER_GIT_COMMIT`, `KAMAL_VERSION` and `CONTAINER_VERSION` environment variables, so an application that kept a placeholder `REVISION` file in source control reported that placeholder as its revision. The `revision` config option and the `APP_REVISION` environment variable still take precedence over both.
+
+  Thanks to @rmm5t for their contribution!
+
+  (patch [bc14ef9c](https://github.com/appsignal/appsignal-ruby/commit/bc14ef9c6db3de71bf2ca8f23ad088f29294c0ff))
+
 ## 5.0.1
 
 _Published on 2026-10-02._

data/README.md

@@ -318,7 +318,7 @@ Also see our [SUPPORT.md file](SUPPORT.md).
 [custom-instrumentation]: https://docs.appsignal.com/ruby/instrumentation.html
 [front-end-monitoring]: https://docs.appsignal.com/front-end.html
 [exception-handling]: https://docs.appsignal.com/ruby/instrumentation/exception-handling.html
-[tagging]: https://docs.appsignal.com/guides/custom-data/tagging-request.html
+[tagging]: https://docs.appsignal.com/guides/tagging#ruby
 [host-metrics]: https://docs.appsignal.com/metrics/host.html
 [custom-metrics]: https://docs.appsignal.com/metrics/custom.html
 

data/lib/appsignal/config.rb

@@ -177,9 +177,7 @@ module Appsignal
     }.freeze
 
     # Environment variables set by deployment platforms that name the
-    # revision that is being deployed, in the order the agent reads them.
-    # The agent detects the revision this way as well, but only for the data
-    # it sends itself, so the gem has to do it for collector mode.
+    # revision that is being deployed, in the order they are read.
     # @!visibility private
     PLATFORM_REVISION_ENV_VARS = [
       "HEROKU_SLUG_COMMIT",
@@ -812,10 +810,10 @@ module Appsignal
 
         hash[:enable_at_exit_hook] = "always" if Appsignal::Extension.running_in_container?
 
-        # Set the revision from a REVISION file in the project root, which
-        # helps with Capistrano and Hatchbox.io deployments, or from the
-        # environment variable the deployment platform sets.
-        revision = detect_revision_from_file || detect_revision_from_platform
+        # Set the revision from the environment variable the deployment
+        # platform sets, or from a REVISION file in the project root, which
+        # helps with Capistrano and Hatchbox.io deployments.
+        revision = detect_revision_from_platform || detect_revision_from_file
         hash[:revision] = revision if revision
 
         hostname = detect_hostname

data/lib/appsignal/opentelemetry/process_resource.rb

@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+require "securerandom"
+
+module Appsignal
+  module OpenTelemetry
+    # @!visibility private
+    #
+    # The resource attributes that identify the current process:
+    # `service.instance.id` and `process.pid`. The OpenTelemetry providers are
+    # built once, so a process forked after that inherits its parent's values
+    # until {.attach_fork_hook} refreshes them in the child.
+    module ProcessResource
+      SERVICE_INSTANCE_ID = "service.instance.id"
+      PROCESS_PID = "process.pid"
+      REFRESH_FAILED = "Could not refresh the OpenTelemetry resource after fork"
+
+      class << self
+        # A random UUIDv4, generated again when the process ID changes.
+        def service_instance_id
+          pid = Process.pid
+          unless @service_instance_id_pid == pid
+            @service_instance_id = SecureRandom.uuid
+            @service_instance_id_pid = pid
+          end
+          @service_instance_id
+        end
+
+        def resource
+          ::OpenTelemetry::SDK::Resources::Resource.create(
+            SERVICE_INSTANCE_ID => service_instance_id,
+            PROCESS_PID => Process.pid
+          )
+        end
+
+        def attach_fork_hook
+          return if @fork_hook_attached
+
+          Process.singleton_class.prepend(ForkHook)
+          @fork_hook_attached = true
+        end
+
+        def before_fork
+          return unless Appsignal::OpenTelemetry.started?
+
+          providers.transform_values do |provider|
+            current = current_resource(provider)
+            current && attribute(current, SERVICE_INSTANCE_ID)
+          end
+        rescue => e
+          log_failure("#{e.class}: #{e.message}")
+          nil
+        end
+
+        def after_fork(instance_ids_before_fork)
+          return unless instance_ids_before_fork
+
+          update = resource
+          providers.each do |name, provider|
+            refresh(name, provider, update, instance_ids_before_fork[name])
+          end
+        rescue => e
+          log_failure("#{e.class}: #{e.message}")
+        end
+
+        private
+
+        def providers
+          {
+            "tracer" => ::OpenTelemetry.tracer_provider,
+            "meter" => ::OpenTelemetry.meter_provider,
+            "logger" => ::OpenTelemetry.logger_provider
+          }
+        end
+
+        def refresh(name, provider, update, instance_id_before_fork)
+          current = current_resource(provider)
+          unless current
+            log_failure("the #{name} provider's resource could not be read")
+            return
+          end
+          return unless attribute(current, SERVICE_INSTANCE_ID) == instance_id_before_fork
+
+          refreshed = current.merge(update)
+          write_resource(provider, refreshed)
+          return if current_resource(provider).equal?(refreshed)
+
+          log_failure("the #{name} provider did not keep the new resource")
+        end
+
+        # The SDK providers take their resource only in their constructors, and
+        # read it from `@resource` when they export.
+        def current_resource(provider)
+          if provider.respond_to?(:resource)
+            resource = provider.resource
+            unless provider.respond_to?(:resource=)
+              # Without a setter, only `@resource` can be written, and it isn't there.
+              return unless provider.instance_variable_defined?(:@resource)
+              # The reader returns something else, so writing `@resource` would change nothing.
+              return unless provider.instance_variable_get(:@resource).equal?(resource)
+            end
+          elsif provider.instance_variable_defined?(:@resource)
+            resource = provider.instance_variable_get(:@resource)
+          end
+          # If it's not a resource, it isn't what the provider exports.
+          resource if resource.is_a?(::OpenTelemetry::SDK::Resources::Resource)
+        end
+
+        def write_resource(provider, resource)
+          if provider.respond_to?(:resource=)
+            provider.resource = resource
+          else
+            provider.instance_variable_set(:@resource, resource)
+          end
+        end
+
+        def attribute(resource, key)
+          resource.attribute_enumerator.each { |k, v| return v if k == key }
+          nil
+        end
+
+        def log_failure(reason)
+          Appsignal.internal_logger.warn("#{REFRESH_FAILED}: #{reason}")
+        end
+      end
+
+      module ForkHook
+        def _fork
+          instance_ids = ProcessResource.before_fork
+          pid = super
+          ProcessResource.after_fork(instance_ids) if pid.zero?
+          pid
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/opentelemetry.rb

@@ -8,6 +8,7 @@ require "appsignal/opentelemetry/http_method"
 require "appsignal/opentelemetry/http_response"
 require "appsignal/opentelemetry/http_server_request"
 require "appsignal/opentelemetry/messaging"
+require "appsignal/opentelemetry/process_resource"
 require "appsignal/opentelemetry/proxied_exporter"
 require "appsignal/opentelemetry/rendering"
 require "appsignal/opentelemetry/sql_db_system"
@@ -59,7 +60,9 @@ module Appsignal
         # `LoggerProvider` take a `resource:` kwarg that replaces (not
         # merges), so we do the merge ourselves and use the same merged
         # resource for the tracer provider to keep all three in sync.
-        resource = ::OpenTelemetry::SDK::Resources::Resource.default.merge(build_resource(config))
+        resource = ProcessResource.resource
+          .merge(::OpenTelemetry::SDK::Resources::Resource.default)
+          .merge(build_resource(config))
 
         span_exporter = build_exporter(
           ::OpenTelemetry::Exporter::OTLP::Exporter,
@@ -103,6 +106,7 @@ module Appsignal
         )
 
         @started = true
+        ProcessResource.attach_fork_hook
       rescue LoadError => e
         @started = false
         Appsignal::Utils::StdoutAndLoggerMessage.error(

data/lib/appsignal/version.rb

@@ -2,5 +2,5 @@
 
 module Appsignal
   # @return [String]
-  VERSION = "5.0.1"
+  VERSION = "5.0.3"
 end

data/sig/appsignal.rbi

@@ -8,7 +8,7 @@
 module Appsignal
   extend Appsignal::Helpers::Metrics
   extend Appsignal::Helpers::Instrumentation
-  VERSION = T.let("5.0.1", T.untyped)
+  VERSION = T.let("5.0.3", T.untyped)
 
   class << self
     # The loaded AppSignal configuration.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.3
 platform: java
 authors:
 - Robert Beekman
@@ -306,6 +306,7 @@ files:
 - lib/appsignal/opentelemetry/http_response.rb
 - lib/appsignal/opentelemetry/http_server_request.rb
 - lib/appsignal/opentelemetry/messaging.rb
+- lib/appsignal/opentelemetry/process_resource.rb
 - lib/appsignal/opentelemetry/proxied_exporter.rb
 - lib/appsignal/opentelemetry/rendering.rb
 - lib/appsignal/opentelemetry/sql_db_system.rb