Remove deprecated client methods (#2741)

Author: sl0thentr0py

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Remove deprecated `config.logger=`, use `config.sdk_logger=` instead ([#2732](https://github.com/getsentry/sentry-ruby/pull/2732))
 - Remove deprecated `Sentry::Rails::Tracing::ActionControllerSubscriber` ([#2733](https://github.com/getsentry/sentry-ruby/pull/2733))
 - Remove deprecated `Event#configuration` ([#2740](https://github.com/getsentry/sentry-ruby/pull/2740))
+- Remove deprecated `Sentry::Client#generate_sentry_trace` and `Sentry::Client#generate_baggage` ([#2741](https://github.com/getsentry/sentry-ruby/pull/2741))
 - Remove `Transaction` deprecations ([#2736](https://github.com/getsentry/sentry-ruby/pull/2736))
   - Remove deprecated constant `Sentry::Transaction::SENTRY_TRACE_REGEXP`, use `Sentry::PropagationContext::SENTRY_TRACE_REGEXP` instead
   - Remove deprecated method `Sentry::Transaction.from_sentry_trace`, use `Sentry.continue_trace` instead

sentry-ruby/lib/sentry/client.rb

@@ -328,38 +328,6 @@ def send_envelope(envelope)
       raise
     end
 
-    # @deprecated use Sentry.get_traceparent instead.
-    #
-    # Generates a Sentry trace for distribted tracing from the given Span.
-    # Returns `nil` if `config.propagate_traces` is `false`.
-    # @param span [Span] the span to generate trace from.
-    # @return [String, nil]
-    def generate_sentry_trace(span)
-      return unless configuration.propagate_traces
-
-      trace = span.to_sentry_trace
-      log_debug("[Tracing] Adding #{SENTRY_TRACE_HEADER_NAME} header to outgoing request: #{trace}")
-      trace
-    end
-
-    # @deprecated Use Sentry.get_baggage instead.
-    #
-    # Generates a W3C Baggage header for distributed tracing from the given Span.
-    # Returns `nil` if `config.propagate_traces` is `false`.
-    # @param span [Span] the span to generate trace from.
-    # @return [String, nil]
-    def generate_baggage(span)
-      return unless configuration.propagate_traces
-
-      baggage = span.to_baggage
-
-      if baggage && !baggage.empty?
-        log_debug("[Tracing] Adding #{BAGGAGE_HEADER_NAME} header to outgoing request: #{baggage}")
-      end
-
-      baggage
-    end
-
     private
 
     def dispatch_background_event(event, hint)

sentry-ruby/spec/sentry/client_spec.rb

@@ -718,84 +718,4 @@ module ExcTag; end
       expect(hash[:monitor_config]).to eq({ schedule: { type: :interval, value: 30, unit: :minute } })
     end
   end
-
-  describe "#generate_sentry_trace" do
-    let(:string_io) { StringIO.new }
-    let(:logger) do
-      ::Logger.new(string_io)
-    end
-
-    before do
-      configuration.sdk_logger = logger
-    end
-
-    let(:span) { Sentry::Span.new(transaction: transaction) }
-
-    it "generates the trace with given span and logs correct message" do
-      expect(subject.generate_sentry_trace(span)).to eq(span.to_sentry_trace)
-      expect(string_io.string).to match(
-        /\[Tracing\] Adding sentry-trace header to outgoing request: #{span.to_sentry_trace}/
-      )
-    end
-
-    context "with config.propagate_traces = false" do
-      before do
-        configuration.propagate_traces = false
-      end
-
-      it "returns nil" do
-        expect(subject.generate_sentry_trace(span)).to eq(nil)
-      end
-    end
-  end
-
-  describe "#generate_baggage" do
-    before { configuration.sdk_logger = logger }
-
-    let(:string_io) { StringIO.new }
-    let(:logger) { ::Logger.new(string_io) }
-    let(:baggage) do
-      Sentry::Baggage.from_incoming_header(
-        "other-vendor-value-1=foo;bar;baz, sentry-trace_id=771a43a4192642f0b136d5159a501700, "\
-        "sentry-public_key=49d0f7386ad645858ae85020e393bef3, sentry-sample_rate=0.01337, "\
-        "sentry-user_id=Am%C3%A9lie, other-vendor-value-2=foo;bar;"
-      )
-    end
-
-    let(:span) do
-      hub = Sentry::Hub.new(subject, Sentry::Scope.new)
-      transaction = Sentry::Transaction.new(name: "test transaction",
-                                            baggage: baggage,
-                                            hub: hub,
-                                            sampled: true)
-
-      transaction.start_child(op: "finished child", timestamp: Time.now.utc.iso8601)
-    end
-
-    it "generates the baggage header with given span and logs correct message" do
-      generated_baggage = subject.generate_baggage(span)
-      expect(generated_baggage).to eq(span.to_baggage)
-
-      expect(generated_baggage).to eq(
-        "sentry-trace_id=771a43a4192642f0b136d5159a501700,"\
-        "sentry-public_key=49d0f7386ad645858ae85020e393bef3,"\
-        "sentry-sample_rate=0.01337,"\
-        "sentry-user_id=Am%C3%A9lie"
-      )
-
-      expect(string_io.string).to match(
-        /\[Tracing\] Adding baggage header to outgoing request: #{span.to_baggage}/
-      )
-    end
-
-    context "with config.propagate_traces = false" do
-      before do
-        configuration.propagate_traces = false
-      end
-
-      it "returns nil" do
-        expect(subject.generate_baggage(span)).to eq(nil)
-      end
-    end
-  end
 end