Skip to content

Commit 2675aac

Browse files
trasktrask
authored
Rename OSHI and Elasticsearch transport common modules to include base version (#18854)
1 parent e1329a1 commit 2675aac

56 files changed

Lines changed: 82 additions & 83 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.fossa.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@ targets:
231231
target: ':instrumentation:oracle-ucp-11.2:library'
232232
- type: gradle
233233
path: ./
234-
target: ':instrumentation:oshi:javaagent'
234+
target: ':instrumentation:oshi-5.0:javaagent'
235235
- type: gradle
236236
path: ./
237-
target: ':instrumentation:oshi:library'
237+
target: ':instrumentation:oshi-5.0:library'
238238
- type: gradle
239239
path: ./
240240
target: ':instrumentation:payara-5.2020:javaagent'
@@ -489,7 +489,7 @@ targets:
489489
target: ':instrumentation:elasticsearch:elasticsearch-transport-6.0:javaagent'
490490
- type: gradle
491491
path: ./
492-
target: ':instrumentation:elasticsearch:elasticsearch-transport-common:javaagent'
492+
target: ':instrumentation:elasticsearch:elasticsearch-transport-common-5.0:javaagent'
493493
- type: gradle
494494
path: ./
495495
target: ':instrumentation:graphql-java:graphql-java-12.0:javaagent'

‎.github/scripts/check-package-names.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
3838
# - jdbc
3939
# - lettuce-common
4040
# - netty-common
41-
# - oshi
4241
# - resources
4342
# - servlet-common-javax
44-
if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "jdbc" && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" && "$module_name" != "oshi" && "$module_name" != "resources" && "$module_name" != "servlet-common-javax" ]]; then
43+
if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "jdbc" && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" && "$module_name" != "resources" && "$module_name" != "servlet-common-javax" ]]; then
4544
echo "module name doesn't have a base version: $dir"
4645
exit 1
4746
fi

‎.github/scripts/instrumentations.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ readonly INSTRUMENTATIONS=(
208208
"opensearch:opensearch-rest-3.0:javaagent:testStableSemconv"
209209
"oracle-ucp-11.2:javaagent:test"
210210
"oracle-ucp-11.2:javaagent:testStableSemconv"
211-
"oshi:javaagent:test"
212-
"oshi:javaagent:testExperimental"
211+
"oshi-5.0:javaagent:test"
212+
"oshi-5.0:javaagent:testExperimental"
213213
"pekko:pekko-http-1.0:javaagent:test"
214214
"play:play-mvc:play-mvc-2.4:javaagent:test"
215215
"play:play-mvc:play-mvc-2.6:javaagent:check"

‎docs/instrumentation-list.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11393,7 +11393,7 @@ libraries:
1139311393
semantic_conventions:
1139411394
- SYSTEM_METRICS
1139511395
library_link: https://github.com/oshi/oshi/
11396-
source_path: instrumentation/oshi
11396+
source_path: instrumentation/oshi-5.0
1139711397
scope:
1139811398
name: io.opentelemetry.oshi
1139911399
has_standalone_library: true

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ These are the supported libraries and frameworks:
120120
| [OpenSearch Rest Client](https://github.com/opensearch-project/opensearch-java) | 1.0+ | | [Database Client Spans], [Database Client Metrics] [6] |
121121
| [OkHttp](https://github.com/square/okhttp/) | 2.2+ | [opentelemetry-okhttp-3.0](../instrumentation/okhttp/okhttp-3.0/library) | [HTTP Client Spans], [HTTP Client Metrics] |
122122
| [Oracle UCP](https://docs.oracle.com/database/121/JJUCP/) | 11.2+ | [opentelemetry-oracle-ucp-11.2](../instrumentation/oracle-ucp-11.2/library) | [Database Pool Metrics] |
123-
| [OSHI](https://github.com/oshi/oshi/) | 5.3.1+ | [opentelemetry-oshi](../instrumentation/oshi/library) | [System Metrics] (partial support) |
123+
| [OSHI](https://github.com/oshi/oshi/) | 5.3.1+ | [opentelemetry-oshi](../instrumentation/oshi-5.0/library) | [System Metrics] (partial support) |
124124
| [Play MVC](https://github.com/playframework/playframework) | 2.4+ | N/A | Provides `http.route` [2], Controller Spans [3] |
125125
| [Play WS](https://github.com/playframework/play-ws) | 1.0+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |
126126
| [PowerJob](http://www.powerjob.tech/) | 4.0.0+ | N/A | none |

‎instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ muzzle {
2424
dependencies {
2525
compileOnly("org.elasticsearch.client:transport:5.0.0")
2626

27-
implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:javaagent"))
27+
implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common-5.0:javaagent"))
2828

2929
// Ensure no cross interference
3030
testInstrumentation(project(":instrumentation:elasticsearch:elasticsearch-rest-5.0:javaagent"))
@@ -33,7 +33,7 @@ dependencies {
3333
testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent"))
3434
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
3535

36-
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
36+
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common-5.0:testing"))
3737
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
3838
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
3939

‎instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/AbstractClientInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import io.opentelemetry.context.Scope;
1515
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1616
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
17-
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.ElasticTransportRequest;
18-
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.TransportActionListener;
17+
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.v5_0.ElasticTransportRequest;
18+
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.v5_0.TransportActionListener;
1919
import javax.annotation.Nullable;
2020
import net.bytebuddy.asm.Advice;
2121
import net.bytebuddy.asm.Advice.AssignReturned;

‎instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportAttributesGetter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v5_0;
77

8-
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.ElasticTransportRequest;
9-
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.ElasticsearchTransportAttributesGetter;
8+
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.v5_0.ElasticTransportRequest;
9+
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.v5_0.ElasticsearchTransportAttributesGetter;
1010
import javax.annotation.Nullable;
1111
import org.elasticsearch.action.ActionResponse;
1212

‎instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportExperimentalAttributesExtractor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.common.AttributesBuilder;
1010
import io.opentelemetry.context.Context;
11-
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.ElasticTransportRequest;
12-
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.ElasticsearchTransportExperimentalAttributesExtractor;
11+
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.v5_0.ElasticTransportRequest;
12+
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.v5_0.ElasticsearchTransportExperimentalAttributesExtractor;
1313
import org.elasticsearch.action.DocumentRequest;
1414

1515
class Elasticsearch5TransportExperimentalAttributesExtractor

‎instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportSingletons.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.v5_0;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
9-
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.ElasticTransportRequest;
10-
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.ElasticsearchTransportInstrumenterFactory;
9+
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.v5_0.ElasticTransportRequest;
10+
import io.opentelemetry.javaagent.instrumentation.elasticsearch.transport.common.v5_0.ElasticsearchTransportInstrumenterFactory;
1111
import org.elasticsearch.action.ActionResponse;
1212

1313
class Elasticsearch5TransportSingletons {

0 commit comments

Comments
 (0)