Merge branch 'main' into pr-1404-3

Author: kaylareopelle

.github/workflows/ci-contrib.yml

@@ -110,6 +110,7 @@ jobs:
       fail-fast: false
       matrix:
         gem:
+          - resource-detector-aws
           - resource-detector-azure
           - resource-detector-container
           - resource-detector-google_cloud_platform

.github/workflows/ossf-scorecard.yml

@@ -43,6 +43,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
         with:
           sarif_file: results.sarif

.toys/.data/releases.yml

@@ -241,6 +241,11 @@ gems:
     directory: propagator/xray
     version_constant: [OpenTelemetry, Propagator, XRay, VERSION]
 
+  - name: opentelemetry-resource-detector-aws
+    directory: resources/aws
+    version_rb_path: lib/opentelemetry/resource/detector/aws/version.rb
+    version_constant: [OpenTelemetry, Resource, Detector, AWS, VERSION]
+
   - name: opentelemetry-resource-detector-azure
     directory: resources/azure
     version_rb_path: lib/opentelemetry/resource/detector/azure/version.rb

instrumentation/all/Gemfile

@@ -29,7 +29,7 @@ group :test do
      .sort
      .each { |dir| gem "opentelemetry-helpers-#{dir}", path: "../../helpers/#{dir}" }
 
-  excluded_instrumentations = %w[. .. all grpc]
+  excluded_instrumentations = %w[. .. all]
   Dir.entries('../')
      .select { |entry| File.directory?(File.join('../', entry)) }
      .reject { |entry| excluded_instrumentations.include?(entry) }

instrumentation/all/lib/opentelemetry/instrumentation/all.rb

@@ -28,6 +28,7 @@
 require 'opentelemetry-instrumentation-faraday'
 require 'opentelemetry-instrumentation-grape'
 require 'opentelemetry-instrumentation-graphql'
+require 'opentelemetry-instrumentation-grpc'
 require 'opentelemetry-instrumentation-http_client'
 require 'opentelemetry-instrumentation-mongo'
 require 'opentelemetry-instrumentation-mysql2'

instrumentation/all/opentelemetry-instrumentation-all.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-faraday', '~> 0.26.0'
   spec.add_dependency 'opentelemetry-instrumentation-grape', '~> 0.3.0'
   spec.add_dependency 'opentelemetry-instrumentation-graphql', '~> 0.29.0'
+  spec.add_dependency 'opentelemetry-instrumentation-grpc', '~> 0.2.0'
   spec.add_dependency 'opentelemetry-instrumentation-gruf', '~> 0.3.0'
   spec.add_dependency 'opentelemetry-instrumentation-http', '~> 0.24.0'
   spec.add_dependency 'opentelemetry-instrumentation-http_client', '~> 0.23.0'

instrumentation/grpc/example/trace_demonstration.rb

@@ -1,6 +1,3 @@
-require_relative './proto/example_api_services_pb'
-require_relative './example_impl'
-
 require 'bundler/inline'
 
 gemfile do
@@ -12,6 +9,9 @@
   gem 'opentelemetry-sdk'
 end
 
+require_relative 'proto/example_api_services_pb'
+require_relative 'example_impl'
+
 ENV['OTEL_TRACES_EXPORTER'] = 'console'
 OpenTelemetry::SDK.configure do |c|
   c.use 'OpenTelemetry::Instrumentation::Grpc'

instrumentation/grpc/lib/opentelemetry/instrumentation/grpc.rb

@@ -18,4 +18,3 @@ class Error < StandardError; end
 
 require_relative 'grpc/instrumentation'
 require_relative 'grpc/version'
-require_relative 'grpc/interceptors/client_tracer'

instrumentation/grpc/test/opentelemetry/instrumentation/grpc/interceptors/client_tracer_test.rb

@@ -6,6 +6,7 @@
 
 require_relative '../../../../test_helper'
 require_relative '../../../../support/grpc_server_runner'
+require_relative '../../../../../lib/opentelemetry/instrumentation/grpc/interceptors/client_tracer'
 
 describe OpenTelemetry::Instrumentation::Grpc::Interceptors::ClientTracer do
   let(:instrumentation) { OpenTelemetry::Instrumentation::Grpc::Instrumentation.instance }