Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 489a81e

Browse files
author
alrex
authored
rename span processor (open-telemetry#1656)
1 parent 326b7b0 commit 489a81e

File tree

35 files changed

+101
-108
lines changed

35 files changed

+101
-108
lines changed

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: c86562fcddcf8fd037492de3880790776abe79ce
13+
CONTRIB_REPO_SHA: 63a755348c2c9a2b83da85a5c72487ddc507b8b4
1414

1515
jobs:
1616
build:

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
([#1652])(https://github.com/open-telemetry/opentelemetry-python/pull/1652)
1818
- Rename Resource's `create_empty` to `get_empty`
1919
([#1653])(https://github.com/open-telemetry/opentelemetry-python/pull/1653)
20+
- Renamed `BatchExportSpanProcessor` to `BatchSpanProcessor` and `SimpleExportSpanProcessor` to
21+
`SimpleSpanProcessor`
22+
([#1656])(https://github.com/open-telemetry/opentelemetry-python/pull/1656)
2023

2124
## [0.18b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.18b0) - 2021-02-16
2225

‎docs/examples/auto-instrumentation/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
from opentelemetry.sdk.trace import TracerProvider
2121
from opentelemetry.sdk.trace.export import (
2222
ConsoleSpanExporter,
23-
SimpleExportSpanProcessor,
23+
SimpleSpanProcessor,
2424
)
2525

2626
trace.set_tracer_provider(TracerProvider())
2727
tracer = trace.get_tracer_provider().get_tracer(__name__)
2828

2929
trace.get_tracer_provider().add_span_processor(
30-
SimpleExportSpanProcessor(ConsoleSpanExporter())
30+
SimpleSpanProcessor(ConsoleSpanExporter())
3131
)
3232

3333

‎docs/examples/auto-instrumentation/server_instrumented.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from opentelemetry.sdk.trace import TracerProvider
2121
from opentelemetry.sdk.trace.export import (
2222
ConsoleSpanExporter,
23-
SimpleExportSpanProcessor,
23+
SimpleSpanProcessor,
2424
)
2525
from opentelemetry.trace.propagation.textmap import DictGetter
2626

@@ -30,7 +30,7 @@
3030
tracer = trace.get_tracer_provider().get_tracer(__name__)
3131

3232
trace.get_tracer_provider().add_span_processor(
33-
SimpleExportSpanProcessor(ConsoleSpanExporter())
33+
SimpleSpanProcessor(ConsoleSpanExporter())
3434
)
3535

3636

‎docs/examples/auto-instrumentation/server_uninstrumented.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
from opentelemetry.sdk.trace import TracerProvider
1919
from opentelemetry.sdk.trace.export import (
2020
ConsoleSpanExporter,
21-
SimpleExportSpanProcessor,
21+
SimpleSpanProcessor,
2222
)
2323

2424
app = Flask(__name__)
2525

2626
trace.set_tracer_provider(TracerProvider())
2727

2828
trace.get_tracer_provider().add_span_processor(
29-
SimpleExportSpanProcessor(ConsoleSpanExporter())
29+
SimpleSpanProcessor(ConsoleSpanExporter())
3030
)
3131

3232

‎docs/examples/basic_tracer/basic_trace.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
from opentelemetry.sdk.trace import TracerProvider
1717
from opentelemetry.sdk.trace.export import (
1818
ConsoleSpanExporter,
19-
SimpleExportSpanProcessor,
19+
SimpleSpanProcessor,
2020
)
2121

2222
trace.set_tracer_provider(TracerProvider())
2323
trace.get_tracer_provider().add_span_processor(
24-
SimpleExportSpanProcessor(ConsoleSpanExporter())
24+
SimpleSpanProcessor(ConsoleSpanExporter())
2525
)
2626
tracer = trace.get_tracer(__name__)
2727
with tracer.start_as_current_span("foo"):

‎docs/examples/basic_tracer/resources.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
from opentelemetry.sdk.trace import TracerProvider
1818
from opentelemetry.sdk.trace.export import (
1919
ConsoleSpanExporter,
20-
SimpleExportSpanProcessor,
20+
SimpleSpanProcessor,
2121
)
2222

2323
resource = Resource.create({"service.name": "basic_service"})
2424

2525
trace.set_tracer_provider(TracerProvider(resource=resource))
2626

2727
trace.get_tracer_provider().add_span_processor(
28-
SimpleExportSpanProcessor(ConsoleSpanExporter())
28+
SimpleSpanProcessor(ConsoleSpanExporter())
2929
)
3030
tracer = trace.get_tracer(__name__)
3131
with tracer.start_as_current_span("foo"):

‎docs/examples/django/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
from opentelemetry.sdk.trace import TracerProvider
2222
from opentelemetry.sdk.trace.export import (
2323
ConsoleSpanExporter,
24-
SimpleExportSpanProcessor,
24+
SimpleSpanProcessor,
2525
)
2626

2727
trace.set_tracer_provider(TracerProvider())
2828
tracer = trace.get_tracer_provider().get_tracer(__name__)
2929

3030
trace.get_tracer_provider().add_span_processor(
31-
SimpleExportSpanProcessor(ConsoleSpanExporter())
31+
SimpleSpanProcessor(ConsoleSpanExporter())
3232
)
3333

3434

‎docs/examples/django/pages/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
from opentelemetry.sdk.trace import TracerProvider
1818
from opentelemetry.sdk.trace.export import (
1919
ConsoleSpanExporter,
20-
SimpleExportSpanProcessor,
20+
SimpleSpanProcessor,
2121
)
2222

2323
trace.set_tracer_provider(TracerProvider())
2424

2525
trace.get_tracer_provider().add_span_processor(
26-
SimpleExportSpanProcessor(ConsoleSpanExporter())
26+
SimpleSpanProcessor(ConsoleSpanExporter())
2727
)
2828

2929

‎docs/examples/opencensus-exporter-tracer/collector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
OpenCensusSpanExporter,
2020
)
2121
from opentelemetry.sdk.trace import TracerProvider
22-
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
22+
from opentelemetry.sdk.trace.export import BatchSpanProcessor
2323

2424
exporter = OpenCensusSpanExporter(
2525
service_name="basic-service", endpoint="localhost:55678"
2626
)
2727

2828
trace.set_tracer_provider(TracerProvider())
2929
tracer = trace.get_tracer(__name__)
30-
span_processor = BatchExportSpanProcessor(exporter)
30+
span_processor = BatchSpanProcessor(exporter)
3131

3232
trace.get_tracer_provider().add_span_processor(span_processor)
3333
with tracer.start_as_current_span("foo"):

‎docs/examples/opentracing/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from opentelemetry import trace
66
from opentelemetry.exporter.jaeger import JaegerSpanExporter
77
from opentelemetry.sdk.trace import TracerProvider
8-
from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
8+
from opentelemetry.sdk.trace.export import SimpleSpanProcessor
99
from opentelemetry.shim import opentracing_shim
1010

1111
# Configure the tracer using the default implementation
@@ -18,7 +18,7 @@
1818
agent_host_name="localhost",
1919
agent_port=6831,
2020
)
21-
span_processor = SimpleExportSpanProcessor(jaeger_exporter)
21+
span_processor = SimpleSpanProcessor(jaeger_exporter)
2222
tracer_provider.add_span_processor(span_processor)
2323

2424
# Create an OpenTracing shim. This implements the OpenTracing tracer API, but

‎docs/getting_started/flask_example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
from opentelemetry.sdk.trace import TracerProvider
2323
from opentelemetry.sdk.trace.export import (
2424
ConsoleSpanExporter,
25-
SimpleExportSpanProcessor,
25+
SimpleSpanProcessor,
2626
)
2727

2828
trace.set_tracer_provider(TracerProvider())
2929
trace.get_tracer_provider().add_span_processor(
30-
SimpleExportSpanProcessor(ConsoleSpanExporter())
30+
SimpleSpanProcessor(ConsoleSpanExporter())
3131
)
3232

3333
app = flask.Flask(__name__)

‎docs/getting_started/jaeger_example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from opentelemetry import trace
1717
from opentelemetry.exporter import jaeger
1818
from opentelemetry.sdk.trace import TracerProvider
19-
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
19+
from opentelemetry.sdk.trace.export import BatchSpanProcessor
2020

2121
trace.set_tracer_provider(TracerProvider())
2222

@@ -27,7 +27,7 @@
2727
)
2828

2929
trace.get_tracer_provider().add_span_processor(
30-
BatchExportSpanProcessor(jaeger_exporter)
30+
BatchSpanProcessor(jaeger_exporter)
3131
)
3232

3333
tracer = trace.get_tracer(__name__)

‎docs/getting_started/otlpcollector_example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from opentelemetry import trace
1919
from opentelemetry.exporter.otlp.trace_exporter import OTLPSpanExporter
2020
from opentelemetry.sdk.trace import TracerProvider
21-
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
21+
from opentelemetry.sdk.trace.export import BatchSpanProcessor
2222

2323
span_exporter = OTLPSpanExporter(
2424
# optional
@@ -28,7 +28,7 @@
2828
)
2929
tracer_provider = TracerProvider()
3030
trace.set_tracer_provider(tracer_provider)
31-
span_processor = BatchExportSpanProcessor(span_exporter)
31+
span_processor = BatchSpanProcessor(span_exporter)
3232
tracer_provider.add_span_processor(span_processor)
3333

3434
# Configure the tracer to use the collector exporter

‎docs/getting_started/tracing_example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
from opentelemetry.sdk.trace import TracerProvider
1818
from opentelemetry.sdk.trace.export import (
1919
ConsoleSpanExporter,
20-
SimpleExportSpanProcessor,
20+
SimpleSpanProcessor,
2121
)
2222

2323
trace.set_tracer_provider(TracerProvider())
2424
trace.get_tracer_provider().add_span_processor(
25-
SimpleExportSpanProcessor(ConsoleSpanExporter())
25+
SimpleSpanProcessor(ConsoleSpanExporter())
2626
)
2727

2828
tracer = trace.get_tracer(__name__)

‎exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from opentelemetry import trace
44
from opentelemetry.exporter import jaeger
55
from opentelemetry.sdk.trace import TracerProvider
6-
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
6+
from opentelemetry.sdk.trace.export import BatchSpanProcessor
77

88
trace.set_tracer_provider(TracerProvider())
99
tracer = trace.get_tracer(__name__)
@@ -35,8 +35,8 @@
3535
# transport_format="protobuf",
3636
# )
3737

38-
# create a BatchExportSpanProcessor and add the exporter to it
39-
span_processor = BatchExportSpanProcessor(jaeger_exporter)
38+
# create a BatchSpanProcessor and add the exporter to it
39+
span_processor = BatchSpanProcessor(jaeger_exporter)
4040

4141
# add to the tracer factory
4242
trace.get_tracer_provider().add_span_processor(span_processor)

‎exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from opentelemetry import trace
3030
from opentelemetry.exporter import jaeger
3131
from opentelemetry.sdk.trace import TracerProvider
32-
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
32+
from opentelemetry.sdk.trace.export import BatchSpanProcessor
3333
3434
trace.set_tracer_provider(TracerProvider())
3535
tracer = trace.get_tracer(__name__)
@@ -50,8 +50,8 @@
5050
# max_tag_value_length=None # optional
5151
)
5252
53-
# Create a BatchExportSpanProcessor and add the exporter to it
54-
span_processor = BatchExportSpanProcessor(jaeger_exporter)
53+
# Create a BatchSpanProcessor and add the exporter to it
54+
span_processor = BatchSpanProcessor(jaeger_exporter)
5555
5656
# add to the tracer
5757
trace.get_tracer_provider().add_span_processor(span_processor)

‎exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
from opentelemetry.exporter.otlp.trace_exporter import OTLPSpanExporter
4343
from opentelemetry.sdk.resources import Resource
4444
from opentelemetry.sdk.trace import TracerProvider
45-
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
45+
from opentelemetry.sdk.trace.export import BatchSpanProcessor
4646
4747
# Resource can be required for some backends, e.g. Jaeger
4848
# If resource wouldn't be set - traces wouldn't appears in Jaeger
@@ -55,7 +55,7 @@
5555
5656
otlp_exporter = OTLPSpanExporter(endpoint="localhost:4317", insecure=True)
5757
58-
span_processor = BatchExportSpanProcessor(otlp_exporter)
58+
span_processor = BatchSpanProcessor(otlp_exporter)
5959
6060
trace.get_tracer_provider().add_span_processor(span_processor)
6161

‎exporter/opentelemetry-exporter-otlp/tests/performance/benchmarks/test_benchmark_trace_exporter.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from opentelemetry.exporter.otlp.trace_exporter import OTLPSpanExporter
1818
from opentelemetry.sdk.trace import TracerProvider, sampling
1919
from opentelemetry.sdk.trace.export import (
20-
BatchExportSpanProcessor,
21-
SimpleExportSpanProcessor,
20+
BatchSpanProcessor,
21+
SimpleSpanProcessor,
2222
)
2323

2424

@@ -40,7 +40,7 @@ def __init__(self, channel):
4040
new=MockTraceServiceStub,
4141
)
4242
def test_simple_span_processor(benchmark):
43-
tracer = get_tracer_with_processor(SimpleExportSpanProcessor)
43+
tracer = get_tracer_with_processor(SimpleSpanProcessor)
4444

4545
def create_spans_to_be_exported():
4646
span = tracer.start_span("benchmarkedSpan",)
@@ -59,14 +59,14 @@ def create_spans_to_be_exported():
5959
new=MockTraceServiceStub,
6060
)
6161
def test_batch_span_processor(benchmark):
62-
"""Runs benchmark tests using BatchExportSpanProcessor.
62+
"""Runs benchmark tests using BatchSpanProcessor.
6363
6464
One particular call by pytest-benchmark will be much more expensive since
6565
the batch export thread will activate and consume a lot of CPU to process
6666
all the spans. For this reason, focus on the average measurement. Do not
6767
focus on the min/max measurements which will be misleading.
6868
"""
69-
tracer = get_tracer_with_processor(BatchExportSpanProcessor)
69+
tracer = get_tracer_with_processor(BatchSpanProcessor)
7070

7171
def create_spans_to_be_exported():
7272
span = tracer.start_span("benchmarkedSpan",)

‎exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
from opentelemetry.sdk.trace import StatusCode as SDKStatusCode
5757
from opentelemetry.sdk.trace import TracerProvider, _Span
5858
from opentelemetry.sdk.trace.export import (
59-
SimpleExportSpanProcessor,
59+
SimpleSpanProcessor,
6060
SpanExportResult,
6161
)
6262
from opentelemetry.sdk.util.instrumentation import InstrumentationInfo
@@ -114,9 +114,7 @@ class TestOTLPSpanExporter(TestCase):
114114
def setUp(self):
115115
tracer_provider = TracerProvider()
116116
self.exporter = OTLPSpanExporter(insecure=True)
117-
tracer_provider.add_span_processor(
118-
SimpleExportSpanProcessor(self.exporter)
119-
)
117+
tracer_provider.add_span_processor(SimpleSpanProcessor(self.exporter))
120118
self.tracer = tracer_provider.get_tracer(__name__)
121119

122120
self.server = server(ThreadPoolExecutor(max_workers=10))

‎exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from opentelemetry import trace
3535
from opentelemetry.exporter import zipkin
3636
from opentelemetry.sdk.trace import TracerProvider
37-
from opentelemetry.sdk.trace.export import BatchExportSpanProcessor
37+
from opentelemetry.sdk.trace.export import BatchSpanProcessor
3838
3939
trace.set_tracer_provider(TracerProvider())
4040
tracer = trace.get_tracer(__name__)
@@ -50,8 +50,8 @@
5050
# max_tag_value_length=256
5151
)
5252
53-
# Create a BatchExportSpanProcessor and add the exporter to it
54-
span_processor = BatchExportSpanProcessor(zipkin_exporter)
53+
# Create a BatchSpanProcessor and add the exporter to it
54+
span_processor = BatchSpanProcessor(zipkin_exporter)
5555
5656
# add to the tracer
5757
trace.get_tracer_provider().add_span_processor(span_processor)

‎opentelemetry-distro/src/opentelemetry/distro/__init__.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@
2929
from opentelemetry.instrumentation.distro import BaseDistro
3030
from opentelemetry.sdk.resources import Resource
3131
from opentelemetry.sdk.trace import TracerProvider
32-
from opentelemetry.sdk.trace.export import (
33-
BatchExportSpanProcessor,
34-
SpanExporter,
35-
)
32+
from opentelemetry.sdk.trace.export import BatchSpanProcessor, SpanExporter
3633
from opentelemetry.sdk.trace.id_generator import IdGenerator
3734

3835
logger = getLogger(__file__)
@@ -95,7 +92,7 @@ def _init_tracing(
9592
exporter_args["service_name"] = service_name
9693

9794
provider.add_span_processor(
98-
BatchExportSpanProcessor(exporter_class(**exporter_args))
95+
BatchSpanProcessor(exporter_class(**exporter_args))
9996
)
10097

10198

0 commit comments

Comments
 (0)