From bd55908dac1545e936faa0ae80f6a3c126dca9c6 Mon Sep 17 00:00:00 2001 From: Sander Jans Date: Thu, 7 Sep 2023 10:01:47 +0200 Subject: [PATCH] chore: remove resource_detectors from CI. --- .github/dependabot.yml | 4 ---- .github/workflows/ci-contrib-canary.yml | 1 - .github/workflows/ci-contrib.yml | 1 - .toys/.data/releases.yml | 5 ----- CONTRIBUTING.md | 6 +++--- README.md | 2 +- releases/Gemfile | 1 - 7 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bc622e2e7..5485d59f1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -173,10 +173,6 @@ updates: directory: "/instrumentation/rails" schedule: interval: weekly -- package-ecosystem: bundler - directory: "/resource_detectors" - schedule: - interval: weekly - package-ecosystem: bundler directory: "/resources/azure" schedule: diff --git a/.github/workflows/ci-contrib-canary.yml b/.github/workflows/ci-contrib-canary.yml index ebf4f534a..214a516a7 100644 --- a/.github/workflows/ci-contrib-canary.yml +++ b/.github/workflows/ci-contrib-canary.yml @@ -63,7 +63,6 @@ jobs: fail-fast: false matrix: gem: - - resource_detectors - resource-detector-azure - resource-detector-container - resource-detector-google_cloud_platform diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml index c2a86e1b0..75e970310 100644 --- a/.github/workflows/ci-contrib.yml +++ b/.github/workflows/ci-contrib.yml @@ -54,7 +54,6 @@ jobs: fail-fast: false matrix: gem: - - resource_detectors - resource-detector-azure - resource-detector-container - resource-detector-google_cloud_platform diff --git a/.toys/.data/releases.yml b/.toys/.data/releases.yml index 8b78685f3..4cb72bc97 100644 --- a/.toys/.data/releases.yml +++ b/.toys/.data/releases.yml @@ -203,11 +203,6 @@ gems: directory: propagator/xray version_constant: [OpenTelemetry, Propagator, XRay, VERSION] - - name: opentelemetry-resource_detectors - directory: resource_detectors - version_rb_path: lib/opentelemetry/resource/detectors/version.rb - version_constant: [OpenTelemetry, Resource, Detectors, VERSION] - - name: opentelemetry-resource-detector-azure directory: resources/azure version_rb_path: lib/opentelemetry/resource/detector/azure/version.rb diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 391929061..aad37a276 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,15 +67,15 @@ _Setting up a running Ruby environment is outside the scope of this document._ 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-resource_detectors` located in the `resource_detectors` directory Each of these gems has its configuration and tests. -For example, to test `opentelemetry-resource_detectors` you would: +For example, to test `opentelemetry-instrumentation-action_pack` you would: - 1. Change directory to `resource_detectors` + 1. Change directory to `instrumentation/action_pack` 2. Install the bundle with `bundle install` 3. Run the tests with `bundle exec rake` diff --git a/README.md b/README.md index ea2c37820..67216b2b9 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ using OpenTelemetry with minimal changes to your application. See the This repository also contains libraries to aid with interoperablity with vendor specific tracing solutions: - [Context Propagation](propagator/): OTTrace and Amazon X-Ray -- [Resource Detectors](resource_detectors/): +- [Resource Detectors](resources/): - Azure - Container - Google Cloud Platform diff --git a/releases/Gemfile b/releases/Gemfile index bfc49848d..c9cd38765 100644 --- a/releases/Gemfile +++ b/releases/Gemfile @@ -36,7 +36,6 @@ gem 'trilogy' gem 'opentelemetry-api' gem 'opentelemetry-sdk' -gem 'opentelemetry-resource_detectors' Dir['../propagator/**/version.rb'].each do |f| name = f.match(%r{propagator/(\w+)/lib})[1]