Refactor packages structure (#343)

* Tidy up package structure
ExpediaGroup · May 28, 2021 · 801be7f · 801be7f
1 parent a23c5f1
commit 801be7f
Show file tree

Hide file tree

Showing 55 changed files with 134 additions and 138 deletions.
diff --git a/...tracing/zipkintohaystack/Application.java → ...va/com/expedia/pitchfork/Application.java b/...tracing/zipkintohaystack/Application.java → ...va/com/expedia/pitchfork/Application.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack;
+package com.expedia.pitchfork;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...acing/zipkintohaystack/RoutingConfig.java → .../com/expedia/pitchfork/RoutingConfig.java b/...acing/zipkintohaystack/RoutingConfig.java → .../com/expedia/pitchfork/RoutingConfig.java
@@ -14,11 +14,11 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack;
+package com.expedia.pitchfork;
 
-import com.hotels.service.tracing.zipkintohaystack.ingresses.datadog.DatadogSpansMessagePackDecoder;
-import com.hotels.service.tracing.zipkintohaystack.ingresses.datadog.DatadogSpansJsonDecoder;
-import com.hotels.service.tracing.zipkintohaystack.metrics.MetersProvider;
+import com.expedia.pitchfork.systems.datadog.ingress.DatadogSpansMessagePackDecoder;
+import com.expedia.pitchfork.systems.datadog.ingress.DatadogSpansJsonDecoder;
+import com.expedia.pitchfork.monitoring.metrics.MetersProvider;
 import io.netty.handler.codec.http.HttpContentDecompressor;
 import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory;
 import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory;

diff --git a/...ng/zipkintohaystack/ZipkinController.java → ...m/expedia/pitchfork/ZipkinController.java b/...ng/zipkintohaystack/ZipkinController.java → ...m/expedia/pitchfork/ZipkinController.java
@@ -14,12 +14,12 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack;
+package com.expedia.pitchfork;
 
-import com.hotels.service.tracing.zipkintohaystack.forwarders.Fork;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.SpanForwarder;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.SpanValidator;
-import com.hotels.service.tracing.zipkintohaystack.ingresses.Decoder;
+import com.expedia.pitchfork.systems.common.Fork;
+import com.expedia.pitchfork.systems.common.SpanForwarder;
+import com.expedia.pitchfork.systems.haystack.SpanValidator;
+import com.expedia.pitchfork.systems.common.IngressDecoder;
 import io.micrometer.core.instrument.Counter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,7 +67,7 @@ public Mono<ServerResponse> unmatched(ServerRequest serverRequest) {
      * Valid requests made to this service will be handled by this function.
      * It submits the reported spans to the registered {@link SpanForwarder} asynchronously and waits until they all complete.
      */
-    public Mono<ServerResponse> addSpans(ServerRequest serverRequest, Decoder decoder, Counter counter) {
+    public Mono<ServerResponse> addSpans(ServerRequest serverRequest, IngressDecoder decoder, Counter counter) {
         return serverRequest
                 .bodyToMono(byte[].class)
                 .flatMapIterable(decodeList(decoder))
@@ -78,7 +78,7 @@ public Mono<ServerResponse> addSpans(ServerRequest serverRequest, Decoder decode
                 .then(ok().body(BodyInserters.empty()));
     }
 
-    private Function<byte[], Iterable<Span>> decodeList(Decoder decoder) {
+    private Function<byte[], Iterable<Span>> decodeList(IngressDecoder decoder) {
         return bytes -> (Collection<Span>) decoder.decodeList(bytes);
     }
 }
diff --git a/...kintohaystack/metrics/MetersProvider.java → ...rk/monitoring/metrics/MetersProvider.java b/...kintohaystack/metrics/MetersProvider.java → ...rk/monitoring/metrics/MetersProvider.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.metrics;
+package com.expedia.pitchfork.monitoring.metrics;
 
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;

diff --git a/...ing/zipkintohaystack/forwarders/Fork.java → ...xpedia/pitchfork/systems/common/Fork.java b/...ing/zipkintohaystack/forwarders/Fork.java → ...xpedia/pitchfork/systems/common/Fork.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders;
+package com.expedia.pitchfork.systems.common;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...g/zipkintohaystack/ingresses/Decoder.java → ...chfork/systems/common/IngressDecoder.java b/...g/zipkintohaystack/ingresses/Decoder.java → ...chfork/systems/common/IngressDecoder.java
@@ -1,4 +1,4 @@
-package com.hotels.service.tracing.zipkintohaystack.ingresses;
+package com.expedia.pitchfork.systems.common;
 
 import zipkin2.Span;
 
@@ -7,7 +7,7 @@
 /**
  * Contract for a decoder of bytes {@link Span}.
  */
-public interface Decoder {
+public interface IngressDecoder {
 
     /**
      * Returns a collection of spans from their serialized form.

diff --git a/...ntohaystack/forwarders/SpanForwarder.java → ...tchfork/systems/common/SpanForwarder.java b/...ntohaystack/forwarders/SpanForwarder.java → ...tchfork/systems/common/SpanForwarder.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders;
+package com.expedia.pitchfork.systems.common;
 
 import zipkin2.Span;
 

diff --git a/...rders/datadog/DatadogDomainConverter.java → ...stems/datadog/DatadogDomainConverter.java b/...rders/datadog/DatadogDomainConverter.java → ...stems/datadog/DatadogDomainConverter.java
@@ -14,9 +14,9 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.datadog;
+package com.expedia.pitchfork.systems.datadog;
 
-import com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.model.DatadogSpan;
+import com.expedia.pitchfork.systems.datadog.model.DatadogSpan;
 import zipkin2.Annotation;
 import zipkin2.Endpoint;
 import zipkin2.Span;

diff --git a/.../forwarders/datadog/DatadogForwarder.java → ...s/datadog/forwarder/DatadogForwarder.java b/.../forwarders/datadog/DatadogForwarder.java → ...s/datadog/forwarder/DatadogForwarder.java
@@ -14,10 +14,10 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.datadog;
+package com.expedia.pitchfork.systems.datadog.forwarder;
 
-import com.hotels.service.tracing.zipkintohaystack.forwarders.SpanForwarder;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.properties.DatadogForwarderConfigProperties;
+import com.expedia.pitchfork.systems.common.SpanForwarder;
+import com.expedia.pitchfork.systems.datadog.forwarder.properties.DatadogForwarderConfigProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -51,7 +51,7 @@ public void initialize() {
 
     @Override
     public void process(Span span) {
-        logger.info("operation=process, span={}", span);
+        logger.debug("operation=process, span={}", span);
 
         spansDispatcher.addSpan(span);
     }

diff --git a/...rders/datadog/DatadogSpansDispatcher.java → ...dog/forwarder/DatadogSpansDispatcher.java b/...rders/datadog/DatadogSpansDispatcher.java → ...dog/forwarder/DatadogSpansDispatcher.java
@@ -1,10 +1,11 @@
-package com.hotels.service.tracing.zipkintohaystack.forwarders.datadog;
+package com.expedia.pitchfork.systems.datadog.forwarder;
 
+import com.expedia.pitchfork.systems.datadog.DatadogDomainConverter;
+import com.expedia.pitchfork.systems.datadog.model.DatadogSpan;
+import com.expedia.pitchfork.systems.datadog.forwarder.properties.DatadogForwarderConfigProperties;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.model.DatadogSpan;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.properties.DatadogForwarderConfigProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

diff --git a/...atadog/client/HttpClientSpringConfig.java → ...warder/client/HttpClientSpringConfig.java b/...atadog/client/HttpClientSpringConfig.java → ...warder/client/HttpClientSpringConfig.java
@@ -1,6 +1,6 @@
-package com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.client;
+package com.expedia.pitchfork.systems.datadog.forwarder.client;
 
-import com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.properties.DatadogForwarderConfigProperties;
+import com.expedia.pitchfork.systems.datadog.forwarder.properties.DatadogForwarderConfigProperties;
 import io.netty.handler.timeout.ReadTimeoutHandler;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

diff --git a/...ies/DatadogForwarderConfigProperties.java → ...ies/DatadogForwarderConfigProperties.java b/...ies/DatadogForwarderConfigProperties.java → ...ies/DatadogForwarderConfigProperties.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.properties;
+package com.expedia.pitchfork.systems.datadog.forwarder.properties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

diff --git a/...sses/datadog/DatadogSpansJsonDecoder.java → ...adog/ingress/DatadogSpansJsonDecoder.java b/...sses/datadog/DatadogSpansJsonDecoder.java → ...adog/ingress/DatadogSpansJsonDecoder.java
@@ -1,12 +1,12 @@
-package com.hotels.service.tracing.zipkintohaystack.ingresses.datadog;
+package com.expedia.pitchfork.systems.datadog.ingress;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.DatadogDomainConverter;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.model.DatadogSpan;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.zipkin.http.ZipkinForwarder;
-import com.hotels.service.tracing.zipkintohaystack.ingresses.Decoder;
+import com.expedia.pitchfork.systems.datadog.DatadogDomainConverter;
+import com.expedia.pitchfork.systems.datadog.model.DatadogSpan;
+import com.expedia.pitchfork.systems.zipkin.forwarder.ZipkinForwarder;
+import com.expedia.pitchfork.systems.common.IngressDecoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -19,7 +19,7 @@
 import static java.util.stream.Collectors.toList;
 
 @Component
-public class DatadogSpansJsonDecoder implements Decoder {
+public class DatadogSpansJsonDecoder implements IngressDecoder {
 
     private static final Logger logger = LoggerFactory.getLogger(ZipkinForwarder.class);
     private final ObjectReader reader;

diff --git a/...tadog/DatadogSpansMessagePackDecoder.java → ...gress/DatadogSpansMessagePackDecoder.java b/...tadog/DatadogSpansMessagePackDecoder.java → ...gress/DatadogSpansMessagePackDecoder.java
@@ -1,12 +1,12 @@
-package com.hotels.service.tracing.zipkintohaystack.ingresses.datadog;
+package com.expedia.pitchfork.systems.datadog.ingress;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.DatadogDomainConverter;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.model.DatadogSpan;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.zipkin.http.ZipkinForwarder;
-import com.hotels.service.tracing.zipkintohaystack.ingresses.Decoder;
+import com.expedia.pitchfork.systems.datadog.DatadogDomainConverter;
+import com.expedia.pitchfork.systems.datadog.model.DatadogSpan;
+import com.expedia.pitchfork.systems.zipkin.forwarder.ZipkinForwarder;
+import com.expedia.pitchfork.systems.common.IngressDecoder;
 import org.msgpack.jackson.dataformat.MessagePackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +21,7 @@
 import static java.util.stream.Collectors.toList;
 
 @Component
-public class DatadogSpansMessagePackDecoder implements Decoder {
+public class DatadogSpansMessagePackDecoder implements IngressDecoder {
 
     private static final Logger logger = LoggerFactory.getLogger(ZipkinForwarder.class);
     private ObjectReader reader;

diff --git a/...forwarders/datadog/model/DatadogSpan.java → ...rk/systems/datadog/model/DatadogSpan.java b/...forwarders/datadog/model/DatadogSpan.java → ...rk/systems/datadog/model/DatadogSpan.java
@@ -1,4 +1,4 @@
-package com.hotels.service.tracing.zipkintohaystack.forwarders.datadog.model;
+package com.expedia.pitchfork.systems.datadog.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...ers/haystack/HaystackDomainConverter.java → ...ems/haystack/HaystackDomainConverter.java b/...ers/haystack/HaystackDomainConverter.java → ...ems/haystack/HaystackDomainConverter.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack;
+package com.expedia.pitchfork.systems.haystack;
 
 import com.expedia.open.tracing.Log;
 import com.expedia.open.tracing.Span;

diff --git a/...ck/forwarders/haystack/SpanValidator.java → ...hfork/systems/haystack/SpanValidator.java b/...ck/forwarders/haystack/SpanValidator.java → ...hfork/systems/haystack/SpanValidator.java
@@ -14,16 +14,16 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack;
+package com.expedia.pitchfork.systems.haystack;
 
 import javax.annotation.PostConstruct;
 
+import com.expedia.pitchfork.monitoring.metrics.MetersProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.hotels.service.tracing.zipkintohaystack.metrics.MetersProvider;
 import io.micrometer.core.instrument.Counter;
 
 /**

diff --git a/...ystack/kafka/HaystackForwarderConfig.java → ...warder/kafka/HaystackForwarderConfig.java b/...ystack/kafka/HaystackForwarderConfig.java → ...warder/kafka/HaystackForwarderConfig.java
@@ -14,10 +14,10 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kafka;
+package com.expedia.pitchfork.systems.haystack.forwarder.kafka;
 
-import com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kafka.properties.KafkaForwarderConfigProperties;
-import com.hotels.service.tracing.zipkintohaystack.metrics.MetersProvider;
+import com.expedia.pitchfork.systems.haystack.forwarder.kafka.properties.KafkaForwarderConfigProperties;
+import com.expedia.pitchfork.monitoring.metrics.MetersProvider;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
 import org.apache.kafka.clients.producer.KafkaProducer;

diff --git a/...ack/kafka/HaystackKafkaSpanForwarder.java → ...der/kafka/HaystackKafkaSpanForwarder.java b/...ack/kafka/HaystackKafkaSpanForwarder.java → ...der/kafka/HaystackKafkaSpanForwarder.java
@@ -14,19 +14,18 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kafka;
+package com.expedia.pitchfork.systems.haystack.forwarder.kafka;
 
 import com.expedia.open.tracing.Span;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.SpanForwarder;
-import com.hotels.service.tracing.zipkintohaystack.metrics.MetersProvider;
+import com.expedia.pitchfork.systems.common.SpanForwarder;
+import com.expedia.pitchfork.systems.haystack.HaystackDomainConverter;
+import com.expedia.pitchfork.monitoring.metrics.MetersProvider;
 import io.micrometer.core.instrument.Counter;
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.HaystackDomainConverter.fromZipkinV2;
-
 /**
  * Implementation of a {@link SpanForwarder} that accepts a span in {@code Zipkin} format, converts to Haystack domain and pushes a {@code Kafka} stream.
  */
@@ -51,7 +50,7 @@ public void process(zipkin2.Span input) {
         logger.debug("operation=process, span={}", input);
 
         try {
-            Span span = fromZipkinV2(input);
+            Span span = HaystackDomainConverter.fromZipkinV2(input);
             byte[] value = span.toByteArray();
 
             final ProducerRecord<String, byte[]> record = new ProducerRecord<>(topic, span.getTraceId(), value);

diff --git a/...rties/KafkaForwarderConfigProperties.java → ...rties/KafkaForwarderConfigProperties.java b/...rties/KafkaForwarderConfigProperties.java → ...rties/KafkaForwarderConfigProperties.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kafka.properties;
+package com.expedia.pitchfork.systems.haystack.forwarder.kafka.properties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

diff --git a/...rs/haystack/kinesis/KinesisForwarder.java → ...k/forwarder/kinesis/KinesisForwarder.java b/...rs/haystack/kinesis/KinesisForwarder.java → ...k/forwarder/kinesis/KinesisForwarder.java
@@ -14,19 +14,19 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kinesis;
+package com.expedia.pitchfork.systems.haystack.forwarder.kinesis;
 
 import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.expedia.open.tracing.Span;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.SpanForwarder;
-import com.hotels.service.tracing.zipkintohaystack.metrics.MetersProvider;
+import com.expedia.pitchfork.systems.common.SpanForwarder;
+import com.expedia.pitchfork.monitoring.metrics.MetersProvider;
 import io.micrometer.core.instrument.Counter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 
-import static com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.HaystackDomainConverter.fromZipkinV2;
+import static com.expedia.pitchfork.systems.haystack.HaystackDomainConverter.fromZipkinV2;
 
 /**
  * Implementation of a {@link SpanForwarder} that accepts a span in {@code Zipkin} format,

diff --git a/...stack/kinesis/KinesisForwarderConfig.java → ...arder/kinesis/KinesisForwarderConfig.java b/...stack/kinesis/KinesisForwarderConfig.java → ...arder/kinesis/KinesisForwarderConfig.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kinesis;
+package com.expedia.pitchfork.systems.haystack.forwarder.kinesis;
 
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
@@ -23,10 +23,10 @@
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kinesis.properties.AuthConfigProperties;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kinesis.properties.ClientConfigProperties;
-import com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kinesis.properties.KinesisForwarderConfigProperties;
-import com.hotels.service.tracing.zipkintohaystack.metrics.MetersProvider;
+import com.expedia.pitchfork.systems.haystack.forwarder.kinesis.properties.AuthConfigProperties;
+import com.expedia.pitchfork.systems.haystack.forwarder.kinesis.properties.ClientConfigProperties;
+import com.expedia.pitchfork.systems.haystack.forwarder.kinesis.properties.KinesisForwarderConfigProperties;
+import com.expedia.pitchfork.monitoring.metrics.MetersProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

diff --git a/...esis/properties/AuthConfigProperties.java → ...esis/properties/AuthConfigProperties.java b/...esis/properties/AuthConfigProperties.java → ...esis/properties/AuthConfigProperties.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kinesis.properties;
+package com.expedia.pitchfork.systems.haystack.forwarder.kinesis.properties;
 
 public class AuthConfigProperties {
     private AwsAuthenticationTypeEnum configType;

diff --git a/...properties/AwsAuthenticationTypeEnum.java → ...properties/AwsAuthenticationTypeEnum.java b/...properties/AwsAuthenticationTypeEnum.java → ...properties/AwsAuthenticationTypeEnum.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kinesis.properties;
+package com.expedia.pitchfork.systems.haystack.forwarder.kinesis.properties;
 
 public enum AwsAuthenticationTypeEnum {
     DEFAULT,

diff --git a/...properties/BasicAuthConfigProperties.java → ...properties/BasicAuthConfigProperties.java b/...properties/BasicAuthConfigProperties.java → ...properties/BasicAuthConfigProperties.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kinesis.properties;
+package com.expedia.pitchfork.systems.haystack.forwarder.kinesis.properties;
 
 public class BasicAuthConfigProperties {
     private String awsAccessKey;

diff --git a/...is/properties/ClientConfigProperties.java → ...is/properties/ClientConfigProperties.java b/...is/properties/ClientConfigProperties.java → ...is/properties/ClientConfigProperties.java
@@ -14,7 +14,7 @@
  *       limitations under the License.
  *
  */
-package com.hotels.service.tracing.zipkintohaystack.forwarders.haystack.kinesis.properties;
+package com.expedia.pitchfork.systems.haystack.forwarder.kinesis.properties;
 
 public class ClientConfigProperties {
     private ClientConfigurationEnum configType;