From 7312f033999f95f023659d12245a625b5b5ef639 Mon Sep 17 00:00:00 2001 From: Olivier Albertini Date: Fri, 30 Aug 2019 16:06:00 -0400 Subject: [PATCH] fix: case issues and test executed in ci env --- .../src/enums/AttributeNames.ts | 34 ------------------- .../src/enums/Format.ts | 19 ----------- .../src/enums/attributeNames.ts | 34 ------------------- .../src/enums/format.ts | 19 ----------- .../test/integrations/http-enable.test.ts | 1 + 5 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 packages/opentelemetry-plugin-http/src/enums/AttributeNames.ts delete mode 100644 packages/opentelemetry-plugin-http/src/enums/Format.ts delete mode 100644 packages/opentelemetry-plugin-http/src/enums/attributeNames.ts delete mode 100644 packages/opentelemetry-plugin-http/src/enums/format.ts diff --git a/packages/opentelemetry-plugin-http/src/enums/AttributeNames.ts b/packages/opentelemetry-plugin-http/src/enums/AttributeNames.ts deleted file mode 100644 index 277dbf1776a..00000000000 --- a/packages/opentelemetry-plugin-http/src/enums/AttributeNames.ts +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright 2019, OpenTelemetry Authors - * - * 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 - * - * https://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. - */ - -/** - * Attributes Names according to Opencensus HTTP Specs since there is no specific OpenTelemetry Attributes - * https://github.com/open-telemetry/opentelemetry-specification/blob/master/work_in_progress/opencensus/HTTP.md#attributes - */ -export enum AttributeNames { - HTTP_HOSTNAME = 'http.hostname', - COMPONENT = 'component', - HTTP_METHOD = 'http.method', - HTTP_PATH = 'http.path', - HTTP_ROUTE = 'http.route', - HTTP_URL = 'http.url', - HTTP_STATUS_CODE = 'http.status_code', - HTTP_STATUS_TEXT = 'http.status_text', - // NOT ON OFFICIAL SPEC - HTTP_ERROR_NAME = 'http.error_name', - HTTP_ERROR_MESSAGE = 'http.error_message', - HTTP_USER_AGENT = 'http.user_agent', -} diff --git a/packages/opentelemetry-plugin-http/src/enums/Format.ts b/packages/opentelemetry-plugin-http/src/enums/Format.ts deleted file mode 100644 index 66826b5da67..00000000000 --- a/packages/opentelemetry-plugin-http/src/enums/Format.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright 2019, OpenTelemetry Authors - * - * 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 - * - * https://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. - */ - -export enum Format { - HTTP = 'HttpTraceContext', -} diff --git a/packages/opentelemetry-plugin-http/src/enums/attributeNames.ts b/packages/opentelemetry-plugin-http/src/enums/attributeNames.ts deleted file mode 100644 index 277dbf1776a..00000000000 --- a/packages/opentelemetry-plugin-http/src/enums/attributeNames.ts +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright 2019, OpenTelemetry Authors - * - * 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 - * - * https://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. - */ - -/** - * Attributes Names according to Opencensus HTTP Specs since there is no specific OpenTelemetry Attributes - * https://github.com/open-telemetry/opentelemetry-specification/blob/master/work_in_progress/opencensus/HTTP.md#attributes - */ -export enum AttributeNames { - HTTP_HOSTNAME = 'http.hostname', - COMPONENT = 'component', - HTTP_METHOD = 'http.method', - HTTP_PATH = 'http.path', - HTTP_ROUTE = 'http.route', - HTTP_URL = 'http.url', - HTTP_STATUS_CODE = 'http.status_code', - HTTP_STATUS_TEXT = 'http.status_text', - // NOT ON OFFICIAL SPEC - HTTP_ERROR_NAME = 'http.error_name', - HTTP_ERROR_MESSAGE = 'http.error_message', - HTTP_USER_AGENT = 'http.user_agent', -} diff --git a/packages/opentelemetry-plugin-http/src/enums/format.ts b/packages/opentelemetry-plugin-http/src/enums/format.ts deleted file mode 100644 index 66826b5da67..00000000000 --- a/packages/opentelemetry-plugin-http/src/enums/format.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright 2019, OpenTelemetry Authors - * - * 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 - * - * https://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. - */ - -export enum Format { - HTTP = 'HttpTraceContext', -} diff --git a/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts b/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts index f2e9b635ca2..5a5f3ec1179 100644 --- a/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts +++ b/packages/opentelemetry-plugin-http/test/integrations/http-enable.test.ts @@ -41,6 +41,7 @@ describe('HttpPlugin Integration tests', () => { before(function(done) { // mandatory if (process.env.CI) { + done(); return; }