lib/elastic_apm/agent.rb in elastic-apm-2.1.2 vs lib/elastic_apm/agent.rb in elastic-apm-2.2.0

@@ -47,16 +47,18 @@
     end
 
     def initialize(config)
       @config = config
 
-      @transport = Transport::Base.new(config)
-      @instrumenter = Instrumenter.new(config) { |event| enqueue event }
-
       @stacktrace_builder = StacktraceBuilder.new(config)
-      @context_builder = ContextBuilder.new(self)
+      @context_builder = ContextBuilder.new(config)
       @error_builder = ErrorBuilder.new(self)
+
+      @transport = Transport::Base.new(config)
+      @instrumenter = Instrumenter.new(
+        config, stacktrace_builder: stacktrace_builder
+      ) { |event| enqueue event }
     end
 
     attr_reader :config, :transport, :instrumenter,
       :stacktrace_builder, :context_builder, :error_builder
 
@@ -104,29 +106,36 @@
 
     def start_transaction(
       name = nil,
       type = nil,
       context: nil,
-      traceparent: nil
+      trace_context: nil
     )
       instrumenter.start_transaction(
         name,
         type,
         context: context,
-        traceparent: traceparent
+        trace_context: trace_context
       )
     end
 
     def end_transaction(result = nil)
       instrumenter.end_transaction(result)
     end
 
-    def start_span(name = nil, type = nil, backtrace: nil, context: nil)
+    def start_span(
+      name = nil,
+      type = nil,
+      backtrace: nil,
+      context: nil,
+      trace_context: nil
+    )
       instrumenter.start_span(
         name,
         type,
         backtrace: backtrace,
-        context: context
+        context: context,
+        trace_context: trace_context
       )
     end
 
     def end_span
       instrumenter.end_span