Merge pull request #104 from ebullient/rename

Use consistent package space for newrelic registry

README.md

@@ -27,8 +27,8 @@ custom events. This implementation is intended to supersede that, as [dimensiona
     </dependency>
 ```
 
-3) The registry class is `io.micrometer.newrelic.NewRelicRegistry`. 
-It will need to be built via a `io.micrometer.NewRelicRegistryConfig` implementation. An example of how you might do that is in the wiki: [Spring-Config-Example](https://github.com/newrelic/micrometer-registry-newrelic/wiki/Spring-Config-Example)
+3) The registry class is `com.newrelic.telemetry.micrometer.NewRelicRegistry`. 
+It will need to be built via a `com.newrelic.telemetry.micrometer.NewRelicRegistryConfig` implementation. An example of how you might do that is in the wiki: [Spring-Config-Example](https://github.com/newrelic/micrometer-registry-newrelic/wiki/Spring-Config-Example)
 
 In order to send metrics to New Relic, you will also need an Insert API Key. Please see [New Relic Api Keys](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#) for more information.
 

src/main/java/io/micrometer/newrelic/MicrometerHttpPoster.java → src/main/java/com/newrelic/telemetry/micrometer/MicrometerHttpPoster.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic;
+package com.newrelic.telemetry.micrometer;
 
 import static java.util.Collections.emptyMap;
 

src/main/java/io/micrometer/newrelic/NewRelicRegistry.java → src/main/java/com/newrelic/telemetry/micrometer/NewRelicRegistry.java

@@ -3,15 +3,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.micrometer.newrelic;
+package com.newrelic.telemetry.micrometer;
 
 import com.newrelic.telemetry.Attributes;
 import com.newrelic.telemetry.SenderConfiguration;
 import com.newrelic.telemetry.TelemetryClient;
 import com.newrelic.telemetry.metrics.Metric;
 import com.newrelic.telemetry.metrics.MetricBatch;
 import com.newrelic.telemetry.metrics.MetricBatchSender;
-import io.micrometer.NewRelicRegistryConfig;
+import com.newrelic.telemetry.micrometer.transform.AttributesMaker;
+import com.newrelic.telemetry.micrometer.transform.BareMeterTransformer;
+import com.newrelic.telemetry.micrometer.transform.CommonCounterTransformer;
+import com.newrelic.telemetry.micrometer.transform.CounterAdapter;
+import com.newrelic.telemetry.micrometer.transform.DistributionSummaryTransformer;
+import com.newrelic.telemetry.micrometer.transform.FunctionCounterAdapter;
+import com.newrelic.telemetry.micrometer.transform.FunctionTimerTransformer;
+import com.newrelic.telemetry.micrometer.transform.GaugeTransformer;
+import com.newrelic.telemetry.micrometer.transform.HistogramGaugeCustomizer;
+import com.newrelic.telemetry.micrometer.transform.LongTaskTimerTransformer;
+import com.newrelic.telemetry.micrometer.transform.TimeGaugeTransformer;
+import com.newrelic.telemetry.micrometer.transform.TimerTransformer;
+import com.newrelic.telemetry.micrometer.util.TimeTracker;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.DistributionSummary;
@@ -30,19 +42,6 @@
 import io.micrometer.core.instrument.util.MeterPartition;
 import io.micrometer.core.ipc.http.HttpSender;
 import io.micrometer.core.ipc.http.HttpUrlConnectionSender;
-import io.micrometer.newrelic.transform.AttributesMaker;
-import io.micrometer.newrelic.transform.BareMeterTransformer;
-import io.micrometer.newrelic.transform.CommonCounterTransformer;
-import io.micrometer.newrelic.transform.CounterAdapter;
-import io.micrometer.newrelic.transform.DistributionSummaryTransformer;
-import io.micrometer.newrelic.transform.FunctionCounterAdapter;
-import io.micrometer.newrelic.transform.FunctionTimerTransformer;
-import io.micrometer.newrelic.transform.GaugeTransformer;
-import io.micrometer.newrelic.transform.HistogramGaugeCustomizer;
-import io.micrometer.newrelic.transform.LongTaskTimerTransformer;
-import io.micrometer.newrelic.transform.TimeGaugeTransformer;
-import io.micrometer.newrelic.transform.TimerTransformer;
-import io.micrometer.newrelic.util.TimeTracker;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.ArrayList;

src/main/java/io/micrometer/NewRelicRegistryConfig.java → src/main/java/com/newrelic/telemetry/micrometer/NewRelicRegistryConfig.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.micrometer;
+package com.newrelic.telemetry.micrometer;
 
 import io.micrometer.core.instrument.config.MissingRequiredConfigurationException;
 import io.micrometer.core.instrument.step.StepRegistryConfig;

src/main/java/io/micrometer/newrelic/json/AttributesWriter.java → src/main/java/com/newrelic/telemetry/micrometer/json/AttributesWriter.java

@@ -5,10 +5,10 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.json;
+package com.newrelic.telemetry.micrometer.json;
 
-import static io.micrometer.newrelic.json.JsonUtil.object;
-import static io.micrometer.newrelic.json.JsonUtil.unknownType;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.object;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.unknownType;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/micrometer/newrelic/json/CountToJson.java → src/main/java/com/newrelic/telemetry/micrometer/json/CountToJson.java

@@ -5,12 +5,11 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.json;
+package com.newrelic.telemetry.micrometer.json;
 
-import static io.micrometer.newrelic.json.AttributesWriter.writeAttributes;
-import static io.micrometer.newrelic.json.JsonUtil.number;
-import static io.micrometer.newrelic.json.JsonUtil.object;
-import static io.micrometer.newrelic.json.JsonUtil.string;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.number;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.object;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.string;
 
 import com.newrelic.telemetry.metrics.Count;
 import java.util.function.Function;
@@ -28,7 +27,7 @@ public String apply(Count count) {
           number(buff, "value", count.getValue());
           number(buff, "timestamp", count.getStartTimeMs());
           number(buff, "interval.ms", count.getEndTimeMs() - count.getStartTimeMs(), false);
-          writeAttributes(buff, count.getAttributes());
+          AttributesWriter.writeAttributes(buff, count.getAttributes());
         },
         false);
     return buff.toString();

src/main/java/io/micrometer/newrelic/json/GaugeToJson.java → src/main/java/com/newrelic/telemetry/micrometer/json/GaugeToJson.java

@@ -5,12 +5,11 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.json;
+package com.newrelic.telemetry.micrometer.json;
 
-import static io.micrometer.newrelic.json.AttributesWriter.writeAttributes;
-import static io.micrometer.newrelic.json.JsonUtil.number;
-import static io.micrometer.newrelic.json.JsonUtil.object;
-import static io.micrometer.newrelic.json.JsonUtil.string;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.number;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.object;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.string;
 
 import com.newrelic.telemetry.metrics.Gauge;
 import java.util.function.Function;
@@ -27,7 +26,7 @@ public String apply(Gauge gauge) {
           string(buff, "type", "gauge");
           number(buff, "value", gauge.getValue());
           number(buff, "timestamp", gauge.getTimestamp(), false);
-          writeAttributes(buff, gauge.getAttributes());
+          AttributesWriter.writeAttributes(buff, gauge.getAttributes());
         },
         false);
     return buff.toString();

src/main/java/io/micrometer/newrelic/json/JsonUtil.java → src/main/java/com/newrelic/telemetry/micrometer/json/JsonUtil.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.json;
+package com.newrelic.telemetry.micrometer.json;
 
 import static io.micrometer.core.instrument.util.StringEscapeUtils.escapeJson;
 

src/main/java/io/micrometer/newrelic/json/SummaryToJson.java → src/main/java/com/newrelic/telemetry/micrometer/json/SummaryToJson.java

@@ -5,12 +5,11 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.json;
+package com.newrelic.telemetry.micrometer.json;
 
-import static io.micrometer.newrelic.json.AttributesWriter.writeAttributes;
-import static io.micrometer.newrelic.json.JsonUtil.number;
-import static io.micrometer.newrelic.json.JsonUtil.object;
-import static io.micrometer.newrelic.json.JsonUtil.string;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.number;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.object;
+import static com.newrelic.telemetry.micrometer.json.JsonUtil.string;
 
 import com.newrelic.telemetry.metrics.Summary;
 import java.util.function.Function;
@@ -36,7 +35,7 @@ public String apply(Summary summary) {
               });
           number(buff, "timestamp", summary.getStartTimeMs());
           number(buff, "interval.ms", summary.getEndTimeMs() - summary.getStartTimeMs(), false);
-          writeAttributes(buff, summary.getAttributes());
+          AttributesWriter.writeAttributes(buff, summary.getAttributes());
         },
         false);
     return buff.toString();

src/main/java/io/micrometer/newrelic/transform/AttributesMaker.java → src/main/java/com/newrelic/telemetry/micrometer/transform/AttributesMaker.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import com.newrelic.telemetry.Attributes;
 import io.micrometer.core.instrument.Meter;

src/main/java/io/micrometer/newrelic/transform/BareMeterTransformer.java → src/main/java/com/newrelic/telemetry/micrometer/transform/BareMeterTransformer.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import static java.util.stream.StreamSupport.stream;
 

src/main/java/io/micrometer/newrelic/transform/CommonCounterTransformer.java → src/main/java/com/newrelic/telemetry/micrometer/transform/CommonCounterTransformer.java

@@ -5,12 +5,12 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import com.newrelic.telemetry.Attributes;
 import com.newrelic.telemetry.metrics.Count;
+import com.newrelic.telemetry.micrometer.util.TimeTracker;
 import io.micrometer.core.instrument.Meter.Id;
-import io.micrometer.newrelic.util.TimeTracker;
 import java.util.function.Function;
 
 public class CommonCounterTransformer<T> {

src/main/java/io/micrometer/newrelic/transform/CounterAdapter.java → src/main/java/com/newrelic/telemetry/micrometer/transform/CounterAdapter.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Meter;

src/main/java/io/micrometer/newrelic/transform/DistributionSummaryTransformer.java → src/main/java/com/newrelic/telemetry/micrometer/transform/DistributionSummaryTransformer.java

@@ -3,17 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import static java.util.stream.Collectors.toList;
 
 import com.newrelic.telemetry.Attributes;
 import com.newrelic.telemetry.metrics.Gauge;
 import com.newrelic.telemetry.metrics.Metric;
 import com.newrelic.telemetry.metrics.Summary;
+import com.newrelic.telemetry.micrometer.util.TimeTracker;
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.distribution.HistogramSnapshot;
-import io.micrometer.newrelic.util.TimeTracker;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Stream;

src/main/java/io/micrometer/newrelic/transform/FunctionCounterAdapter.java → src/main/java/com/newrelic/telemetry/micrometer/transform/FunctionCounterAdapter.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import io.micrometer.core.instrument.FunctionCounter;
 import io.micrometer.core.instrument.Meter;

src/main/java/io/micrometer/newrelic/transform/FunctionTimerTransformer.java → src/main/java/com/newrelic/telemetry/micrometer/transform/FunctionTimerTransformer.java

@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import static java.util.Collections.singleton;
 
 import com.newrelic.telemetry.Attributes;
 import com.newrelic.telemetry.metrics.Metric;
 import com.newrelic.telemetry.metrics.Summary;
+import com.newrelic.telemetry.micrometer.util.TimeTracker;
 import io.micrometer.core.instrument.FunctionTimer;
 import io.micrometer.core.instrument.Meter;
-import io.micrometer.newrelic.util.TimeTracker;
 import java.util.Collection;
 
 public class FunctionTimerTransformer {

src/main/java/io/micrometer/newrelic/transform/GaugeTransformer.java → src/main/java/com/newrelic/telemetry/micrometer/transform/GaugeTransformer.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import com.newrelic.telemetry.metrics.Gauge;
 import io.micrometer.core.instrument.Clock;

src/main/java/io/micrometer/newrelic/transform/HistogramGaugeCustomizer.java → src/main/java/com/newrelic/telemetry/micrometer/transform/HistogramGaugeCustomizer.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import static java.util.Collections.emptyList;
 

src/main/java/io/micrometer/newrelic/transform/LongTaskTimerTransformer.java → src/main/java/com/newrelic/telemetry/micrometer/transform/LongTaskTimerTransformer.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import com.newrelic.telemetry.Attributes;
 import com.newrelic.telemetry.metrics.Gauge;

src/main/java/io/micrometer/newrelic/transform/TimeGaugeTransformer.java → src/main/java/com/newrelic/telemetry/micrometer/transform/TimeGaugeTransformer.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import com.newrelic.telemetry.metrics.Metric;
 import io.micrometer.core.instrument.TimeGauge;

src/main/java/io/micrometer/newrelic/transform/TimerTransformer.java → src/main/java/com/newrelic/telemetry/micrometer/transform/TimerTransformer.java

@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.micrometer.newrelic.transform;
+package com.newrelic.telemetry.micrometer.transform;
 
 import static java.util.Collections.singleton;
 
 import com.newrelic.telemetry.metrics.Metric;
 import com.newrelic.telemetry.metrics.Summary;
+import com.newrelic.telemetry.micrometer.util.TimeTracker;
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.Timer;
-import io.micrometer.newrelic.util.TimeTracker;
 import java.util.Collection;
 
 public class TimerTransformer {

src/main/java/io/micrometer/newrelic/util/LastSeenTracker.java → src/main/java/com/newrelic/telemetry/micrometer/util/LastSeenTracker.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.util;
+package com.newrelic.telemetry.micrometer.util;
 
 import java.util.Map;
 import java.util.Objects;

src/main/java/io/micrometer/newrelic/util/TimeTracker.java → src/main/java/com/newrelic/telemetry/micrometer/util/TimeTracker.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic.util;
+package com.newrelic.telemetry.micrometer.util;
 
 import io.micrometer.core.instrument.Clock;
 import java.util.concurrent.atomic.AtomicLong;

src/test/java/io/micrometer/newrelic/MicrometerHttpPosterTest.java → src/test/java/com/newrelic/telemetry/micrometer/MicrometerHttpPosterTest.java

@@ -5,7 +5,7 @@
  * --------------------------------------------------------------------------------------------
  */
 
-package io.micrometer.newrelic;
+package com.newrelic.telemetry.micrometer;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;

src/test/java/io/micrometer/newrelic/NewRelicRegistryTest.java → src/test/java/com/newrelic/telemetry/micrometer/NewRelicRegistryTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.micrometer.newrelic;
+package com.newrelic.telemetry.micrometer;
 
 import static java.util.Collections.singleton;
 import static java.util.Collections.singletonList;
@@ -18,7 +18,16 @@
 import com.newrelic.telemetry.metrics.Metric;
 import com.newrelic.telemetry.metrics.MetricBatch;
 import com.newrelic.telemetry.metrics.Summary;
-import io.micrometer.NewRelicRegistryConfig;
+import com.newrelic.telemetry.micrometer.transform.BareMeterTransformer;
+import com.newrelic.telemetry.micrometer.transform.CommonCounterTransformer;
+import com.newrelic.telemetry.micrometer.transform.DistributionSummaryTransformer;
+import com.newrelic.telemetry.micrometer.transform.FunctionTimerTransformer;
+import com.newrelic.telemetry.micrometer.transform.GaugeTransformer;
+import com.newrelic.telemetry.micrometer.transform.HistogramGaugeCustomizer;
+import com.newrelic.telemetry.micrometer.transform.LongTaskTimerTransformer;
+import com.newrelic.telemetry.micrometer.transform.TimeGaugeTransformer;
+import com.newrelic.telemetry.micrometer.transform.TimerTransformer;
+import com.newrelic.telemetry.micrometer.util.TimeTracker;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.DistributionSummary;
@@ -29,16 +38,6 @@
 import io.micrometer.core.instrument.TimeGauge;
 import io.micrometer.core.instrument.Timer;
 import io.micrometer.core.instrument.config.MeterFilter;
-import io.micrometer.newrelic.transform.BareMeterTransformer;
-import io.micrometer.newrelic.transform.CommonCounterTransformer;
-import io.micrometer.newrelic.transform.DistributionSummaryTransformer;
-import io.micrometer.newrelic.transform.FunctionTimerTransformer;
-import io.micrometer.newrelic.transform.GaugeTransformer;
-import io.micrometer.newrelic.transform.HistogramGaugeCustomizer;
-import io.micrometer.newrelic.transform.LongTaskTimerTransformer;
-import io.micrometer.newrelic.transform.TimeGaugeTransformer;
-import io.micrometer.newrelic.transform.TimerTransformer;
-import io.micrometer.newrelic.util.TimeTracker;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;