Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: census-instrumentation/opencensus-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Encapsia/opencensus-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 21, 2023

  1. change install requirement psycopg2-binary to psycopg2

    @petrem
    petrem committed Jun 21, 2023
    Copy the full SHA
    59e7e11 View commit details

Commits on Nov 1, 2023

  1. Merge branch 'census-instrumentation:master' into master

    @petrem
    petrem authored Nov 1, 2023
    Copy the full SHA
    353d698 View commit details

  2. replace deprecated getdefaultlocale() with getlocale()

    @petrem
    petrem committed Nov 1, 2023
    Copy the full SHA
    fbdd428 View commit details

  3. revert upstream change to depend on opencensus >0.12 because it is no… 

    …t released yet
    @petrem
    petrem committed Nov 1, 2023
    Copy the full SHA
    61537ca View commit details
2 changes: 1 addition & 1 deletion contrib/opencensus-ext-azure/opencensus/ext/azure/common/utils.py
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
'ai.cloud.role': os.path.basename(sys.argv[0]) or 'Python Application',
'ai.cloud.roleInstance': platform.node(),
'ai.device.id': platform.node(),
'ai.device.locale': locale.getdefaultlocale()[0],
'ai.device.locale': locale.getlocale()[0],
'ai.device.osVersion': platform.version(),
'ai.device.type': 'Other',
'ai.internal.sdkVersion': 'py{}:oc{}:ext{}'.format(
2 changes: 1 addition & 1 deletion contrib/opencensus-ext-azure/setup.py
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@
install_requires=[
'azure-core >= 1.12.0, < 2.0.0',
'azure-identity >= 1.5.0, < 2.0.0',
'opencensus >= 0.12.dev0, < 1.0.0',
'opencensus >= 0.11.0, < 1.0.0',
'psutil >= 5.6.3',
'requests >= 2.19.0',
],
2 changes: 1 addition & 1 deletion contrib/opencensus-ext-postgresql/setup.py
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@
long_description=open('README.rst').read(),
install_requires=[
'opencensus >= 0.9.dev0, < 1.0.0',
'psycopg2-binary >= 2.7.3.1',
'psycopg2 >= 2.7.3.1',
],
extras_require={},
license='Apache-2.0',