Skip to content

Rename OSHI and Elasticsearch transport common modules to include base version#18854

Merged
trask merged 1 commit into
open-telemetry:mainfrom
trask:package-name-cleanup-oshi-es-common
May 27, 2026
Merged

Rename OSHI and Elasticsearch transport common modules to include base version#18854
trask merged 1 commit into
open-telemetry:mainfrom
trask:package-name-cleanup-oshi-es-common

Conversation

@trask
Copy link
Copy Markdown
Member

@trask trask commented May 26, 2026

@trask trask force-pushed the package-name-cleanup-oshi-es-common branch from 5c5ba25 to a16f17a Compare May 26, 2026 19:15
@trask trask marked this pull request as ready for review May 26, 2026 22:41
@trask trask requested a review from a team as a code owner May 26, 2026 22:41
Copilot AI review requested due to automatic review settings May 26, 2026 22:41
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR aligns module naming with the repository’s “base version in module name” convention by renaming the OSHI modules and the Elasticsearch transport common modules, and updates packages, build wiring, docs, and scripts accordingly.

Changes:

  • Renamed Gradle modules to include base versions (oshi-5.0, elasticsearch-transport-common-5.0) and updated settings.gradle.kts includes and inter-module dependencies.
  • Updated Java package names to include v5_0 for OSHI and Elasticsearch transport common code/tests.
  • Updated repository docs and automation scripts to point at the new module paths.

Reviewed changes

Copilot reviewed 51 out of 56 changed files in this pull request and generated no comments.

Show a summary per file
File Description
settings.gradle.kts Updates included Gradle modules to use versioned OSHI and Elasticsearch transport common module names.
instrumentation/oshi-5.0/testing/src/main/java/io/opentelemetry/instrumentation/oshi/v5_0/AbstractSystemMetricsTest.java Moves test base package to ...oshi.v5_0.
instrumentation/oshi-5.0/testing/src/main/java/io/opentelemetry/instrumentation/oshi/v5_0/AbstractProcessMetricsTest.java Moves test base package to ...oshi.v5_0.
instrumentation/oshi-5.0/testing/build.gradle.kts Adds Gradle build for the new OSHI testing module.
instrumentation/oshi-5.0/README.md Adds OSHI module README under the versioned module directory.
instrumentation/oshi-5.0/metadata.yaml Adds OSHI instrumentation metadata under the versioned module directory.
instrumentation/oshi-5.0/library/src/test/java/io/opentelemetry/instrumentation/oshi/v5_0/SystemMetricsTest.java Updates test package to ...oshi.v5_0.
instrumentation/oshi-5.0/library/src/test/java/io/opentelemetry/instrumentation/oshi/v5_0/ProcessMetricsTest.java Updates test package to ...oshi.v5_0.
instrumentation/oshi-5.0/library/src/main/java/io/opentelemetry/instrumentation/oshi/v5_0/SystemMetrics.java Updates library package to ...oshi.v5_0.
instrumentation/oshi-5.0/library/src/main/java/io/opentelemetry/instrumentation/oshi/v5_0/ProcessMetrics.java Updates library package to ...oshi.v5_0.
instrumentation/oshi-5.0/library/README.md Updates documentation snippet imports to the new ...oshi.v5_0 package.
instrumentation/oshi-5.0/library/build.gradle.kts Fixes test dependency to use :instrumentation:oshi-5.0:testing.
instrumentation/oshi-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/oshi/v5_0/SystemMetricsTest.java Updates javaagent test package/imports to versioned OSHI testing bases.
instrumentation/oshi-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/oshi/v5_0/ProcessMetricsTest.java Updates javaagent test package/imports to versioned OSHI testing bases.
instrumentation/oshi-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/v5_0/SystemInfoInstrumentation.java Moves javaagent instrumentation package to ...oshi.v5_0.
instrumentation/oshi-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/v5_0/OshiMetricsInstaller.java Moves installer package to ...oshi.v5_0.
instrumentation/oshi-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/v5_0/OshiInstrumentationModule.java Adds versioned instrumentation name alias ("oshi-5.0") while keeping "oshi" as primary.
instrumentation/oshi-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/v5_0/MetricsRegistration.java Updates package/imports for versioned OSHI library classes.
instrumentation/oshi-5.0/javaagent/build.gradle.kts Updates dependencies to point at versioned OSHI library/testing modules.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/common/v5_0/AbstractElasticsearchTransportClientTest.java Moves Elasticsearch transport common test helpers to ...common.v5_0.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/common/v5_0/AbstractElasticsearchNodeClientTest.java Moves Elasticsearch transport common test helpers to ...common.v5_0.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/common/v5_0/AbstractElasticsearchClientTest.java Moves Elasticsearch transport common test helpers to ...common.v5_0.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/testing/build.gradle.kts Adds build for the versioned Elasticsearch transport common testing module.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/common/v5_0/TransportActionListener.java Moves Elasticsearch transport common javaagent helpers to ...common.v5_0.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/common/v5_0/ElasticTransportRequest.java Moves Elasticsearch transport common javaagent helpers to ...common.v5_0.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/common/v5_0/ElasticsearchTransportInstrumenterFactory.java Moves factory to ...common.v5_0.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/common/v5_0/ElasticsearchTransportExperimentalAttributesExtractor.java Moves extractor to ...common.v5_0.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/common/v5_0/ElasticsearchTransportAttributesGetter.java Moves attributes getter to ...common.v5_0.
instrumentation/elasticsearch/elasticsearch-transport-common-5.0/javaagent/build.gradle.kts Adds build for the versioned Elasticsearch transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6TransportClientTest.java Updates imports to reference versioned transport common test helpers.
instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6NodeClientTest.java Updates imports to reference versioned transport common test helpers.
instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/build.gradle.kts Updates dependency to versioned transport common testing module.
instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportSingletons.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportExperimentalAttributesExtractor.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportAttributesGetter.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractClientInstrumentation.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts Updates dependencies to versioned transport common javaagent/testing modules.
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientTest.java Updates imports to versioned transport common test helpers.
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53NodeClientTest.java Updates imports to versioned transport common test helpers.
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportSingletons.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportExperimentalAttributesExtractor.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportAttributesGetter.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/AbstractClientInstrumentation.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts Updates dependencies to versioned transport common javaagent/testing modules.
instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientTest.java Updates imports to versioned transport common test helpers.
instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5NodeClientTest.java Updates imports to versioned transport common test helpers.
instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportSingletons.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportExperimentalAttributesExtractor.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportAttributesGetter.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/AbstractClientInstrumentation.java Updates imports to versioned transport common javaagent module.
instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts Updates dependencies to versioned transport common javaagent/testing modules.
docs/supported-libraries.md Updates OSHI library source link to the new instrumentation/oshi-5.0/library path.
docs/instrumentation-list.yaml Updates OSHI source_path to the new instrumentation/oshi-5.0 directory.
.github/scripts/instrumentations.sh Updates CI script targets to run OSHI tests from the versioned module.
.github/scripts/check-package-names.sh Removes OSHI from the “no base version” exception list now that it is versioned.
.fossa.yml Updates FOSSA Gradle targets for OSHI and Elasticsearch transport common to the versioned module names.

@trask trask merged commit 2675aac into open-telemetry:main May 27, 2026
187 of 189 checks passed
@trask trask deleted the package-name-cleanup-oshi-es-common branch May 27, 2026 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants