Rename TraceSpan->Span, TraceContext->SpanContext (#51)

* Rename TraceSpan->Span, TraceContext->SpanContext

* Fix class provided by extension to add Ext namespace to avoid collision

* Rename classes provided by the extension

Author: chingor13

ext/README.md

@@ -198,14 +198,14 @@ opencensus_trace_finish();
 
 ### Retrieving span data
 
-Retrieve an array of collected spans. This returns an array of `OpenCensus\Trace\Span` instances. In general,
+Retrieve an array of collected spans. This returns an array of `OpenCensus\Trace\Ext\Span` instances. In general,
 you will do this at the end of the request. See the [PHP equivalent code](span.php).
 
 ```php
 /**
  * Retrieve the list of collected trace spans
  *
- * @return OpenCensus\Trace\Span[]
+ * @return OpenCensus\Trace\Ext\Span[]
  */
 function opencensus_trace_list();
 
@@ -221,13 +221,13 @@ function opencensus_trace_clear();
 
 As you create spans, your trace context is automatically maintained for you. Trace context consists of a `$traceId`
 and current `$spanId`. At any point, you can ask for the current trace context. This returns a
-`OpenCensus\Trace\Context` object. See the [PHP equivalent code](context.php).
+`OpenCensus\Trace\Ext\SpanContext` object. See the [PHP equivalent code](span_context.php).
 
 ```php
 /**
  * Fetch the current trace context
  *
- * @return OpenCensus\Trace\Context
+ * @return OpenCensus\Trace\Ext\SpanContext
  */
 function opencensus_trace_context();
 ```

ext/opencensus_trace.c

@@ -446,7 +446,7 @@ PHP_FUNCTION(opencensus_trace_set_context)
 /**
  * Return the current trace context
  *
- * @return OpenCensus\Trace\Context
+ * @return OpenCensus\Trace\SpanContext
  */
 PHP_FUNCTION(opencensus_trace_context)
 {

ext/opencensus_trace_context.c

@@ -15,7 +15,7 @@
  */
 
 /*
- * This is the implementation of the OpenCensus\Trace\Context class. The PHP
+ * This is the implementation of the OpenCensus\Trace\SpanContext class. The PHP
  * equivalent is:
  *
  * namespace OpenCensus\Trace;
@@ -52,7 +52,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_OpenCensusTraceContext_construct, 0, 0, 1)
 ZEND_END_ARG_INFO();
 
 /**
- * Initializer for OpenCensus\Trace\Context
+ * Initializer for OpenCensus\Trace\SpanContext
  *
  * @param array $contextOptions
  */
@@ -105,19 +105,19 @@ static PHP_METHOD(OpenCensusTraceContext, traceId) {
     RETURN_ZVAL(val, 1, 0);
 }
 
-/* Declare method entries for the OpenCensus\Trace\Context class */
+/* Declare method entries for the OpenCensus\Trace\SpanContext class */
 static zend_function_entry opencensus_trace_context_methods[] = {
     PHP_ME(OpenCensusTraceContext, __construct, arginfo_OpenCensusTraceContext_construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
     PHP_ME(OpenCensusTraceContext, spanId, NULL, ZEND_ACC_PUBLIC)
     PHP_ME(OpenCensusTraceContext, traceId, NULL, ZEND_ACC_PUBLIC)
     PHP_FE_END
 };
 
-/* Module init handler for registering the OpenCensus\Trace\Context class */
+/* Module init handler for registering the OpenCensus\Trace\SpanContext class */
 int opencensus_trace_context_minit(INIT_FUNC_ARGS) {
     zend_class_entry ce;
 
-    INIT_CLASS_ENTRY(ce, "OpenCensus\\Trace\\Context", opencensus_trace_context_methods);
+    INIT_CLASS_ENTRY(ce, "OpenCensus\\Trace\\Ext\\SpanContext", opencensus_trace_context_methods);
     opencensus_trace_context_ce = zend_register_internal_class(&ce);
 
     zend_declare_property_null(opencensus_trace_context_ce, "spanId", sizeof("spanId") - 1, ZEND_ACC_PROTECTED TSRMLS_CC);

ext/opencensus_trace_span.c

@@ -263,7 +263,7 @@ static zend_function_entry opencensus_trace_span_methods[] = {
 int opencensus_trace_span_minit(INIT_FUNC_ARGS) {
     zend_class_entry ce;
 
-    INIT_CLASS_ENTRY(ce, "OpenCensus\\Trace\\Span", opencensus_trace_span_methods);
+    INIT_CLASS_ENTRY(ce, "OpenCensus\\Trace\\Ext\\Span", opencensus_trace_span_methods);
     opencensus_trace_span_ce = zend_register_internal_class(&ce);
 
     zend_declare_property_string(

ext/span.php

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace OpenCensus\Trace;
+namespace OpenCensus\Trace\Ext;
 
 /**
  * This is the equivalent PHP class created by the opencensus C extension

ext/context.php ext/span_context.phpext/context.php renamed to ext/span_context.php

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-namespace OpenCensus\Trace;
+namespace OpenCensus\Trace\Ext;
 
 /**
  * This is the equivalent PHP class created by the opencensus C extension
  */
-class Context {
+class SpanContext {
     protected $traceId;
     protected $spanId;
 

ext/tests/basic_context.phpt

@@ -14,6 +14,6 @@ echo "Span id: {$context->spanId()}\n";
 ?>
 --EXPECT--
 Set context: 1
-Context class: OpenCensus\Trace\Context
+Context class: OpenCensus\Trace\Ext\SpanContext
 Trace id: traceid
 Span id: 1234

ext/tests/constants_test.phpt

@@ -3,11 +3,11 @@ OpenCensus Trace: Test Constants Defined
 --FILE--
 <?php
 
-var_dump(OpenCensus\Trace\Span::SPAN_KIND_UNKNOWN);
-var_dump(OpenCensus\Trace\Span::SPAN_KIND_CLIENT);
-var_dump(OpenCensus\Trace\Span::SPAN_KIND_SERVER);
-var_dump(OpenCensus\Trace\Span::SPAN_KIND_PRODUCER);
-var_dump(OpenCensus\Trace\Span::SPAN_KIND_CONSUMER);
+var_dump(OpenCensus\Trace\Ext\Span::SPAN_KIND_UNKNOWN);
+var_dump(OpenCensus\Trace\Ext\Span::SPAN_KIND_CLIENT);
+var_dump(OpenCensus\Trace\Ext\Span::SPAN_KIND_SERVER);
+var_dump(OpenCensus\Trace\Ext\Span::SPAN_KIND_PRODUCER);
+var_dump(OpenCensus\Trace\Ext\Span::SPAN_KIND_CONSUMER);
 
 ?>
 --EXPECT--

ext/tests/context_class.phpt

@@ -5,11 +5,11 @@ OpenCensus Trace: Context Class Test
 
 require_once(__DIR__ . '/common.php');
 
-if (class_exists('OpenCensus\Trace\Context')) {
-    echo "OpenCensus\\Trace\\Context class is defined.\n";
+if (class_exists('OpenCensus\Trace\Ext\SpanContext')) {
+    echo "OpenCensus\\Trace\\Ext\SpanContext class is defined.\n";
 }
 
-$context = new OpenCensus\Trace\Context([
+$context = new OpenCensus\Trace\Ext\SpanContext([
     'spanId' => 1234,
     'traceId' => 'foo'
 ]);
@@ -19,6 +19,6 @@ echo "Trace id: {$context->traceId()}\n";
 
 ?>
 --EXPECT--
-OpenCensus\Trace\Context class is defined.
+OpenCensus\Trace\Ext\SpanContext class is defined.
 Span id: 1234
 Trace id: foo

ext/tests/manual_spans_default_options.phpt

@@ -21,7 +21,7 @@ print_r($traces);
 Number of traces: 2
 Array
 (
-    [0] => OpenCensus\Trace\Span Object
+    [0] => OpenCensus\Trace\Ext\Span Object
         (
             [name:protected] => /
             [spanId:protected] => %s
@@ -39,7 +39,7 @@ Array
 
         )
 
-    [1] => OpenCensus\Trace\Span Object
+    [1] => OpenCensus\Trace\Ext\Span Object
         (
             [name:protected] => inner-1
             [spanId:protected] => %s