Skip to content

Commit edb1391

Browse files
authored
1 parent ad3e239 commit edb1391

File tree

27 files changed

+41
-41
lines changed

27 files changed

+41
-41
lines changed

Diff for: CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
378378

379379
### Added
380380

381-
- Allow span limits to be set programatically via TracerProvider.
381+
- Allow span limits to be set programmatically via TracerProvider.
382382
([#1877](https://github.com/open-telemetry/opentelemetry-python/pull/1877))
383383
- Added support for CreateKey functionality.
384384
([#1853](https://github.com/open-telemetry/opentelemetry-python/pull/1853))
@@ -808,7 +808,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
808808
([#1194](https://github.com/open-telemetry/opentelemetry-python/pull/1194))
809809
- Make instances of SpanContext immutable
810810
([#1134](https://github.com/open-telemetry/opentelemetry-python/pull/1134))
811-
- Parent is now always passed in via Context, intead of Span or SpanContext
811+
- Parent is now always passed in via Context, instead of Span or SpanContext
812812
([#1146](https://github.com/open-telemetry/opentelemetry-python/pull/1146))
813813
- Update OpenTelemetry protos to v0.5.0
814814
([#1143](https://github.com/open-telemetry/opentelemetry-python/pull/1143))

Diff for: CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,6 @@ automatically load as options for the `opentelemetry-instrument` command.
229229

230230
* docstrings should adhere to the [Google Python Style
231231
Guide](http://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings)
232-
as specified with the [napolean
232+
as specified with the [napoleon
233233
extension](http://www.sphinx-doc.org/en/master/usage/extensions/napoleon.html#google-vs-numpy)
234234
extension in [Sphinx](http://www.sphinx-doc.org/en/master/index.html).

Diff for: RELEASING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ A `hotfix` is defined as a small change developed to correct a bug that should b
8080
1. Identify the packages that are affected by the bug. Make the changes to those packages, merging to `main`, as quickly as possible.
8181
2. On your local machine, remove the `dev0` tags from the version number and increment the patch version number.
8282
3. On your local machine, update `CHANGELOG.md` with the date of the hotfix change.
83-
4. With administrator priviledges for PyPi, manually publish the affected packages.
83+
4. With administrator privileges for PyPi, manually publish the affected packages.
8484
a. Install [twine](https://pypi.org/project/twine/)
8585
b. Navigate to where the `setup.py` file exists for the package you want to publish.
8686
c. Run `python setup.py sdist bdist_wheel`. You may have to install [wheel](https://pypi.org/project/wheel/) as well.
8787
d. Validate your built distributions by running `twine check dist/*`.
88-
e. Upload distibutions to PyPi by running `twine upload dist/*`.
88+
e. Upload distributions to PyPi by running `twine upload dist/*`.
8989
5. Note that since hotfixes are manually published, the build scripts for publish after creating a release are not run.
9090

9191
## Troubleshooting

Diff for: docs/examples/error_handler/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ which just logs the exception to standard logging, as seen here:
109109
AssertionError
110110
111111
When no exception is raised, the code inside the scope of
112-
``GlobalErrorHandler`` is exectued normally:
112+
``GlobalErrorHandler`` is executed normally:
113113

114114
.. code::
115115

Diff for: docs/examples/logs/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OpenTelemetry Logs SDK
44
.. warning::
55
OpenTelemetry Python logs are in an experimental state. The APIs within
66
:mod:`opentelemetry.sdk._logs` are subject to change in minor/patch releases and make no
7-
backward compatability guarantees at this time.
7+
backward compatibility guarantees at this time.
88

99
Start the Collector locally to see data being exported. Write the following file:
1010

Diff for: docs/examples/opentracing/main.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# Our example caching library expects an OpenTracing-compliant tracer.
2828
redis_cache = RedisCache(opentracing_tracer)
2929

30-
# Appication code uses an OpenTelemetry Tracer as usual.
30+
# Application code uses an OpenTelemetry Tracer as usual.
3131
tracer = trace.get_tracer(__name__)
3232

3333

Diff for: docs/sdk/logs.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ opentelemetry.sdk._logs package
44
.. warning::
55
OpenTelemetry Python logs are in an experimental state. The APIs within
66
:mod:`opentelemetry.sdk._logs` are subject to change in minor/patch releases and make no
7-
backward compatability guarantees at this time.
7+
backward compatibility guarantees at this time.
88

99
Once logs become stable, this package will be be renamed to ``opentelemetry.sdk.logs``.
1010

Diff for: exporter/opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/gen/zipkincore/ttypes.py

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: exporter/opentelemetry-exporter-jaeger-thrift/thrift/zipkincore.thrift

+3-3
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ struct Span {
292292
3: string name,
293293
4: i64 id, # unique span id, only used for this span
294294
5: optional i64 parent_id, # parent span id
295-
6: list<Annotation> annotations, # all annotations/events that occured, sorted by timestamp
295+
6: list<Annotation> annotations, # all annotations/events that occurred, sorted by timestamp
296296
8: list<BinaryAnnotation> binary_annotations # any binary annotations
297297
9: optional bool debug = 0 # if true, we DEMAND that this span passes all samplers
298298
/**
@@ -302,7 +302,7 @@ struct Span {
302302
* precise value possible. For example, gettimeofday or syncing nanoTime
303303
* against a tick of currentTimeMillis.
304304
*
305-
* For compatibilty with instrumentation that precede this field, collectors
305+
* For compatibility with instrumentation that precede this field, collectors
306306
* or span stores can derive this via Annotation.timestamp.
307307
* For example, SERVER_RECV.timestamp or CLIENT_SEND.timestamp.
308308
*
@@ -317,7 +317,7 @@ struct Span {
317317
* precise measurement decoupled from problems of clocks, such as skew or NTP
318318
* updates causing time to move backwards.
319319
*
320-
* For compatibilty with instrumentation that precede this field, collectors
320+
* For compatibility with instrumentation that precede this field, collectors
321321
* or span stores can derive this by subtracting Annotation.timestamp.
322322
* For example, SERVER_SEND.timestamp - SERVER_RECV.timestamp.
323323
*

Diff for: mypy-relaxed.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; This is mainly intended for unit tests and such. So proably going forward, we
1+
; This is mainly intended for unit tests and such. So probably going forward, we
22
; will disable even more warnings here.
33
[mypy]
44
disallow_any_unimported = True

Diff for: opentelemetry-api/src/opentelemetry/context/contextvars_context.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
class ContextVarsRuntimeContext(_RuntimeContext):
2626
"""An implementation of the RuntimeContext interface which wraps ContextVar under
27-
the hood. This is the prefered implementation for usage with Python 3.5+
27+
the hood. This is the preferred implementation for usage with Python 3.5+
2828
"""
2929

3030
_CONTEXT_KEY = "current_context"

Diff for: opentelemetry-api/src/opentelemetry/metrics/_internal/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ def set_mp() -> None:
749749
def set_meter_provider(meter_provider: MeterProvider) -> None:
750750
"""Sets the current global :class:`~.MeterProvider` object.
751751
752-
This can only be done once, a warning will be logged if any furter attempt
752+
This can only be done once, a warning will be logged if any further attempt
753753
is made.
754754
"""
755755
_set_meter_provider(meter_provider, log=True)

Diff for: opentelemetry-api/src/opentelemetry/trace/__init__.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def get_tracer(
202202
vs. a functional tracer).
203203
204204
Args:
205-
instrumenting_module_name: The uniquely identifiable name for instrumentaion
205+
instrumenting_module_name: The uniquely identifiable name for instrumentation
206206
scope, such as instrumentation library, package, module or class name.
207207
``__name__`` may not be used as this can result in
208208
different tracer names if the tracers are in different files.
@@ -318,7 +318,7 @@ def start_span(
318318
record_exception: Whether to record any exceptions raised within the
319319
context as error event on the span.
320320
set_status_on_exception: Only relevant if the returned span is used
321-
in a with/context manager. Defines wether the span status will
321+
in a with/context manager. Defines whether the span status will
322322
be automatically set to ERROR when an uncaught exception is
323323
raised in the span with block. The span status won't be set by
324324
this mechanism if it was previously set manually.
@@ -391,7 +391,7 @@ def function():
391391
record_exception: Whether to record any exceptions raised within the
392392
context as error event on the span.
393393
set_status_on_exception: Only relevant if the returned span is used
394-
in a with/context manager. Defines wether the span status will
394+
in a with/context manager. Defines whether the span status will
395395
be automatically set to ERROR when an uncaught exception is
396396
raised in the span with block. The span status won't be set by
397397
this mechanism if it was previously set manually.
@@ -524,7 +524,7 @@ def set_tp() -> None:
524524
def set_tracer_provider(tracer_provider: TracerProvider) -> None:
525525
"""Sets the current global :class:`~.TracerProvider` object.
526526
527-
This can only be done once, a warning will be logged if any furter attempt
527+
This can only be done once, a warning will be logged if any further attempt
528528
is made.
529529
"""
530530
_set_tracer_provider(tracer_provider, log=True)
@@ -562,7 +562,7 @@ def use_span(
562562
record_exception: Whether to record any exceptions raised within the
563563
context as error event on the span.
564564
set_status_on_exception: Only relevant if the returned span is used
565-
in a with/context manager. Defines wether the span status will
565+
in a with/context manager. Defines whether the span status will
566566
be automatically set to ERROR when an uncaught exception is
567567
raised in the span with block. The span status won't be set by
568568
this mechanism if it was previously set manually.

Diff for: opentelemetry-api/tests/trace/propagation/test_tracecontexthttptextformat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_no_traceparent_header(self):
4545

4646
def test_headers_with_tracestate(self):
4747
"""When there is a traceparent and tracestate header, data from
48-
both should be addded to the SpanContext.
48+
both should be added to the SpanContext.
4949
"""
5050
traceparent_value = "00-{trace_id}-{span_id}-00".format(
5151
trace_id=format(self.TRACE_ID, "032x"),

Diff for: opentelemetry-api/tests/trace/test_globals.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def do_concurrently() -> Mock:
7777
mock_tps_with_any_call[0].get_tracer.call_count, num_threads
7878
)
7979

80-
# should have warned everytime except for the successful set
80+
# should have warned every time except for the successful set
8181
self.assertEqual(mock_logger.warning.call_count, num_threads - 1)
8282

8383

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def configure(self, **kwargs):
274274

275275

276276
class _OTelSDKConfigurator(_BaseConfigurator):
277-
"""A basic Configurator by OTel Python for initalizing OTel SDK components
277+
"""A basic Configurator by OTel Python for initializing OTel SDK components
278278
279279
Initializes several crucial OTel SDK components (i.e. TracerProvider,
280280
MeterProvider, Processors...) according to a default implementation. Other

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/_logs/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ def get_log_emitter_provider() -> LogEmitterProvider:
489489
def set_log_emitter_provider(log_emitter_provider: LogEmitterProvider) -> None:
490490
"""Sets the current global :class:`~.LogEmitterProvider` object.
491491
492-
This can only be done once, a warning will be logged if any furter attempt
492+
This can only be done once, a warning will be logged if any further attempt
493493
is made.
494494
"""
495495
global _LOG_EMITTER_PROVIDER # pylint: disable=global-statement

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/environment_variables.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
.. envvar:: OTEL_ATTRIBUTE_COUNT_LIMIT
104104
105105
The :envvar:`OTEL_ATTRIBUTE_COUNT_LIMIT` represents the maximum allowed attribute count for spans, events and links.
106-
This limit is overriden by model specific limits such as OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT.
106+
This limit is overridden by model specific limits such as OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT.
107107
Default: 128
108108
"""
109109

@@ -343,7 +343,7 @@
343343
.. envvar:: OTEL_EXPORTER_OTLP_TRACES_COMPRESSION
344344
345345
Same as :envvar:`OTEL_EXPORTER_OTLP_COMPRESSION` but only for the span
346-
exporter. If both are present, this takes higher precendence.
346+
exporter. If both are present, this takes higher precedence.
347347
"""
348348

349349
OTEL_EXPORTER_OTLP_TRACES_TIMEOUT = "OTEL_EXPORTER_OTLP_TRACES_TIMEOUT"
@@ -414,7 +414,7 @@
414414
.. envvar:: OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED
415415
416416
The :envvar:`OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED` environment variable allows users to
417-
enable/disabe the logging SDK auto instrumentation.
417+
enable/disable the logging SDK auto instrumentation.
418418
Default: False
419419
420420
Note: Logs SDK and its related settings are experimental.

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ class MetricReader(ABC):
185185
to change, not necessarily all of them. The classes not included in
186186
the passed dictionary will retain their association to their
187187
default aggregations. The aggregation defined here will be
188-
overriden by an aggregation defined by a view that is not
188+
overridden by an aggregation defined by a view that is not
189189
`DefaultAggregation`.
190190
191-
.. document protected _receive_metrics which is a intended to be overriden by subclass
191+
.. document protected _receive_metrics which is a intended to be overridden by subclass
192192
.. automethod:: _receive_metrics
193193
"""
194194

@@ -325,7 +325,7 @@ def _set_collect_callback(
325325
Iterable["opentelemetry.sdk.metrics.export.Metric"],
326326
],
327327
) -> None:
328-
"""This function is internal to the SDK. It should not be called or overriden by users"""
328+
"""This function is internal to the SDK. It should not be called or overridden by users"""
329329
self._collect = func
330330

331331
@abstractmethod

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/trace/sampling.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
Sampling probability can be set with ``OTEL_TRACES_SAMPLER_ARG`` if the sampler is traceidratio or parentbased_traceidratio, when not provided rate will be set to 1.0 (maximum rate possible).
7777
7878
79-
Prev example but with environment vairables. Please make sure to set the env ``OTEL_TRACES_SAMPLER=traceidratio`` and ``OTEL_TRACES_SAMPLER_ARG=0.001``.
79+
Prev example but with environment variables. Please make sure to set the env ``OTEL_TRACES_SAMPLER=traceidratio`` and ``OTEL_TRACES_SAMPLER_ARG=0.001``.
8080
8181
.. code:: python
8282

Diff for: opentelemetry-sdk/tests/logs/test_export.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def test_shutdown(self):
187187

188188
logger.warning("warning message: %s", "possible upcoming heatwave")
189189
logger.error("Very high rise in temperatures across the globe")
190-
logger.critical("Temparature hits high 420 C in Hyderabad")
190+
logger.critical("Temperature hits high 420 C in Hyderabad")
191191

192192
log_processor.shutdown()
193193
self.assertTrue(exporter._stopped)
@@ -197,7 +197,7 @@ def test_shutdown(self):
197197
("warning message: possible upcoming heatwave", "WARNING"),
198198
("Very high rise in temperatures across the globe", "ERROR"),
199199
(
200-
"Temparature hits high 420 C in Hyderabad",
200+
"Temperature hits high 420 C in Hyderabad",
201201
"CRITICAL",
202202
),
203203
]

Diff for: opentelemetry-sdk/tests/metrics/test_backward_compat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
be made in such a way that existing implementations (outside of this repo) continue to work
1919
when *called* by the SDK.
2020
21-
This does not apply to classes which are not intended to be overriden by the user e.g. Meter
21+
This does not apply to classes which are not intended to be overridden by the user e.g. Meter
2222
and PeriodicExportingMetricReader concrete class. Those may freely be modified in a
2323
backward-compatible way for *callers*.
2424

Diff for: opentelemetry-sdk/tests/trace/test_sampling.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def test_probability_sampler_limits(self):
311311
None, 0xFFFFFFFFFFFFFFFF, "span name"
312312
).decision.is_sampled()
313313
)
314-
# Check that the higest effective sampling rate is actually lower than
314+
# Check that the highest effective sampling rate is actually lower than
315315
# the highest theoretical sampling rate. If this test fails the test
316316
# above is wrong.
317317
self.assertLess(

Diff for: opentelemetry-sdk/tests/trace/test_trace.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def run_general_code(shutdown_on_exit, explicit_shutdown):
118118
self.assertTrue(out.startswith(b"1"))
119119

120120
# test that shutdown is called only once even if Tracer.shutdown is
121-
# called explicitely
121+
# called explicitly
122122
out = run_general_code(True, True)
123123
self.assertTrue(out.startswith(b"1"))
124124

Diff for: opentelemetry-semantic-conventions/src/opentelemetry/semconv/resource/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class ResourceAttributes:
169169
170170
* **AWS Lambda:** The function [ARN](https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html).
171171
Take care not to use the "invoked ARN" directly but replace any
172-
[alias suffix](https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html) with the resolved function version, as the same runtime instance may be invokable with multiple
172+
[alias suffix](https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html) with the resolved function version, as the same runtime instance may be invocable with multiple
173173
different aliases.
174174
* **GCP:** The [URI of the resource](https://cloud.google.com/iam/docs/full-resource-names)
175175
* **Azure:** The [Fully Qualified Resource ID](https://docs.microsoft.com/en-us/rest/api/resources/resources/get-by-id).

Diff for: scripts/eachdist.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ def update_changelog(path, version, new_entry):
554554
text = changelog.read()
555555
if f"## [{version}]" in text:
556556
raise AttributeError(
557-
f"{path} already contans version {version}"
557+
f"{path} already contains version {version}"
558558
)
559559
with open(path, encoding="utf-8") as changelog:
560560
for line in changelog:

Diff for: shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ def extract(self, format: object, carrier: object):
730730
"""
731731

732732
# pylint: disable=redefined-builtin
733-
# This implementation does not perform the extracing by itself but
733+
# This implementation does not perform the extracting by itself but
734734
# uses the configured propagators in opentelemetry.propagators.
735735
# TODO: Support Format.BINARY once it is supported in
736736
# opentelemetry-python.

0 commit comments

Comments
 (0)