From 84167790bf98212294a42e02654eaf777a4d1fb4 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 20 Feb 2023 14:36:28 -0800 Subject: [PATCH 1/4] Rename JFR Streaming to JFR Metrics --- .github/scripts/draft-change-log-entries.sh | 2 +- CHANGELOG.md | 12 +++---- README.md | 39 ++++++++++++++------- jfr-streaming/README.md | 9 ++--- jfr-streaming/build.gradle.kts | 2 +- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/.github/scripts/draft-change-log-entries.sh b/.github/scripts/draft-change-log-entries.sh index b31e51970..8cef331a1 100755 --- a/.github/scripts/draft-change-log-entries.sh +++ b/.github/scripts/draft-change-log-entries.sh @@ -29,7 +29,7 @@ component_names["aws-xray/"]="AWS X-Ray SDK support" component_names["aws-xray-propagator/"]="AWS X-Ray propagator" component_names["consistent-sampling/"]="Consistent sampling" component_names["jfr-events/"]="JFR events" -component_names["jfr-streaming/"]="JFR streaming" +component_names["jfr-streaming/"]="JFR metrics" component_names["jmx-metrics/"]="JMX metrics" component_names["maven-extension/"]="Maven extension" component_names["micrometer-meter-provider/"]="Micrometer MeterProvider" diff --git a/CHANGELOG.md b/CHANGELOG.md index 31bd9a898..3547cf89b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ## Version 1.22.0 (2023-01-17) -### JFR streaming +### JFR metrics - Add buffer handlers and implement buffer metrics ([#650](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/650)) @@ -19,7 +19,7 @@ This module can be used to bridge OpenTelemetry metrics into the `prometheus-sim ## Version 1.21.0 (2022-12-15) -### JFR streaming +### JFR metrics - Update handlers in jfr-streaming to match spec ([#616](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/616)) @@ -38,7 +38,7 @@ This module can be used to bridge OpenTelemetry metrics into the `prometheus-sim - Move io.opentelemetry:opentelemetry-extension-aws to contrib ([#547](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/547)) -### JFR streaming +### JFR metrics - Thread count and classes loaded handlers ([#571](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/571)) @@ -162,7 +162,7 @@ All components updated to target OpenTelemetry SDK 1.12.0. All components updated to target OpenTelemetry SDK 1.11.0. -### JFR streaming +### JFR metrics - Split up GC Handlers, add support for Parallel ([#201](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/201)) @@ -248,7 +248,7 @@ All components updated to target OpenTelemetry SDK 1.9.1. - X-Ray Sampler: Match rule's HTTP path against http.url attribute if t ([#141](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/141)) -### JFR streaming +### JFR metrics - Tidy up jfr-streaming ([#127](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/127)) @@ -267,7 +267,7 @@ All components updated to target OpenTelemetry SDK 1.7.0. Moved from SDK repo. -### JFR streaming - New 🌟 +### JFR metrics - New 🌟 Listens for JFR events (using the Streaming API) and converts them to OpenTelemetry metrics. diff --git a/README.md b/README.md index 8abf06999..40b669fe3 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,15 @@ # OpenTelemetry Java Contrib + [![Build](https://github.com/open-telemetry/opentelemetry-java-contrib/actions/workflows/build.yml/badge.svg)](https://github.com/open-telemetry/opentelemetry-java-contrib/actions/workflows/build.yml) -This project is intended to provide helpful libraries and standalone OpenTelemetry-based utilities that don't fit -the express scope of the [OpenTelemetry Java](https://github.com/open-telemetry/opentelemetry-java) or -[Java Instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation) projects. If you need an -easier way to bring observability to remote JVM-based applications and workflows that isn't easily satisfied by an SDK +This project is intended to provide helpful libraries and standalone OpenTelemetry-based utilities +that don't fit +the express scope of the [OpenTelemetry Java](https://github.com/open-telemetry/opentelemetry-java) +or +[Java Instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation) +projects. If you need an +easier way to bring observability to remote JVM-based applications and workflows that isn't easily +satisfied by an SDK feature or via instrumentation, this project is hopefully for you. ## Provided Libraries @@ -13,7 +18,7 @@ feature or via instrumentation, this project is hopefully for you. * [AWS X-Ray SDK Support](./aws-xray/README.md) * [AWS X-Ray Propagator](./aws-xray-propagator/README.md) * [Consistent sampling](./consistent-sampling/README.md) -* [JFR Streaming](./jfr-streaming/README.md) +* [JFR Metrics](./jfr-streaming/README.md) * [JMX Metric Gatherer](./jmx-metrics/README.md) * [OpenTelemetry Maven Extension](./maven-extension/README.md) * [Runtime Attach](./runtime-attach/README.md) @@ -37,16 +42,23 @@ $ ./gradlew clean ## Contributing -The Java Contrib project was initially formed to provide methods of easy remote JMX metric gathering and reporting, -which is actively in development. If you have an idea for a similar use case in the metrics, traces, or logging -domain we would be very interested in supporting it. Please -[open an issue](https://github.com/open-telemetry/opentelemetry-java-contrib/issues/new/choose) to share your idea or -suggestion. PRs are always welcome and greatly appreciated, but for larger functional changes a pre-coding introduction -can be helpful to ensure this is the correct place and that active or conflicting efforts don't exist. +The Java Contrib project was initially formed to provide methods of easy remote JMX metric gathering +and reporting, +which is actively in development. If you have an idea for a similar use case in the metrics, traces, +or logging +domain we would be very interested in supporting it. Please +[open an issue](https://github.com/open-telemetry/opentelemetry-java-contrib/issues/new/choose) to +share your idea or +suggestion. PRs are always welcome and greatly appreciated, but for larger functional changes a +pre-coding introduction +can be helpful to ensure this is the correct place and that active or conflicting efforts don't +exist. Triagers ([@open-telemetry/java-contrib-triagers](https://github.com/orgs/open-telemetry/teams/java-contrib-triagers)): -- All [component owners](https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/.github/component_owners.yml) are given Triager permissions to this repository. +- +All [component owners](https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/.github/component_owners.yml) +are given Triager permissions to this repository. Approvers ([@open-telemetry/java-contrib-approvers](https://github.com/orgs/open-telemetry/teams/java-contrib-approvers)): @@ -64,7 +76,8 @@ Emeritus maintainers: - [Ryan Fitzpatrick](https://github.com/rmfitzpatrick), Splunk -Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md). +Learn more about roles in +the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md). Thanks to all the people who already contributed! diff --git a/jfr-streaming/README.md b/jfr-streaming/README.md index 305821829..505f51e17 100644 --- a/jfr-streaming/README.md +++ b/jfr-streaming/README.md @@ -1,17 +1,18 @@ -# JFR Streaming +# JFR Metrics * Java 17 only. * Build it with `./gradlew :jfr-streaming:build` -The main entry point is the `JfrTelemetry` class in the package `io.opentelemetry.contrib.jfr.streaming`: +The main entry point is the `JfrTelemetry` class in the +package `io.opentelemetry.contrib.jfr.streaming`: ```java // Initialize JfrTelemetry -JfrTelemetry jfrTelemetry = JfrTelemetry.create(openTelemetry); +JfrTelemetry jfrTelemetry=JfrTelemetry.create(openTelemetry); // Close JfrTelemetry to stop listening for JFR events -jfrTelemetry.close(); + jfrTelemetry.close(); ``` `JfrTelemetry` works by subscribing to certain JFR events, and using relevant bits of information diff --git a/jfr-streaming/build.gradle.kts b/jfr-streaming/build.gradle.kts index fff2c27f2..ebc5f8207 100644 --- a/jfr-streaming/build.gradle.kts +++ b/jfr-streaming/build.gradle.kts @@ -5,7 +5,7 @@ plugins { id("otel.publish-conventions") } -description = "OpenTelemetry JFR Streaming" +description = "OpenTelemetry JFR Metrics" otelJava.moduleName.set("io.opentelemetry.contrib.jfr.streaming") // Disable publishing test fixtures From 543a818d1d065372ea17b96becf974c0ddfc082b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 20 Feb 2023 14:37:06 -0800 Subject: [PATCH 2/4] Rename packages --- .../G1GcMemoryMetricTest.java | 30 ++++++------- .../HandlerRegistry.java | 42 +++++++++---------- .../{streaming => metrics}/JfrFeature.java | 2 +- .../{streaming => metrics}/JfrTelemetry.java | 4 +- .../JfrTelemetryBuilder.java | 2 +- .../AbstractThreadDispatchingHandler.java | 2 +- .../internal/Constants.java | 2 +- .../internal/DurationUtil.java | 2 +- .../G1GarbageCollectionHandler.java | 20 ++++----- .../OldGarbageCollectionHandler.java | 20 ++++----- .../YoungGarbageCollectionHandler.java | 20 ++++----- .../internal/RecordedEventHandler.java | 4 +- .../internal/ThreadGrouper.java | 2 +- .../buffer/DirectBufferStatisticsHandler.java | 12 +++--- .../classes/ClassesLoadedHandler.java | 8 ++-- .../ContainerConfigurationHandler.java | 8 ++-- .../cpu/ContextSwitchRateHandler.java | 8 ++-- .../internal/cpu/LongLockHandler.java | 14 +++---- .../internal/cpu/OverallCPULoadHandler.java | 8 ++-- .../memory/CodeCacheConfigurationHandler.java | 20 ++++----- .../internal/memory/G1HeapSummaryHandler.java | 28 ++++++------- .../memory/MetaspaceSummaryHandler.java | 32 +++++++------- .../ObjectAllocationInNewTLABHandler.java | 18 ++++---- .../ObjectAllocationOutsideTLABHandler.java | 18 ++++---- .../memory/ParallelHeapSummaryHandler.java | 38 ++++++++--------- .../internal/network/NetworkReadHandler.java | 28 ++++++------- .../internal/network/NetworkWriteHandler.java | 28 ++++++------- .../internal/threads/ThreadCountHandler.java | 10 ++--- .../PsGcMemoryMetricTest.java | 34 +++++++-------- .../SerialGcMemoryMetricTest.java | 14 +++---- .../BufferMetricTest.java | 8 ++-- .../CodeCacheMemoryInitMetricTest.java | 10 ++--- .../{streaming => metrics}/GenerateDocs.java | 2 +- .../JfrCPULockTest.java | 4 +- .../JfrClassesLoadedCountTest.java | 4 +- .../JfrOverallCPULoadHandlerTest.java | 4 +- .../JfrTelemetryBuilderTest.java | 2 +- .../JfrTelemetryTest.java | 2 +- .../JfrThreadCountTest.java | 6 +-- .../MetaspaceMemoryCommittedMetricTest.java | 10 ++--- .../MetaspaceMemoryLimitMetricTest.java | 8 ++-- .../MetaspaceMemoryUsageMetricTest.java | 12 +++--- .../{streaming => metrics}/JfrExtension.java | 2 +- 43 files changed, 276 insertions(+), 276 deletions(-) rename jfr-streaming/src/g1GcTest/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/G1GcMemoryMetricTest.java (71%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/HandlerRegistry.java (65%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrFeature.java (96%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrTelemetry.java (96%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrTelemetryBuilder.java (97%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/AbstractThreadDispatchingHandler.java (94%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/Constants.java (98%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/DurationUtil.java (90%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/GarbageCollection/G1GarbageCollectionHandler.java (61%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/GarbageCollection/OldGarbageCollectionHandler.java (63%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/GarbageCollection/YoungGarbageCollectionHandler.java (64%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/RecordedEventHandler.java (94%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/ThreadGrouper.java (91%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/buffer/DirectBufferStatisticsHandler.java (86%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/classes/ClassesLoadedHandler.java (91%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/container/ContainerConfigurationHandler.java (81%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/cpu/ContextSwitchRateHandler.java (82%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/cpu/LongLockHandler.java (81%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/cpu/OverallCPULoadHandler.java (89%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/memory/CodeCacheConfigurationHandler.java (66%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/memory/G1HeapSummaryHandler.java (79%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/memory/MetaspaceSummaryHandler.java (75%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/memory/ObjectAllocationInNewTLABHandler.java (74%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/memory/ObjectAllocationOutsideTLABHandler.java (74%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/memory/ParallelHeapSummaryHandler.java (81%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/network/NetworkReadHandler.java (66%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/network/NetworkWriteHandler.java (72%) rename jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/internal/threads/ThreadCountHandler.java (83%) rename jfr-streaming/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/PsGcMemoryMetricTest.java (67%) rename jfr-streaming/src/serialGcTest/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/SerialGcMemoryMetricTest.java (73%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/BufferMetricTest.java (92%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/CodeCacheMemoryInitMetricTest.java (72%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/GenerateDocs.java (99%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrCPULockTest.java (85%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrClassesLoadedCountTest.java (94%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrOverallCPULoadHandlerTest.java (88%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrTelemetryBuilderTest.java (97%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrTelemetryTest.java (98%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrThreadCountTest.java (89%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/MetaspaceMemoryCommittedMetricTest.java (72%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/MetaspaceMemoryLimitMetricTest.java (74%) rename jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/MetaspaceMemoryUsageMetricTest.java (69%) rename jfr-streaming/src/testFixtures/java/io/opentelemetry/contrib/jfr/{streaming => metrics}/JfrExtension.java (97%) diff --git a/jfr-streaming/src/g1GcTest/java/io/opentelemetry/contrib/jfr/streaming/G1GcMemoryMetricTest.java b/jfr-streaming/src/g1GcTest/java/io/opentelemetry/contrib/jfr/metrics/G1GcMemoryMetricTest.java similarity index 71% rename from jfr-streaming/src/g1GcTest/java/io/opentelemetry/contrib/jfr/streaming/G1GcMemoryMetricTest.java rename to jfr-streaming/src/g1GcTest/java/io/opentelemetry/contrib/jfr/metrics/G1GcMemoryMetricTest.java index a051da6b8..5abf9b415 100644 --- a/jfr-streaming/src/g1GcTest/java/io/opentelemetry/contrib/jfr/streaming/G1GcMemoryMetricTest.java +++ b/jfr-streaming/src/g1GcTest/java/io/opentelemetry/contrib/jfr/metrics/G1GcMemoryMetricTest.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_ACTION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_G1_EDEN_SPACE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_G1_SURVIVOR_SPACE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.END_OF_MAJOR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.END_OF_MINOR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_COMMITTED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_AFTER; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_AFTER; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ACTION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_G1_EDEN_SPACE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_G1_SURVIVOR_SPACE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.END_OF_MAJOR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.END_OF_MINOR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_AFTER; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_AFTER; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/HandlerRegistry.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java similarity index 65% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/HandlerRegistry.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java index 59f763f6a..224fe73b5 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/HandlerRegistry.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java @@ -3,30 +3,30 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.internal.GarbageCollection.G1GarbageCollectionHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.GarbageCollection.OldGarbageCollectionHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.GarbageCollection.YoungGarbageCollectionHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.ThreadGrouper; -import io.opentelemetry.contrib.jfr.streaming.internal.buffer.DirectBufferStatisticsHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.classes.ClassesLoadedHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.container.ContainerConfigurationHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.cpu.ContextSwitchRateHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.cpu.LongLockHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.cpu.OverallCPULoadHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.memory.CodeCacheConfigurationHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.memory.G1HeapSummaryHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.memory.MetaspaceSummaryHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.memory.ObjectAllocationInNewTLABHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.memory.ObjectAllocationOutsideTLABHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.memory.ParallelHeapSummaryHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.network.NetworkReadHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.network.NetworkWriteHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.threads.ThreadCountHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.GarbageCollection.G1GarbageCollectionHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.GarbageCollection.OldGarbageCollectionHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.GarbageCollection.YoungGarbageCollectionHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.ThreadGrouper; +import io.opentelemetry.contrib.jfr.metrics.internal.buffer.DirectBufferStatisticsHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.classes.ClassesLoadedHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.container.ContainerConfigurationHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.cpu.ContextSwitchRateHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.cpu.LongLockHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.cpu.OverallCPULoadHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.memory.CodeCacheConfigurationHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.memory.G1HeapSummaryHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.memory.MetaspaceSummaryHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.memory.ObjectAllocationInNewTLABHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.memory.ObjectAllocationOutsideTLABHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.memory.ParallelHeapSummaryHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.network.NetworkReadHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.network.NetworkWriteHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.threads.ThreadCountHandler; import java.io.IOException; import java.lang.management.ManagementFactory; import java.util.ArrayList; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/JfrFeature.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrFeature.java similarity index 96% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/JfrFeature.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrFeature.java index aeafbf5ed..0865958b4 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/JfrFeature.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrFeature.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; /** * Enumeration of JFR features, which can be toggled on or off via {@link JfrTelemetryBuilder}. diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetry.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetry.java similarity index 96% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetry.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetry.java index 208bddf6a..f02638f98 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetry.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetry.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.io.Closeable; import java.io.IOException; import java.util.List; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetryBuilder.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilder.java similarity index 97% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetryBuilder.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilder.java index dd1bbd375..c37ed8d2c 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetryBuilder.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.OpenTelemetry; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/AbstractThreadDispatchingHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/AbstractThreadDispatchingHandler.java similarity index 94% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/AbstractThreadDispatchingHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/AbstractThreadDispatchingHandler.java index 7e2027221..c968d13f3 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/AbstractThreadDispatchingHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/AbstractThreadDispatchingHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal; +package io.opentelemetry.contrib.jfr.metrics.internal; import java.util.HashMap; import java.util.Map; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/Constants.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/Constants.java similarity index 98% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/Constants.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/Constants.java index 57627be32..c051d10b9 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/Constants.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/Constants.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal; +package io.opentelemetry.contrib.jfr.metrics.internal; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/DurationUtil.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/DurationUtil.java similarity index 90% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/DurationUtil.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/DurationUtil.java index 9c039875f..f6394d8a0 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/DurationUtil.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/DurationUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal; +package io.opentelemetry.contrib.jfr.metrics.internal; import java.time.Duration; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/GarbageCollection/G1GarbageCollectionHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/G1GarbageCollectionHandler.java similarity index 61% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/GarbageCollection/G1GarbageCollectionHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/G1GarbageCollectionHandler.java index c541adea2..9b70256f2 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/GarbageCollection/G1GarbageCollectionHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/G1GarbageCollectionHandler.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.GarbageCollection; +package io.opentelemetry.contrib.jfr.metrics.internal.GarbageCollection; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_ACTION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.END_OF_MINOR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_GC_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ACTION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.END_OF_MINOR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_GC_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.Optional; import jdk.jfr.consumer.RecordedEvent; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/GarbageCollection/OldGarbageCollectionHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/OldGarbageCollectionHandler.java similarity index 63% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/GarbageCollection/OldGarbageCollectionHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/OldGarbageCollectionHandler.java index 0b46c3d6e..af55dbc40 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/GarbageCollection/OldGarbageCollectionHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/OldGarbageCollectionHandler.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.GarbageCollection; +package io.opentelemetry.contrib.jfr.metrics.internal.GarbageCollection; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_ACTION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.END_OF_MAJOR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_GC_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ACTION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.END_OF_MAJOR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_GC_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.Optional; import jdk.jfr.consumer.RecordedEvent; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/GarbageCollection/YoungGarbageCollectionHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/YoungGarbageCollectionHandler.java similarity index 64% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/GarbageCollection/YoungGarbageCollectionHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/YoungGarbageCollectionHandler.java index e8ebd02bf..9610fe82c 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/GarbageCollection/YoungGarbageCollectionHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/YoungGarbageCollectionHandler.java @@ -3,21 +3,21 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.GarbageCollection; +package io.opentelemetry.contrib.jfr.metrics.internal.GarbageCollection; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_ACTION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.END_OF_MINOR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_GC_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ACTION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.END_OF_MINOR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_GC_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.Optional; import jdk.jfr.consumer.RecordedEvent; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/RecordedEventHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/RecordedEventHandler.java similarity index 94% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/RecordedEventHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/RecordedEventHandler.java index d437185ad..a7a564e18 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/RecordedEventHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/RecordedEventHandler.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal; +package io.opentelemetry.contrib.jfr.metrics.internal; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; import java.io.Closeable; import java.time.Duration; import java.util.List; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/ThreadGrouper.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/ThreadGrouper.java similarity index 91% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/ThreadGrouper.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/ThreadGrouper.java index d41a27c1b..e37491644 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/ThreadGrouper.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/ThreadGrouper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal; +package io.opentelemetry.contrib.jfr.metrics.internal; import java.util.Optional; import jdk.jfr.consumer.RecordedEvent; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/buffer/DirectBufferStatisticsHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/buffer/DirectBufferStatisticsHandler.java similarity index 86% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/buffer/DirectBufferStatisticsHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/buffer/DirectBufferStatisticsHandler.java index e96610a36..0459a20da 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/buffer/DirectBufferStatisticsHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/buffer/DirectBufferStatisticsHandler.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.buffer; +package io.opentelemetry.contrib.jfr.metrics.internal.buffer; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_POOL; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.UNIT_BUFFERS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_POOL; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.UNIT_BUFFERS; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/classes/ClassesLoadedHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/classes/ClassesLoadedHandler.java similarity index 91% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/classes/ClassesLoadedHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/classes/ClassesLoadedHandler.java index d03f718fe..848e2a3f8 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/classes/ClassesLoadedHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/classes/ClassesLoadedHandler.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.classes; +package io.opentelemetry.contrib.jfr.metrics.internal.classes; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.UNIT_CLASSES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.UNIT_CLASSES; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/container/ContainerConfigurationHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/container/ContainerConfigurationHandler.java similarity index 81% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/container/ContainerConfigurationHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/container/ContainerConfigurationHandler.java index eb5edeb56..988d02422 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/container/ContainerConfigurationHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/container/ContainerConfigurationHandler.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.container; +package io.opentelemetry.contrib.jfr.metrics.internal.container; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ONE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ONE; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.util.ArrayList; import java.util.List; import jdk.jfr.consumer.RecordedEvent; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/cpu/ContextSwitchRateHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/ContextSwitchRateHandler.java similarity index 82% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/cpu/ContextSwitchRateHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/ContextSwitchRateHandler.java index 8450e6fd8..941d2d631 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/cpu/ContextSwitchRateHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/ContextSwitchRateHandler.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.cpu; +package io.opentelemetry.contrib.jfr.metrics.internal.cpu; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.HERTZ; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.HERTZ; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/cpu/LongLockHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/LongLockHandler.java similarity index 81% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/cpu/LongLockHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/LongLockHandler.java index a169290b2..9a615b4e0 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/cpu/LongLockHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/LongLockHandler.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.cpu; +package io.opentelemetry.contrib.jfr.metrics.internal.cpu; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_THREAD_NAME; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_THREAD_NAME; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.AbstractThreadDispatchingHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.DurationUtil; -import io.opentelemetry.contrib.jfr.streaming.internal.ThreadGrouper; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.AbstractThreadDispatchingHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.DurationUtil; +import io.opentelemetry.contrib.jfr.metrics.internal.ThreadGrouper; import java.time.Duration; import java.util.Optional; import java.util.function.Consumer; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/cpu/OverallCPULoadHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/OverallCPULoadHandler.java similarity index 89% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/cpu/OverallCPULoadHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/OverallCPULoadHandler.java index f3aa15359..996b8d774 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/cpu/OverallCPULoadHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/OverallCPULoadHandler.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.cpu; +package io.opentelemetry.contrib.jfr.metrics.internal.cpu; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.UNIT_UTILIZATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.UNIT_UTILIZATION; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/CodeCacheConfigurationHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/CodeCacheConfigurationHandler.java similarity index 66% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/CodeCacheConfigurationHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/CodeCacheConfigurationHandler.java index 6a9723cf1..6a28d01de 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/CodeCacheConfigurationHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/CodeCacheConfigurationHandler.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.memory; +package io.opentelemetry.contrib.jfr.metrics.internal.memory; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_POOL; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_TYPE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.INITIAL_SIZE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_INIT; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_INIT; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.NON_HEAP; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_POOL; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_TYPE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.INITIAL_SIZE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_INIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_INIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.NON_HEAP; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/G1HeapSummaryHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/G1HeapSummaryHandler.java similarity index 79% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/G1HeapSummaryHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/G1HeapSummaryHandler.java index f42fb120f..8703e8f96 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/G1HeapSummaryHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/G1HeapSummaryHandler.java @@ -3,23 +3,23 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.memory; - -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_POOL; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_TYPE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.HEAP; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_COMMITTED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_AFTER; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_COMMITTED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_AFTER; +package io.opentelemetry.contrib.jfr.metrics.internal.memory; + +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_POOL; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_TYPE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.HEAP; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_AFTER; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_AFTER; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/MetaspaceSummaryHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/MetaspaceSummaryHandler.java similarity index 75% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/MetaspaceSummaryHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/MetaspaceSummaryHandler.java index 2ce66ced9..a07bd294e 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/MetaspaceSummaryHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/MetaspaceSummaryHandler.java @@ -3,26 +3,26 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.memory; +package io.opentelemetry.contrib.jfr.metrics.internal.memory; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_POOL; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_TYPE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.COMMITTED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_COMMITTED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_LIMIT; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_COMMITTED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_LIMIT; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.NON_HEAP; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.RESERVED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.USED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_POOL; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_TYPE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_LIMIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_LIMIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.NON_HEAP; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.RESERVED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.USED; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/ObjectAllocationInNewTLABHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationInNewTLABHandler.java similarity index 74% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/ObjectAllocationInNewTLABHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationInNewTLABHandler.java index 027a68749..ed730d037 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/ObjectAllocationInNewTLABHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationInNewTLABHandler.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.memory; +package io.opentelemetry.contrib.jfr.metrics.internal.memory; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_ARENA_NAME; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_THREAD_NAME; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_ALLOCATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_ALLOCATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ARENA_NAME; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_THREAD_NAME; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_ALLOCATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_ALLOCATION; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.AbstractThreadDispatchingHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.ThreadGrouper; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.AbstractThreadDispatchingHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.ThreadGrouper; import java.util.function.Consumer; import jdk.jfr.consumer.RecordedEvent; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/ObjectAllocationOutsideTLABHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationOutsideTLABHandler.java similarity index 74% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/ObjectAllocationOutsideTLABHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationOutsideTLABHandler.java index 77392123c..0e8256e52 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/ObjectAllocationOutsideTLABHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationOutsideTLABHandler.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.memory; +package io.opentelemetry.contrib.jfr.metrics.internal.memory; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_ARENA_NAME; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_THREAD_NAME; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_ALLOCATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_ALLOCATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ARENA_NAME; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_THREAD_NAME; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_ALLOCATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_ALLOCATION; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.AbstractThreadDispatchingHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.ThreadGrouper; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.AbstractThreadDispatchingHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.ThreadGrouper; import java.util.function.Consumer; import jdk.jfr.consumer.RecordedEvent; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/ParallelHeapSummaryHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ParallelHeapSummaryHandler.java similarity index 81% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/ParallelHeapSummaryHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ParallelHeapSummaryHandler.java index 8c4120595..cde93570e 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/memory/ParallelHeapSummaryHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ParallelHeapSummaryHandler.java @@ -3,28 +3,28 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.memory; - -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_POOL; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_TYPE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.COMMITTED_SIZE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.HEAP; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_COMMITTED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_AFTER; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_LIMIT; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_COMMITTED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_AFTER; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_LIMIT; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.RESERVED_SIZE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.USED; +package io.opentelemetry.contrib.jfr.metrics.internal.memory; + +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_POOL; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_TYPE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.COMMITTED_SIZE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.HEAP; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_AFTER; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_LIMIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_AFTER; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_LIMIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.RESERVED_SIZE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.USED; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/network/NetworkReadHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkReadHandler.java similarity index 66% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/network/NetworkReadHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkReadHandler.java index b6ff99770..2c81c60b0 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/network/NetworkReadHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkReadHandler.java @@ -3,26 +3,26 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.network; +package io.opentelemetry.contrib.jfr.metrics.internal.network; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_NETWORK_MODE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_THREAD_NAME; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_NETWORK_BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_NETWORK_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_NETWORK_BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_NETWORK_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.NETWORK_MODE_READ; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_NETWORK_MODE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_THREAD_NAME; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_NETWORK_BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_NETWORK_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_NETWORK_BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_NETWORK_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.NETWORK_MODE_READ; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.AbstractThreadDispatchingHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.DurationUtil; -import io.opentelemetry.contrib.jfr.streaming.internal.ThreadGrouper; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.AbstractThreadDispatchingHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.DurationUtil; +import io.opentelemetry.contrib.jfr.metrics.internal.ThreadGrouper; import java.util.function.Consumer; import jdk.jfr.consumer.RecordedEvent; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/network/NetworkWriteHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkWriteHandler.java similarity index 72% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/network/NetworkWriteHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkWriteHandler.java index c9fed3bd7..897a60ddd 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/network/NetworkWriteHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkWriteHandler.java @@ -3,26 +3,26 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.network; +package io.opentelemetry.contrib.jfr.metrics.internal.network; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_NETWORK_MODE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_THREAD_NAME; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_NETWORK_BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_NETWORK_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_NETWORK_BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_NETWORK_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.NETWORK_MODE_WRITE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_NETWORK_MODE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_THREAD_NAME; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_NETWORK_BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_NETWORK_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_NETWORK_BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_NETWORK_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.NETWORK_MODE_WRITE; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.AbstractThreadDispatchingHandler; -import io.opentelemetry.contrib.jfr.streaming.internal.DurationUtil; -import io.opentelemetry.contrib.jfr.streaming.internal.ThreadGrouper; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.AbstractThreadDispatchingHandler; +import io.opentelemetry.contrib.jfr.metrics.internal.DurationUtil; +import io.opentelemetry.contrib.jfr.metrics.internal.ThreadGrouper; import java.util.function.Consumer; import jdk.jfr.consumer.RecordedEvent; diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/threads/ThreadCountHandler.java b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/threads/ThreadCountHandler.java similarity index 83% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/threads/ThreadCountHandler.java rename to jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/threads/ThreadCountHandler.java index 095e648a5..bc053f944 100644 --- a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/streaming/internal/threads/ThreadCountHandler.java +++ b/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/threads/ThreadCountHandler.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming.internal.threads; +package io.opentelemetry.contrib.jfr.metrics.internal.threads; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_DAEMON; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.UNIT_THREADS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_DAEMON; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.UNIT_THREADS; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.contrib.jfr.streaming.JfrFeature; -import io.opentelemetry.contrib.jfr.streaming.internal.RecordedEventHandler; +import io.opentelemetry.contrib.jfr.metrics.JfrFeature; +import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/jfr-streaming/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/streaming/PsGcMemoryMetricTest.java b/jfr-streaming/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/metrics/PsGcMemoryMetricTest.java similarity index 67% rename from jfr-streaming/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/streaming/PsGcMemoryMetricTest.java rename to jfr-streaming/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/metrics/PsGcMemoryMetricTest.java index f5ed36a07..5692a50e3 100644 --- a/jfr-streaming/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/streaming/PsGcMemoryMetricTest.java +++ b/jfr-streaming/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/metrics/PsGcMemoryMetricTest.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_ACTION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_PS_EDEN_SPACE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_PS_OLD_GEN; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_PS_SURVIVOR_SPACE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.END_OF_MAJOR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.END_OF_MINOR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_COMMITTED; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_AFTER; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_LIMIT; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_AFTER; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ACTION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_PS_EDEN_SPACE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_PS_OLD_GEN; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_PS_SURVIVOR_SPACE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.END_OF_MAJOR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.END_OF_MINOR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_AFTER; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_LIMIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_AFTER; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; diff --git a/jfr-streaming/src/serialGcTest/java/io/opentelemetry/contrib/jfr/streaming/SerialGcMemoryMetricTest.java b/jfr-streaming/src/serialGcTest/java/io/opentelemetry/contrib/jfr/metrics/SerialGcMemoryMetricTest.java similarity index 73% rename from jfr-streaming/src/serialGcTest/java/io/opentelemetry/contrib/jfr/streaming/SerialGcMemoryMetricTest.java rename to jfr-streaming/src/serialGcTest/java/io/opentelemetry/contrib/jfr/metrics/SerialGcMemoryMetricTest.java index 6d529d93b..3264aac5c 100644 --- a/jfr-streaming/src/serialGcTest/java/io/opentelemetry/contrib/jfr/streaming/SerialGcMemoryMetricTest.java +++ b/jfr-streaming/src/serialGcTest/java/io/opentelemetry/contrib/jfr/metrics/SerialGcMemoryMetricTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_ACTION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.END_OF_MAJOR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.END_OF_MINOR_GC; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ACTION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.END_OF_MAJOR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.END_OF_MINOR_GC; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_GC_DURATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/BufferMetricTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/BufferMetricTest.java similarity index 92% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/BufferMetricTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/BufferMetricTest.java index 8f27271ba..38a235683 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/BufferMetricTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/BufferMetricTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_POOL; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.UNIT_BUFFERS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_POOL; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.UNIT_BUFFERS; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/CodeCacheMemoryInitMetricTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/CodeCacheMemoryInitMetricTest.java similarity index 72% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/CodeCacheMemoryInitMetricTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/CodeCacheMemoryInitMetricTest.java index 6e87ad1b6..ce746b7ab 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/CodeCacheMemoryInitMetricTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/CodeCacheMemoryInitMetricTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_CODE_CACHE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_INIT; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY_INIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_CODE_CACHE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_INIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_INIT; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/GenerateDocs.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/GenerateDocs.java similarity index 99% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/GenerateDocs.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/GenerateDocs.java index 02558c621..3f941d28c 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/GenerateDocs.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/GenerateDocs.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toSet; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrCPULockTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrCPULockTest.java similarity index 85% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrCPULockTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrCPULockTest.java index 3ea8ec874..6f4f798ae 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrCPULockTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrCPULockTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.MILLISECONDS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MILLISECONDS; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrClassesLoadedCountTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrClassesLoadedCountTest.java similarity index 94% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrClassesLoadedCountTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrClassesLoadedCountTest.java index a2dbac9e5..24528e7ac 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrClassesLoadedCountTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrClassesLoadedCountTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.UNIT_CLASSES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.UNIT_CLASSES; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrOverallCPULoadHandlerTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrOverallCPULoadHandlerTest.java similarity index 88% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrOverallCPULoadHandlerTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrOverallCPULoadHandlerTest.java index b67dec0df..547a2734b 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrOverallCPULoadHandlerTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrOverallCPULoadHandlerTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.UNIT_UTILIZATION; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.UNIT_UTILIZATION; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetryBuilderTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilderTest.java similarity index 97% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetryBuilderTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilderTest.java index 9d93c712d..79dfcb5a2 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetryBuilderTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; import static org.assertj.core.api.Assertions.assertThat; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetryTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java similarity index 98% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetryTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java index ab6d0146b..4d26fa160 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrTelemetryTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrThreadCountTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrThreadCountTest.java similarity index 89% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrThreadCountTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrThreadCountTest.java index abf5dcc0c..d019cc655 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/JfrThreadCountTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrThreadCountTest.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.DAEMON; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.UNIT_THREADS; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.DAEMON; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.UNIT_THREADS; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.AttributeKey; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/MetaspaceMemoryCommittedMetricTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryCommittedMetricTest.java similarity index 72% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/MetaspaceMemoryCommittedMetricTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryCommittedMetricTest.java index d7c19e046..a1ba428f4 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/MetaspaceMemoryCommittedMetricTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryCommittedMetricTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_COMPRESSED_CLASS_SPACE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_METASPACE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_COMMITTED; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_COMPRESSED_CLASS_SPACE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_METASPACE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_COMMITTED; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/MetaspaceMemoryLimitMetricTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryLimitMetricTest.java similarity index 74% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/MetaspaceMemoryLimitMetricTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryLimitMetricTest.java index c7ba9dea8..3779b8449 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/MetaspaceMemoryLimitMetricTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryLimitMetricTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_COMPRESSED_CLASS_SPACE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY_LIMIT; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_COMPRESSED_CLASS_SPACE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY_LIMIT; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/MetaspaceMemoryUsageMetricTest.java b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryUsageMetricTest.java similarity index 69% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/MetaspaceMemoryUsageMetricTest.java rename to jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryUsageMetricTest.java index ab3436cb0..10bb08d12 100644 --- a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/streaming/MetaspaceMemoryUsageMetricTest.java +++ b/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryUsageMetricTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_COMPRESSED_CLASS_SPACE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.ATTR_METASPACE; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.BYTES; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_DESCRIPTION_MEMORY; -import static io.opentelemetry.contrib.jfr.streaming.internal.Constants.METRIC_NAME_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_COMPRESSED_CLASS_SPACE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_METASPACE; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_DESCRIPTION_MEMORY; +import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; diff --git a/jfr-streaming/src/testFixtures/java/io/opentelemetry/contrib/jfr/streaming/JfrExtension.java b/jfr-streaming/src/testFixtures/java/io/opentelemetry/contrib/jfr/metrics/JfrExtension.java similarity index 97% rename from jfr-streaming/src/testFixtures/java/io/opentelemetry/contrib/jfr/streaming/JfrExtension.java rename to jfr-streaming/src/testFixtures/java/io/opentelemetry/contrib/jfr/metrics/JfrExtension.java index 01bafabb0..8dafa2079 100644 --- a/jfr-streaming/src/testFixtures/java/io/opentelemetry/contrib/jfr/streaming/JfrExtension.java +++ b/jfr-streaming/src/testFixtures/java/io/opentelemetry/contrib/jfr/metrics/JfrExtension.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.contrib.jfr.streaming; +package io.opentelemetry.contrib.jfr.metrics; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.awaitility.Awaitility.await; From d5f0301641d0927e5ec776c7b7fb40484ff89b9c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 20 Feb 2023 14:37:56 -0800 Subject: [PATCH 3/4] Rename module --- .github/component_owners.yml | 2 +- .github/scripts/draft-change-log-entries.sh | 2 +- CHANGELOG.md | 4 +- README.md | 3 +- jfr-metrics/README.md | 62 +++++++++++++++++++ .../build.gradle.kts | 0 .../jfr/metrics/G1GcMemoryMetricTest.java | 0 .../contrib/jfr/metrics/HandlerRegistry.java | 0 .../contrib/jfr/metrics/JfrFeature.java | 0 .../contrib/jfr/metrics/JfrTelemetry.java | 0 .../jfr/metrics/JfrTelemetryBuilder.java | 0 .../AbstractThreadDispatchingHandler.java | 0 .../jfr/metrics/internal/Constants.java | 0 .../jfr/metrics/internal/DurationUtil.java | 0 .../G1GarbageCollectionHandler.java | 0 .../OldGarbageCollectionHandler.java | 0 .../YoungGarbageCollectionHandler.java | 0 .../internal/RecordedEventHandler.java | 0 .../jfr/metrics/internal/ThreadGrouper.java | 0 .../buffer/DirectBufferStatisticsHandler.java | 0 .../classes/ClassesLoadedHandler.java | 0 .../ContainerConfigurationHandler.java | 0 .../cpu/ContextSwitchRateHandler.java | 0 .../metrics/internal/cpu/LongLockHandler.java | 0 .../internal/cpu/OverallCPULoadHandler.java | 0 .../memory/CodeCacheConfigurationHandler.java | 0 .../internal/memory/G1HeapSummaryHandler.java | 0 .../memory/MetaspaceSummaryHandler.java | 0 .../ObjectAllocationInNewTLABHandler.java | 0 .../ObjectAllocationOutsideTLABHandler.java | 0 .../memory/ParallelHeapSummaryHandler.java | 0 .../internal/network/NetworkReadHandler.java | 0 .../internal/network/NetworkWriteHandler.java | 0 .../internal/threads/ThreadCountHandler.java | 0 .../jfr/metrics/PsGcMemoryMetricTest.java | 0 .../jfr/metrics/SerialGcMemoryMetricTest.java | 0 .../contrib/jfr/metrics/BufferMetricTest.java | 0 .../CodeCacheMemoryInitMetricTest.java | 0 .../contrib/jfr/metrics/GenerateDocs.java | 0 .../contrib/jfr/metrics/JfrCPULockTest.java | 0 .../metrics/JfrClassesLoadedCountTest.java | 0 .../metrics/JfrOverallCPULoadHandlerTest.java | 0 .../jfr/metrics/JfrTelemetryBuilderTest.java | 0 .../contrib/jfr/metrics/JfrTelemetryTest.java | 0 .../jfr/metrics/JfrThreadCountTest.java | 0 .../MetaspaceMemoryCommittedMetricTest.java | 0 .../MetaspaceMemoryLimitMetricTest.java | 0 .../MetaspaceMemoryUsageMetricTest.java | 0 .../contrib/jfr/metrics/JfrExtension.java | 0 jfr-streaming/README.md | 62 ------------------- settings.gradle.kts | 2 +- 51 files changed, 69 insertions(+), 68 deletions(-) create mode 100644 jfr-metrics/README.md rename {jfr-streaming => jfr-metrics}/build.gradle.kts (100%) rename {jfr-streaming => jfr-metrics}/src/g1GcTest/java/io/opentelemetry/contrib/jfr/metrics/G1GcMemoryMetricTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrFeature.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetry.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilder.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/AbstractThreadDispatchingHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/Constants.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/DurationUtil.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/G1GarbageCollectionHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/OldGarbageCollectionHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/YoungGarbageCollectionHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/RecordedEventHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/ThreadGrouper.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/buffer/DirectBufferStatisticsHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/classes/ClassesLoadedHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/container/ContainerConfigurationHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/ContextSwitchRateHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/LongLockHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/OverallCPULoadHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/CodeCacheConfigurationHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/G1HeapSummaryHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/MetaspaceSummaryHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationInNewTLABHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationOutsideTLABHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ParallelHeapSummaryHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkReadHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkWriteHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/threads/ThreadCountHandler.java (100%) rename {jfr-streaming => jfr-metrics}/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/metrics/PsGcMemoryMetricTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/serialGcTest/java/io/opentelemetry/contrib/jfr/metrics/SerialGcMemoryMetricTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/BufferMetricTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/CodeCacheMemoryInitMetricTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/GenerateDocs.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrCPULockTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrClassesLoadedCountTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrOverallCPULoadHandlerTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilderTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrThreadCountTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryCommittedMetricTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryLimitMetricTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryUsageMetricTest.java (100%) rename {jfr-streaming => jfr-metrics}/src/testFixtures/java/io/opentelemetry/contrib/jfr/metrics/JfrExtension.java (100%) delete mode 100644 jfr-streaming/README.md diff --git a/.github/component_owners.yml b/.github/component_owners.yml index 93136cfaa..e39f96092 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -24,7 +24,7 @@ components: - trask jfr-events: - sfriberg - jfr-streaming: + jfr-metrics: - breedx-splk - jack-berg - kittylyst diff --git a/.github/scripts/draft-change-log-entries.sh b/.github/scripts/draft-change-log-entries.sh index 8cef331a1..65e2c83a6 100755 --- a/.github/scripts/draft-change-log-entries.sh +++ b/.github/scripts/draft-change-log-entries.sh @@ -29,7 +29,7 @@ component_names["aws-xray/"]="AWS X-Ray SDK support" component_names["aws-xray-propagator/"]="AWS X-Ray propagator" component_names["consistent-sampling/"]="Consistent sampling" component_names["jfr-events/"]="JFR events" -component_names["jfr-streaming/"]="JFR metrics" +component_names["jfr-metrics/"]="JFR metrics" component_names["jmx-metrics/"]="JMX metrics" component_names["maven-extension/"]="Maven extension" component_names["micrometer-meter-provider/"]="Micrometer MeterProvider" diff --git a/CHANGELOG.md b/CHANGELOG.md index 3547cf89b..a44352cd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ This module can be used to bridge OpenTelemetry metrics into the `prometheus-sim ### JFR metrics -- Update handlers in jfr-streaming to match spec +- Update handlers in jfr-metrics to match spec ([#616](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/616)) ## Version 1.20.1 (2022-11-22) @@ -250,7 +250,7 @@ All components updated to target OpenTelemetry SDK 1.9.1. ### JFR metrics -- Tidy up jfr-streaming +- Tidy up jfr-metrics ([#127](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/127)) - Fix units for some metrics ([#140](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/140)) diff --git a/README.md b/README.md index 40b669fe3..9aadd4c26 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ feature or via instrumentation, this project is hopefully for you. * [AWS X-Ray SDK Support](./aws-xray/README.md) * [AWS X-Ray Propagator](./aws-xray-propagator/README.md) * [Consistent sampling](./consistent-sampling/README.md) -* [JFR Metrics](./jfr-streaming/README.md) +* [JFR Metrics](./jfr-metrics/README.md) * [JMX Metric Gatherer](./jmx-metrics/README.md) * [OpenTelemetry Maven Extension](./maven-extension/README.md) * [Runtime Attach](./runtime-attach/README.md) @@ -57,6 +57,7 @@ exist. Triagers ([@open-telemetry/java-contrib-triagers](https://github.com/orgs/open-telemetry/teams/java-contrib-triagers)): - + All [component owners](https://github.com/open-telemetry/opentelemetry-java-contrib/blob/main/.github/component_owners.yml) are given Triager permissions to this repository. diff --git a/jfr-metrics/README.md b/jfr-metrics/README.md new file mode 100644 index 000000000..b6ee112bc --- /dev/null +++ b/jfr-metrics/README.md @@ -0,0 +1,62 @@ +# JFR Metrics + +* Java 17 only. + +* Build it with `./gradlew :jfr-metrics:build` + +The main entry point is the `JfrTelemetry` class in the +package `io.opentelemetry.contrib.jfr.streaming`: + +```java +// Initialize JfrTelemetry +JfrTelemetry jfrTelemetry=JfrTelemetry.create(openTelemetry); + +// Close JfrTelemetry to stop listening for JFR events + jfrTelemetry.close(); +``` + +`JfrTelemetry` works by subscribing to certain JFR events, and using relevant bits of information +from the events to produce telemetry data like metrics. The code is divided into "handlers", which +listen for specific events and produce relevant telemetry. The handlers are organized into +features (i.e `JfrFeature`), which represent a category of telemetry and can be toggled on and +off. `JfrTelemetry` evaluates which features are enabled, and only listens for the events required +by the handlers associated with those features. + +Enable or disable a feature as follows: + +``` +JfrTelemetry jfrTelemetry = JfrTelemetry.builder(openTelemetry) + .enableFeature(JfrFeature.BUFFER_METRICS) + .disableFeature(JfrFeature.LOCK_METRICS) + .build(); +``` + +The following table describes the set of `JfrFeatures` available, whether each is enabled by +default, and the telemetry each produces: + + + + +| JfrFeature | Default Enabled | Metrics | +|---------------------------|-----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| BUFFER_METRICS | false | `process.runtime.jvm.buffer.count`, `process.runtime.jvm.buffer.limit`, `process.runtime.jvm.buffer.usage` | +| CLASS_LOAD_METRICS | false | `process.runtime.jvm.classes.current_loaded`, `process.runtime.jvm.classes.loaded`, `process.runtime.jvm.classes.unloaded` | +| CONTEXT_SWITCH_METRICS | true | `process.runtime.jvm.cpu.context_switch` | +| CPU_COUNT_METRICS | true | `process.runtime.jvm.cpu.limit` | +| CPU_UTILIZATION_METRICS | false | `process.runtime.jvm.cpu.utilization`, `process.runtime.jvm.system.cpu.utilization` | +| GC_DURATION_METRICS | false | `process.runtime.jvm.gc.duration` | +| LOCK_METRICS | true | `process.runtime.jvm.cpu.longlock` | +| MEMORY_ALLOCATION_METRICS | true | `process.runtime.jvm.memory.allocation` | +| MEMORY_POOL_METRICS | false | `process.runtime.jvm.memory.committed`, `process.runtime.jvm.memory.init`, `process.runtime.jvm.memory.limit`, `process.runtime.jvm.memory.usage`, `process.runtime.jvm.memory.usage_after_last_gc` | +| NETWORK_IO_METRICS | true | `process.runtime.jvm.network.io`, `process.runtime.jvm.network.time` | +| THREAD_METRICS | false | `process.runtime.jvm.threads.count` | + + + +## Component owners + +- [Ben Evans](https://github.com/kittylyst), Red Hat +- [Jack Berg](https://github.com/jack-berg), New Relic +- [Jason Plumb](https://github.com/breedx-splk), Splunk + +Learn more about component owners in [component_owners.yml](../.github/component_owners.yml). diff --git a/jfr-streaming/build.gradle.kts b/jfr-metrics/build.gradle.kts similarity index 100% rename from jfr-streaming/build.gradle.kts rename to jfr-metrics/build.gradle.kts diff --git a/jfr-streaming/src/g1GcTest/java/io/opentelemetry/contrib/jfr/metrics/G1GcMemoryMetricTest.java b/jfr-metrics/src/g1GcTest/java/io/opentelemetry/contrib/jfr/metrics/G1GcMemoryMetricTest.java similarity index 100% rename from jfr-streaming/src/g1GcTest/java/io/opentelemetry/contrib/jfr/metrics/G1GcMemoryMetricTest.java rename to jfr-metrics/src/g1GcTest/java/io/opentelemetry/contrib/jfr/metrics/G1GcMemoryMetricTest.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrFeature.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrFeature.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrFeature.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrFeature.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetry.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetry.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetry.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetry.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilder.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilder.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilder.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilder.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/AbstractThreadDispatchingHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/AbstractThreadDispatchingHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/AbstractThreadDispatchingHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/AbstractThreadDispatchingHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/Constants.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/Constants.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/Constants.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/Constants.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/DurationUtil.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/DurationUtil.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/DurationUtil.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/DurationUtil.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/G1GarbageCollectionHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/G1GarbageCollectionHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/G1GarbageCollectionHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/G1GarbageCollectionHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/OldGarbageCollectionHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/OldGarbageCollectionHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/OldGarbageCollectionHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/OldGarbageCollectionHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/YoungGarbageCollectionHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/YoungGarbageCollectionHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/YoungGarbageCollectionHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/GarbageCollection/YoungGarbageCollectionHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/RecordedEventHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/RecordedEventHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/RecordedEventHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/RecordedEventHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/ThreadGrouper.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/ThreadGrouper.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/ThreadGrouper.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/ThreadGrouper.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/buffer/DirectBufferStatisticsHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/buffer/DirectBufferStatisticsHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/buffer/DirectBufferStatisticsHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/buffer/DirectBufferStatisticsHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/classes/ClassesLoadedHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/classes/ClassesLoadedHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/classes/ClassesLoadedHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/classes/ClassesLoadedHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/container/ContainerConfigurationHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/container/ContainerConfigurationHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/container/ContainerConfigurationHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/container/ContainerConfigurationHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/ContextSwitchRateHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/ContextSwitchRateHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/ContextSwitchRateHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/ContextSwitchRateHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/LongLockHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/LongLockHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/LongLockHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/LongLockHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/OverallCPULoadHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/OverallCPULoadHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/OverallCPULoadHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/OverallCPULoadHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/CodeCacheConfigurationHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/CodeCacheConfigurationHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/CodeCacheConfigurationHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/CodeCacheConfigurationHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/G1HeapSummaryHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/G1HeapSummaryHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/G1HeapSummaryHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/G1HeapSummaryHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/MetaspaceSummaryHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/MetaspaceSummaryHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/MetaspaceSummaryHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/MetaspaceSummaryHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationInNewTLABHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationInNewTLABHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationInNewTLABHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationInNewTLABHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationOutsideTLABHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationOutsideTLABHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationOutsideTLABHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ObjectAllocationOutsideTLABHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ParallelHeapSummaryHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ParallelHeapSummaryHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ParallelHeapSummaryHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ParallelHeapSummaryHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkReadHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkReadHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkReadHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkReadHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkWriteHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkWriteHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkWriteHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/network/NetworkWriteHandler.java diff --git a/jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/threads/ThreadCountHandler.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/threads/ThreadCountHandler.java similarity index 100% rename from jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/threads/ThreadCountHandler.java rename to jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/threads/ThreadCountHandler.java diff --git a/jfr-streaming/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/metrics/PsGcMemoryMetricTest.java b/jfr-metrics/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/metrics/PsGcMemoryMetricTest.java similarity index 100% rename from jfr-streaming/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/metrics/PsGcMemoryMetricTest.java rename to jfr-metrics/src/parallelGcTest/java/io/opentelemetry/contrib/jfr/metrics/PsGcMemoryMetricTest.java diff --git a/jfr-streaming/src/serialGcTest/java/io/opentelemetry/contrib/jfr/metrics/SerialGcMemoryMetricTest.java b/jfr-metrics/src/serialGcTest/java/io/opentelemetry/contrib/jfr/metrics/SerialGcMemoryMetricTest.java similarity index 100% rename from jfr-streaming/src/serialGcTest/java/io/opentelemetry/contrib/jfr/metrics/SerialGcMemoryMetricTest.java rename to jfr-metrics/src/serialGcTest/java/io/opentelemetry/contrib/jfr/metrics/SerialGcMemoryMetricTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/BufferMetricTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/BufferMetricTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/BufferMetricTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/BufferMetricTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/CodeCacheMemoryInitMetricTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/CodeCacheMemoryInitMetricTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/CodeCacheMemoryInitMetricTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/CodeCacheMemoryInitMetricTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/GenerateDocs.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/GenerateDocs.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/GenerateDocs.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/GenerateDocs.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrCPULockTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrCPULockTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrCPULockTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrCPULockTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrClassesLoadedCountTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrClassesLoadedCountTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrClassesLoadedCountTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrClassesLoadedCountTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrOverallCPULoadHandlerTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrOverallCPULoadHandlerTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrOverallCPULoadHandlerTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrOverallCPULoadHandlerTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilderTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilderTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilderTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryBuilderTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrThreadCountTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrThreadCountTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrThreadCountTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrThreadCountTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryCommittedMetricTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryCommittedMetricTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryCommittedMetricTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryCommittedMetricTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryLimitMetricTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryLimitMetricTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryLimitMetricTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryLimitMetricTest.java diff --git a/jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryUsageMetricTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryUsageMetricTest.java similarity index 100% rename from jfr-streaming/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryUsageMetricTest.java rename to jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/MetaspaceMemoryUsageMetricTest.java diff --git a/jfr-streaming/src/testFixtures/java/io/opentelemetry/contrib/jfr/metrics/JfrExtension.java b/jfr-metrics/src/testFixtures/java/io/opentelemetry/contrib/jfr/metrics/JfrExtension.java similarity index 100% rename from jfr-streaming/src/testFixtures/java/io/opentelemetry/contrib/jfr/metrics/JfrExtension.java rename to jfr-metrics/src/testFixtures/java/io/opentelemetry/contrib/jfr/metrics/JfrExtension.java diff --git a/jfr-streaming/README.md b/jfr-streaming/README.md deleted file mode 100644 index 505f51e17..000000000 --- a/jfr-streaming/README.md +++ /dev/null @@ -1,62 +0,0 @@ -# JFR Metrics - -* Java 17 only. - -* Build it with `./gradlew :jfr-streaming:build` - -The main entry point is the `JfrTelemetry` class in the -package `io.opentelemetry.contrib.jfr.streaming`: - -```java -// Initialize JfrTelemetry -JfrTelemetry jfrTelemetry=JfrTelemetry.create(openTelemetry); - -// Close JfrTelemetry to stop listening for JFR events - jfrTelemetry.close(); -``` - -`JfrTelemetry` works by subscribing to certain JFR events, and using relevant bits of information -from the events to produce telemetry data like metrics. The code is divided into "handlers", which -listen for specific events and produce relevant telemetry. The handlers are organized into -features (i.e `JfrFeature`), which represent a category of telemetry and can be toggled on and -off. `JfrTelemetry` evaluates which features are enabled, and only listens for the events required -by the handlers associated with those features. - -Enable or disable a feature as follows: - -``` -JfrTelemetry jfrTelemetry = JfrTelemetry.builder(openTelemetry) - .enableFeature(JfrFeature.BUFFER_METRICS) - .disableFeature(JfrFeature.LOCK_METRICS) - .build(); -``` - -The following table describes the set of `JfrFeatures` available, whether each is enabled by -default, and the telemetry each produces: - - - - -| JfrFeature | Default Enabled | Metrics | -|---|---|---| -| BUFFER_METRICS | false | `process.runtime.jvm.buffer.count`, `process.runtime.jvm.buffer.limit`, `process.runtime.jvm.buffer.usage` | -| CLASS_LOAD_METRICS | false | `process.runtime.jvm.classes.current_loaded`, `process.runtime.jvm.classes.loaded`, `process.runtime.jvm.classes.unloaded` | -| CONTEXT_SWITCH_METRICS | true | `process.runtime.jvm.cpu.context_switch` | -| CPU_COUNT_METRICS | true | `process.runtime.jvm.cpu.limit` | -| CPU_UTILIZATION_METRICS | false | `process.runtime.jvm.cpu.utilization`, `process.runtime.jvm.system.cpu.utilization` | -| GC_DURATION_METRICS | false | `process.runtime.jvm.gc.duration` | -| LOCK_METRICS | true | `process.runtime.jvm.cpu.longlock` | -| MEMORY_ALLOCATION_METRICS | true | `process.runtime.jvm.memory.allocation` | -| MEMORY_POOL_METRICS | false | `process.runtime.jvm.memory.committed`, `process.runtime.jvm.memory.init`, `process.runtime.jvm.memory.limit`, `process.runtime.jvm.memory.usage`, `process.runtime.jvm.memory.usage_after_last_gc` | -| NETWORK_IO_METRICS | true | `process.runtime.jvm.network.io`, `process.runtime.jvm.network.time` | -| THREAD_METRICS | false | `process.runtime.jvm.threads.count` | - - - -## Component owners - -- [Ben Evans](https://github.com/kittylyst), Red Hat -- [Jack Berg](https://github.com/jack-berg), New Relic -- [Jason Plumb](https://github.com/breedx-splk), Splunk - -Learn more about component owners in [component_owners.yml](../.github/component_owners.yml). diff --git a/settings.gradle.kts b/settings.gradle.kts index 4cb62c526..b7813bf5a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -45,7 +45,7 @@ include(":consistent-sampling") include(":dependencyManagement") include(":example") include(":jfr-events") -include(":jfr-streaming") +include(":jfr-metrics") include(":jmx-metrics") include(":maven-extension") include(":micrometer-meter-provider") From b4ff82acf8cb86201fd608bf1421ad4093e440d2 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 20 Feb 2023 14:40:19 -0800 Subject: [PATCH 4/4] More --- jfr-metrics/README.md | 2 +- jfr-metrics/build.gradle.kts | 4 ++-- .../io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java | 2 +- .../opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jfr-metrics/README.md b/jfr-metrics/README.md index b6ee112bc..21c2cc2f6 100644 --- a/jfr-metrics/README.md +++ b/jfr-metrics/README.md @@ -5,7 +5,7 @@ * Build it with `./gradlew :jfr-metrics:build` The main entry point is the `JfrTelemetry` class in the -package `io.opentelemetry.contrib.jfr.streaming`: +package `io.opentelemetry.contrib.jfr.metrics`: ```java // Initialize JfrTelemetry diff --git a/jfr-metrics/build.gradle.kts b/jfr-metrics/build.gradle.kts index ebc5f8207..1b1ab2eaf 100644 --- a/jfr-metrics/build.gradle.kts +++ b/jfr-metrics/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } description = "OpenTelemetry JFR Metrics" -otelJava.moduleName.set("io.opentelemetry.contrib.jfr.streaming") +otelJava.moduleName.set("io.opentelemetry.contrib.jfr.metrics") // Disable publishing test fixtures val javaComponent = components["java"] as AdhocComponentWithVariants @@ -47,7 +47,7 @@ tasks.create("generateDocs", JavaExec::class) { group = "build" description = "Generate table for README.md" classpath = sourceSets.test.get().runtimeClasspath - mainClass.set("io.opentelemetry.contrib.jfr.streaming.GenerateDocs") + mainClass.set("io.opentelemetry.contrib.jfr.metrics.GenerateDocs") systemProperties.set("jfr.readme.path", project.projectDir.toString() + "/README.md") } tasks.getByName("build").dependsOn("generateDocs") diff --git a/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java index 224fe73b5..8f2217405 100644 --- a/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java +++ b/jfr-metrics/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java @@ -36,7 +36,7 @@ import java.util.function.Predicate; final class HandlerRegistry { - private static final String SCOPE_NAME = "io.opentelemetry.contrib.jfr.streaming"; + private static final String SCOPE_NAME = "io.opentelemetry.contrib.jfr.metrics"; private static final String SCOPE_VERSION = readVersion(); private HandlerRegistry() {} diff --git a/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java index 4d26fa160..b7847d86b 100644 --- a/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java +++ b/jfr-metrics/src/test/java/io/opentelemetry/contrib/jfr/metrics/JfrTelemetryTest.java @@ -49,7 +49,7 @@ void create_Default() { .allSatisfy( metric -> { assertThat(metric.getInstrumentationScopeInfo().getName()) - .isEqualTo("io.opentelemetry.contrib.jfr.streaming"); + .isEqualTo("io.opentelemetry.contrib.jfr.metrics"); assertThat(metric.getInstrumentationScopeInfo().getVersion()) .matches("1\\..*-alpha.*"); });