Merge branch 'main' into os-resource-detector

Author: ocelotl

.github/workflows/benchmarks.yml

@@ -6,7 +6,6 @@ on:
 
 jobs:
   sdk-benchmarks:
-    env:
     runs-on: self-hosted
     steps:
     - name: Checkout Core Repo @ SHA - ${{ github.sha }}

.github/workflows/test.yml

@@ -10,7 +10,7 @@ env:
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
-  CONTRIB_REPO_SHA: 7d4573da89c7aef748614e6f1511be3eddf5b230
+  CONTRIB_REPO_SHA: main
 
   # This is needed because we do not clone the core repo in contrib builds anymore.
   # When running contrib builds as part of core builds, we use actions/checkout@v4 which
@@ -174,7 +174,6 @@ jobs:
           - "redis"
           - "remoulade"
           - "requests"
-          - "sklearn"
           - "sqlalchemy"
           - "sqlite3"
           - "starlette"

docs-requirements.txt

@@ -9,8 +9,12 @@ sphinx-jekyll-builder==0.3.0
 ./opentelemetry-api
 ./opentelemetry-semantic-conventions
 ./opentelemetry-sdk
+./opentelemetry-proto
 ./shim/opentelemetry-opencensus-shim
 ./shim/opentelemetry-opentracing-shim
+./exporter/opentelemetry-exporter-otlp-proto-common
+./exporter/opentelemetry-exporter-otlp-proto-http
+./exporter/opentelemetry-exporter-otlp-proto-grpc
 
 # Required by instrumentation and exporter packages
 grpcio~=1.27

docs/conf.py

@@ -115,6 +115,29 @@
         "py:class",
         "opentelemetry.trace._LinkBase",
     ),
+    (
+        "py:class",
+        "opentelemetry.exporter.otlp.proto.grpc.exporter.OTLPExporterMixin",
+    ),
+    (
+        "py:class",
+        "opentelemetry.proto.collector.trace.v1.trace_service_pb2.ExportTraceServiceRequest",
+    ),
+    (
+        "py:class",
+        "opentelemetry.exporter.otlp.proto.common._internal.metrics_encoder.OTLPMetricExporterMixin",
+    ),
+    ("py:class", "opentelemetry.proto.resource.v1.resource_pb2.Resource"),
+    (
+        "py:class",
+        "opentelemetry.proto.collector.metrics.v1.metrics_service_pb2.ExportMetricsServiceRequest",
+    ),
+    ("py:class", "opentelemetry.sdk._logs._internal.export.LogExporter"),
+    ("py:class", "opentelemetry.sdk._logs._internal.export.LogExportResult"),
+    (
+        "py:class",
+        "opentelemetry.proto.collector.logs.v1.logs_service_pb2.ExportLogsServiceRequest",
+    ),
 ]
 
 # Add any paths that contain templates here, relative to this directory.

docs/examples/logs/README.rst

@@ -15,21 +15,26 @@ Start the Collector locally to see data being exported. Write the following file
       otlp:
         protocols:
           grpc:
-
-    processors:
-      batch:
+            endpoint: 0.0.0.0:4317
 
     exporters:
       logging:
-        verbosity: detailed
+        loglevel: debug
+
+    processors:
+      batch:
 
     service:
         pipelines:
             logs:
                 receivers: [otlp]
                 processors: [batch]
                 exporters: [logging]
-  
+            traces:
+                receivers: [otlp]
+                processors: [batch]
+                exporters: [logging]
+
 Then start the Docker container:
 
 .. code-block:: sh

docs/examples/logs/otel-collector-config.yaml

@@ -2,6 +2,7 @@ receivers:
   otlp:
     protocols:
       grpc:
+        endpoint: 0.0.0.0:4317
 
 exporters:
   logging:

docs/examples/metrics/instruments/README.rst

@@ -10,6 +10,7 @@ Start the Collector locally to see data being exported. Write the following file
         otlp:
             protocols:
                 grpc:
+                    endpoint: 0.0.0.0:4317
 
     exporters:
         logging:

docs/examples/metrics/instruments/otel-collector-config.yaml

@@ -2,6 +2,7 @@ receivers:
     otlp:
         protocols:
             grpc:
+                endpoint: 0.0.0.0:4317
 
 exporters:
     logging:

docs/exporter/otlp/otlp.rst

@@ -1,12 +1,34 @@
 OpenTelemetry OTLP Exporters
 ============================
-
 .. automodule:: opentelemetry.exporter.otlp
     :members:
     :undoc-members:
     :show-inheritance:
 
+opentelemetry.exporter.otlp.proto.http
+---------------------------------------
+
+.. automodule:: opentelemetry.exporter.otlp.proto.http
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+.. automodule:: opentelemetry.exporter.otlp.proto.http.trace_exporter
+
+.. automodule:: opentelemetry.exporter.otlp.proto.http.metric_exporter
+
+.. automodule:: opentelemetry.exporter.otlp.proto.http._log_exporter
+
+opentelemetry.exporter.otlp.proto.grpc
+---------------------------------------
+
 .. automodule:: opentelemetry.exporter.otlp.proto.grpc
     :members:
     :undoc-members:
     :show-inheritance:
+
+.. automodule:: opentelemetry.exporter.otlp.proto.grpc.trace_exporter
+
+.. automodule:: opentelemetry.exporter.otlp.proto.grpc.metric_exporter
+
+.. automodule:: opentelemetry.exporter.otlp.proto.grpc._log_exporter

exporter/opentelemetry-exporter-otlp-proto-grpc/benchmarks/test_benchmark_trace_exporter.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# pylint: disable=invalid-name
+
 from unittest.mock import patch
 
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (