From 770820e9344508886a4d0d603576c0d4dfa0a589 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 3 Aug 2021 09:31:35 -0700 Subject: [PATCH 1/3] update OTLP/HTTP port to 4318 --- .../exporter/otlp/proto/http/trace_exporter/__init__.py | 2 +- tests/opentelemetry-docker-tests/tests/docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/trace_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/trace_exporter/__init__.py index 061484d0e38..daf025b78d7 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/trace_exporter/__init__.py +++ b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/trace_exporter/__init__.py @@ -46,7 +46,7 @@ DEFAULT_COMPRESSION = Compression.NoCompression -DEFAULT_ENDPOINT = "http://localhost:55681/v1/traces" +DEFAULT_ENDPOINT = "http://localhost:4318/v1/traces" DEFAULT_TIMEOUT = 10 # in seconds diff --git a/tests/opentelemetry-docker-tests/tests/docker-compose.yml b/tests/opentelemetry-docker-tests/tests/docker-compose.yml index b1cd2d6e1fe..552456f8dbf 100644 --- a/tests/opentelemetry-docker-tests/tests/docker-compose.yml +++ b/tests/opentelemetry-docker-tests/tests/docker-compose.yml @@ -8,7 +8,7 @@ services: - "8888:8888" - "55678:55678" otcollector: - image: otel/opentelemetry-collector:0.22.0 + image: otel/opentelemetry-collector:0.32.0 ports: - "4317:4317" - - "55681:55681" + - "4318:4318" From 732daedc9623b6733cbdee207f55cc2464cab2cd Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 3 Aug 2021 09:44:23 -0700 Subject: [PATCH 2/3] map 4318->55681 in the collector for now --- CHANGELOG.md | 2 ++ tests/opentelemetry-docker-tests/tests/docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6e35414c80..5d9b46b9f0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#2071](https://github.com/open-telemetry/opentelemetry-python/pull/2071)) - Do not skip sequence attribute on decode error ([#2097](https://github.com/open-telemetry/opentelemetry-python/pull/2097)) +- `opentelemetry-exporter-otlp-proto-http` default port changed to 4318 to follow specification. + ([#2016](https://github.com/open-telemetry/opentelemetry-python/pull/2016)) ## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-26 diff --git a/tests/opentelemetry-docker-tests/tests/docker-compose.yml b/tests/opentelemetry-docker-tests/tests/docker-compose.yml index 552456f8dbf..3f74827156a 100644 --- a/tests/opentelemetry-docker-tests/tests/docker-compose.yml +++ b/tests/opentelemetry-docker-tests/tests/docker-compose.yml @@ -8,7 +8,7 @@ services: - "8888:8888" - "55678:55678" otcollector: - image: otel/opentelemetry-collector:0.32.0 + image: otel/opentelemetry-collector:0.31.0 ports: - "4317:4317" - - "4318:4318" + - "4318:55681" From 4741e4267d6255066402723fc18f7a7f6be9dd68 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Wed, 6 Oct 2021 08:26:26 -0700 Subject: [PATCH 3/3] update development status --- exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg index 38b82f42656..9ea3711965e 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg +++ b/exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg @@ -23,7 +23,7 @@ url = https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/ platforms = any license = Apache-2.0 classifiers = - Development Status :: 4 - Beta + Development Status :: 5 - Production/Stable Intended Audience :: Developers License :: OSI Approved :: Apache Software License Programming Language :: Python