diff options
| author | Yang Song <songy23@users.noreply.github.com> | 2018-06-05 17:08:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 17:08:43 -0700 |
| commit | 4f1b11a7573c30fabfaa1a90244da7b8604dba61 (patch) | |
| tree | 89a1d82e2e54e49a8962f11742b3b08de6b06347 | |
| parent | eaa577023bacf8b7d9404d9c95d40b15d19f4e5a (diff) | |
| download | platform_external_opencensus-java-4f1b11a7573c30fabfaa1a90244da7b8604dba61.tar.gz platform_external_opencensus-java-4f1b11a7573c30fabfaa1a90244da7b8604dba61.tar.bz2 platform_external_opencensus-java-4f1b11a7573c30fabfaa1a90244da7b8604dba61.zip | |
Metrics: Move Metrics to a separate artifact. (#1216)
* Move Metrics to a separate artifact.
* Fix review comments.
* Update one TODO about the naming of the artifact.
| -rw-r--r-- | build.gradle | 1 | ||||
| -rw-r--r-- | buildscripts/import-control.xml | 5 | ||||
| -rw-r--r-- | metrics/README.md | 7 | ||||
| -rw-r--r-- | metrics/build.gradle | 11 | ||||
| -rw-r--r-- | metrics/src/main/java/io/opencensus/metrics/package-info.java (renamed from api/src/main/java/io/opencensus/stats/metrics/package-info.java) | 2 | ||||
| -rw-r--r-- | settings.gradle | 4 |
6 files changed, 29 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle index 8472773f..113768e4 100644 --- a/build.gradle +++ b/build.gradle @@ -386,6 +386,7 @@ subprojects { 'opencensus-impl-core', 'opencensus-impl-lite', 'opencensus-impl', + // TODO(songya): add the Export (or Metrics + SpanData) artifact once we agree on its name 'opencensus-testing'] } diff --git a/buildscripts/import-control.xml b/buildscripts/import-control.xml index 845bcc87..4fb0eac8 100644 --- a/buildscripts/import-control.xml +++ b/buildscripts/import-control.xml @@ -38,6 +38,11 @@ General guidelines on imports: <allow pkg="io.opencensus.internal"/> <allow pkg="io.opencensus.tags"/> </subpackage> + <subpackage name="metrics"> + <allow pkg="io.opencensus.common"/> + <allow pkg="io.opencensus.stats"/> + <allow pkg="io.opencensus.tags"/> + </subpackage> <subpackage name="stats"> <allow pkg="io.opencensus.common"/> <allow pkg="io.opencensus.internal"/> diff --git a/metrics/README.md b/metrics/README.md new file mode 100644 index 00000000..550ecdf7 --- /dev/null +++ b/metrics/README.md @@ -0,0 +1,7 @@ +OpenCensus Metrics +====================================================== + +* The Metrics data model used by Stats exporters. This data model may eventually become the wire +format for metrics. +* Currently all the public classes under this package are marked as `ExperimentalApi`. +* Java 7 and compatible. diff --git a/metrics/build.gradle b/metrics/build.gradle new file mode 100644 index 00000000..b94d76eb --- /dev/null +++ b/metrics/build.gradle @@ -0,0 +1,11 @@ +description = 'OpenCensus Metrics' + +dependencies { + compile project(':opencensus-api') + + compileOnly libraries.auto_value + + testCompile project(':opencensus-api') + + signature "org.codehaus.mojo.signature:java16:+@signature" +} diff --git a/api/src/main/java/io/opencensus/stats/metrics/package-info.java b/metrics/src/main/java/io/opencensus/metrics/package-info.java index ad7b7efb..f48e3712 100644 --- a/api/src/main/java/io/opencensus/stats/metrics/package-info.java +++ b/metrics/src/main/java/io/opencensus/metrics/package-info.java @@ -28,4 +28,4 @@ * for more details. */ @io.opencensus.common.ExperimentalApi -package io.opencensus.stats.metrics; +package io.opencensus.metrics; diff --git a/settings.gradle b/settings.gradle index 92c19282..930c5c08 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,6 +19,8 @@ include ":opencensus-contrib-grpc-metrics" include ":opencensus-contrib-grpc-util" include ":opencensus-contrib-http-util" include ":opencensus-contrib-monitored-resource-util" +// TODO(songya): uncomment this once classes were added to Metrics library. +//include ":opencensus-metrics" project(':opencensus-api').projectDir = "$rootDir/api" as File project(':opencensus-impl-core').projectDir = "$rootDir/impl_core" as File @@ -44,6 +46,8 @@ project(':opencensus-exporter-trace-jaeger').projectDir = "$rootDir/exporters/tr project(':opencensus-exporter-stats-signalfx').projectDir = "$rootDir/exporters/stats/signalfx" as File project(':opencensus-exporter-stats-stackdriver').projectDir = "$rootDir/exporters/stats/stackdriver" as File project(':opencensus-exporter-stats-prometheus').projectDir = "$rootDir/exporters/stats/prometheus" as File +// TODO(songya): uncomment this once classes were added to Metrics library. +//project(':opencensus-metrics').projectDir = "$rootDir/metrics" as File // Java8 projects only |
