Skip to content

Commit bfde945

Browse files
committed
Remove deprecated runtime-telemetry-java8 and runtime-telemetry-java17 modules
Functionality is provided by the unified runtime-telemetry module. Moved JarAnalyzerInstallerTest to runtime-telemetry/javaagent; JMX/JFR metric coverage is already provided by SpringBootSmokeTest and the library-level RuntimeTelemetryTest.
1 parent fd97a7a commit bfde945

10 files changed

Lines changed: 4 additions & 142 deletions

File tree

.fossa.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -904,12 +904,6 @@ targets:
904904
- type: gradle
905905
path: ./
906906
target: ':instrumentation:rocketmq:rocketmq-client-5.0:javaagent'
907-
- type: gradle
908-
path: ./
909-
target: ':instrumentation:runtime-telemetry:runtime-telemetry-java17:javaagent'
910-
- type: gradle
911-
path: ./
912-
target: ':instrumentation:runtime-telemetry:runtime-telemetry-java8:javaagent'
913907
- type: gradle
914908
path: ./
915909
target: ':instrumentation:rxjava:rxjava-1.0:library'

instrumentation/runtime-telemetry/javaagent/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ dependencies {
77

88
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
99
compileOnly("io.opentelemetry:opentelemetry-api-incubator")
10+
11+
// used to verify jar analyzer package events
12+
testImplementation("commons-io:commons-io")
1013
}
1114

1215
tasks {

instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java8/JarAnalyzerInstallerTest.java renamed to instrumentation/runtime-telemetry/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JarAnalyzerInstallerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.runtimemetrics.java8;
6+
package io.opentelemetry.javaagent.instrumentation.runtimetelemetry;
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;

instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/build.gradle.kts

Lines changed: 0 additions & 21 deletions
This file was deleted.

instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/JfrRuntimeMetricsTest.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/JmxRuntimeMetricsTest.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

instrumentation/runtime-telemetry/runtime-telemetry-java17/metadata.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/build.gradle.kts

Lines changed: 0 additions & 19 deletions
This file was deleted.

instrumentation/runtime-telemetry/runtime-telemetry-java8/metadata.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

settings.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,8 +587,6 @@ include(":instrumentation:rocketmq:rocketmq-client-5.0:javaagent")
587587
include(":instrumentation:runtime-telemetry:javaagent")
588588
include(":instrumentation:runtime-telemetry:library")
589589
include(":instrumentation:runtime-telemetry:testing")
590-
include(":instrumentation:runtime-telemetry:runtime-telemetry-java8:javaagent")
591-
include(":instrumentation:runtime-telemetry:runtime-telemetry-java17:javaagent")
592590
include(":instrumentation:rxjava:rxjava-1.0:library")
593591
include(":instrumentation:rxjava:rxjava-2.0:javaagent")
594592
include(":instrumentation:rxjava:rxjava-2.0:library")

0 commit comments

Comments
 (0)