Added support for posting data without auth

Author: preet-dev

example-definitions/cli-target-grpc.yaml

@@ -1,3 +1,4 @@
+authMode: "basic"
 username: "your-username"
 password: "your-password"
 grpchost: "target-gRPC-host"

example-definitions/cli-target-rest.yaml

@@ -1,3 +1,4 @@
+authMode: "basic"
 username: "your-username"
 password: "your-password"
 restURL: "target-rest-URL"

src/main/java/io/opentelemetry/contrib/generator/telemetry/cli/CLIProcessor.java

@@ -20,7 +20,9 @@
 import io.opentelemetry.contrib.generator.telemetry.dto.GeneratorInput;
 import io.opentelemetry.contrib.generator.telemetry.transport.PayloadHandler;
 import io.opentelemetry.contrib.generator.telemetry.TelemetryGenerator;
+import io.opentelemetry.contrib.generator.telemetry.transport.auth.AuthHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.auth.BasicAuthHandler;
+import io.opentelemetry.contrib.generator.telemetry.transport.auth.NoAuthHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.implementations.grpc.GRPCPayloadHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.implementations.rest.RESTPayloadHandler;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -60,27 +62,32 @@ public static void main(String[] args) throws ParseException {
     private static Options getOptions() {
         Option entityDefinition = Option.builder("e")
                 .argName("entityDefinition")
+                .longOpt("entityDefinition")
                 .desc("Path to the entity definition YAML")
                 .hasArg()
                 .required()
                 .build();
         Option metricDefinition = Option.builder("m")
                 .argName("metricDefinition")
+                .longOpt("metricDefinition")
                 .desc("Path to the metric definition YAML")
                 .hasArg()
                 .build();
         Option logsDefinition = Option.builder("l")
                 .argName("logDefinition")
+                .longOpt("logDefinition")
                 .desc("Path to the log definition YAML")
                 .hasArg()
                 .build();
         Option traceDefinition = Option.builder("s")
                 .argName("spanDefinition")
+                .longOpt("spanDefinition")
                 .desc("Path to the trace definition YAML")
                 .hasArg()
                 .build();
         Option targetEnvYAML = Option.builder("t")
                 .argName("target")
+                .longOpt("target")
                 .desc("Path to the YAML containing details of the environment to target")
                 .hasArg()
                 .required()
@@ -99,31 +106,36 @@ private static Options getOptions() {
 
     private static PayloadHandler getPayloadHandler(String targetEnvYAML) {
         TargetEnvironmentDetails targetEnvironmentDetails = getTargetEnvDetails(targetEnvYAML);
-        if (StringUtils.defaultString(targetEnvironmentDetails.getUsername()).isBlank()) {
-            throw new GeneratorException("Missing username in environment target YAML");
-        }
-        if (StringUtils.defaultString(targetEnvironmentDetails.getPassword()).isBlank()) {
-            throw new GeneratorException("Missing password in environment target YAML");
-        }
         String nonNullRestURL = StringUtils.defaultString(targetEnvironmentDetails.getRestURL());
         String nonNullGRPCHost = StringUtils.defaultString(targetEnvironmentDetails.getGRPCHost());
         String nonNullGRPCPort = StringUtils.defaultString(targetEnvironmentDetails.getGRPCPort());
         if (nonNullRestURL.isBlank() && (nonNullGRPCHost.isBlank() || nonNullGRPCPort.isBlank())) {
             throw new GeneratorException("Either restURL (for REST endpoint) or gRPCHost & gRPCPort (for gRPC endpoint) " +
                     "must be provided in environment target YAML");
         }
+        AuthHandler authHandler;
+        if (targetEnvironmentDetails.getAuthMode().equalsIgnoreCase("NONE")) {
+            authHandler = new NoAuthHandler();
+        } else {
+            if (StringUtils.defaultString(targetEnvironmentDetails.getUsername()).isBlank()) {
+                throw new GeneratorException("Missing username in environment target YAML");
+            }
+            if (StringUtils.defaultString(targetEnvironmentDetails.getPassword()).isBlank()) {
+                throw new GeneratorException("Missing password in environment target YAML");
+            }
+            authHandler = new BasicAuthHandler(targetEnvironmentDetails.getUsername(),
+                    targetEnvironmentDetails.getPassword());
+        }
         if (!nonNullRestURL.isBlank()) {
-            return new RESTPayloadHandler(nonNullRestURL,
-                    new BasicAuthHandler(targetEnvironmentDetails.getUsername(), targetEnvironmentDetails.getPassword()));
+            return new RESTPayloadHandler(nonNullRestURL, authHandler);
         }
         int gRPCPort;
         try {
             gRPCPort = Integer.parseInt(nonNullGRPCPort);
         } catch (NumberFormatException numberFormatException) {
             throw new GeneratorException("Invalid gRPC port " + nonNullGRPCPort + " provided in environment target YAML");
         }
-        return new GRPCPayloadHandler(nonNullGRPCHost, gRPCPort,
-                new BasicAuthHandler(targetEnvironmentDetails.getUsername(), targetEnvironmentDetails.getPassword()));
+        return new GRPCPayloadHandler(nonNullGRPCHost, gRPCPort, authHandler);
     }
 
     private static TargetEnvironmentDetails getTargetEnvDetails(String targetEnvYAML) {

src/main/java/io/opentelemetry/contrib/generator/telemetry/cli/TargetEnvironmentDetails.java

@@ -21,9 +21,10 @@
 @Data
 public class TargetEnvironmentDetails {
 
-    private String username;
-    private String password;
     private String restURL;
     private String gRPCHost;
     private String gRPCPort;
+    private String authMode;
+    private String username;
+    private String password;
 }

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/auth/NoAuthHandler.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 AppDynamics Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.opentelemetry.contrib.generator.telemetry.transport.auth;
+
+public class NoAuthHandler implements AuthHandler {
+
+    @Override
+    public String getAuthString() {
+        return "NO_AUTH";
+    }
+}

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/grpc/GRPCPayloadHandler.java

@@ -20,6 +20,7 @@
 import io.opentelemetry.contrib.generator.telemetry.transport.auth.AuthHandler;
 import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.*;
+import io.opentelemetry.contrib.generator.telemetry.transport.auth.NoAuthHandler;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceResponse;
 import io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
@@ -41,6 +42,7 @@ public class GRPCPayloadHandler implements PayloadHandler {
     private final String HOST;
     private final int gRPCPORT;
     private final AuthHandler authHandler;
+    private final boolean isAuthEnabled;
     private ManagedChannel managedChannel;
     private MetricsServiceGrpc.MetricsServiceBlockingStub metricsServiceBlockingStub;
     private LogsServiceGrpc.LogsServiceBlockingStub logsServiceBlockingStub;
@@ -50,6 +52,7 @@ public GRPCPayloadHandler(String host, int gRPCPort, AuthHandler authHandler) {
         this.HOST = host;
         this.gRPCPORT = gRPCPort;
         this.authHandler = authHandler;
+        isAuthEnabled = authHandler instanceof NoAuthHandler;
     }
 
     @Override
@@ -113,6 +116,6 @@ public void start(Listener<RespT> responseListener, Metadata headers) {
     }
 
     protected String[] getHeadersPostData() {
-        return new String[] {HttpHeaders.AUTHORIZATION, authHandler.getAuthString()};
+        return isAuthEnabled ? new String[] {HttpHeaders.AUTHORIZATION, authHandler.getAuthString()} : new String[0];
     }
 }

src/main/java/io/opentelemetry/contrib/generator/telemetry/transport/implementations/rest/RESTPayloadHandler.java

@@ -19,6 +19,7 @@
 import io.opentelemetry.contrib.generator.telemetry.transport.PayloadHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.auth.AuthHandler;
 import com.google.protobuf.GeneratedMessageV3;
+import io.opentelemetry.contrib.generator.telemetry.transport.auth.NoAuthHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.implementations.HTTPClient;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
@@ -28,13 +29,16 @@
 import org.apache.commons.lang3.StringUtils;
 
 import javax.ws.rs.core.HttpHeaders;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 public class RESTPayloadHandler implements PayloadHandler {
 
     private final String ENDPOINT_URL;
     private final AuthHandler authHandler;
     private final HTTPClient httpClient;
+    private final boolean isAuthEnabled;
     @Getter
     @Setter
     private String metricsURL = "";
@@ -51,6 +55,7 @@ public RESTPayloadHandler(String endpointURL, AuthHandler authHandler) {
         this.ENDPOINT_URL = endpointURL;
         httpClient = new HTTPClient();
         this.authHandler = authHandler;
+        isAuthEnabled = authHandler instanceof NoAuthHandler;
     }
 
     @Override
@@ -73,8 +78,15 @@ public boolean postPayload(GeneratedMessageV3 message) {
     }
 
     protected String[] getHeadersPostData() {
-        return new String[] {HttpHeaders.AUTHORIZATION, authHandler.getAuthString(),
-                HttpHeaders.CONTENT_TYPE, "application/x-protobuf",
-                HttpHeaders.ACCEPT, "application/x-protobuf"};
+        List<String> defaultHeaders = new ArrayList<>();
+        defaultHeaders.add(HttpHeaders.CONTENT_TYPE);
+        defaultHeaders.add("application/x-protobuf");
+        defaultHeaders.add(HttpHeaders.ACCEPT);
+        defaultHeaders.add("application/x-protobuf");
+        if (isAuthEnabled) {
+            defaultHeaders.add(HttpHeaders.AUTHORIZATION);
+            defaultHeaders.add(authHandler.getAuthString());
+        }
+        return defaultHeaders.toArray(new String[4]);
     }
 }

src/test/java/io/opentelemetry/contrib/generator/telemetry/TestCLIProcessor.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2022 AppDynamics Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.opentelemetry.contrib.generator.telemetry;
+
+import io.opentelemetry.contrib.generator.telemetry.cli.CLIProcessor;
+import org.apache.commons.cli.ParseException;
+import org.testng.annotations.Test;
+
+import java.nio.file.Paths;
+
+public class TestCLIProcessor {
+
+    private final String cliResourcesPath = Paths.get(System.getProperty("user.dir"), "src", "test", "resources",
+            "test-definitions", "cli").toString();
+    private final String ENTITIES_YAML = Paths.get(cliResourcesPath, "entity-definition.yaml").toString();
+    private final String METRICS_YAML = Paths.get(cliResourcesPath, "metrics-cli-test.yaml").toString();
+    private final String LOGS_YAML = Paths.get(cliResourcesPath, "logs-cli-test.yaml").toString();
+    private final String TRACES_YAML = Paths.get(cliResourcesPath, "traces-cli-test.yaml").toString();
+
+    @Test
+    public void testAllGeneratorsNoAuthREST() throws ParseException {
+        String noAuthTargetYAML = Paths.get(cliResourcesPath, "target-noauth.yaml").toString();
+        String[] cliArgs = new String[] {
+                "-e", ENTITIES_YAML, "-m", METRICS_YAML, "-l", LOGS_YAML, "-s", TRACES_YAML, "-t", noAuthTargetYAML
+        };
+        CLIProcessor.main(cliArgs);
+    }
+
+    @Test
+    public void testMetricsTracesBasicAuthGRPC() throws ParseException {
+        String basicAuthTargetYAML = Paths.get(cliResourcesPath, "target-basicauth.yaml").toString();
+        String[] cliArgs = new String[] {
+                "--entityDefinition", ENTITIES_YAML, "--metricDefinition", METRICS_YAML,
+                "--spanDefinition", TRACES_YAML, "--target", basicAuthTargetYAML
+        };
+        CLIProcessor.main(cliArgs);
+    }
+
+}