Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Opentracing bridge #108

Closed
wants to merge 45 commits into from
Closed
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
2d91407
Stub out opentracingshim
rdooley Sep 18, 2019
36b34d2
Stub out the actual shims that are needed
rdooley Sep 18, 2019
87d3ed4
Some best guesses at shim logic
rdooley Sep 18, 2019
7d5b305
Snake case rename and test touch
rdooley Sep 24, 2019
40fada3
Stub things to test
rdooley Sep 24, 2019
0398643
Misname in travis.yml
rdooley Sep 24, 2019
5db6662
Flesh out span shim test
rdooley Sep 24, 2019
2616506
Merge branch 'master' of https://github.com/Shopify/opentelemetry-rub…
rdooley Sep 25, 2019
4598121
More tests w/ mocks
rdooley Sep 25, 2019
e8baa74
actual inherit
rdooley Sep 25, 2019
89e9279
Bad no good workaround for not realling installing the shim
rdooley Sep 25, 2019
fc4c48f
Rename from shim to bridge
rdooley Sep 26, 2019
1f58a52
In which I rename things and namespace
rdooley Sep 26, 2019
6ff44ea
Intro to namespacing, subclass removal and more
rdooley Sep 30, 2019
3c610af
Implement scope manager as managing a stack of scopes
rdooley Oct 1, 2019
3edb7ef
Some install and travis CI fixes from jaeger branch
rdooley Oct 2, 2019
d860871
Rm lockfile and flesh out log, log_kv methods
rdooley Oct 2, 2019
8ca8cf9
Start_*_span updates based on PR feedback
rdooley Oct 2, 2019
0eea683
Remove block expectations from Tracing bridge extract/inject
rdooley Oct 2, 2019
80386e1
Add baggage to span/span_context in opentelemetry bridge
rdooley Oct 2, 2019
1de936e
Change start*_span methods to return block's return value if block given
rdooley Oct 3, 2019
3059b6b
Merge branch 'master' of https://github.com/Shopify/opentelemetry-rub…
rdooley Oct 10, 2019
aed4901
Merge branch 'master' of https://github.com/Shopify/opentelemetry-rub…
rdooley Nov 11, 2019
2916df5
Enable circleci for opentracing bridge
rdooley Nov 11, 2019
6f696ca
Should? build on circle CI now. The slow updating to HEAD continues
rdooley Nov 11, 2019
b4d75fc
Merge branch 'master' of https://github.com/Shopify/opentelemetry-rub…
rdooley Nov 21, 2019
730ea95
Back to where i was
rdooley Nov 21, 2019
75447bb
all but binary inject/extract
rdooley Nov 25, 2019
9f354d9
And Binary
rdooley Nov 25, 2019
0da7adf
Merge branch 'master' of https://github.com/Shopify/opentelemetry-rub…
rdooley Feb 3, 2020
dd231e2
Checking in for myself
rdooley Feb 4, 2020
6138bcd
Ah rubocop I have missed you
rdooley Feb 4, 2020
5fef7b7
Wrapping OtelSpans coming out of the tracer bridge (many TODO no judge)
rdooley Feb 5, 2020
d16bde2
Still more TODO but uh now tracer context passing tests
rdooley Feb 5, 2020
aaed300
And test when parent is Otrace bridge span as well
rdooley Feb 5, 2020
b3d9dda
Add reference to otracing bridge
rdooley Feb 5, 2020
acda8a5
Reorder circleCI for jruby
rdooley Feb 5, 2020
bda9ca5
Scope manager singleton
rdooley Feb 7, 2020
d671c5f
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
rdooley Feb 7, 2020
c9e590c
Intermediate check in, inject for rack/http still busted atm
rdooley Feb 10, 2020
cce9cc0
Ok this is unused, feel free to correct me mwear
rdooley Feb 10, 2020
ad97e52
In which our developer realizes his simple mistake and corrects it
rdooley Feb 10, 2020
a7fc06a
Switch to convenience methods for the link::ref dichotomy?juxtapositi…
rdooley Feb 10, 2020
ba5a240
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
rdooley Mar 10, 2020
4070229
Working on the OT bridge tracer
rdooley Mar 11, 2020
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
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ env:
matrix:
- TEST_DIR=api
- TEST_DIR=sdk
- TEST_DIR=bridges/opentracing
rvm:
- 2.4
- 2.5
Expand All @@ -13,4 +14,4 @@ rvm:
- truffleruby

install: ( cd api && bundle install --jobs=3 --retry=3 )
script: ( cd $TEST_DIR && rake )
script: ( if [ $TEST_DIR=='bridges/opentracing' ]; then gem install opentracing -v 0.5.0; fi && cd $TEST_DIR && rake )
rdooley marked this conversation as resolved.
Show resolved Hide resolved
13 changes: 13 additions & 0 deletions bridges/opentracing/.rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
AllCops:
TargetRubyVersion: '2.4.0'

Metrics/LineLength:
Enabled: false
Metrics/ParameterLists:
Enabled: false
Metrics/MethodLength:
Max: 20
Style/ModuleFunction:
Enabled: false
Lint/UnusedMethodArgument:
Enabled: false
9 changes: 9 additions & 0 deletions bridges/opentracing/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true

# Copyright 2019 OpenTelemetry Authors
#
# SPDX-License-Identifier: Apache-2.0

source 'https://rubygems.org'

gemspec
201 changes: 201 additions & 0 deletions bridges/opentracing/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
39 changes: 39 additions & 0 deletions bridges/opentracing/Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# frozen_string_literal: true

# Copyright 2019 OpenTelemetry Authors
#
# SPDX-License-Identifier: Apache-2.0

require 'bundler/gem_tasks'
require 'rake/testtask'
require 'yard'

require 'rubocop/rake_task'
RuboCop::RakeTask.new

Rake::TestTask.new :test do |t|
t.libs << 'test'
t.libs << 'lib'
t.libs << '../../api/lib'
t.test_files = FileList['test/**/*_test.rb']
end

YARD::Rake::YardocTask.new do |t|
files = Dir.glob('./lib/**/*.rb')

# Move ./lib/opentelemetry/bridge/opentracing.rb to the end of the array.
# Otherwise other files will overwrite the OpenTelemetryBridge module
# comments with the license information.
ots_index = files.index('./lib/opentelemetry/bridge/opentracing.rb')
files = files.insert(-1, files.delete_at(ots_index))

t.files = files # optional
t.options = ['--output-dir', 'docs/opentracingbridge'] # optional
t.stats_options = ['--list-undoc'] # optional
end

if RUBY_ENGINE == 'truffleruby'
task default: %i[test]
else
task default: %i[test rubocop yard]
end
27 changes: 27 additions & 0 deletions bridges/opentracing/lib/opentelemetry/bridge/opentracing.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# frozen_string_literal: true

# Copyright 2019 OpenTelemetry Authors
#
# SPDX-License-Identifier: Apache-2.0

require 'opentracing'
require 'opentelemetry'

module OpenTelemetry
module Bridge
# OpenTracing Bridge provides a means of converting
# from OpenTelemetry to OpenTracing objects
OT = OpenTracing
rdooley marked this conversation as resolved.
Show resolved Hide resolved
module OpenTracing
FORMAT_TEXT_MAP = OT::FORMAT_TEXT_MAP
FORMAT_RACK = OT::FORMAT_RACK
rdooley marked this conversation as resolved.
Show resolved Hide resolved
end
end
end

require 'opentelemetry/bridge/opentracing/scope_manager'
require 'opentelemetry/bridge/opentracing/scope'
require 'opentelemetry/bridge/opentracing/span_context'
require 'opentelemetry/bridge/opentracing/span'
require 'opentelemetry/bridge/opentracing/tracer'
require 'opentelemetry/bridge/opentracing/version'
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# frozen_string_literal: true

# Copyright 2019 OpenTelemetry Authors
#
# SPDX-License-Identifier: Apache-2.0

module OpenTelemetry
module Bridge
module OpenTracing
# Scope provides a means of referencing an OTelemetry Tracer's Context as
# an OTracing scope
class Scope < OT::Scope
def initialize(tracer = nil)
@tracer = tracer || OpenTelemetry::Trace::Tracer.new
end

def span
@tracer.current_span
end

def close
@tracer.current_span.finish
end
end
rdooley marked this conversation as resolved.
Show resolved Hide resolved
end
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# frozen_string_literal: true

# Copyright 2019 OpenTelemetry Authors
#
# SPDX-License-Identifier: Apache-2.0

module OpenTelemetry
module Bridge
module OpenTracing
# A ScopeManager provides an API for interfacing with
# OpenTelemetry Tracers and Spans as OpenTracing objects
class ScopeManager < OT::ScopeManager
def initialize(tracer)
@tracer = tracer
end

# Activate the given span
#
# @param [Span] span An OpenTelemetry Span
rdooley marked this conversation as resolved.
Show resolved Hide resolved
# @return [Span]
rdooley marked this conversation as resolved.
Show resolved Hide resolved
def activate(span, finish_on_close: true)
Span.new(@tracer.with_span(span))
rdooley marked this conversation as resolved.
Show resolved Hide resolved
end

# Get the active span as a OpenTracingBridge::Span
#
# @return [Span]
def active
Span.new(@tracer.current_span)
rdooley marked this conversation as resolved.
Show resolved Hide resolved
end
end
end
end
end
Loading