Skip to content
This repository was archived by the owner on Dec 23, 2023. It is now read-only.

Commit 4677f0a

Browse files
authored
allow arbitrary metric prefixes (#1440)
(cherry picked from commit 69360e9)
1 parent d092289 commit 4677f0a

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
## Unreleased
2+
- Allow users to report metrics for their registered domain (using custom prefix). This could be a
3+
breaking change if you have custom prefix without (registered) domain.
24

35
## 0.16.0 - 2018-09-14
46
- Add APIs to register gRPC client and server views separately.

exporters/stats/stackdriver/src/main/java/io/opencensus/exporter/stats/stackdriver/StackdriverExporterWorker.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ final class StackdriverExporterWorker implements Runnable {
6868

6969
@VisibleForTesting static final String DEFAULT_DISPLAY_NAME_PREFIX = "OpenCensus/";
7070
@VisibleForTesting static final String CUSTOM_METRIC_DOMAIN = "custom.googleapis.com/";
71-
@VisibleForTesting static final String EXTERNAL_METRIC_DOMAIN = "external.googleapis.com/";
7271

7372
@VisibleForTesting
7473
static final String CUSTOM_OPENCENSUS_DOMAIN = CUSTOM_METRIC_DOMAIN + "opencensus/";
@@ -252,11 +251,10 @@ static String getDomain(@javax.annotation.Nullable String metricNamePrefix) {
252251
if (Strings.isNullOrEmpty(metricNamePrefix)) {
253252
domain = CUSTOM_OPENCENSUS_DOMAIN;
254253
} else {
255-
if (metricNamePrefix.startsWith(CUSTOM_METRIC_DOMAIN)
256-
|| metricNamePrefix.startsWith(EXTERNAL_METRIC_DOMAIN)) {
257-
domain = metricNamePrefix;
254+
if (!metricNamePrefix.endsWith("/")) {
255+
domain = metricNamePrefix + '/';
258256
} else {
259-
domain = CUSTOM_METRIC_DOMAIN + metricNamePrefix + '/';
257+
domain = metricNamePrefix;
260258
}
261259
}
262260
return domain;

exporters/stats/stackdriver/src/test/java/io/opencensus/exporter/stats/stackdriver/StackdriverExporterWorkerTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ public void setUp() {
110110
public void testConstants() {
111111
assertThat(StackdriverExporterWorker.MAX_BATCH_EXPORT_SIZE).isEqualTo(200);
112112
assertThat(StackdriverExporterWorker.CUSTOM_METRIC_DOMAIN).isEqualTo("custom.googleapis.com/");
113-
assertThat(StackdriverExporterWorker.EXTERNAL_METRIC_DOMAIN)
114-
.isEqualTo("external.googleapis.com/");
115113
assertThat(StackdriverExporterWorker.CUSTOM_OPENCENSUS_DOMAIN)
116114
.isEqualTo("custom.googleapis.com/opencensus/");
117115
assertThat(StackdriverExporterWorker.DEFAULT_DISPLAY_NAME_PREFIX).isEqualTo("OpenCensus/");
@@ -283,8 +281,7 @@ public void getDomain() {
283281
.isEqualTo("custom.googleapis.com/myorg/");
284282
assertThat(StackdriverExporterWorker.getDomain("external.googleapis.com/prometheus/"))
285283
.isEqualTo("external.googleapis.com/prometheus/");
286-
assertThat(StackdriverExporterWorker.getDomain("myorg"))
287-
.isEqualTo("custom.googleapis.com/myorg/");
284+
assertThat(StackdriverExporterWorker.getDomain("myorg")).isEqualTo("myorg/");
288285
}
289286

290287
@Test

0 commit comments

Comments
 (0)