datadog-json_logger 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9df47f5fde7ef4639bbba0854c2d9fa90db7f580d489bfc04051c79c191c7d8f
-  data.tar.gz: 8f88db7cf3f19787fabb34d4fa95d787689223e8e933a9e38f3f448b2501322b
+  metadata.gz: c4761325e6c6e8b1ef89a84eb3996f1efeff464d1905c1b02b60e753f74db6a9
+  data.tar.gz: fb35271ac279af034ba6954470a56c385a2485605cf327b747dc9d02db1ebde9
 SHA512:
-  metadata.gz: 24e9e6f6a59711c62bcc386be834a0b2e98bdc70e53084c7da73a6b04a26f25b091afae4a61b8049b6e24b5bc94901997b3383b8fa1d485033f09919140b5ac9
-  data.tar.gz: 8ad6344f4e503a946f6653a30840b9dca8afc70e161b5369a582dbcd2105b276f3545c66d396fb60ac6d25725745a6322c607336931a542f34915a3234652889
+  metadata.gz: 60a1f036af46a40eddf436678882c8feab759cdef7e09a70914dfbc87bb64c935c7602d38b1ddf6d71b01a429637379e4f05d1d0d6bc19ad1a5700c44434575f
+  data.tar.gz: 870db4cf8af593d9f1a60e74a23d0255bb26e2ade670790871a89c8edce48149279dbba24870bc32f7bb9024a1c6b6b00196f791e5021b775fd937f87956ca2c

data/.rubocop.yml

@@ -1,3 +1,7 @@
+plugins:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
   Exclude:
     - 'sig/**/*'
@@ -5,7 +9,7 @@ AllCops:
     - 'lib/datadog/tracing/contrib/bunny/patcher.rb'
     - 'vendor/**/*'
   NewCops: enable
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.4
 
 Style/StringLiterals:
   Enabled: true
@@ -33,4 +37,22 @@ Metrics/BlockLength:
     - 'spec/**/*'
 
 Metrics/ParameterLists:
-  Max: 6
+  Max: 6
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
+
+RSpec/MultipleExpectations:
+  Max: 5
+
+RSpec/NestedGroups:
+  Max: 4
+
+RSpec/ExampleLength:
+  Max: 15
+
+RSpec/MessageChain:
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-3.4.1
+3.4.7

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.4.7

data/README.md

@@ -21,7 +21,7 @@
 ## Requirements
 
 - Ruby 3.0+
-- [ddtrace](https://github.com/DataDog/dd-trace-rb) properly configured in your application
+- [datadog](https://github.com/DataDog/dd-trace-rb) properly configured in your application
 
 ## Installation
 
@@ -62,12 +62,12 @@ logger.info('Hello World')
 Datadog::JSONLogger.configure do |config|
   # Function to extract current user from environment
   config.current_user = ->(env) { { email: env['current_user']&.email } }
-  
+
   # Custom environment keys
   config.controller_key = "sinatra.controller_name"
   config.resource_key = "sinatra.resource_name"
   config.action_key = "sinatra.action_name"
-  
+
   # Custom context for all logs
   config.custom_context = -> { { environment: ENV['RACK_ENV'] } }
 end
@@ -81,7 +81,7 @@ In your `config/initializers/datadog.rb`:
 require 'datadog/json_logger'
 
 Datadog::JSONLogger.configure do |config|
-  config.current_user = ->(env) { { email: env['warden']&.user&.email } } 
+  config.current_user = ->(env) { { email: env['warden']&.user&.email } }
   config.controller_key = "action_controller.instance"
   config.action_key = "action_dispatch.request.path_parameters[:action]"
   config.resource_key = "action_dispatch.request.path_parameters[:controller]"
@@ -103,14 +103,14 @@ class MyApp < Sinatra::Base
     Datadog::JSONLogger.configure do |config|
       config.current_user = ->(env) { { email: env['warden']&.user&.email } }
     end
-    
+
     # Set up logger
     set :logger, Datadog::JSONLogger.new
-    
+
     # Add Rack middleware
     use Datadog::RackMiddleware, settings.logger
   end
-  
+
   # Your routes here
 end
 ```

data/lib/datadog/loggers/version.rb

@@ -2,6 +2,6 @@
 
 module Datadog
   module Loggers
-    VERSION = "0.3.0"
+    VERSION = "0.3.3"
   end
 end

data/lib/datadog/rack_middleware.rb

@@ -12,7 +12,7 @@ module Rack
   end
 end
 
-module Datadog
+module Datadog # rubocop:disable Style/OneClassPerFile
   class RackMiddleware
     attr_reader :app, :logger
 
@@ -45,7 +45,7 @@ module Datadog
     def safely_process_request(env)
       app.call(env)
     rescue StandardError => e
-      [500, { "Content-Type": "application/json" }, [e.class.name, e.message].join(": ")]
+      [500, { "Content-Type": "application/json" }, ["#{e.class.name}: #{e.message}"]]
     end
 
     def log_request(request, env, status, headers, start_time, end_time)

data/lib/datadog/tracing/contrib/bunny/utils.rb

@@ -18,11 +18,23 @@ module Datadog
                                         return
                                       end
 
+            # A producer on a newer datadog gem may serialize digest fields this
+            # consumer's TraceDigest does not know yet; drop them instead of raising.
+            serializes_trace_digest = serializes_trace_digest.slice(*supported_trace_digest_keys)
+
             trace_digest = Datadog::Tracing::TraceDigest.new(**serializes_trace_digest)
             return unless trace_digest
 
             Datadog::Tracing.continue_trace!(trace_digest)
           end
+
+          # @return [Array<Symbol>]
+          def supported_trace_digest_keys
+            @supported_trace_digest_keys ||=
+              Datadog::Tracing::TraceDigest.instance_method(:initialize).parameters.filter_map do |type, name|
+                name if %i[key keyreq].include?(type)
+              end
+          end
         end
       end
     end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: datadog-json_logger
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Eth3rnit3
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datadog
@@ -36,13 +35,12 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".rubycritic.yml"
+- ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Dockerfile.nexus
 - LICENSE.txt
 - README.md
 - Rakefile
-- Steepfile
 - datadog-json_logger.gemspec
 - lib/datadog/configuration.rb
 - lib/datadog/json_logger.rb
@@ -54,7 +52,6 @@ files:
 - lib/datadog/tracing/contrib/bunny/integration.rb
 - lib/datadog/tracing/contrib/bunny/patcher.rb
 - lib/datadog/tracing/contrib/bunny/utils.rb
-- nexus_release.sh
 - sig/.keep
 homepage: https://github.com/buyco/datadog-json-logger
 licenses:
@@ -65,7 +62,6 @@ metadata:
   source_code_uri: https://github.com/buyco/datadog-json-logger
   changelog_uri: https://github.com/buyco/datadog-json-logger/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Connect your ruby application to Datadog logging and tracing.
 test_files: []

data/Dockerfile.nexus

@@ -1,12 +0,0 @@
-FROM ruby:3.0.1-alpine
-
-RUN apk add --no-cache build-base git
-
-COPY . /gem
-WORKDIR /gem
-
-RUN chmod +x nexus_release.sh
-
-RUN gem install nexus
-
-CMD ["/bin/sh", "/gem/nexus_release.sh"]

data/Steepfile

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-# D = Steep::Diagnostic
-#
-target :lib do
-  signature "sig"
-
-  check "lib" # Directory name
-  # ignore "lib/templates/*.rb"
-
-  # library "pathname"              # Standard libraries
-  # library "strong_json"           # Gems
-  library "logger"
-  library "uri"
-  library "json"
-
-  # configure_code_diagnostics(D::Ruby.default)      # `default` diagnostics setting (applies by default)
-  # configure_code_diagnostics(D::Ruby.strict)       # `strict` diagnostics setting
-  # configure_code_diagnostics(D::Ruby.lenient)      # `lenient` diagnostics setting
-  # configure_code_diagnostics(D::Ruby.silent)       # `silent` diagnostics setting
-  # configure_code_diagnostics do |hash|             # You can setup everything yourself
-  #   hash[D::Ruby::NoMethod] = :information
-  # end
-end
-
-# target :test do
-#   signature "sig", "sig-private"
-#
-#   check "test"
-#
-#   # library "pathname"              # Standard libraries
-# end

data/nexus_release.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-gem_file=$(ls -1 | grep '\.gem$' | head -n 1)
-
-if [ -z "$gem_file" ]; then
-    echo "Error : no .gem file was found"
-    exit 1
-fi
-
-gem nexus --url $NEXUS_DEPLOY_URL --credential $NEXUS_CREDENTIALS $gem_file