Merge branch 'main' into main

Author: lzchen

.flake8

@@ -12,6 +12,10 @@ ignore =
   # allow whitespace before ':' (https://github.com/psf/black#slices)
   E203
 
+  # conflicts with black
+  E701
+  E704
+
 exclude =
   .bzr
   .git

dev-requirements.txt

@@ -1,7 +1,7 @@
 pylint==3.0.2
 flake8==6.1.0
 isort==5.12.0
-black==22.3.0
+black==24.3.0
 httpretty==1.1.4
 mypy==1.9.0
 sphinx==7.1.2

docs/examples/fork-process-model/flask-gunicorn/requirements.txt

@@ -2,7 +2,7 @@ click==8.1.7
 Flask==2.3.3
 googleapis-common-protos==1.52.0
 grpcio==1.56.0
-gunicorn==20.0.4
+gunicorn==22.0.0
 itsdangerous==2.1.2
 Jinja2==3.1.3
 MarkupSafe==2.1.3

exporter/opentelemetry-exporter-opencensus/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   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.

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py

@@ -133,11 +133,11 @@ def translate_to_collector(spans: Sequence[ReadableSpan]):
         collector_span.parent_span_id = parent_id.to_bytes(8, "big")
 
         if span.context.trace_state is not None:
-            for (key, value) in span.context.trace_state.items():
+            for key, value in span.context.trace_state.items():
                 collector_span.tracestate.entries.add(key=key, value=value)
 
         if span.attributes:
-            for (key, value) in span.attributes.items():
+            for key, value in span.attributes.items():
                 utils.add_proto_attribute_value(
                     collector_span.attributes, key, value
                 )
@@ -150,7 +150,7 @@ def translate_to_collector(spans: Sequence[ReadableSpan]):
                 )
 
                 if event.attributes:
-                    for (key, value) in event.attributes.items():
+                    for key, value in event.attributes.items():
                         utils.add_proto_attribute_value(
                             collector_annotation.attributes, key, value
                         )
@@ -183,7 +183,7 @@ def translate_to_collector(spans: Sequence[ReadableSpan]):
                         )
 
                 if link.attributes:
-                    for (key, value) in link.attributes.items():
+                    for key, value in link.attributes.items():
                         utils.add_proto_attribute_value(
                             collector_span_link.attributes, key, value
                         )

exporter/opentelemetry-exporter-otlp-proto-common/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   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.

exporter/opentelemetry-exporter-otlp-proto-grpc/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   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.

exporter/opentelemetry-exporter-otlp-proto-http/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   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.

exporter/opentelemetry-exporter-otlp/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   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.

exporter/opentelemetry-exporter-prometheus/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   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.