Merge pull request #225 from appsignal/ruby-app-updates

Various (Ruby) app updates (for Ruby gem 4)

Rakefile

@@ -165,7 +165,7 @@ namespace :app do
   task :bash do
     @app = get_app
     puts "Starting bash in #{@app}"
-    run_command "cd #{@app} && docker-compose exec app /bin/bash"
+    run_command "cd #{@app} && docker-compose exec --workdir /app app /bin/bash"
   end
 
   desc "Attach to app and get a console"
@@ -239,7 +239,7 @@ namespace :integrations do
   desc "Clone and reset integrations"
   task :clone do
     # Clone Ruby
-    clone_from_git("ruby/integration", "appsignal-ruby", :branch => "main")
+    clone_from_git("ruby/integration", "appsignal-ruby")
     # Clone Elixir, it currently consists of multiple repos
     FileUtils.mkdir_p("elixir/integration")
     clone_from_git("elixir/integration/appsignal-elixir", "appsignal-elixir")

python/django4-celery/app/appsignal_python_opentelemetry/urls.py

@@ -32,5 +32,6 @@
     path('error_queue_inline/', views.error_queue_inline, name='error_queue_inline'),
     path('make_request/', views.make_request, name='make_request'),
     path('custom_instrumentation/', views.custom_instrumentation, name='custom_instrumentation'),
+    path('metrics/', views.metrics, name='metrics'),
     path('blog/', include("blog.urls"))
 ]

python/django4-celery/app/appsignal_python_opentelemetry/views.py

@@ -1,6 +1,7 @@
 import requests
 import json
 import time
+from random import randrange
 
 from opentelemetry import trace
 
@@ -19,7 +20,10 @@
     set_root_name,
     set_category,
     set_name,
-    set_body
+    set_body,
+    set_gauge,
+    increment_counter,
+    add_distribution_value
 )
 
 
@@ -103,5 +107,12 @@ def custom_instrumentation(request):
     return HttpResponse("I reported some custom instrumentation!")
 
 
+def metrics(request):
+    increment_counter("python_counter", randrange(1, 100))
+    set_gauge("python_gauge", randrange(1, 100))
+    add_distribution_value("python_distribution", randrange(1, 100))
+    return HttpResponse("I reported some metrics instrumentation!")
+
+
 class MyException(Exception):
     pass

python/django4-celery/app/manage.py

@@ -9,6 +9,7 @@
 
 def main():
     """Run administrative tasks."""
+    os.environ["OTEL_SERVICE_NAME"] = "django-app"
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'appsignal_python_opentelemetry.settings')
 
     appsignal.start()

python/django4-celery/app/tasks.py

@@ -1,4 +1,5 @@
 import time
+import os
 
 import appsignal
 
@@ -11,6 +12,7 @@
 
 @worker_process_init.connect(weak=False)
 def init_celery_tracing(*args, **kwargs):
+    os.environ["OTEL_SERVICE_NAME"] = "celery-app"
     appsignal.start()
 
 

ruby/grape/app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /integration
   specs:
-    appsignal (3.9.1)
+    appsignal (4.0.0)
       rack
 
 GEM

ruby/grape/app/api.rb

@@ -1,5 +1,4 @@
 require "grape"
-require "appsignal/integrations/grape"
 
 # In memory database for posts
 class Posts
@@ -24,7 +23,7 @@ def find_by_id(id)
 
 module MyApp
   class BaseAPI < Grape::API
-    insert_before Grape::Middleware::Error, Appsignal::Grape::Middleware
+    insert_before Grape::Middleware::Error, Appsignal::Rack::GrapeMiddleware
   end
 
   module PostsAPI

ruby/grape/app/config.ru

@@ -1,15 +1,12 @@
 require "appsignal"
+require "grape"
 
-Appsignal.config = Appsignal::Config.new(
-  Dir.pwd,
-  ENV.fetch("RACK_ENV", "development")
-)
+use ::Rack::Events, [Appsignal::Rack::EventHandler.new]
+
+Appsignal.load(:grape)
 Appsignal.start
-Appsignal.start_logger
 
 require_relative "api"
 
-use ::Rack::Events, [Appsignal::Rack::EventHandler.new]
-
 MyApp::API.compile!
 run MyApp::API

ruby/hanami2-postgres/app/.gitignore

@@ -0,0 +1 @@
+spec/examples.txt

ruby/hanami2-postgres/app/Gemfile

@@ -4,10 +4,20 @@ source "https://rubygems.org"
 
 gem "appsignal", :path => "/integration"
 
-gem "hanami", "~> 2.0.0"
-gem "hanami-router", "~> 2.0.0"
-gem "hanami-controller", "~> 2.0.0"
-gem "hanami-validations", "~> 2.0.0"
+gem "hanami", "~> 2.1.0"
+gem "hanami-router", "~> 2.1.0"
+gem "hanami-controller", "~> 2.1.0"
+gem "hanami-validations", "~> 2.1.0"
+gem "hanami-assets", "~> 2.1"
+gem "hanami-view", "~> 2.1"
+
+group :development do
+  gem "hanami-webconsole", "~> 2.1"
+end
+
+group :test do
+  gem "capybara"
+end
 
 gem "dry-types", "~> 1.0", ">= 1.6.1"
 gem "puma"