Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SQLCommenter semicolon bug fix #1200

Merged

Conversation

Thiyagu55
Copy link
Contributor

@Thiyagu55 Thiyagu55 commented Jul 20, 2022

Description

This PR fixes the bug which appends ; before the comment. Ideally it should append ; at the last

Type of change

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

  • test_add_sql_comments_with_semicolon
  • test_add_sql_comments_without_semicolon
  • test_add_sql_comments_without_comments
  • Updated existing test queries with ; appended

Does This PR Require a Core Repo Change?

  • Yes. - Link to PR:
  • No.

Checklist:

See contributing.md for styleguide, changelog guidelines, and more.

  • Followed the style guidelines of this project
  • Changelogs have been updated
  • Unit tests have been added

@Thiyagu55 Thiyagu55 requested a review from a team July 20, 2022 08:05
@Thiyagu55 Thiyagu55 marked this pull request as draft July 20, 2022 08:05
@Thiyagu55 Thiyagu55 changed the title Python commenter semicolon bug fix SQLCommenter semicolon bug fix Jul 20, 2022
@Thiyagu55 Thiyagu55 marked this pull request as ready for review July 21, 2022 09:32
@srikanthccv srikanthccv merged commit 7c75b38 into open-telemetry:main Jul 22, 2022
wosc added a commit to ZeitOnline/vivi that referenced this pull request Jul 28, 2022
AFAICT otel violates its own API here, should use get_span_context() instead:
  File "opentelemetry/instrumentation/utils.py", line 160, in _generate_opentelemetry_traceparent
    _span_id = trace.format_span_id(span.context.span_id)
  AttributeError: 'NonRecordingSpan' object has no attribute 'context'

I'm backporting open-telemetry/opentelemetry-python-contrib#1200
which sidesteps the issue by using propagate to generate the traceparent header
instead of doing it manually.
shalevr added a commit to shalevr/opentelemetry-python-contrib that referenced this pull request Aug 30, 2022
* main:
  Codespell ci (open-telemetry#1237)
  aiohttp-client: Fix producing additional spans with each newly created ClientSession (open-telemetry#1246)
  Remove support for 3.6 (open-telemetry#853)
  Added the Licence and Manifest file
  Restore metrics in django (open-telemetry#1208)
  fix typo in example codes (open-telemetry#1240)
  boto3sqs: Make propagation compatible with other instrumentations and add 'messaging.url' span attribute (open-telemetry#1234)
  Release 1.12.0-0.33b0 (open-telemetry#1223)
  Fix Flask instrumentation doc link (open-telemetry#1216)
  Feature/metrics instrumentation urllib3 (open-telemetry#1198)
  Metric instrumentation asgi (open-telemetry#1197)
  Metrics instrumentation flask (open-telemetry#1186)
  Adding sqlalchemy native tags in sqlalchemy commenter (open-telemetry#1206)
  ci: fix docs workflow failure (open-telemetry#1211)
  Add psycopg2 native tags to sqlcommenter (open-telemetry#1203)
  SQLCommenter semicolon bug fix (open-telemetry#1200)
  Sync with sdk setup from setUpClass to setUp (open-telemetry#1193)

# Conflicts:
#	CHANGELOG.md
#	instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py
#	instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants