Repackage the classes

Author: jwatson

README.md

@@ -64,7 +64,7 @@ dependencies {
 package com.handler.example;
 
 import com.amazonaws.services.lambda.runtime.Context;
-import io.opentracing.contrib.aws.TracingRequestHandler;
+import com.newrelic.opentracing.aws.TracingRequestHandler;
 import io.opentracing.util.GlobalTracer;
 
 import java.util.Map;

gradle.properties

@@ -1,4 +1,4 @@
-group = "com.newrelic.opentracing.contrib"
+group = "com.newrelic.opentracing"
 version = 1.0-SNAPSHOT
 
 

src/main/java/io/opentracing/contrib/aws/EventSourceParser.java renamed to src/main/java/com/newrelic/opentracing/aws/EventSourceParser.java

@@ -13,7 +13,7 @@
  *
  */
 
-package io.opentracing.contrib.aws;
+package com.newrelic.opentracing.aws;
 
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.CodeCommitEvent;

src/main/java/io/opentracing/contrib/aws/HeadersParser.java renamed to src/main/java/com/newrelic/opentracing/aws/HeadersParser.java

@@ -13,7 +13,7 @@
  *
  */
 
-package io.opentracing.contrib.aws;
+package com.newrelic.opentracing.aws;
 
 import com.amazonaws.Request;
 import io.opentracing.SpanContext;

src/main/java/io/opentracing/contrib/aws/ResponseParser.java renamed to src/main/java/com/newrelic/opentracing/aws/ResponseParser.java

@@ -13,7 +13,7 @@
  *
  */
 
-package io.opentracing.contrib.aws;
+package com.newrelic.opentracing.aws;
 
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 import io.opentracing.Span;

src/main/java/io/opentracing/contrib/aws/SpanUtil.java renamed to src/main/java/com/newrelic/opentracing/aws/SpanUtil.java

@@ -13,7 +13,7 @@
  *
  */
 
-package io.opentracing.contrib.aws;
+package com.newrelic.opentracing.aws;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import io.opentracing.Scope;

src/main/java/io/opentracing/contrib/aws/TracingRequestHandler.java renamed to src/main/java/com/newrelic/opentracing/aws/TracingRequestHandler.java

@@ -13,7 +13,7 @@
  *
  */
 
-package io.opentracing.contrib.aws;
+package com.newrelic.opentracing.aws;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import io.opentracing.Scope;

src/main/java/io/opentracing/contrib/aws/TracingRequestStreamHandler.java renamed to src/main/java/com/newrelic/opentracing/aws/TracingRequestStreamHandler.java

@@ -13,7 +13,7 @@
  *
  */
 
-package io.opentracing.contrib.aws;
+package com.newrelic.opentracing.aws;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import io.opentracing.Scope;

src/test/java/io/opentracing/GlobalTracerTestUtils.java renamed to src/test/java/com/newrelic/opentracing/aws/GlobalTracerTestUtils.java

@@ -12,9 +12,9 @@
  * limitations under the License.
  *
  */
+package com.newrelic.opentracing.aws;
 
-package io.opentracing;
-
+import io.opentracing.Tracer;
 import io.opentracing.util.GlobalTracer;
 import java.lang.reflect.Field;
 

src/test/java/io/opentracing/contrib/aws/TracingRequestHandlerTest.java renamed to src/test/java/com/newrelic/opentracing/aws/TracingRequestHandlerTest.java

@@ -13,7 +13,7 @@
  *
  */
 
-package io.opentracing.contrib.aws;
+package com.newrelic.opentracing.aws;
 
 import com.amazonaws.services.lambda.runtime.ClientContext;
 import com.amazonaws.services.lambda.runtime.CognitoIdentity;
@@ -30,7 +30,6 @@
 import com.amazonaws.services.lambda.runtime.events.SNSEvent;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
 import com.amazonaws.services.s3.event.S3EventNotification;
-import io.opentracing.GlobalTracerTestUtils;
 import io.opentracing.mock.MockSpan;
 import io.opentracing.mock.MockTracer;
 import java.util.ArrayList;
@@ -40,6 +39,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class TracingRequestHandlerTest {
@@ -263,32 +263,32 @@ public void testAPIGatewayProxyRequestEvent() {
         "APIGatewayProxyRequestEventUserARN", span.tags().get("aws.lambda.eventSource.arn"));
   }
 
-  //    @Test // TODO we would like this but there doesn't seem to be an available arn currently
-  //    public void testCloudWatchLogsEvent() {
-  //        final MyCloudWatchRequestHandler myCloudWatchRequestHandler = new
-  // MyCloudWatchRequestHandler();
-  //
-  //        final CloudWatchLogsEvent cloudWatchLogsEvent = new CloudWatchLogsEvent();
-  //
-  //        myCloudWatchRequestHandler.handleRequest(cloudWatchLogsEvent, createContext());
-  //        final MockSpan span = mockTracer.finishedSpans().get(0);
-  //        Assert.assertEquals("CloudWatchLogsEventSourceARN",
-  // span.tags().get("aws.lambda.eventSource.arn"));
-  //    }
-
-  //    @Test // TODO we would like this but there doesn't seem to be an available arn currently
-  //    public void testCloudFrontEvent() {
-  //        final MyCloudFrontRequestHandler myCloudFrontRequestHandler = new
-  // MyCloudFrontRequestHandler();
-  //
-  //        final CloudFrontEvent cloudFrontEvent = new CloudFrontEvent();
-  //        final CloudFrontEvent.Record record = new CloudFrontEvent.Record();
-  //
-  //        myCloudFrontRequestHandler.handleRequest(cloudFrontEvent, createContext());
-  //        final MockSpan span = mockTracer.finishedSpans().get(0);
-  //        Assert.assertEquals("CloudFrontEventEventSourceARN",
-  // span.tags().get("aws.lambda.eventSource.arn"));
-  //    }
+  @Test
+  @Ignore("We would like this but there doesn't seem to be an available arn currently")
+  public void testCloudWatchLogsEvent() {
+    final MyCloudWatchRequestHandler myCloudWatchRequestHandler = new MyCloudWatchRequestHandler();
+
+    final CloudWatchLogsEvent cloudWatchLogsEvent = new CloudWatchLogsEvent();
+
+    myCloudWatchRequestHandler.handleRequest(cloudWatchLogsEvent, createContext());
+    final MockSpan span = mockTracer.finishedSpans().get(0);
+    Assert.assertEquals(
+        "CloudWatchLogsEventSourceARN", span.tags().get("aws.lambda.eventSource.arn"));
+  }
+
+  @Test
+  @Ignore("We would like this but there doesn't seem to be an available arn currently")
+  public void testCloudFrontEvent() {
+    final MyCloudFrontRequestHandler myCloudFrontRequestHandler = new MyCloudFrontRequestHandler();
+
+    final CloudFrontEvent cloudFrontEvent = new CloudFrontEvent();
+    final CloudFrontEvent.Record record = new CloudFrontEvent.Record();
+
+    myCloudFrontRequestHandler.handleRequest(cloudFrontEvent, createContext());
+    final MockSpan span = mockTracer.finishedSpans().get(0);
+    Assert.assertEquals(
+        "CloudFrontEventEventSourceARN", span.tags().get("aws.lambda.eventSource.arn"));
+  }
 
   static class MyRequestHandler implements TracingRequestHandler<String, String> {