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

improvements for PR #1 #2

Merged
merged 53 commits into from
Aug 31, 2016
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
e6392b6
Initial commit
dawallin May 26, 2016
26ce53e
Changed License to MIT
dawallin May 26, 2016
05e3379
.gitignore for visual studio project
dawallin May 26, 2016
5a7a752
Readme file added.
dawallin May 26, 2016
1a956bc
OpenTracing initial commit
dawallin May 26, 2016
e096e40
BasicTracer initial commit
dawallin May 26, 2016
f80f893
HttpClientCarrair initial commit
dawallin May 26, 2016
c2df056
Build status in readme
dawallin May 26, 2016
e0939a1
Removed SpanFactory
dawallin May 30, 2016
a5334d4
Removed SpanRecorder
dawallin May 30, 2016
9571514
Renamed BasicTracerContext to OpenTracingSpanContext (from BasicSpanC…
dawallin May 31, 2016
b90961a
Moved Tracer and Span implementations to BasicTracer (from OpenTracin…
dawallin May 31, 2016
d570a6a
Removed leaking context in StartSpanOptions.Parent.
dawallin May 31, 2016
b4387e5
Moved the OpenTracing Tracer and Span to root namespace.
dawallin Jun 1, 2016
6b0eb32
Moved the BasicTracer Tracer and Span to root namespace
dawallin Jun 1, 2016
8ff3c6c
Fixed unit test name (from copy paste typo error).
dawallin Jun 1, 2016
583e0df
Changed assembly name to simply OpenTracing.dll
dawallin Jun 2, 2016
668dfd4
Nuspec:s for OpenTracing and BasicTracer
dawallin Jun 2, 2016
af55c33
Clean up some namespaces.
dawallin Jun 2, 2016
5d4c4b9
Removed many generic type constraints on interfaces not needed.
dawallin Jun 4, 2016
68e7316
Moved TracerBuilder to BasicTracer
dawallin Jun 4, 2016
72a26c4
Moved SpanContext interfaces out from OpenTracing into BasicTracer.
dawallin Jun 4, 2016
2951da2
Simplified ContextMapper and removed TextMapFormat
dawallin Jun 5, 2016
97de99e
Merge branch 'InitialPR' into master
dawallin Jun 6, 2016
6656848
build script; rename to src (to better follow new Microsoft repos)
cwe1ss Aug 20, 2016
c253d97
since parent folder is now called "src", library folder can be "OpenT…
cwe1ss Aug 20, 2016
7189a71
nuget.exe not necessary with dotnet cli
cwe1ss Aug 20, 2016
094de2c
converted netstandard
cwe1ss Aug 20, 2016
435216f
refactoring
cwe1ss Aug 20, 2016
1e2352d
refactoring
cwe1ss Aug 20, 2016
ce43aa5
abstract base class for Span, singleton for NullTracer
cwe1ss Aug 20, 2016
d2d8ea8
SetTag now accepts an object
cwe1ss Aug 20, 2016
3f573ca
built-in tags are now regular ISpan extensions; BasicTracer compiles
cwe1ss Aug 21, 2016
705dec5
API refinements
cwe1ss Aug 21, 2016
1e6e7e2
tests succeed
cwe1ss Aug 21, 2016
ab72020
separate files for interfaces
cwe1ss Aug 21, 2016
62a4bdc
move tests to test folder
cwe1ss Aug 21, 2016
e532779
renamed IntegrationTests project to just tests
cwe1ss Aug 21, 2016
3f4c0b3
moved baggage dictionary into its own class
cwe1ss Aug 21, 2016
65885ee
removed SpanContext.GetBaggageItems() from interface
cwe1ss Aug 21, 2016
b79bb3c
naming etc
cwe1ss Aug 21, 2016
dc9c8fd
visual studio files
cwe1ss Aug 21, 2016
a29b4bd
stuff that accepts ISpanContext now also accepts ISpan
cwe1ss Aug 21, 2016
317f958
accidentally commited sample code; fixed powershell warnings
cwe1ss Aug 21, 2016
5db8b2d
PoC for AspNetCore integration
cwe1ss Aug 21, 2016
e052b65
big refactoring after gitter discussion; docs
cwe1ss Aug 23, 2016
5ea4551
renamed Log() to LogEvent() as of https://github.com/opentracing/open…
cwe1ss Aug 23, 2016
7d2cca2
TODOs
cwe1ss Aug 23, 2016
d39266a
removed get/setBaggageItem from SpanContext - as of opentracing.githu…
cwe1ss Aug 24, 2016
f4f1488
SpanBuilder from @dawallin
cwe1ss Aug 24, 2016
8c25747
SetOperationName(), BasicTracer: removed baggage key restrictions
cwe1ss Aug 29, 2016
e9c8ae8
Format/Carrier now almost equal to Java implementation
cwe1ss Aug 29, 2016
f55fdd6
AspNetCore is now in a separate branch - will move to a different rep…
cwe1ss Aug 29, 2016
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
63 changes: 63 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
252 changes: 252 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml
Empty file added Implementation.md
Empty file.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2016 The OpenTracing Authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
7 changes: 7 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

meta-comment: I'm just trusting you on what should be .gitignored and what shouldn't be...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NuGet is the .NET package manager (like NPM for node). This file defines which servers should be included for the package restore project.

As long as the file only contains this one default endpoint, it would not be necessary. But I like having it in the repo because it also has an explicit "clear" statement. This means, the repo still takes the default server, even if someone has a machine-level override.

<configuration>
<packageSources>
<clear />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
Loading