Skip to content
This repository was archived by the owner on Oct 13, 2021. It is now read-only.

otel-trace-py implementation #3

Merged
merged 11 commits into from
Nov 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
92 changes: 9 additions & 83 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,35 +99,6 @@ jobs:
- *persist_to_workspace_step
- *save_cache_step

opentracer:
docker:
- *test_runner
resource_class: *resource_class
steps:
- checkout
- *restore_cache_step
- run: scripts/run-tox-scenario '^py..-opentracer'
- *persist_to_workspace_step
- *save_cache_step

integration:
docker:
- <<: *test_runner
env:
TEST_DATADOG_INTEGRATION: 1
- image: datadog/docker-dd-agent
env:
- DD_APM_ENABLED=true
- DD_BIND_HOST=0.0.0.0
- DD_API_KEY=invalid_key_but_this_is_fine
resource_class: *resource_class
steps:
- checkout
- *restore_cache_step
- run: scripts/run-tox-scenario '^py..-integration$'
- *persist_to_workspace_step
- *save_cache_step

futures:
docker:
- *test_runner
Expand All @@ -150,14 +121,14 @@ jobs:
- *persist_to_workspace_step
- *save_cache_step

ddtracerun:
oteltracerun:
docker:
- *test_runner
- image: redis:4.0-alpine
resource_class: *resource_class
steps:
- checkout
- run: scripts/run-tox-scenario '^py..-ddtracerun$'
- run: scripts/run-tox-scenario '^py..-oteltracerun$'
- *persist_to_workspace_step

test_utils:
Expand Down Expand Up @@ -193,17 +164,6 @@ jobs:
- *persist_to_workspace_step
- *save_cache_step

pylons:
docker:
- *test_runner
resource_class: *resource_class
steps:
- checkout
- *restore_cache_step
- run: scripts/run-tox-scenario '^pylons_contrib-'
- *persist_to_workspace_step
- *save_cache_step

aiohttp:
docker:
- *test_runner
Expand Down Expand Up @@ -298,7 +258,7 @@ jobs:
steps:
- checkout
- *restore_cache_step
- run: tox -e 'falcon_contrib{,_autopatch}-{py27,py34,py35,py36}-falcon{10,11,12,13,14}' --result-json /tmp/falcon.results
- run: tox -e 'falcon_contrib{,_autopatch}-{py34,py35,py36}-falcon{10,11,12,13,14}' --result-json /tmp/falcon.results
- *persist_to_workspace_step
- *save_cache_step

Expand All @@ -309,9 +269,9 @@ jobs:
- image: memcached:1.5-alpine
- image: datadog/docker-dd-agent
env:
- DD_APM_ENABLED=true
- DD_BIND_HOST=0.0.0.0
- DD_API_KEY=invalid_key_but_this_is_fine
- OTEL_APM_ENABLED=true
- OTEL_BIND_HOST=0.0.0.0
- OTEL_API_KEY=invalid_key_but_this_is_fine
resource_class: *resource_class
steps:
- checkout
Expand Down Expand Up @@ -413,24 +373,6 @@ jobs:
- *persist_to_workspace_step
- *save_cache_step

mysqldb:
docker:
- *test_runner
- image: mysql:5.7
env:
- MYSQL_ROOT_PASSWORD=admin
- MYSQL_PASSWORD=test
- MYSQL_USER=test
- MYSQL_DATABASE=test
resource_class: *resource_class
steps:
- checkout
- *restore_cache_step
- run: tox -e 'wait' mysql
- run: scripts/run-tox-scenario '^mysqldb_contrib-.*-mysqldb'
- *persist_to_workspace_step
- *save_cache_step

pymysql:
docker:
- *test_runner
Expand Down Expand Up @@ -700,7 +642,7 @@ jobs:
- run:
command: |
mkdir -p /tmp/test-reports
tox -e 'benchmarks-{py27,py34,py35,py36,py37}' --result-json /tmp/benchmarks.results -- --benchmark-storage=file:///tmp/test-reports/ --benchmark-autosave
tox -e 'benchmarks-{py34,py35,py36,py37}' --result-json /tmp/benchmarks.results -- --benchmark-storage=file:///tmp/test-reports/ --benchmark-autosave
- store_test_results:
path: /tmp/test-reports
- store_artifacts:
Expand Down Expand Up @@ -860,7 +802,7 @@ workflows:
- dbapi:
requires:
- flake8
- ddtracerun:
- oteltracerun:
requires:
- flake8
- django:
Expand All @@ -887,9 +829,6 @@ workflows:
- httplib:
requires:
- flake8
- integration:
requires:
- flake8
- internal:
requires:
- flake8
Expand All @@ -911,24 +850,15 @@ workflows:
- mysqlconnector:
requires:
- flake8
- mysqldb:
requires:
- flake8
- mysqlpython:
requires:
- flake8
- opentracer:
requires:
- flake8
- psycopg:
requires:
- flake8
- pylibmc:
requires:
- flake8
- pylons:
requires:
- flake8
- pymemcache:
requires:
- flake8
Expand Down Expand Up @@ -997,7 +927,7 @@ workflows:
- celery
- consul
- dbapi
- ddtracerun
- oteltracerun
- django
- elasticsearch
- falcon
Expand All @@ -1006,20 +936,16 @@ workflows:
- gevent
- grpc
- httplib
- integration
- internal
- jinja2
- kombu
- mako
- molten
- mongoengine
- mysqlconnector
- mysqldb
- mysqlpython
- opentracer
- psycopg
- pylibmc
- pylons
- pymemcache
- pymongo
- pymysql
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# dd-trace-py
# otel-trace-py

[![CircleCI](https://circleci.com/gh/DataDog/dd-trace-py/tree/master.svg?style=svg)](https://circleci.com/gh/DataDog/dd-trace-py/tree/master)
[![Pyversions](https://img.shields.io/pypi/pyversions/ddtrace.svg?style=flat)](https://pypi.org/project/ddtrace/)
[![PypiVersions](https://img.shields.io/pypi/v/ddtrace.svg)](https://pypi.org/project/ddtrace/)
[![OpenTracing Badge](https://img.shields.io/badge/OpenTracing-enabled-blue.svg)](http://pypi.datadoghq.com/trace/docs/installation_quickstart.html#opentracing)
[![CircleCI](https://circleci.com/gh/DataDog/otel-trace-py/tree/master.svg?style=svg)](https://circleci.com/gh/DataDog/otel-trace-py/tree/master)
[![Pyversions](https://img.shields.io/pypi/pyversions/oteltrace.svg?style=flat)](https://pypi.org/project/oteltrace/)
[![PypiVersions](https://img.shields.io/pypi/v/oteltrace.svg)](https://pypi.org/project/oteltrace/)

`ddtrace` is Datadog's tracing library for Python. It is used to trace requests
`oteltrace` is OpenTelemetry's tracing library for Python. It is used to trace requests
as they flow across web servers, databases and microservices so that developers
have great visiblity into bottlenecks and troublesome requests.

Expand Down
12 changes: 6 additions & 6 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@ namespace :pypi do
end

task :confirm do
ddtrace_version = get_version
oteltrace_version = get_version

if get_branch.downcase != 'tags/v#{ddtrace_version}'
print "WARNING: Expected current commit to be tagged as 'tags/v#{ddtrace_version}, instead we are on '#{get_branch}', proceed anyways [y|N]? "
if get_branch.downcase != 'tags/v#{oteltrace_version}'
print "WARNING: Expected current commit to be tagged as 'tags/v#{oteltrace_version}, instead we are on '#{get_branch}', proceed anyways [y|N]? "
$stdout.flush

abort if $stdin.gets.to_s.strip.downcase != 'y'
end

puts "WARNING: This task will build and release new wheels to https://pypi.org/project/ddtrace/, this action cannot be undone"
print " To proceed please type the version '#{ddtrace_version}': "
puts "WARNING: This task will build and release new wheels to https://pypi.org/project/oteltrace/, this action cannot be undone"
print " To proceed please type the version '#{oteltrace_version}': "
$stdout.flush

abort if $stdin.gets.to_s.strip.downcase != ddtrace_version
abort if $stdin.gets.to_s.strip.downcase != oteltrace_version
end

task :clean do
Expand Down
Loading