comment out ts-consumer for testing

Author: jfzunigac

psc-integration-test/pom.xml

@@ -53,25 +53,25 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.pinterest.kafka.tieredstorage</groupId>
-            <artifactId>ts-consumer</artifactId>
-            <version>${ts-consumer.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.pinterest.kafka.tieredstorage</groupId>-->
+<!--            <artifactId>ts-consumer</artifactId>-->
+<!--            <version>${ts-consumer.version}</version>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>log4j</groupId>-->
+<!--                    <artifactId>log4j</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.slf4j</groupId>-->
+<!--                    <artifactId>slf4j-log4j12</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.slf4j</groupId>-->
+<!--                    <artifactId>log4j-over-slf4j</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.pinterest.psc</groupId>
             <artifactId>psc-logging</artifactId>

psc/pom.xml

@@ -35,25 +35,25 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.pinterest.kafka.tieredstorage</groupId>
-            <artifactId>ts-consumer</artifactId>
-            <version>${ts-consumer.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.pinterest.kafka.tieredstorage</groupId>-->
+<!--            <artifactId>ts-consumer</artifactId>-->
+<!--            <version>${ts-consumer.version}</version>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>log4j</groupId>-->
+<!--                    <artifactId>log4j</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.slf4j</groupId>-->
+<!--                    <artifactId>slf4j-log4j12</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.slf4j</groupId>-->
+<!--                    <artifactId>log4j-over-slf4j</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>

psc/src/main/java/com/pinterest/psc/consumer/kafka/PscKafkaConsumer.java

@@ -107,8 +107,7 @@ public void initializeBackend(ServiceDiscoveryConfig discoveryConfig, TopicUri t
 
     @Override
     protected synchronized void reportConsumerMetrics() {
-        // temporary fix to avoid NPE in KafkaConsumer.metrics()
-        if (kafkaConsumer == null || kafkaConsumer.metrics() == null)
+        if (kafkaConsumer == null)
             return;
 
         Map<org.apache.kafka.common.MetricName, ? extends org.apache.kafka.common.Metric> kafkaMetrics = kafkaConsumer.metrics();