open-telemetry · obecny · Aug 24, 2020 · Aug 18, 2020 · Aug 18, 2020 · Aug 18, 2020
diff --git a/.gitignore b/.gitignore
@@ -78,3 +78,7 @@ package.json.lerna_backup
 
 # VsCode configs
 .vscode/
+
+#IDEA
+.idea
+*.iml
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
-[submodule "packages/opentelemetry-exporter-collector/src/platform/node/protos"]
-	path = packages/opentelemetry-exporter-collector/src/platform/node/protos
+[submodule "packages/opentelemetry-exporter-collector-grpc/protos"]
+	path = packages/opentelemetry-exporter-collector-grpc/protos
+	url = /~https://github.com/open-telemetry/opentelemetry-proto.git
+[submodule "packages/opentelemetry-exporter-collector-proto/protos"]
+	path = packages/opentelemetry-exporter-collector-proto/protos
 	url = /~https://github.com/open-telemetry/opentelemetry-proto.git
diff --git a/examples/collector-exporter-node/metrics.js b/examples/collector-exporter-node/metrics.js
@@ -1,17 +1,21 @@
 'use strict';
 
+const { ConsoleLogger, LogLevel } = require('@opentelemetry/core');
 const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector');
+// const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-grpc');
+// const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector-proto');
 const { MeterProvider } = require('@opentelemetry/metrics');
 
 const metricExporter = new CollectorMetricExporter({
   serviceName: 'basic-metric-service',
-  // logger: new ConsoleLogger(LogLevel.DEBUG),
+  // url: 'http://localhost:55681/v1/metrics',
+  logger: new ConsoleLogger(LogLevel.DEBUG),
 });
 
 const meter = new MeterProvider({
   exporter: metricExporter,
   interval: 1000,
-}).getMeter('example-prometheus');
+}).getMeter('example-exporter-collector');
 
 const requestCounter = meter.createCounter('requests', {
   description: 'Example of a Counter',

diff --git a/examples/collector-exporter-node/package.json b/examples/collector-exporter-node/package.json
@@ -31,6 +31,8 @@
     "@opentelemetry/api": "^0.10.2",
     "@opentelemetry/core": "^0.10.2",
     "@opentelemetry/exporter-collector": "^0.10.2",
+    "@opentelemetry/exporter-collector-grpc": "^0.10.2",
+    "@opentelemetry/exporter-collector-proto": "^0.10.2",
     "@opentelemetry/metrics": "^0.10.2",
     "@opentelemetry/tracing": "^0.10.2"
   },

diff --git a/examples/collector-exporter-node/tracing.js b/examples/collector-exporter-node/tracing.js
@@ -3,16 +3,16 @@
 const opentelemetry = require('@opentelemetry/api');
 // const { ConsoleLogger,  LogLevel} = require('@opentelemetry/core');
 const { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/tracing');
-const { CollectorTraceExporter, CollectorProtocolNode } = require('@opentelemetry/exporter-collector');
+const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');
+// const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-grpc');
+// const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector-proto');
 
 const exporter = new CollectorTraceExporter({
   serviceName: 'basic-service',
   // logger: new ConsoleLogger(LogLevel.DEBUG),
   // headers: {
   //   foo: 'bar'
   // },
-  protocolNode: CollectorProtocolNode.HTTP_PROTO,
-  // protocolNode: CollectorProtocolNode.HTTP_JSON,
 });
 
 const provider = new BasicTracerProvider();

diff --git a/examples/tracer-web/examples/metrics/index.html b/examples/tracer-web/examples/metrics/index.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <title>Metrics Example</title>
+  <base href="/">
+
+  <!--
+    https://www.w3.org/TR/trace-context/
+    Set the `traceparent` in the server's HTML template code. It should be
+    dynamically generated server side to have the server's request trace Id,
+    a parent span Id that was set on the server's request span, and the trace
+    flags to indicate the server's sampling decision
+    (01 = sampled, 00 = notsampled).
+    '{version}-{traceId}-{spanId}-{sampleDecision}'
+  -->
+<!--  <meta name="traceparent" content="00-ab42124a3c573678d4d8b21ba52df3bf-d21f7bc17caa5aba-01">-->
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+
+<body>
+  Example of using metrics with Collector Exporter
+  <script type="text/javascript" src="metrics.js"></script>
+  <br/>
+  <button id="startBtn">Start metrics</button>
+  <button id="stopBtn">Stop metrics</button>
+  <br/>
+
+If you run the collector from example "opentelemetry-exporter-collector" you should see traces at: <br/>
+<a href="http://localhost:9090/graph?g0.range_input=1m&g0.expr=requests&g0.tab=0/" target="_blank">http://localhost:9090/</a>
+
+</body>
+
+</html>
diff --git a/examples/tracer-web/examples/metrics/index.js b/examples/tracer-web/examples/metrics/index.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const { ConsoleLogger, LogLevel } = require('@opentelemetry/core');
+const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector');
+const { MeterProvider } = require('@opentelemetry/metrics');
+
+const metricExporter = new CollectorMetricExporter({
+  serviceName: 'basic-metric-service',
+  logger: new ConsoleLogger(LogLevel.DEBUG),
+});
+
+let interval;
+let meter;
+
+function stopMetrics() {
+  console.log('STOPPING METRICS');
+  clearInterval(interval);
+  meter.shutdown();
+}
+
+function startMetrics() {
+  console.log('STARTING METRICS');
+  meter = new MeterProvider({
+    exporter: metricExporter,
+    interval: 1000,
+  }).getMeter('example-exporter-collector');
+
+  const requestCounter = meter.createCounter('requests', {
+    description: 'Example of a Counter',
+  });
+
+  const upDownCounter = meter.createUpDownCounter('test_up_down_counter', {
+    description: 'Example of a UpDownCounter',
+  });
+
+  const labels = { pid: process.pid, environment: 'staging' };
+
+  interval = setInterval(() => {
+    requestCounter.bind(labels).add(1);
+    upDownCounter.bind(labels).add(Math.random() > 0.5 ? 1 : -1);
+  }, 1000);
+}
+
+const addClickEvents = () => {
+  const startBtn = document.getElementById('startBtn');
+  const stopBtn = document.getElementById('stopBtn');
+  startBtn.addEventListener('click', startMetrics);
+  stopBtn.addEventListener('click', stopMetrics);
+};
+
+window.addEventListener('load', addClickEvents);
diff --git a/examples/tracer-web/package.json b/examples/tracer-web/package.json
@@ -37,9 +37,10 @@
     "@opentelemetry/context-zone": "^0.10.2",
     "@opentelemetry/core": "^0.10.2",
     "@opentelemetry/exporter-collector": "^0.10.2",
-    "@opentelemetry/plugin-document-load": "^0.6.1",
+    "@opentelemetry/metrics": "^0.10.2",
+    "@opentelemetry/plugin-document-load": "^0.9.0",
     "@opentelemetry/plugin-fetch": "^0.10.2",
-    "@opentelemetry/plugin-user-interaction": "^0.6.1",
+    "@opentelemetry/plugin-user-interaction": "^0.9.0",
     "@opentelemetry/plugin-xml-http-request": "^0.10.2",
     "@opentelemetry/tracing": "^0.10.2",
     "@opentelemetry/web": "^0.10.2"

diff --git a/examples/tracer-web/webpack.config.js b/examples/tracer-web/webpack.config.js
@@ -8,6 +8,7 @@ const common = {
   mode: 'development',
   entry: {
     'document-load': 'examples/document-load/index.js',
+    metrics: 'examples/metrics/index.js',
     fetch: 'examples/fetch/index.js',
     'xml-http-request': 'examples/xml-http-request/index.js',
     'user-interaction': 'examples/user-interaction/index.js',

diff --git a/packages/opentelemetry-exporter-collector-grpc/.eslintignore b/packages/opentelemetry-exporter-collector-grpc/.eslintignore
@@ -0,0 +1 @@
+build
diff --git a/packages/opentelemetry-exporter-collector-grpc/.eslintrc.js b/packages/opentelemetry-exporter-collector-grpc/.eslintrc.js
@@ -0,0 +1,8 @@
+module.exports = {
+    "env": {
+        "mocha": true,
+        "commonjs": true,
+        "node": true,
+    },
+    ...require('../../eslint.config.js')
+}
diff --git a/packages/opentelemetry-exporter-collector-grpc/.npmignore b/packages/opentelemetry-exporter-collector-grpc/.npmignore
@@ -0,0 +1,4 @@
+/bin
+/coverage
+/doc
+/test
diff --git a/packages/opentelemetry-exporter-collector-grpc/LICENSE b/packages/opentelemetry-exporter-collector-grpc/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,3 +78,7 @@ package.json.lerna_backup @@
     # VsCode configs
     .vscode/
+    #IDEA
+    .idea
+    *.iml