feat(experimental-packages): Update packages to latest SDK Version. (#…

…2871)

Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>

.github/workflows/peer-api.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Install lerna
         run: npm install -g lerna
 
-      - name: Install semver 
+      - name: Install semver
         run: npm install semver
 
       - name: Check API dependency semantics (stable)
@@ -27,4 +27,4 @@ jobs:
 
       - name: Check API dependency semantics (experimental)
         working-directory: experimental
-        run: lerna exec --ignore propagation-validation-server --ignore @opentelemetry/selenium-tests --ignore @opentelemetry/api-metrics-wip --ignore @opentelemetry/otlp-transformer "node ../../../scripts/peer-api-check.js"
+        run: lerna exec --ignore propagation-validation-server --ignore @opentelemetry/selenium-tests --ignore @opentelemetry/api-metrics --ignore @opentelemetry/otlp-transformer "node ../../../scripts/peer-api-check.js"

.gitmodules

@@ -1,7 +1,7 @@
-[submodule "packages/exporter-trace-otlp-proto/protos"]
+[submodule "experimental/packages/exporter-trace-otlp-proto/protos"]
 	path = experimental/packages/exporter-trace-otlp-proto/protos
 	url = https://github.com/open-telemetry/opentelemetry-proto.git
-[submodule "packages/exporter-trace-otlp-grpc/protos"]
+[submodule "experimental/packages/exporter-trace-otlp-grpc/protos"]
 	path = experimental/packages/exporter-trace-otlp-grpc/protos
 	url = https://github.com/open-telemetry/opentelemetry-proto.git
 [submodule "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos"]

experimental/CHANGELOG.md

@@ -9,6 +9,13 @@ All notable changes to experimental packages in this project will be documented
 * feat(sdk-metrics-base): update metric exporter interfaces #2707 @srikanthccv
 * feat(api-metrics): remove observable types #2687 @legendecas
 * fix(otlp-http-exporter): remove content length header #2879 @svetlanabrennan
+* feat(experimental-packages): Update packages to latest SDK Version. #2871 @pichlermarc
+  * removed the -wip suffix from api-metrics and metrics-sdk-base.
+  * updated dependencies to stable packages to `1.1.1` for all "experimental" packages.
+  * updated Metrics Exporters to the latest Metrics SDK (`exporter-metrics-otlp-grpc`, `exporter-metrics-otlp-http`, `exporter-metrics-otlp-proto`)
+  * updated `opentelemetry-sdk-node` to the latest Metrics SDK.
+  * updated `otlp-transformer` to the latest Metrics SDK.
+  * updated all `instrumentation-*` packages to use local implementations of `parseUrl()` due to #2884
 
 ### :rocket: (Enhancement)
 

experimental/backwards-compatability/node10/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@opentelemetry/sdk-node": "0.27.0",
-    "@opentelemetry/sdk-trace-base": "1.0.1"
+    "@opentelemetry/sdk-trace-base": "1.1.1"
   },
   "devDependencies": {
     "@types/node": "10.17.60",

experimental/backwards-compatability/node12/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@opentelemetry/sdk-node": "0.27.0",
-    "@opentelemetry/sdk-trace-base": "1.0.1"
+    "@opentelemetry/sdk-trace-base": "1.1.1"
   },
   "devDependencies": {
     "@types/node": "12.20.37",

experimental/backwards-compatability/node8/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@opentelemetry/sdk-node": "0.27.0",
-    "@opentelemetry/sdk-trace-base": "1.0.1"
+    "@opentelemetry/sdk-trace-base": "1.1.1"
   },
   "devDependencies": {
     "@types/node": "8.10.66",

experimental/packages/exporter-trace-otlp-grpc/package.json

@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@opentelemetry/api": "^1.0.3",
+    "@opentelemetry/api": "^1.1.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -64,7 +64,7 @@
     "typescript": "4.4.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.3"
+    "@opentelemetry/api": "^1.1.0"
   },
   "dependencies": {
     "@opentelemetry/core": "1.1.1",

experimental/packages/exporter-trace-otlp-http/package.json

@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@opentelemetry/api": "^1.0.3",
+    "@opentelemetry/api": "^1.1.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -89,7 +89,7 @@
     "webpack-merge": "5.8.0"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.3"
+    "@opentelemetry/api": "^1.1.0"
   },
   "dependencies": {
     "@opentelemetry/core": "1.1.1",

experimental/packages/exporter-trace-otlp-proto/package.json

@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@opentelemetry/api": "^1.0.3",
+    "@opentelemetry/api": "^1.1.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -64,7 +64,7 @@
     "typescript": "4.4.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.3"
+    "@opentelemetry/api": "^1.1.0"
   },
   "dependencies": {
     "@opentelemetry/core": "1.1.1",

experimental/packages/opentelemetry-api-metrics/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@opentelemetry/api-metrics-wip",
+  "name": "@opentelemetry/api-metrics",
   "version": "0.27.0",
   "private": true,
   "description": "Public metrics API for OpenTelemetry",

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json

@@ -65,16 +65,16 @@
     "typescript": "4.4.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.3"
+    "@opentelemetry/api": "^1.1.0"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
-    "@opentelemetry/core": "1.0.1",
+    "@opentelemetry/core": "1.1.1",
     "@opentelemetry/exporter-metrics-otlp-http": "0.27.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "0.27.0",
     "@opentelemetry/exporter-trace-otlp-http": "0.27.0",
-    "@opentelemetry/resources": "1.0.1",
+    "@opentelemetry/resources": "1.1.1",
     "@opentelemetry/sdk-metrics-base": "0.27.0"
   }
 }

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/src/OTLPMetricExporter.ts

@@ -15,8 +15,13 @@
  */
 
 import { otlpTypes } from '@opentelemetry/exporter-trace-otlp-http';
-import { toOTLPExportMetricServiceRequest } from '@opentelemetry/exporter-metrics-otlp-http';
-import { MetricRecord, MetricExporter } from '@opentelemetry/sdk-metrics-base';
+import {
+  defaultExporterTemporality,
+  defaultOptions,
+  OTLPMetricExporterBase, OTLPMetricExporterOptions,
+  toOTLPExportMetricServiceRequest
+} from '@opentelemetry/exporter-metrics-otlp-http';
+import { AggregationTemporality, ResourceMetrics } from '@opentelemetry/sdk-metrics-base';
 import {
   OTLPExporterConfigNode,
   OTLPExporterNodeBase,
@@ -28,52 +33,53 @@ import { Metadata } from '@grpc/grpc-js';
 
 const DEFAULT_COLLECTOR_URL = 'localhost:4317';
 
-/**
- * OTLP Metric Exporter for Node
- */
-export class OTLPMetricExporter
-  extends OTLPExporterNodeBase<
-    MetricRecord,
-    otlpTypes.opentelemetryProto.collector.metrics.v1.ExportMetricsServiceRequest
-  >
-  implements MetricExporter {
-  // Converts time to nanoseconds
-  protected readonly _startTime = new Date().getTime() * 1000000;
 
-  constructor(config: OTLPExporterConfigNode = {}) {
+class OTLPMetricExporterProxy extends OTLPExporterNodeBase<ResourceMetrics,
+  otlpTypes.opentelemetryProto.collector.metrics.v1.ExportMetricsServiceRequest> {
+  protected readonly _aggregationTemporality: AggregationTemporality;
+
+  constructor(config: OTLPExporterConfigNode & OTLPMetricExporterOptions= defaultOptions) {
     super(config);
-    const headers = baggageUtils.parseKeyPairsIntoRecord(getEnv().OTEL_EXPORTER_OTLP_METRICS_HEADERS);
     this.metadata ||= new Metadata();
+    const headers = baggageUtils.parseKeyPairsIntoRecord(getEnv().OTEL_EXPORTER_OTLP_METRICS_HEADERS);
     for (const [k, v] of Object.entries(headers)) {
       this.metadata.set(k, v);
     }
+    this._aggregationTemporality = config.aggregationTemporality ?? defaultExporterTemporality;
   }
 
-  convert(
-    metrics: MetricRecord[]
-  ): otlpTypes.opentelemetryProto.collector.metrics.v1.ExportMetricsServiceRequest {
-    return toOTLPExportMetricServiceRequest(
-      metrics,
-      this._startTime,
-      this
-    );
+  getServiceProtoPath(): string {
+    return 'opentelemetry/proto/collector/metrics/v1/metrics_service.proto';
+  }
+
+  getServiceClientType(): ServiceClientType {
+    return ServiceClientType.METRICS;
   }
 
   getDefaultUrl(config: OTLPExporterConfigNode): string {
     return typeof config.url === 'string'
       ? validateAndNormalizeUrl(config.url)
       : getEnv().OTEL_EXPORTER_OTLP_METRICS_ENDPOINT.length > 0
-      ? validateAndNormalizeUrl(getEnv().OTEL_EXPORTER_OTLP_METRICS_ENDPOINT)
-      : getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0
-      ? validateAndNormalizeUrl(getEnv().OTEL_EXPORTER_OTLP_ENDPOINT)
-      : DEFAULT_COLLECTOR_URL;
+        ? validateAndNormalizeUrl(getEnv().OTEL_EXPORTER_OTLP_METRICS_ENDPOINT)
+        : getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0
+          ? validateAndNormalizeUrl(getEnv().OTEL_EXPORTER_OTLP_ENDPOINT)
+          : DEFAULT_COLLECTOR_URL;
   }
 
-  getServiceClientType(): ServiceClientType {
-    return ServiceClientType.METRICS;
+  convert(metrics: ResourceMetrics[]): otlpTypes.opentelemetryProto.collector.metrics.v1.ExportMetricsServiceRequest {
+    return toOTLPExportMetricServiceRequest(
+      metrics[0],
+      this._aggregationTemporality,
+      this
+    );
   }
+}
 
-  getServiceProtoPath(): string {
-    return 'opentelemetry/proto/collector/metrics/v1/metrics_service.proto';
+/**
+ * OTLP-gRPC metric exporter
+ */
+export class OTLPMetricExporter extends OTLPMetricExporterBase<OTLPMetricExporterProxy>{
+  constructor(config: OTLPExporterConfigNode & OTLPMetricExporterOptions = defaultOptions) {
+    super(new OTLPMetricExporterProxy(config), config);
   }
 }