Bump version, fix a bug, and make specs a little more robust.

Some DBs, like Postgresql, can handle more types for args than what are supported in DB::Any. With procs for arg filters, this breaks. However, without resorting to more chicanery than I am willing to right now, pluggable argument filters won't work without procs. So, pluggable argument filter goes away, for now, and we let the compiler sort out the types itself. Also, the HTTP Server specs start a test server, normally on port 8080. I have added a port scanner that will scan for the next available port (up to 1000 attempts) if 8080 is unavailable. Bumping version for a quick release.

Author: wyhaines

VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

shard.yml

@@ -1,5 +1,5 @@
 name: opentelemetry-instrumentation
-version: 0.3.4
+version: 0.3.5
 
 authors:
   - Kirk Haines <wyhaines@gmail.com>

spec/instrumentation/crystal_http_server_spec.cr

@@ -5,6 +5,25 @@ require "../../src/opentelemetry/instrumentation/crystal/http_server"
 require "io/memory"
 require "json"
 
+HTTP_SERVER_TEST_PORT = [8080]
+
+1000.times do |t|
+  begin
+    server = HTTP::Server.new do |context|
+      context.response.content_type = "text/plain"
+      context.response.print "Hello world!"
+    end
+
+    try_port = 8080 + t
+    server.bind_tcp try_port
+
+    HTTP_SERVER_TEST_PORT[0] = try_port
+    break
+  rescue ex
+    # NOP
+  end
+end
+
 describe HTTP::Server, tags: ["HTTP::Server"] do
   it_may_focus_and_it "should have instrumented HTTP::Server" do
     Tracer::TRACED_METHODS_BY_RECEIVER[HTTP::Server]?.should be_truthy
@@ -35,15 +54,15 @@ describe HTTP::Server, tags: ["HTTP::Server"] do
       end
 
       # Start the server.
-      address = server.bind_tcp 8080
+      address = server.bind_tcp HTTP_SERVER_TEST_PORT[0]
       server.listen
     end
 
     sleep 1
 
     # Send requests to the server. These will generate OTel traces.
     1.times do
-      HTTP::Client.get("http://127.0.0.1:8080")
+      HTTP::Client.get("http://127.0.0.1:#{HTTP_SERVER_TEST_PORT[0]}/")
       sleep((rand() * 100) / 1000)
     end
 
@@ -59,7 +78,7 @@ describe HTTP::Server, tags: ["HTTP::Server"] do
 
     client_traces[0]["spans"][0]["name"].should eq("HTTP::Client GET")
     client_traces[0]["spans"][0]["kind"].should eq 3
-    client_traces[0]["spans"][0]["attributes"]["http.url"].should eq "http://127.0.0.1:8080/"
+    client_traces[0]["spans"][0]["attributes"]["http.url"].should eq "http://127.0.0.1:#{HTTP_SERVER_TEST_PORT[0]}/"
 
     server_traces[0]["spans"][0]["name"].should eq "HTTP::Server connection"
     server_traces[0]["resource"]["service.name"].should eq "Crystal OTel Instrumentation - HTTP::Server"

src/opentelemetry/instrumentation/crystal/db.cr

@@ -39,15 +39,13 @@ unless_enabled?("OTEL_CRYSTAL_DISABLE_INSTRUMENTATION_DB") do
     # :nodoc:
     module OpenTelemetry::Instrumentation
       class CrystalDB < OpenTelemetry::Instrumentation::Instrument
+        def self.filter(arg)
+          arg.inspect
+        end
+
         {% begin %}
-        alias DB::Types = {% for type in DB::Any.union_types %}Array({{ type.id }}) | {% end %}DB::Any
+        alias DB::Types = {% for type in DB::Any.union_types %}Array({{ type.id }}) | {% end %}DB::Any | UUID | Array(UUID)
         {% end %}
-        # One can add their own procs to this array (prepend them to the array) to add other data filtration"
-        ArgFilters = [
-          ->(arg : DB::Types) do
-            arg.inspect
-          end,
-        ]
       end
     end
 
@@ -91,10 +89,11 @@ unless_enabled?("OTEL_CRYSTAL_DISABLE_INSTRUMENTATION_DB") do
           OpenTelemetry.trace.in_span("#{db_name}->#{operation.upcase}") do |span| # My kingdom for a SQL parser that can extract table names from a SQL query!
             query_args = [] of String
             args.each do |arg|
-              OpenTelemetry::Instrumentation::CrystalDB::ArgFilters.each do |filter|
-                filter_result = filter.call(arg)
-                arg = filter_result if filter_result
-              end
+              # OpenTelemetry::Instrumentation::CrystalDB::ArgFilters.each do |filter|
+              #   filter_result = filter.call(arg)
+              #   arg = filter_result if filter_result
+              # end
+              arg = OpenTelemetry::Instrumentation::CrystalDB.filter(arg)
 
               arg = arg.to_s unless arg.is_a?(String)
               query_args << arg