Skip to content

Commit

Permalink
Merge branch 'main' into flands-glossary-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
flands authored Dec 11, 2023
2 parents 95782b2 + 579b647 commit c13e330
Show file tree
Hide file tree
Showing 55 changed files with 961 additions and 314 deletions.
152 changes: 152 additions & 0 deletions .cspell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
# cSpell:ignore textlintrc
# For settings, see
# https://www.streetsidesoftware.com/vscode-spell-checker/docs/configuration/
version: '0.2'
caseSensitive: true
ignorePaths:
- '*.svg'
# words here are only listed for their spelling, if there is a certain way
# to write a word (e.g. OpenTelemetry vs Opentelemetry or cloud native vs
# cloud-native), edit the text-lint rules in .textlintrc.yml
words:
- accountingservice
- adservice
- alibaba
- Alloc
- Alolita
- APAC
- appdynamics
- appender
- appenders
- aspecto
- autoload
- autoloaded
- autoloader
- autoloading
- backoff
- bytecode
- caml
- cartservice
- cassandra
- checkoutservice
- cncf
- currencyservice
- daemonset
- datadog
- declarators
- discoverability
- dotnet
- Dyla
- dynatrace
- emailservice
- EMEA
- erlang
- errorf
- featureflagservice
- frauddetectionservice
- frontendproxy
- github
- gitpod
- grafana
- gzipped
- Hausenblas
- hugo
- initializers
- instana
- istio
- jaeger
- jaegertracing
- javaagent
- javadoc
- jboss
- jdbc
- julia
- Juraci
- knative
- kotlin
- Kröhling
- kubecon
- kubernetes
- laravel
- lifecycles
- lightstep
- linux
- Loffay
- Mancuso
- microservices
- mongodb
- mysql
- ndjson
- netlify
- Neumann
- nginx
- ocaml
- opamp
- opencensus
- opensearch
- opentelemetry
- opentracing
- openzipkin
- otel
- otel-comms
- otel-endusers
- otelcol
- otep
- otlp
- overridable
- Paixão
- parentbased
- Pavol
- paymentservice
- pluggable
- postgresql
- Pranay
- Prateek
- Println
- productcatalogservice
- prometheus
- proto
- protobuf
- quantile
- quantiles
- quarkus
- quoteservice
- recommendationservice
- redis
- relref
- Rexed
- roadmap
- runtimes
- Rynn
- semconv
- servlet
- Severin
- Sharma
- shippingservice
- shortcode
- snmp
- Socha
- sqlite
- Stalnaker
- stdoutmetric
- Strimzi
- subdir
- symfony
- tabpane
- textlint
- thanos
- tocstop
- tracecontext
- traceidratio
- traceloop
- traceparent
- traefik
- Trask
- uids
- unshallow
- upstreamed
- Villela
- wordpress
- WSGI
- zend
- zipkin
2 changes: 1 addition & 1 deletion .github/workflows/check-spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
content/**/*.md
layouts/**/*.md
data/**/*
config: .vscode/cspell.json
config: .cspell.yml

dict-check:
name: CSPELL:IGNORE check
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ assets/jsconfig.json

# VS Code
/.vscode/**
!/.vscode/cspell.json

# Webstorm
/.idea/**
152 changes: 0 additions & 152 deletions .vscode/cspell.json

This file was deleted.

33 changes: 33 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,39 @@ the production server.
To see deploy logs and more, visit project's [dashboard][] -- Netlify login
required.
## Approver and Maintainer practices
This last section includes guidelines and some common practices used by
approvers and maintainers while doing code reviews:
- PRs with changes to documentation co-owned by a SIG (collector, demo,
language-specific...) should aim for two approvals: one by a docs approver and
one by a SIG approver:
- Doc approver label such PRs with `sig:<name>` and tag the SIG `-approvers`
group on that PR
- If no SIG approval is given within a certain grace period (two weeks in
general, but may be less in urgent cases), docs maintainer may use their own
judgement to merge that PR
- If the PR branch is `out-of-date with the base branch`, they do not need to be
updated continuously: every update triggers all the PR CI checks to be run!
It's often enough to update them before merging.
- A PR by non-maintainers should **never** update git sub modules. This happens
by accident from time to time. Let the PR author know that they should not
worry about it, we will fix this before merging, but in the future they should
make sure that they work from an up-to-date fork.
- If the contributor is having trouble signing the CLA or used the wrong email
by mistake in one of their commits, ask them to fix the issue or rebase the
pull request. Worst case scenario, close and re-open the PR to trigger a new
CLA check.
- Words unknown to cspell should be added to the cspell ignore list per page by
PR authors. Only approvers and maintainers will add commonly used terms to the
global list.
- When an approver or maintainer won't be available to contribute for an
extended period of time (more than a few days or a week) or won't be available
in that period of time, they should communicate this using the
[#otel-comms](https://cloud-native.slack.com/archives/C02UN96HZH6) channel and
updating the GitHub status.

[.nvmrc]: .nvmrc
[clone]:
https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository
Expand Down
22 changes: 22 additions & 0 deletions content/en/blog/2023/otel-in-focus-break.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
title: 'OpenTelemetry in Focus: Wrapping Up a Successful 2023'
linkTitle: OTel in Focus Wrap-Up
date: 2023-12-06
author: '[Severin Neumann](https://github.com/svrnm) (Cisco)'
---

As we approach the end of an eventful year, we're announcing that "OpenTelemetry
in Focus", our platform for sharing updates about the OpenTelemetry project, is
taking an end-of-year break after ten successful editions in 2023.

Over the past year, OpenTelemetry in Focus has been a key resource for news and
insights about the OpenTelemetry project.
[Austin Parker](https://github.com/austinlparker) aimed to give a clear picture
of OTel's progress, the issues that got solved, and what is planned for the
future.

In those ten editions, each issue has highlighted the ongoing work, creativity,
and dedication that drive the OpenTelemetry project.

While OpenTelemetry in Focus is on a break, we will be working on a new and
improved format for it. Stay tuned!
Loading

0 comments on commit c13e330

Please sign in to comment.