Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
svrnm committed Mar 14, 2024
2 parents bd97302 + c78228f commit 546060a
Show file tree
Hide file tree
Showing 12 changed files with 77 additions and 93 deletions.
4 changes: 3 additions & 1 deletion content/en/blog/2024/kubecon-eu.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@ Time (CET).
[End User Feedback Session - Semantic Conventions](https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-semantic-conventions?month=2024-03)
- **March 21st, 14:30-15:30:**
[End User Feedback Session - Comms (website, docs)](https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-comms?month=2024-03)
- **March 21th, 15:00-16:00:**
- **March 21st, 15:00-16:00:**
[End User Feedback Session - Profiling](https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-profiling?month=2024-03)
- **March 21st, 15:30-16:30:**
[End User Feedback Session - Client-side](https://calendly.com/euwg-user-feedback-session/end-user-feedback-session-client-side)

A maximum of 5 participants will join one SIG maintainer to provide feedback for
that SIG. Sessions will be recorded and posted on the
Expand Down
41 changes: 19 additions & 22 deletions content/en/docs/collector/transforming-telemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Transforming telemetry
weight: 26
# prettier-ignore
cSpell:ignore: accountid clustername k8sattributes metricstransform resourcedetection
cSpell:ignore: accountid clustername k8sattributes metricstransform OTTL resourcedetection
---

The OpenTelemetry Collector is a convenient place to transform data before
Expand All @@ -23,38 +23,35 @@ a significant impact on collector performance.
**Processor**:
[filter processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/filterprocessor)

The filter processor allows users to filter telemetry based on `include` or
`exclude` rules. Include rules are used for defining "allow lists" where
anything that does _not_ match include rules is dropped from the collector.
Exclude rules are used for defining "deny lists" where telemetry that matches
rules is dropped from the collector.
The filter processor allows users to filter telemetry using
[OTTL](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/pkg/ottl/README.md).
Telemetry that matches any condition is dropped.

For example, to _only_ allow span data from services app1, app2, and app3 and
drop data from all other services:

```yaml
processors:
filter/allowlist:
spans:
include:
match_type: strict
services:
- app1
- app2
- app3
filter/ottl:
error_mode: ignore
traces:
span:
- |
resource.attributes["service.name"] != "app1" and
resource.attributes["service.name"] != "app2" and
resource.attributes["service.name"] != "app3"
```

To only block spans from a service called development while allowing all other
spans, an exclude rule is used:
To only drop spans from a service called `service1` while keeping all other
spans:

```yaml
processors:
filter/denylist:
spans:
exclude:
match_type: strict
services:
- development
filter/ottl:
error_mode: ignore
traces:
span:
- resource.attributes["service.name"] == "service1"
```

The
Expand Down
5 changes: 4 additions & 1 deletion content/en/docs/demo/feature-flags.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
title: Feature Flags
aliases: [feature_flags]
aliases:
- feature_flags
- services/feature-flag
- services/featureflagservice
cSpell:ignore: flagd OLJCESPC7Z
---

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/kubernetes/operator/automatic.md
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ kubectl logs -l app.kubernetes.io/name=opentelemetry-operator --container manage

### Were the resources deployed in the right order?

Order matters! The `Instrumentation` resource needs to be deployed before before
Order matters! The `Instrumentation` resource needs to be deployed before
deploying the application, otherwise the auto-instrumentation won’t work.

Recall the auto-instrumentation annotation:
Expand Down
8 changes: 5 additions & 3 deletions content/en/docs/languages/python/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,18 @@ app = Flask(__name__)
logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)


@app.route("/rolldice")
def roll_dice():
player = request.args.get('player', default = None, type = str)
player = request.args.get('player', default=None, type=str)
result = str(roll())
if player:
logger.warn("%s is rolling the dice: %s", player, result)
logger.warning("%s is rolling the dice: %s", player, result)
else:
logger.warn("Anonymous player is rolling the dice: %s", result)
logger.warning("Anonymous player is rolling the dice: %s", result)
return result


def roll():
return randint(1, 6)
```
Expand Down

0 comments on commit 546060a

Please sign in to comment.