Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
32d7962
chore: updating submodule for opentelemetry-proto
Sep 21, 2021
f9972c8
chore: initialized exporter-metrics-otlp-grpc package
Sep 21, 2021
9685772
feat\!: populated exporter-metrics-otlp-grpc package
Sep 21, 2021
007970c
chore: bootstrapped exporter-metrics-otlp-http package
Sep 21, 2021
9618274
feat\!: migrated metric exporter logic to exporter-metrics-otlp-http
Sep 21, 2021
d2ecae0
chore: updating submodule for opentelemetry-proto
Sep 21, 2021
07b43bf
chore: bootstrapped exporter-metrics-otlp-proto package
Sep 21, 2021
5ac7d7b
feat!: migrated proto logic to exporter-metrics-otlp-proto package
Sep 21, 2021
308cfe3
fix: fixed some issues in grpc and proto
Sep 22, 2021
16e7a95
removed debug logging
Sep 22, 2021
c50cada
added api to devdeps
Sep 22, 2021
e5ed763
merge branch 'main' into split-exporters
Sep 29, 2021
0751815
fixed imports
Sep 29, 2021
b886cb9
merge 'main' into split-exporters
Oct 5, 2021
211fa12
updated versions to latest
Oct 5, 2021
9140258
fixed merge conflicts
Oct 26, 2021
8b3571f
applied changes from #2496 to metricHelpers
Oct 26, 2021
752463e
renamed exporter-otlp-http -> exporter-trace-otlp-http
Oct 26, 2021
c4aa74a
renamed exporter-otlp-grpc -> exporter-trace-otlp-grpc
Oct 26, 2021
3e7daf4
renamed exporter-otlp-proto -> exporter-trace-otlp-proto
Oct 26, 2021
44de3a7
Merge branch 'main' into split-exporters
dyladan Oct 26, 2021
8eccf90
Merge branch 'main' into split-exporters
vmarchaud Oct 27, 2021
2992e5c
fix conflicts and bump api version
Oct 28, 2021
81891ec
Merge branch 'split-exporters' of https://github.com/willarmiros/open…
Oct 28, 2021
353d038
Merge branch 'main' into split-exporters
dyladan Nov 1, 2021
e068039
Merge branch 'main' into split-exporters
rauno56 Nov 2, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
renamed exporter-otlp-grpc -> exporter-trace-otlp-grpc
  • Loading branch information
William Armiros committed Oct 26, 2021
commit c4aa74afb1193669de185de8bad64912dfb723c7
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "experimental/packages/opentelemetry-exporter-otlp-proto/protos"]
path = experimental/packages/opentelemetry-exporter-otlp-proto/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
[submodule "experimental/packages/opentelemetry-exporter-otlp-grpc/protos"]
path = experimental/packages/opentelemetry-exporter-otlp-grpc/protos
[submodule "experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos"]
path = experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos
url = https://github.com/open-telemetry/opentelemetry-proto.git
[submodule "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos"]
path = experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-metrics-otlp-grpc.svg
[opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector
[semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service
[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-otlp-grpc
[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-trace-otlp-grpc
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"@opentelemetry/core": "1.0.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.26.0",
"@opentelemetry/exporter-trace-otlp-http": "0.26.0",
"@opentelemetry/exporter-otlp-grpc": "0.26.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.26.0",
"@opentelemetry/sdk-metrics-base": "0.26.0",
"@opentelemetry/resources": "1.0.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
OTLPExporterNodeBase,
ServiceClientType,
validateAndNormalizeUrl
} from '@opentelemetry/exporter-otlp-grpc';
} from '@opentelemetry/exporter-trace-otlp-grpc';
import { baggageUtils, getEnv } from '@opentelemetry/core';
import { Metadata } from '@grpc/grpc-js';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This module provides exporter for web and node to be used with [opentelemetry-co
## Installation

```bash
npm install --save @opentelemetry/exporter-otlp-grpc
npm install --save @opentelemetry/exporter-trace-otlp-grpc
```

## Service Name
Expand All @@ -25,7 +25,7 @@ The OTLPTraceExporter in Node expects the URL to only be the hostname. It will n

```js
const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { OTLPTraceExporter } = require('@opentelemetry/exporter-otlp-grpc');
const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-grpc');

const collectorOptions = {
// url is optional and can be omitted - default is grpc://localhost:4317
Expand All @@ -49,7 +49,7 @@ const fs = require('fs');
const grpc = require('@grpc/grpc-js');

const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { OTLPTraceExporter } = require('@opentelemetry/exporter-otlp-grpc');
const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-grpc');

const collectorOptions = {
// url is optional and can be omitted - default is grpc://localhost:4317
Expand Down Expand Up @@ -85,7 +85,7 @@ The exporter can be configured to send custom metadata with each request as in t
const grpc = require('@grpc/grpc-js');

const { BasicTracerProvider, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { OTLPTraceExporter } = require('@opentelemetry/exporter-otlp-grpc');
const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-grpc');

const metadata = new grpc.Metadata();
// For instance, an API key or access token might go here.
Expand Down Expand Up @@ -128,11 +128,11 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
[discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions
[license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE
[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-otlp-grpc
[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-otlp-grpc
[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-otlp-grpc&type=dev
[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-otlp-grpc&type=dev
[npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-otlp-grpc
[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-trace-otlp-grpc
[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-trace-otlp-grpc
[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-trace-otlp-grpc&type=dev
[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-trace-otlp-grpc&type=dev
[npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-trace-otlp-grpc
[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-otlp-grpc.svg
[opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector
[semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@opentelemetry/exporter-otlp-grpc",
"name": "@opentelemetry/exporter-trace-otlp-grpc",
"version": "0.26.0",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-trace-otlp-http&type=dev
[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-trace-otlp-http&type=dev
[npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-trace-otlp-http
[npm-url-grpc]: https://www.npmjs.com/package/@opentelemetry/exporter-otlp-grpc
[npm-url-grpc]: https://www.npmjs.com/package/@opentelemetry/exporter-trace-otlp-grpc
[npm-url-proto]: https://www.npmjs.com/package/@opentelemetry/exporter-otlp-proto
[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-otlp-http.svg
[opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion experimental/tsconfig.esm.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"path": "packages/opentelemetry-api-metrics/tsconfig.esm.json"
},
{
"path": "packages/opentelemetry-exporter-otlp-grpc"
"path": "packages/opentelemetry-exporter-trace-otlp-grpc"
},
{
"path": "packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json"
Expand Down
2 changes: 1 addition & 1 deletion experimental/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"path": "packages/opentelemetry-api-metrics"
},
{
"path": "packages/opentelemetry-exporter-otlp-grpc"
"path": "packages/opentelemetry-exporter-trace-otlp-grpc"
},
{
"path": "packages/opentelemetry-exporter-trace-otlp-http"
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"typedocOptions": {
"packages": [
"experimental/packages/opentelemetry-api-metrics",
"experimental/packages/opentelemetry-exporter-otlp-grpc",
"experimental/packages/opentelemetry-exporter-trace-otlp-grpc",
"experimental/packages/opentelemetry-exporter-trace-otlp-http",
"experimental/packages/opentelemetry-exporter-otlp-proto",
"experimental/packages/opentelemetry-exporter-prometheus",
Expand Down