Skip to content

Commit

Permalink
maint: enable linting step in CI (#92)
Browse files Browse the repository at this point in the history
<!--
Thank you for contributing to the project! 💜
Please see our [OSS process
document](https://github.com/honeycombio/home/blob/main/honeycomb-oss-lifecycle-and-practices.md#)
to get an idea of how we operate.
-->

## Which problem is this PR solving?

- Closes #31 

## Short description of the changes

built off of #85 , please review that one first! Only the last 3 commits
in this PR are finalizing turning on the linting in CI.
## How to verify that this has the expected result

In CircleCI, the linting step should run.
  • Loading branch information
emilyashley committed Feb 27, 2023
1 parent 90fbf88 commit 8a7c626
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ executors:
- image: cibuilds/github:0.13.0

jobs:
# lint:
# executor:
# name: python/default
# tag: *default_python_version
# steps:
# - checkout
# - python/install-packages:
# pkg-manager: poetry
# - run: make lint
lint:
executor:
name: python/default
tag: *default_python_version
steps:
- checkout
- python/install-packages:
pkg-manager: poetry
- run: make lint
codestyle:
executor:
name: python/default
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
workflows:
build:
jobs:
# - lint # We need to get our rules in order.
- lint
- codestyle:
<<: *filters_always
- test:
Expand Down
5 changes: 3 additions & 2 deletions src/honeycomb/opentelemetry/baggage.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from typing import Optional
from opentelemetry.baggage import get_all as get_all_baggage
from opentelemetry.sdk.trace.export import SpanProcessor
from opentelemetry.trace import Span
Expand Down Expand Up @@ -33,8 +34,8 @@ def __init__(self) -> None:

def on_start(
self,
span: Span,
parent_context: Context
span: "Span",
parent_context: Optional[Context] = None
) -> None:
baggage = get_all_baggage(parent_context)
for key, value in baggage.items():
Expand Down
2 changes: 1 addition & 1 deletion src/honeycomb/opentelemetry/local_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def export(self, spans: typing.Sequence[ReadableSpan]) -> SpanExportResult:
)
return SpanExportResult.SUCCESS

def force_flush(self) -> bool:
def force_flush(self, timeout_millis: int = 30000) -> bool:
"""Ensures all telemetry waiting to be dispatched is processed.
"""
return True
Expand Down
1 change: 1 addition & 0 deletions src/honeycomb/opentelemetry/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
OTEL_SERVICE_NAME
)
from grpc import ssl_channel_credentials
OTEL_SERVICE_VERSION = "OTEL_SERVICE_VERSION"

# Environment Variable Names
OTEL_SERVICE_VERSION = "OTEL_SERVICE_VERSION"
Expand Down

0 comments on commit 8a7c626

Please sign in to comment.