Merge branch 'main' into dependabot/github_actions/github/codeql-action-4.30.8

Author: arielvalentin

.github/dependabot.yml

@@ -5,11 +5,25 @@ updates:
     directory: "/"
     schedule:
       interval: daily
+  # Update all dependencies - processes from root to handle path dependencies correctly
   - package-ecosystem: bundler
     directory: "/"
     schedule:
       interval: weekly
+    ignore:
+      # Ignore internal instrumentation interdependencies managed via local paths in Gemfiles
+      - dependency-name: "opentelemetry-instrumentation-*"
+      - dependency-name: "opentelemetry-helpers-*"
+      - dependency-name: "opentelemetry-processor-*"
+      - dependency-name: "opentelemetry-propagator-*"
+      - dependency-name: "opentelemetry-sampler-*"
+      - dependency-name: "opentelemetry-resource-detector-*"
     groups:
-      all-gems:
+      production-dependencies:
+        dependency-type: "production"
         patterns:
-          - "**/Gemfile"
+          - "*"
+      development-dependencies:
+        dependency-type: "development"
+        patterns:
+          - "*"

.toys/.data/releases.yml

@@ -193,6 +193,10 @@ gems:
     directory: instrumentation/faraday
     version_constant: [OpenTelemetry, Instrumentation, Faraday, VERSION]
 
+  - name: opentelemetry-instrumentation-grpc
+    directory: instrumentation/grpc
+    version_constant: [OpenTelemetry, Instrumentation, Grpc, VERSION]
+
   - name: opentelemetry-instrumentation-mongo
     directory: instrumentation/mongo
     version_constant: [OpenTelemetry, Instrumentation, Mongo, VERSION]
@@ -290,6 +294,6 @@ gems:
     version_rb_path: lib/opentelemetry/resource/detector/google_cloud_platform/version.rb
     version_constant: [OpenTelemetry, Resource, Detector, GoogleCloudPlatform, VERSION]
 
-  - name: opentelemetry-instrumentation-grpc
-    directory: instrumentation/grpc
-    version_constant: [OpenTelemetry, Instrumentation, Grpc, VERSION]
+  - name: opentelemetry-sampler-xray
+    directory: sampler/xray
+    version_constant: [OpenTelemetry, Sampler, XRay, VERSION]

CONTRIBUTING.md

@@ -69,9 +69,8 @@ This repository contains multiple Ruby gems:
 
 * Various instrumentation gems located in subdirectories of `instrumentation`
 * Various resource detector gems located in subdirectories of `resources`
-* `opentelemetry-propagator-xray` located in the `propagator/xray` directory
-* `opentelemetry-propagator-ottrace` located in the `propagator/ottrace` directory
-* `opentelemetry-propagator-google_cloud_trace_context` located in the `propagator/google_cloud_trace_context` directory
+* Various propagation gems located in the subdirectories of `propagator`
+* `opentelemetry-sampler-xray` located in the `sampler/xray` directory
 
 Each of these gems has its configuration and tests.