Skip to content

Commit

Permalink
Drop opentelemetry-sdk-extension-jfr-events, which moved to opentelem…
Browse files Browse the repository at this point in the history
…etry-java-contrib (#4703)
  • Loading branch information
jack-berg authored Aug 25, 2022
1 parent 2bc88f4 commit def1c85
Show file tree
Hide file tree
Showing 13 changed files with 6 additions and 402 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ dependency as follows, replacing `{{artifact-id}}` with the value from the "Arti
| [SDK Resources Extension](./sdk-extensions/resources) | Resource providers, including container, host, os, and process | `opentelemetry-sdk-extension-resources` | <!--VERSION_STABLE-->1.17.0<!--/VERSION_STABLE--> |
| [SDK AWS Extension](./sdk-extensions/aws) | AWS resource providers, including beanstalk, ec2, ecs, eks, and lambda | `opentelemetry-sdk-extension-aws` | <!--VERSION_STABLE-->1.17.0<!--/VERSION_STABLE--> |
| [SDK Jaeger Remote Sampler Extension](./sdk-extensions/jaeger-remote-sampler) | Sampler which obtains sampling configuration from remote Jaeger server | `opentelemetry-sdk-extension-jaeger-remote-sampler` | <!--VERSION_STABLE-->1.17.0<!--/VERSION_STABLE--> |
| [SDK JFR Events Extension](./sdk-extensions/jfr-events) | SpanProcessor which records spans as JFR events | `opentelemetry-sdk-extension-jfr-events` | <!--VERSION_UNSTABLE-->1.17.0-alpha<!--/VERSION_UNSTABLE--> |
| [SDK Incubator](./sdk-extensions/incubator) | SDK incubator, including YAML based view configuration, LeakDetectingSpanProcessor, and zPages | `opentelemetry-sdk-extension-incubator` | TODO: add version when published |

### Shims
Expand Down
10 changes: 4 additions & 6 deletions all/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ otelJava.moduleName.set("io.opentelemetry.all")
tasks {
// We don't compile much here, just some API boundary tests. This project is mostly for
// aggregating jacoco reports and it doesn't work if this isn't at least as high as the
// highest supported Java version in any of our projects. Most of our projects target
// Java 8, except for jfr-events.
// highest supported Java version in any of our projects. All of our projects target
// Java 8.
withType(JavaCompile::class) {
options.release.set(11)
options.release.set(8)
}

val testJavaVersion: String? by project
Expand Down Expand Up @@ -83,9 +83,7 @@ tasks.named<JacocoReport>("jacocoTestReport") {
!it.absolutePath.contains("io/opentelemetry/exporter/jaeger/internal/protobuf/") &&
!it.absolutePath.contains("io/opentelemetry/sdk/extension/trace/jaeger/proto/") &&
!it.absolutePath.contains("io/opentelemetry/semconv/trace/attributes/") &&
!it.absolutePath.contains("AutoValue_") &&
// TODO(anuraaga): Remove exclusion after enabling coverage for jfr-events
!it.absolutePath.contains("io/opentelemetry/sdk/extension/jfr")
!it.absolutePath.contains("AutoValue_")
}
)
}
Expand Down
4 changes: 2 additions & 2 deletions all/src/test/java/io/opentelemetry/all/SdkDesignTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void sdkImplementationOfApiClassesShouldReturnApiTypeOnly() {
}

static DescribedPredicate<? super JavaMethod> implementOrOverride() {
return new DescribedPredicate<>("implement or override a method") {
return new DescribedPredicate<JavaMethod>("implement or override a method") {
@Override
public boolean apply(JavaMethod input) {
List<JavaClass> params = input.getRawParameterTypes();
Expand All @@ -78,7 +78,7 @@ public boolean apply(JavaMethod input) {
}

static DescribedPredicate<? super JavaClass> inPackage(String... requiredPackages) {
return new DescribedPredicate<>("are in " + Arrays.toString(requiredPackages)) {
return new DescribedPredicate<JavaClass>("are in " + Arrays.toString(requiredPackages)) {
@Override
public boolean apply(JavaClass member) {
for (String requiredPackage : requiredPackages) {
Expand Down
23 changes: 0 additions & 23 deletions sdk-extensions/jfr-events/README.md

This file was deleted.

30 changes: 0 additions & 30 deletions sdk-extensions/jfr-events/build.gradle.kts

This file was deleted.

1 change: 0 additions & 1 deletion sdk-extensions/jfr-events/gradle.properties

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit def1c85

Please sign in to comment.