Skip to content

Commit

Permalink
Merge branch 'main' into task/2073-nodejs
Browse files Browse the repository at this point in the history
  • Loading branch information
iblancasa authored Oct 6, 2023
2 parents 5dcb47f + 3b10d4c commit 56ef57b
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 52 deletions.
16 changes: 16 additions & 0 deletions .chloggen/python41b0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
component: autoinstrumentation

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Bump python autoinstrumentation version to 1.20.0/0.41b0

# One or more tracking issues related to the change
issues: [2192]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
96 changes: 48 additions & 48 deletions autoinstrumentation/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
opentelemetry-distro==0.40b0
opentelemetry-distro==0.41b0
# We don't use the distro[otlp] option which automatically includes exporters since gRPC is not appropriate for
# injected auto-instrumentation, where it has a strict dependency on the OS / Python version the artifact is built for.
opentelemetry-exporter-otlp-proto-http==1.19.0
opentelemetry-exporter-otlp-proto-http==1.20.0

opentelemetry-propagator-b3==1.19.0
opentelemetry-propagator-jaeger==1.19.0
opentelemetry-propagator-b3==1.20.0
opentelemetry-propagator-jaeger==1.20.0
opentelemetry-propagator-aws-xray==1.0.1

opentelemetry-instrumentation==0.40b0
opentelemetry-propagator-ot-trace==0.40b0
opentelemetry-instrumentation==0.41b0
opentelemetry-propagator-ot-trace==0.41b0

# Copied in from https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation
# except for aws-lambda
opentelemetry-instrumentation-aio-pika==0.40b0
opentelemetry-instrumentation-aiohttp-client==0.40b0
opentelemetry-instrumentation-aiopg==0.40b0
opentelemetry-instrumentation-asgi==0.40b0
opentelemetry-instrumentation-asyncpg==0.40b0
opentelemetry-instrumentation-boto==0.40b0
opentelemetry-instrumentation-boto3sqs==0.40b0
opentelemetry-instrumentation-botocore==0.40b0
opentelemetry-instrumentation-celery==0.40b0
opentelemetry-instrumentation-confluent-kafka==0.40b0
opentelemetry-instrumentation-dbapi==0.40b0
opentelemetry-instrumentation-django==0.40b0
opentelemetry-instrumentation-elasticsearch==0.40b0
opentelemetry-instrumentation-falcon==0.40b0
opentelemetry-instrumentation-fastapi==0.40b0
opentelemetry-instrumentation-flask==0.40b0
opentelemetry-instrumentation-grpc==0.40b0
opentelemetry-instrumentation-httpx==0.40b0
opentelemetry-instrumentation-jinja2==0.40b0
opentelemetry-instrumentation-kafka-python==0.40b0
opentelemetry-instrumentation-logging==0.40b0
opentelemetry-instrumentation-mysql==0.40b0
opentelemetry-instrumentation-mysqlclient==0.40b0
opentelemetry-instrumentation-pika==0.40b0
opentelemetry-instrumentation-psycopg2==0.40b0
opentelemetry-instrumentation-pymemcache==0.40b0
opentelemetry-instrumentation-pymongo==0.40b0
opentelemetry-instrumentation-pymysql==0.40b0
opentelemetry-instrumentation-pyramid==0.40b0
opentelemetry-instrumentation-redis==0.40b0
opentelemetry-instrumentation-remoulade==0.40b0
opentelemetry-instrumentation-requests==0.40b0
opentelemetry-instrumentation-sklearn==0.40b0
opentelemetry-instrumentation-sqlalchemy==0.40b0
opentelemetry-instrumentation-sqlite3==0.40b0
opentelemetry-instrumentation-starlette==0.40b0
opentelemetry-instrumentation-system-metrics==0.40b0
opentelemetry-instrumentation-tornado==0.40b0
opentelemetry-instrumentation-tortoiseorm==0.40b0
opentelemetry-instrumentation-urllib==0.40b0
opentelemetry-instrumentation-urllib3==0.40b0
opentelemetry-instrumentation-wsgi==0.40b0
opentelemetry-instrumentation-aio-pika==0.41b0
opentelemetry-instrumentation-aiohttp-client==0.41b0
opentelemetry-instrumentation-aiopg==0.41b0
opentelemetry-instrumentation-asgi==0.41b0
opentelemetry-instrumentation-asyncpg==0.41b0
opentelemetry-instrumentation-boto==0.41b0
opentelemetry-instrumentation-boto3sqs==0.41b0
opentelemetry-instrumentation-botocore==0.41b0
opentelemetry-instrumentation-celery==0.41b0
opentelemetry-instrumentation-confluent-kafka==0.41b0
opentelemetry-instrumentation-dbapi==0.41b0
opentelemetry-instrumentation-django==0.41b0
opentelemetry-instrumentation-elasticsearch==0.41b0
opentelemetry-instrumentation-falcon==0.41b0
opentelemetry-instrumentation-fastapi==0.41b0
opentelemetry-instrumentation-flask==0.41b0
opentelemetry-instrumentation-grpc==0.41b0
opentelemetry-instrumentation-httpx==0.41b0
opentelemetry-instrumentation-jinja2==0.41b0
opentelemetry-instrumentation-kafka-python==0.41b0
opentelemetry-instrumentation-logging==0.41b0
opentelemetry-instrumentation-mysql==0.41b0
opentelemetry-instrumentation-mysqlclient==0.41b0
opentelemetry-instrumentation-pika==0.41b0
opentelemetry-instrumentation-psycopg2==0.41b0
opentelemetry-instrumentation-pymemcache==0.41b0
opentelemetry-instrumentation-pymongo==0.41b0
opentelemetry-instrumentation-pymysql==0.41b0
opentelemetry-instrumentation-pyramid==0.41b0
opentelemetry-instrumentation-redis==0.41b0
opentelemetry-instrumentation-remoulade==0.41b0
opentelemetry-instrumentation-requests==0.41b0
opentelemetry-instrumentation-sklearn==0.41b0
opentelemetry-instrumentation-sqlalchemy==0.41b0
opentelemetry-instrumentation-sqlite3==0.41b0
opentelemetry-instrumentation-starlette==0.41b0
opentelemetry-instrumentation-system-metrics==0.41b0
opentelemetry-instrumentation-tornado==0.41b0
opentelemetry-instrumentation-tortoiseorm==0.41b0
opentelemetry-instrumentation-urllib==0.41b0
opentelemetry-instrumentation-urllib3==0.41b0
opentelemetry-instrumentation-wsgi==0.41b0
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/openshift/api v3.9.0+incompatible
github.com/operator-framework/operator-lib v0.11.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0
github.com/prometheus/prometheus v0.47.0
github.com/prometheus/prometheus v0.47.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/featuregate v0.77.0
Expand All @@ -24,6 +24,7 @@ require (
k8s.io/client-go v0.28.2
k8s.io/component-base v0.28.2
k8s.io/kubectl v0.28.2
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.16.2
)

Expand Down Expand Up @@ -159,7 +160,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk=
github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
github.com/prometheus/prometheus v0.47.0 h1:tIJJKZGlmrMVsvIt6rMfB8he7CRHEc8ZxS5ubcZtbkM=
github.com/prometheus/prometheus v0.47.0/go.mod h1:J/bmOSjgH7lFxz2gZhrWEZs2i64vMS+HIuZfmYNhJ/M=
github.com/prometheus/prometheus v0.47.1 h1:bd2LiZyxzHn9Oo2Ei4eK2D86vz/L/OiqR1qYo0XmMBo=
github.com/prometheus/prometheus v0.47.1/go.mod h1:J/bmOSjgH7lFxz2gZhrWEZs2i64vMS+HIuZfmYNhJ/M=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
Expand Down

0 comments on commit 56ef57b

Please sign in to comment.