Merge branch 'master' into karafka-tracing

Author: nvh0412

Diff for: .circleci/config.yml

@@ -65,7 +65,7 @@ save_bundle_checksum: &save_bundle_checksum
     command: |
       if [ "$CI_BUNDLE_CACHE_HIT" != 1 ]; then
         # Recompute gemfiles/*.lock checksum, as those files might have changed
-        cat Gemfile Gemfile.lock Appraisals gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
+        cat Gemfile Gemfile.lock jruby-*.gemfile ruby-*.gemfile gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
       fi
       cp .circleci/bundle_checksum /usr/local/bundle/bundle_checksum
 step_bundle_install: &step_bundle_install
@@ -96,21 +96,7 @@ step_compute_bundle_checksum: &step_compute_bundle_checksum
     # updating the gemset lock files produces extremely large commits.
     command: |
       bundle lock # Create Gemfile.lock
-      cat Gemfile Gemfile.lock Appraisals gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
-step_run_all_tests: &step_run_all_tests
-  run:
-    name: Run tests
-    command: |
-        # Ensures it's possible to debug hung tests in CI
-        echo "--format=documentation" >> .rspec-local
-
-        # Configure RSpec metadata exporter
-        echo "
-        --format=RspecJunitFormatter
-        --out='/tmp/rspec/-<%= ARGV.join.gsub('/', '-') %>.xml'
-        " >> .rspec-local
-
-        bundle exec rake ci
+      cat Gemfile Gemfile.lock jruby-*.gemfile ruby-*.gemfile gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
 step_get_test_agent_trace_check_results: &step_get_test_agent_trace_check_results
   run:
     name: Get APM Test Agent Trace Check Results
@@ -278,10 +264,28 @@ orbs:
           - docker-wait:
               host: "testagent"
               port: 9126
-          - *step_run_all_tests
+          - run:
+              name: Run tests
+              command: |
+                  ln -s .rspec-local.example .rspec-local
+
+                  bundle exec rake ci
           - *step_get_test_agent_trace_check_results
+          - run:
+              name: Upload JUnit reports to Datadog
+              when: always
+              command: |
+                sed -i 's/file="\.\//file="/g' tmp/rspec/*.xml
+                
+                ls -l tmp/rspec/*.xml
+
+                curl -L --fail --retry 3 "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
+
+                datadog-ci version
+
+                DD_ENV=ci DATADOG_API_KEY=$JUNIT_UPLOAD_API_KEY DATADOG_SITE=datadoghq.com datadog-ci junit upload --service dd-trace-rb tmp/rspec/
           - store_test_results:
-              path: /tmp/rspec
+              path: tmp/rspec
           - persist_to_workspace:
               root: .
               paths:

Diff for: .github/CODEOWNERS

@@ -1,39 +1,39 @@
 * @DataDog/ruby-guild
 
 # Public Documentation
-/docs/Compatibility.md @DataDog/documentation
-/docs/GettingStarted.md @DataDog/documentation
+docs/Compatibility.md @DataDog/documentation
+docs/GettingStarted.md @DataDog/documentation
 
 # Library
-/lib/datadog/appsec/ @DataDog/asm-ruby
-/lib/datadog/appsec.rb @DataDog/asm-ruby
-/lib/datadog/tracing/ @DataDog/tracing-ruby
-/lib/datadog/tracing/contrib/ @DataDog/apm-idm-ruby
-/lib/datadog/tracing.rb @DataDog/tracing-ruby
-/lib/datadog/opentelemetry/ @DataDog/tracing-ruby
-/lib/datadog/opentelemetry.rb @DataDog/tracing-ruby
-/lib-injection/ @DataDog/tracing-ruby
-/lib/datadog/profiling/ @DataDog/profiling-rb @DataDog/ruby-guild
-/lib/datadog/profiling.rb @DataDog/profiling-rb @DataDog/ruby-guild
-/ext/ @DataDog/profiling-rb @DataDog/ruby-guild
+lib/datadog/appsec/ @DataDog/asm-ruby
+lib/datadog/appsec.rb @DataDog/asm-ruby
+lib/datadog/tracing/ @DataDog/tracing-ruby
+lib/datadog/tracing/contrib/ @DataDog/apm-idm-ruby
+lib/datadog/tracing.rb @DataDog/tracing-ruby
+lib/datadog/opentelemetry/ @DataDog/tracing-ruby
+lib/datadog/opentelemetry.rb @DataDog/tracing-ruby
+lib-injection/ @DataDog/tracing-ruby
+lib/datadog/profiling/ @DataDog/profiling-rb @DataDog/ruby-guild
+lib/datadog/profiling.rb @DataDog/profiling-rb @DataDog/ruby-guild
+ext/ @DataDog/profiling-rb @DataDog/ruby-guild
 
 # RBS signatures
-/sig/datadog/appsec/ @DataDog/asm-ruby
-/sig/datadog/appsec.rbs @DataDog/asm-ruby
-/sig/datadog/tracing/ @DataDog/tracing-ruby
-/sig/datadog/tracing/contrib/ @DataDog/apm-idm-ruby
-/sig/datadog/tracing.rbs @DataDog/tracing-ruby
-/sig/datadog/opentelemetry/ @DataDog/tracing-ruby
-/sig/datadog/opentelemetry.rbs @DataDog/tracing-ruby
-/sig/datadog/profiling/ @DataDog/profiling-rb @DataDog/ruby-guild
-/sig/datadog/profiling.rbs @DataDog/profiling-rb @DataDog/ruby-guild
+sig/datadog/appsec/ @DataDog/asm-ruby
+sig/datadog/appsec.rbs @DataDog/asm-ruby
+sig/datadog/tracing/ @DataDog/tracing-ruby
+sig/datadog/tracing/contrib/ @DataDog/apm-idm-ruby
+sig/datadog/tracing.rbs @DataDog/tracing-ruby
+sig/datadog/opentelemetry/ @DataDog/tracing-ruby
+sig/datadog/opentelemetry.rbs @DataDog/tracing-ruby
+sig/datadog/profiling/ @DataDog/profiling-rb @DataDog/ruby-guild
+sig/datadog/profiling.rbs @DataDog/profiling-rb @DataDog/ruby-guild
 
 # Specs
-/spec/datadog/appsec/ @DataDog/asm-ruby
-/spec/datadog/tracing/ @DataDog/tracing-ruby
-/spec/datadog/tracing/contrib/ @DataDog/apm-idm-ruby
-/spec/datadog/tracing_spec.rb @DataDog/tracing-ruby
-/spec/datadog/opentelemetry/ @DataDog/tracing-ruby
-/spec/datadog/opentelemetry_spec.rb @DataDog/tracing-ruby
-/spec/datadog/profiling/ @DataDog/profiling-rb @DataDog/ruby-guild
-/spec/datadog/profiling_spec.rb @DataDog/profiling-rb @DataDog/ruby-guild
+spec/datadog/appsec/ @DataDog/asm-ruby
+spec/datadog/tracing/ @DataDog/tracing-ruby
+spec/datadog/tracing/contrib/ @DataDog/apm-idm-ruby
+spec/datadog/tracing_spec.rb @DataDog/tracing-ruby
+spec/datadog/opentelemetry/ @DataDog/tracing-ruby
+spec/datadog/opentelemetry_spec.rb @DataDog/tracing-ruby
+spec/datadog/profiling/ @DataDog/profiling-rb @DataDog/ruby-guild
+spec/datadog/profiling_spec.rb @DataDog/profiling-rb @DataDog/ruby-guild

Diff for: .github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,71 @@
+name: "Bug Report (Low Priority)"
+description: "Create a public Bug Report. Note that these may not be addressed as quickly as the helpdesk and that looking up account information will be difficult."
+title: "[BUG]: "
+labels: community, bug
+body:
+  - type: input
+    attributes:
+      label: Tracer Version(s)
+      description: "Version(s) of the tracer affected by this bug"
+      placeholder: "1.23.4, 2.8.0"
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Ruby Version(s)
+      description: "Version(s) of Ruby (`ruby --version`) that you've encountered this bug with"
+      placeholder: "ruby 2.7.5p203 (2021-11-24 revision f69aeb8314) [arm64-darwin21]"
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Relevent Library and Version(s)
+      description: "The name of a library and version(s) that you've encountered this bug with"
+      placeholder: "mysql 2.9.1"
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Bug Report
+      description: Please add a clear and concise description of the bug here
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Reproduction Code
+      description: Please add code here to help us reproduce the problem
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Configuration Block
+      description: How is your tracer configured, e.g. `Datadog.configure ...`
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Error Logs
+      description: "Please provide any error logs from the tracer (`DD_TRACE_DEBUG=true` can help)"
+    validations:
+      required: false
+
+  - type: input
+    attributes:
+      label: Operating System
+      description: "Provide your operating system and version (e.g. `uname -a`)"
+      placeholder: Darwin Kernel Version 23.6.0
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: How does Datadog help you?
+      description: "Optionally, tell us why and how you're using datadog, and what your overall experience with it is!"
+    validations:
+      required: false

Diff for: .github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,5 +1,8 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
-  - name: ℹ️ Datadog Support
-    url: https://www.datadoghq.com/support/
-    about: Get help from the Datadog support team
+  - name: Bug Report (High Priority)
+    url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:ruby
+    about: Create an expedited Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private.
+  - name: Feature Request (High Priority)
+    url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:ruby&tf_1260825272270=pt_apm_category_feature_request
+    about: Create an expedited Feature Request via the helpdesk (no login required). This helps with prioritization and allows you to provide additional information in private.

Diff for: .github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,57 @@
+name: Feature Request (Low Priority)
+description: Create a public Feature Request. Note that these may not be addressed as quickly as the helpdesk and that looking up account information will be difficult.
+title: "[FEATURE]: "
+labels: community, feature-request
+body:
+  - type: input
+    attributes:
+      label: Gem Name
+      description: "If your feature request is to add instrumentation support for a Ruby gem please provide the gem name here"
+      placeholder: mysql
+    validations:
+      required: false
+
+  - type: input
+    attributes:
+      label: Gem Version(s)
+      description: "Please provide the version of the above gem here"
+      placeholder: 2.9.1
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Describe the goal of the feature
+      description: A clear and concise goal of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem?
+      description: |
+        Please add a clear and concise description of your problem.
+        E.g. I'm unable to instrument my database queries...
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: How does Datadog help you?
+      description: "Optionally, tell us why and how you're using datadog, and what your overall experience with it is!"
+    validations:
+      required: false

Diff for: .github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,7 @@
 dependencies:
   - Gemfile
   - '*.gemfile'
-  - Appraisals
   - datadog.gemspec
-  - tasks/appraisal.rake
   - tasks/dependency.rake
   - .github/workflows/lock-dependency.yml
   - lib/datadog/version.rb