Bump otel version and get ready for stable metrics release. (#154)

* Bump to stable OTEL metrics version and start cleaning up javadoc/public API for stable metrics exporter release.

* Remove -alpha qualifier from metrics exporter release.

* Fix build breakage, need semconv for tests.

* Update metric config to use endpoint instead of stub for alternative endpoints.

* Expose endpoint config for trace exporter.

* cleanups.

* Spotless apply

* Fix CI build failure.

* Fix other test failure.

* Fix code review comments.

* Rename metric exporter to avoid name clash.

* Fix e2e test docker file.

* Run spotless.

Author: jsuereth

build.gradle

@@ -109,8 +109,8 @@ subprojects {
 		googleCloudVersion = '2.0.5'
 		googleTraceVersion = '2.0.0'
 		cloudMonitoringVersion = '3.0.0'
-		openTelemetryVersion = '1.13.0'
-		openTelemetryInstrumentationVersion = '1.13.0'
+		openTelemetryVersion = '1.15.0'
+		openTelemetryInstrumentationVersion = '1.14.0'
 		junitVersion = '4.13'
 		mockitoVersion = '3.5.10'
 		pubSubVersion = '1.111.2'
@@ -139,7 +139,7 @@ subprojects {
 			opentelemetry_autoconfigure_spi : "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:${openTelemetryVersion}",
 			opentelemetry_autoconfigure  : "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${openTelemetryVersion}-alpha",
 			opentelemetry_semconv        : "io.opentelemetry:opentelemetry-semconv:${openTelemetryVersion}-alpha",
-			opentelemetry_sdk_metrics    : "io.opentelemetry:opentelemetry-sdk-metrics:${openTelemetryVersion}-alpha",
+			opentelemetry_sdk_metrics    : "io.opentelemetry:opentelemetry-sdk-metrics:${openTelemetryVersion}",
 			opentelemetry_sdk_autoconf   : "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${openTelemetryVersion}-alpha",
 			opentelemetry_sdk_resources  : "io.opentelemetry:opentelemetry-sdk-extension-resources:${openTelemetryVersion}",
 			opentelemetry_agent_extension: "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${openTelemetryInstrumentationVersion}-alpha",

examples/metrics/src/main/java/com/google/cloud/opentelemetry/example/metrics/MetricsExporterExample.java

@@ -15,7 +15,7 @@
  */
 package com.google.cloud.opentelemetry.example.metrics;
 
-import com.google.cloud.opentelemetry.metric.MetricExporter;
+import com.google.cloud.opentelemetry.metric.GoogleCloudMetricExporter;
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
@@ -31,7 +31,8 @@ public class MetricsExporterExample {
 
   private static void setupMetricExporter() {
     try {
-      MetricExporter metricExporter = MetricExporter.createWithDefaultConfiguration();
+      GoogleCloudMetricExporter metricExporter =
+          GoogleCloudMetricExporter.createWithDefaultConfiguration();
       METER_PROVIDER =
           SdkMeterProvider.builder()
               .registerMetricReader(

exporters/auto/src/main/java/com/google/cloud/opentelemetry/auto/GoogleCloudMetricExporterFactory.java

@@ -16,17 +16,17 @@
 package com.google.cloud.opentelemetry.auto;
 
 import com.google.auto.service.AutoService;
-import com.google.cloud.opentelemetry.metric.MetricExporter;
+import com.google.cloud.opentelemetry.metric.GoogleCloudMetricExporter;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider;
 import java.io.IOException;
 
 @AutoService(ConfigurableMetricExporterProvider.class)
 public class GoogleCloudMetricExporterFactory implements ConfigurableMetricExporterProvider {
   @Override
-  public MetricExporter createExporter(ConfigProperties config) {
+  public GoogleCloudMetricExporter createExporter(ConfigProperties config) {
     try {
-      return MetricExporter.createWithDefaultConfiguration();
+      return GoogleCloudMetricExporter.createWithDefaultConfiguration();
     } catch (IOException ex) {
       throw new RuntimeException(ex);
     }

exporters/metrics/README.md

@@ -35,12 +35,13 @@ import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 
 import com.google.cloud.opentelemetry.metric.MetricConfiguration;
 import com.google.cloud.opentelemetry.metric.MetricDescriptorStrategy;
+import com.google.cloud.opentelemetry.metric.GoogleCloudMetricExporter;
 
 import java.util.Collections;
 
 // Configure the exporter in code.
 MetricExporter cloudMonitoringExporter =
-  com.google.cloud.opentelemetry.metric.MetricExporter.createWithConfiguration(
+  GoogleCloudMetricExporter.createWithConfiguration(
       MetricConfiguration.builder()
       // Configure the cloud project id.  Note: this is autodiscovered by default.
       .setProjectId(...)
@@ -59,7 +60,9 @@ MeterProvider provider = SdkMeterProvider.builder()
     // See https://cloud.google.com/monitoring/quotas#custom_metrics_quotas
     // Rate at which data can be written to a single time series: one point each 10
     // seconds.
-    PeriodicMetricReader.create(metricExporter, java.time.Duration.ofSeconds(20)))
+    PeriodicMetricReader.builder(metricExporter)
+    .setImterval(java.time.Duration.ofSeconds(20))
+    .build())
   .build();
 ```
 

exporters/metrics/build.gradle

@@ -24,7 +24,7 @@ dependencies {
 	api(libraries.google_cloud_core)
 	api(libraries.google_cloud_monitoring)
 	implementation(project(':shared-resourcemapping'))
-	implementation(libraries.opentelemetry_semconv)
+	testImplementation(libraries.opentelemetry_semconv)
 	testImplementation(testLibraries.junit)
 	testImplementation(testLibraries.mockito)
 	testImplementation(testLibraries.slf4j_simple)

exporters/metrics/gradle.properties

@@ -1,2 +1 @@
-release.qualifier=alpha
 release.enabled=true

exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/AggregateByLabelMetricTimeSeriesBuilder.java

@@ -22,7 +22,7 @@
 import static com.google.cloud.opentelemetry.metric.ResourceTranslator.mapResource;
 
 import com.google.api.MetricDescriptor;
-import com.google.cloud.opentelemetry.metric.MetricExporter.MetricWithLabels;
+import com.google.cloud.opentelemetry.metric.GoogleCloudMetricExporter.MetricWithLabels;
 import com.google.monitoring.v3.TimeSeries;
 import com.google.monitoring.v3.TypedValue;
 import io.opentelemetry.api.common.Attributes;
@@ -36,7 +36,11 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public class AggregateByLabelMetricTimeSeriesBuilder implements MetricTimeSeriesBuilder {
+/**
+ * Builds GCM TimeSeries from each OTEL metric point, creating metric descriptors based on the
+ * "first" seen point for any given metric.
+ */
+public final class AggregateByLabelMetricTimeSeriesBuilder implements MetricTimeSeriesBuilder {
 
   private final Map<String, MetricDescriptor> descriptors = new HashMap<>();
   private final Map<MetricWithLabels, TimeSeries.Builder> pendingTimeSeries = new HashMap<>();

exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/CloudMetricClient.java

@@ -21,10 +21,24 @@
 import com.google.monitoring.v3.TimeSeries;
 import java.util.List;
 
+/** Wrapper interface for writing to Google Cloud Monitoring. */
 public interface CloudMetricClient {
+  /**
+   * Construct a metric descriptor.
+   *
+   * <p>This informs Cloud Monitoring of label descriptions, metric descriptions, units, etc.
+   */
   MetricDescriptor createMetricDescriptor(CreateMetricDescriptorRequest request);
 
+  /**
+   * Send a timeseries to Cloud Monitoring.
+   *
+   * @param name The name of the project where we write the timeseries.
+   * @param timeSeries The list of timeseries to write.
+   *     <p>Note: This can only take one point at per timeseries.
+   */
   void createTimeSeries(ProjectName name, List<TimeSeries> timeSeries);
 
+  /** Shutdown this client, cleaning up any resources. */
   void shutdown();
 }

exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/CloudMetricClientImpl.java

@@ -22,7 +22,8 @@
 import com.google.monitoring.v3.TimeSeries;
 import java.util.List;
 
-public class CloudMetricClientImpl implements CloudMetricClient {
+/** Directly talks to Cloud Monitoring. */
+public final class CloudMetricClientImpl implements CloudMetricClient {
   private final MetricServiceClient metricServiceClient;
 
   public CloudMetricClientImpl(MetricServiceClient metricServiceClient) {

exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/MetricExporter.java renamed to exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/GoogleCloudMetricExporter.java

@@ -19,16 +19,19 @@
 
 import com.google.api.MetricDescriptor;
 import com.google.api.gax.core.FixedCredentialsProvider;
+import com.google.api.gax.core.NoCredentialsProvider;
+import com.google.api.gax.grpc.GrpcTransportChannel;
+import com.google.api.gax.rpc.FixedTransportChannelProvider;
 import com.google.auth.Credentials;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.monitoring.v3.MetricServiceClient;
 import com.google.cloud.monitoring.v3.MetricServiceSettings;
-import com.google.cloud.monitoring.v3.stub.MetricServiceStub;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.monitoring.v3.CreateMetricDescriptorRequest;
 import com.google.monitoring.v3.ProjectName;
 import com.google.monitoring.v3.TimeSeries;
+import io.grpc.ManagedChannelBuilder;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.metrics.InstrumentType;
@@ -38,17 +41,17 @@
 import io.opentelemetry.sdk.metrics.data.LongPointData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import java.io.IOException;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MetricExporter implements io.opentelemetry.sdk.metrics.export.MetricExporter {
+public class GoogleCloudMetricExporter
+    implements io.opentelemetry.sdk.metrics.export.MetricExporter {
 
-  private static final Logger logger = LoggerFactory.getLogger(MetricExporter.class);
+  private static final Logger logger = LoggerFactory.getLogger(GoogleCloudMetricExporter.class);
 
   private static final String PROJECT_NAME_PREFIX = "projects/";
   private static final int MAX_BATCH_SIZE = 200;
@@ -57,67 +60,59 @@ public class MetricExporter implements io.opentelemetry.sdk.metrics.export.Metri
   private final String projectId;
   private final MetricDescriptorStrategy metricDescriptorStrategy;
 
-  MetricExporter(
+  GoogleCloudMetricExporter(
       String projectId, CloudMetricClient client, MetricDescriptorStrategy descriptorStrategy) {
     this.projectId = projectId;
     this.metricServiceClient = client;
     this.metricDescriptorStrategy = descriptorStrategy;
   }
 
-  public static MetricExporter createWithDefaultConfiguration() throws IOException {
+  public static GoogleCloudMetricExporter createWithDefaultConfiguration() throws IOException {
     MetricConfiguration configuration = MetricConfiguration.builder().build();
-    return MetricExporter.createWithConfiguration(configuration);
+    return GoogleCloudMetricExporter.createWithConfiguration(configuration);
   }
 
-  public static MetricExporter createWithConfiguration(MetricConfiguration configuration)
+  public static GoogleCloudMetricExporter createWithConfiguration(MetricConfiguration configuration)
       throws IOException {
     String projectId = configuration.getProjectId();
-    MetricServiceStub stub = configuration.getMetricServiceStub();
-
-    if (stub == null) {
+    MetricServiceSettings.Builder builder = MetricServiceSettings.newBuilder();
+    // For testing, we need to hack around our gRPC config.
+    if (configuration.getInsecureEndpoint()) {
+      builder.setCredentialsProvider(NoCredentialsProvider.create());
+      builder.setTransportChannelProvider(
+          FixedTransportChannelProvider.create(
+              GrpcTransportChannel.create(
+                  ManagedChannelBuilder.forTarget(configuration.getMetricServiceEndpoint())
+                      .usePlaintext()
+                      .build())));
+    } else {
+      // For any other endpoint, we force credentials to exist.
       Credentials credentials =
           configuration.getCredentials() == null
               ? GoogleCredentials.getApplicationDefault()
               : configuration.getCredentials();
 
-      return MetricExporter.createWithCredentials(
-          projectId,
-          credentials,
-          configuration.getDeadline(),
-          configuration.getDescriptorStrategy());
+      builder.setCredentialsProvider(
+          FixedCredentialsProvider.create(checkNotNull(credentials, "Credentials not provided.")));
+      builder.setEndpoint(configuration.getMetricServiceEndpoint());
     }
-    return MetricExporter.createWithClient(
+    builder
+        .createMetricDescriptorSettings()
+        .setSimpleTimeoutNoRetries(
+            org.threeten.bp.Duration.ofMillis(configuration.getDeadline().toMillis()));
+
+    return new GoogleCloudMetricExporter(
         projectId,
-        new CloudMetricClientImpl(MetricServiceClient.create(stub)),
+        new CloudMetricClientImpl(MetricServiceClient.create(builder.build())),
         configuration.getDescriptorStrategy());
   }
 
   @VisibleForTesting
-  static MetricExporter createWithClient(
+  static GoogleCloudMetricExporter createWithClient(
       String projectId,
       CloudMetricClient metricServiceClient,
       MetricDescriptorStrategy descriptorStrategy) {
-    return new MetricExporter(projectId, metricServiceClient, descriptorStrategy);
-  }
-
-  private static MetricExporter createWithCredentials(
-      String projectId,
-      Credentials credentials,
-      Duration deadline,
-      MetricDescriptorStrategy descriptorStrategy)
-      throws IOException {
-    MetricServiceSettings.Builder builder =
-        MetricServiceSettings.newBuilder()
-            .setCredentialsProvider(
-                FixedCredentialsProvider.create(
-                    checkNotNull(credentials, "Credentials not provided.")));
-    builder
-        .createMetricDescriptorSettings()
-        .setSimpleTimeoutNoRetries(org.threeten.bp.Duration.ofMillis(deadline.toMillis()));
-    return new MetricExporter(
-        projectId,
-        new CloudMetricClientImpl(MetricServiceClient.create(builder.build())),
-        descriptorStrategy);
+    return new GoogleCloudMetricExporter(projectId, metricServiceClient, descriptorStrategy);
   }
 
   private void exportDescriptor(MetricDescriptor descriptor) {